All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tim Harvey <tharvey@gateworks.com>
To: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
Cc: Stefano Babic <sbabic@denx.de>,
	Fabio Estevam <festevam@gmail.com>,
	 "Ariel D'Alessandro" <ariel.dalessandro@collabora.com>,
	 Michael Trimarchi <michael@amarulasolutions.com>,
	Peng Fan <peng.fan@nxp.com>,  u-boot <u-boot@lists.denx.de>
Subject: Re: [PATCH 2/4] configs: imx8m: use common imx8m.h for i.MX8MN
Date: Tue, 3 May 2022 08:43:42 -0700	[thread overview]
Message-ID: <CAJ+vNU3BWxRxHvVJ=r6+dQKGu_fesNqzTjZzG-cXZj+7Ku1pRw@mail.gmail.com> (raw)
In-Reply-To: <20220503122113.26780-2-peng.fan@oss.nxp.com>

On Tue, May 3, 2022 at 4:39 AM Peng Fan (OSS) <peng.fan@oss.nxp.com> wrote:
>
> From: Peng Fan <peng.fan@nxp.com>
>
> Some SPL definitions could be gerneralized, so use imx8m.h for iMX8MN.
>

Peng,

s/gerneralized/generalized

(looks like that typo is all the patches in your series)

Great cleanup - thanks! This is a great start to getting rid of the
remaining items in the config headers.

If you do end up doing a 2nd version you can probably remove the
comments on the sizes, for example  'SZ_8K /* 8 KB */'' as I think the
comment is not needed.

Works great for imx8mn-venice-*.

Tested-by: Tim Harvey <tharvey@gateworks.com> #imx8mm-venice-*

> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
>  include/configs/imx8m.h                    | 10 ++++++++++
>  include/configs/imx8mn_bsh_smm_s2_common.h | 17 +----------------
>  include/configs/imx8mn_evk.h               | 20 +-------------------
>  include/configs/imx8mn_var_som.h           | 15 +--------------
>  include/configs/imx8mn_venice.h            | 18 +-----------------
>  5 files changed, 14 insertions(+), 66 deletions(-)
>
> diff --git a/include/configs/imx8m.h b/include/configs/imx8m.h
> index 3d4ea834bd0..30dc01221e6 100644
> --- a/include/configs/imx8m.h
> +++ b/include/configs/imx8m.h
> @@ -16,6 +16,8 @@
>         (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
>
>  #ifdef CONFIG_SPL_BUILD
> +
> +#ifdef CONFIG_IMX8MM
>  #define CONFIG_SPL_STACK               0x920000
>  #define CONFIG_SPL_BSS_START_ADDR      0x910000
>  #define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K   /* 8 KB */
> @@ -25,5 +27,13 @@
>  /* malloc f used before GD_FLG_FULL_MALLOC_INIT set */
>  #define CONFIG_MALLOC_F_ADDR           0x930000
>
> +#elif defined(CONFIG_IMX8MN)
> +#define CONFIG_SPL_STACK               0x980000
> +#define CONFIG_SPL_BSS_START_ADDR      0x950000
> +#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K   /* 8 KB */
> +#define CONFIG_SYS_SPL_MALLOC_START    0x42200000
> +#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_512K /* 512 KB */
> +
> +#endif
>  #endif
>  #endif
> diff --git a/include/configs/imx8mn_bsh_smm_s2_common.h b/include/configs/imx8mn_bsh_smm_s2_common.h
> index 57be38d9433..eb210dc597b 100644
> --- a/include/configs/imx8mn_bsh_smm_s2_common.h
> +++ b/include/configs/imx8mn_bsh_smm_s2_common.h
> @@ -6,25 +6,10 @@
>  #ifndef __IMX8MN_BSH_SMM_S2_COMMON_H
>  #define __IMX8MN_BSH_SMM_S2_COMMON_H
>
> -#include <linux/sizes.h>
> -#include <linux/stringify.h>
> -#include <asm/arch/imx-regs.h>
> +#include <configs/imx8m.h>
>
>  #define CONFIG_SYS_BOOTM_LEN           (32 * SZ_1M)
>
> -#define CONFIG_SPL_MAX_SIZE            (148 * SZ_1K)
> -#define CONFIG_SYS_MONITOR_LEN         SZ_512K
> -#define CONFIG_SYS_UBOOT_BASE  \
> -       (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
> -
> -#define CONFIG_SPL_STACK               0x980000
> -#define CONFIG_SPL_BSS_START_ADDR      0x950000
> -#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K
> -#define CONFIG_SYS_SPL_MALLOC_START    0x42200000
> -#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_512K
> -
> -
> -
>  #define MEM_LAYOUT_ENV_SETTINGS \
>         "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
>         "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> diff --git a/include/configs/imx8mn_evk.h b/include/configs/imx8mn_evk.h
> index c0e9b0e9872..6e21192ea03 100644
> --- a/include/configs/imx8mn_evk.h
> +++ b/include/configs/imx8mn_evk.h
> @@ -6,28 +6,10 @@
>  #ifndef __IMX8MN_EVK_H
>  #define __IMX8MN_EVK_H
>
> -#include <linux/sizes.h>
> -#include <linux/stringify.h>
> -#include <asm/arch/imx-regs.h>
> +#include <configs/imx8m.h>
>
>  #define CONFIG_SYS_BOOTM_LEN           (32 * SZ_1M)
>
> -#define CONFIG_SPL_MAX_SIZE            (148 * 1024)
> -#define CONFIG_SYS_MONITOR_LEN         SZ_512K
> -#define CONFIG_SYS_UBOOT_BASE  \
> -       (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
> -
> -#ifdef CONFIG_SPL_BUILD
> -#define CONFIG_SPL_STACK               0x980000
> -#define CONFIG_SPL_BSS_START_ADDR      0x950000
> -#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K   /* 8 KB */
> -#define CONFIG_SYS_SPL_MALLOC_START    0x42200000
> -#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_512K /* 512 KB */
> -
> -/* For RAW image gives a error info not panic */
> -
> -#endif
> -
>  #ifndef CONFIG_SPL_BUILD
>  #define BOOT_TARGET_DEVICES(func) \
>         func(MMC, mmc, 1) \
> diff --git a/include/configs/imx8mn_var_som.h b/include/configs/imx8mn_var_som.h
> index 6ce60b0d704..fc9c4ca4530 100644
> --- a/include/configs/imx8mn_var_som.h
> +++ b/include/configs/imx8mn_var_som.h
> @@ -6,23 +6,10 @@
>  #ifndef __IMX8MN_VAR_SOM_H
>  #define __IMX8MN_VAR_SOM_H
>
> -#include <linux/sizes.h>
> -#include <linux/stringify.h>
> -#include <asm/arch/imx-regs.h>
> +#include <configs/imx8m.h>
>
>  #define CONFIG_SYS_BOOTM_LEN           (32 * SZ_1M)
>
> -#define CONFIG_SPL_MAX_SIZE            (148 * SZ_1K)
> -#define CONFIG_SYS_MONITOR_LEN         SZ_512K
> -#define CONFIG_SYS_UBOOT_BASE  \
> -       (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
> -
> -#define CONFIG_SPL_STACK               0x980000
> -#define CONFIG_SPL_BSS_START_ADDR      0x950000
> -#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K
> -#define CONFIG_SYS_SPL_MALLOC_START    0x42200000
> -#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_512K
> -
>  #define BOOT_TARGET_DEVICES(func) \
>         func(MMC, mmc, 1) \
>         func(MMC, mmc, 2) \
> diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
> index 6f36440b4f2..0bd407c8e8d 100644
> --- a/include/configs/imx8mn_venice.h
> +++ b/include/configs/imx8mn_venice.h
> @@ -6,23 +6,7 @@
>  #ifndef __IMX8MM_VENICE_H
>  #define __IMX8MM_VENICE_H
>
> -#include <asm/arch/imx-regs.h>
> -#include <linux/sizes.h>
> -
> -#define CONFIG_SPL_MAX_SIZE            (148 * 1024)
> -#define CONFIG_SYS_MONITOR_LEN         SZ_512K
> -#define CONFIG_SYS_UBOOT_BASE  \
> -       (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
> -
> -#ifdef CONFIG_SPL_BUILD
> -#define CONFIG_SPL_STACK               0x980000
> -#define CONFIG_SPL_BSS_START_ADDR      0x950000
> -#define CONFIG_SPL_BSS_MAX_SIZE                SZ_8K   /* 8 KB */
> -#define CONFIG_SYS_SPL_MALLOC_START    0x42200000
> -#define CONFIG_SYS_SPL_MALLOC_SIZE     SZ_512K /* 512 KB */
> -
> -/* For RAW image gives a error info not panic */
> -#endif
> +#include <configs/imx8m.h>
>
>  #define MEM_LAYOUT_ENV_SETTINGS \
>         "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> --
> 2.36.0
>

  reply	other threads:[~2022-05-03 15:44 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-03 12:21 [PATCH 1/4] configs: imx8m: use common imx8m.h for i.MX8MM Peng Fan (OSS)
2022-05-03 12:21 ` [PATCH 2/4] configs: imx8m: use common imx8m.h for i.MX8MN Peng Fan (OSS)
2022-05-03 15:43   ` Tim Harvey [this message]
2022-05-04 19:30     ` Ariel D'Alessandro
2022-05-04 19:31       ` Ariel D'Alessandro
2022-05-03 12:21 ` [PATCH 3/4] configs: imx8m: use common imx8m.h for i.MX8MP Peng Fan (OSS)
2022-05-03 15:52   ` Tim Harvey
2022-05-03 12:21 ` [PATCH 4/4] configs: imx8m: use common imx8m.h for i.MX8MQ Peng Fan (OSS)
2022-05-03 15:26 ` [PATCH 1/4] configs: imx8m: use common imx8m.h for i.MX8MM Tim Harvey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAJ+vNU3BWxRxHvVJ=r6+dQKGu_fesNqzTjZzG-cXZj+7Ku1pRw@mail.gmail.com' \
    --to=tharvey@gateworks.com \
    --cc=ariel.dalessandro@collabora.com \
    --cc=festevam@gmail.com \
    --cc=michael@amarulasolutions.com \
    --cc=peng.fan@nxp.com \
    --cc=peng.fan@oss.nxp.com \
    --cc=sbabic@denx.de \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.