On 8/11/21 6:34 AM, Tom Rini wrote:
> Rework the default environment a bit to not use non-standard
> CONFIG_ENV_... names and similar one-off CONFIG names.
>
> Cc: Jaehoon Chung <jh80.ch...@samsung.com>
> Signed-off-by: Tom Rini <tr...@konsulko.com>
Reviewed-by: Jaehoon Chung <jh80.ch...@samsung.com>
Best Regars,
Jaehoon Chung
> ---
> include/configs/exynos4-common.h | 2 +-
> include/configs/s5pc210_universal.h | 26 +++++++++-----------------
> include/configs/trats.h | 9 +++------
> include/configs/trats2.h | 2 +-
> 4 files changed, 14 insertions(+), 25 deletions(-)
>
> diff --git a/include/configs/exynos4-common.h
> b/include/configs/exynos4-common.h
> index 5e2aca371e7e..2ca14d0b86e3 100644
> --- a/include/configs/exynos4-common.h
> +++ b/include/configs/exynos4-common.h
> @@ -32,7 +32,7 @@
> #define CONFIG_USB_GADGET_DWC2_OTG_PHY
>
> /* Common environment variables */
> -#define CONFIG_EXTRA_ENV_ITB \
> +#define ENV_ITB \
> "loadkernel=load mmc ${mmcbootdev}:${mmcbootpart} ${kerneladdr} " \
> "${kernelname}\0" \
> "loadinitrd=load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} " \
> diff --git a/include/configs/s5pc210_universal.h
> b/include/configs/s5pc210_universal.h
> index 0b679f437482..8ee667e69306 100644
> --- a/include/configs/s5pc210_universal.h
> +++ b/include/configs/s5pc210_universal.h
> @@ -44,16 +44,6 @@
> ",100M(swap)"\
> ",-(UMS)\0"
>
> -#define CONFIG_ENV_UBI_MTD " ubi.mtd=${ubiblock} ubi.mtd=4 ubi.mtd=7"
> -#define CONFIG_BOOTBLOCK "10"
> -#define CONFIG_UBIBLOCK "9"
> -
> -#define CONFIG_ENV_UBIFS_OPTION " rootflags=bulk_read,no_chk_data_crc "
> -#define CONFIG_ENV_FLASHBOOT CONFIG_ENV_UBI_MTD CONFIG_ENV_UBIFS_OPTION \
> - "${mtdparts}"
> -
> -#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> "updateb=" \
> "onenand erase 0x0 0x100000;" \
> @@ -71,18 +61,20 @@
> "lpj=lpj=3981312\0" \
> "ubifsboot=" \
> "set bootargs root=ubi0!rootfs rootfstype=ubifs ${lpj} " \
> - CONFIG_ENV_FLASHBOOT " ${opts} ${lcdinfo} " \
> - CONFIG_ENV_COMMON_BOOT "; run bootk\0" \
> + "ubi.mtd=${ubiblock} ubi.mtd=4 ubi.mtd=7 " \
> + "rootflags=bulk_read,no_chk_data_crc ${mtdparts} ${opts} " \
> + "${lcdinfo} ${console} ${meminfo}; run bootk\0" \
> "tftpboot=" \
> "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
> - CONFIG_ENV_FLASHBOOT " ${opts} ${lcdinfo} " \
> - CONFIG_ENV_COMMON_BOOT \
> + "ubi.mtd=${ubiblock} ubi.mtd=4 ubi.mtd=7 " \
> + "rootflags=bulk_read,no_chk_data_crc ${mtdparts} ${opts} " \
> + "${lcdinfo} ${console} ${meminfo}" \
> "; tftp 0x40007FC0 uImage; bootm 0x40007FC0\0" \
> "nfsboot=" \
> "set bootargs root=/dev/nfs rw " \
> "nfsroot=${nfsroot},nolock,tcp " \
> "ip=${ipaddr}:${serverip}:${gatewayip}:" \
> - "${netmask}:generic:usb0:off " CONFIG_ENV_COMMON_BOOT \
> + "${netmask}:generic:usb0:off ${console} ${meminfo}" \
> "; run bootk\0" \
> "ramfsboot=" \
> "set bootargs root=/dev/ram0 rw rootfstype=ext2 " \
> @@ -102,8 +94,8 @@
> "mbrparts=" MBRPARTS_DEFAULT \
> "meminfo=crashkernel=32M@0x50000000\0" \
> "nfsroot=/nfsroot/arm\0" \
> - "bootblock=" CONFIG_BOOTBLOCK "\0" \
> - "ubiblock=" CONFIG_UBIBLOCK" \0" \
> + "bootblock=10\0" \
> + "ubiblock=9\0" \
> "ubi=enabled\0" \
> "loaduimage=fatload mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \
> "mmcdev=0\0" \
> diff --git a/include/configs/trats.h b/include/configs/trats.h
> index a44792d85764..c3f891ae53d8 100644
> --- a/include/configs/trats.h
> +++ b/include/configs/trats.h
> @@ -40,9 +40,6 @@
>
> #define CONFIG_SYS_MONITOR_BASE 0x00000000
>
> -#define CONFIG_BOOTBLOCK "10"
> -#define CONFIG_ENV_COMMON_BOOT "${console} ${meminfo}"
> -
> /* Tizen - partitions definitions */
> #define PARTS_CSA "csa-mmc"
> #define PARTS_BOOT "boot"
> @@ -94,7 +91,7 @@
> "setenv bootargs root=/dev/nfs rw " \
> "nfsroot=${nfsroot},nolock,tcp " \
> "ip=${ipaddr}:${serverip}:${gatewayip}:" \
> - "${netmask}:generic:usb0:off " CONFIG_ENV_COMMON_BOOT \
> + "${netmask}:generic:usb0:off ${console} ${meminfo}" \
> "; run bootk\0" \
> "ramfsboot=" \
> "setenv bootargs root=/dev/ram0 rw rootfstype=ext2 " \
> @@ -112,7 +109,7 @@
> "console=console=ttySAC2,115200n8\0" \
> "meminfo=crashkernel=32M@0x50000000\0" \
> "nfsroot=/nfsroot/arm\0" \
> - "bootblock=" CONFIG_BOOTBLOCK "\0" \
> + "bootblock=10\0" \
> "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \
> "loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \
> "${fdtfile}\0" \
> @@ -141,7 +138,7 @@
> "setenv spl_imgsize;" \
> "setenv spl_imgaddr;" \
> "setenv spl_addr_tmp;\0" \
> - CONFIG_EXTRA_ENV_ITB \
> + ENV_ITB \
> "fdtaddr=40800000\0" \
>
> /* Falcon mode definitions */
> diff --git a/include/configs/trats2.h b/include/configs/trats2.h
> index 4b1eff08f3b3..e5f2b0cc993a 100644
> --- a/include/configs/trats2.h
> +++ b/include/configs/trats2.h
> @@ -125,7 +125,7 @@
> "setenv spl_imgsize;" \
> "setenv spl_imgaddr;" \
> "setenv spl_addr_tmp;\0" \
> - CONFIG_EXTRA_ENV_ITB \
> + ENV_ITB \
> "fdtaddr=40800000\0" \
>
> /* GPT */
>
