On 3/31/22 07:07, Tom Rini wrote:
> A number of CONFIG options are used on these platforms as part of the
> default environment. Set some of these more directly and in other
> cases, just reference them directly.
>
> Cc: Jaehoon Chung <[email protected]>
> Cc: Minkyu Kang <[email protected]>
> Signed-off-by: Tom Rini <[email protected]>
Reviewed-by: Jaehoon Chung <[email protected]>
Best Regards,
Jaehoon Chung
> ---
> include/configs/s5p_goni.h | 23 ++++++++++-------------
> include/configs/smdkc100.h | 24 ++++++++++--------------
> 2 files changed, 20 insertions(+), 27 deletions(-)
>
> diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h
> index 0ec60cadb49e..3b4347dd00bd 100644
> --- a/include/configs/s5p_goni.h
> +++ b/include/configs/s5p_goni.h
> @@ -67,18 +67,14 @@
> "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
> "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
>
> -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \
> - " ${console} ${meminfo}"
> -
> -#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}"
> -
> -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \
> - " onenand write 0x32008000 0x0 0x100000\0"
> +#define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"
>
> #define CONFIG_MISC_COMMON
>
> #define CONFIG_EXTRA_ENV_SETTINGS \
> - CONFIG_UPDATEB \
> + "updateb=" \
> + "onenand erase 0x0 0x100000;" \
> + "onenand write 0x32008000 0x0 0x100000\0" \
> "updatek=" \
> "onenand erase 0xc00000 0x600000;" \
> "onenand write 0x31008000 0xc00000 0x600000\0" \
> @@ -91,22 +87,23 @@
> "flashboot=" \
> "set bootargs root=/dev/mtdblock${bootblock} " \
> "rootfstype=${rootfstype} ${opts} " \
> - "${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \
> + "${lcdinfo} " COMMON_BOOT "; run bootk\0" \
> "ubifsboot=" \
> "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
> "${opts} ${lcdinfo} " \
> - CONFIG_COMMON_BOOT "; run bootk\0" \
> + COMMON_BOOT "; run bootk\0" \
> "tftpboot=" \
> "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
> - "${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \
> + "${opts} ${lcdinfo} " COMMON_BOOT \
> "; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \
> "ramboot=" \
> - "set bootargs " CONFIG_RAMDISK_BOOT \
> + "set bootargs root=/dev/ram0 rw rootfstype=ext4" \
> + " ${console} ${meminfo} " \
> "initrd=0x33000000,8M ramdisk=8192\0" \
> "mmcboot=" \
> "set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
> "rootfstype=${rootfstype} ${opts} ${lcdinfo} " \
> - CONFIG_COMMON_BOOT "; run bootk\0" \
> + COMMON_BOOT "; run bootk\0" \
> "boottrace=setenv opts initcall_debug; run bootcmd\0" \
> "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
> "verify=n\0" \
> diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h
> index 4401094ee39c..8eea45450b5c 100644
> --- a/include/configs/smdkc100.h
> +++ b/include/configs/smdkc100.h
> @@ -35,19 +35,14 @@
> /* PWM */
> #define CONFIG_PWM 1
>
> -#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \
> - " console=ttySAC0,115200n8" \
> - " mem=128M"
> -
> -#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \
> +#define COMMON_BOOT "console=ttySAC0,115200n8" \
> " mem=128M " \
> " " CONFIG_MTDPARTS_DEFAULT
>
> -#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
> - " onenand write 0x32008000 0x0 0x40000\0"
> -
> #define CONFIG_EXTRA_ENV_SETTINGS \
> - CONFIG_UPDATEB \
> + "updateb=" \
> + "onenand erase 0x0 0x40000;" \
> + "onenand write 0x32008000 0x0 0x40000\0" \
> "updatek=" \
> "onenand erase 0x60000 0x300000;" \
> "onenand write 0x31008000 0x60000 0x300000\0" \
> @@ -60,25 +55,26 @@
> "flashboot=" \
> "set bootargs root=/dev/mtdblock${bootblock} " \
> "rootfstype=${rootfstype} " \
> - "ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT ";" \
> + "ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT ";" \
> "run bootk\0" \
> "ubifsboot=" \
> "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
> - " ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; " \
> + " ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT "; " \
> "run bootk\0" \
> "boottrace=setenv opts initcall_debug; run bootcmd\0" \
> "android=" \
> "set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock} " \
> - "rootfstype=ubifs init=/init.sh " CONFIG_COMMON_BOOT "; " \
> + "rootfstype=ubifs init=/init.sh " COMMON_BOOT "; " \
> "run bootk\0" \
> "nfsboot=" \
> "set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \
> "nfsroot=${nfsroot},nolock " \
> "ip=${ipaddr}:${serverip}:${gatewayip}:" \
> - "${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; " \
> + "${netmask}:nowplus:usb0:off " COMMON_BOOT "; " \
> "run bootk\0" \
> "ramboot=" \
> - "set bootargs " CONFIG_RAMDISK_BOOT \
> + "set bootargs root=/dev/ram0 rw rootfstype=ext2" \
> + " console=ttySAC0,115200n8 mem=128M" \
> " initrd=0x33000000,8M ramdisk=8192\0" \
> "rootfstype=cramfs\0" \
> "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
