random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

s5p_goni, smdkc100: Move some environment settings out of CONFIG

Browse Source 
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 <jh80.chung@samsung.com>
Cc: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-03-30 18:07:16 -04:00
parent f01928e232
commit 428eb2e26f
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/configs/s5p_goni.h
View File

@ -67,18 +67,14 @@
"name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \ "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \
"name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \
#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext4" \ #define COMMON_BOOT "${console} ${meminfo} ${mtdparts}"
" ${console} ${meminfo}"
#define CONFIG_COMMON_BOOT "${console} ${meminfo} ${mtdparts}"
#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x100000;" \
" onenand write 0x32008000 0x0 0x100000\0"
#define CONFIG_MISC_COMMON #define CONFIG_MISC_COMMON
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_UPDATEB \ "updateb=" \
"onenand erase 0x0 0x100000;" \
"onenand write 0x32008000 0x0 0x100000\0" \
"updatek=" \ "updatek=" \
"onenand erase 0xc00000 0x600000;" \ "onenand erase 0xc00000 0x600000;" \
"onenand write 0x31008000 0xc00000 0x600000\0" \ "onenand write 0x31008000 0xc00000 0x600000\0" \
@ -91,22 +87,23 @@
"flashboot=" \ "flashboot=" \
"set bootargs root=/dev/mtdblock${bootblock} " \ "set bootargs root=/dev/mtdblock${bootblock} " \
"rootfstype=${rootfstype} ${opts} " \ "rootfstype=${rootfstype} ${opts} " \
"${lcdinfo} " CONFIG_COMMON_BOOT "; run bootk\0" \ "${lcdinfo} " COMMON_BOOT "; run bootk\0" \
"ubifsboot=" \ "ubifsboot=" \
"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
"${opts} ${lcdinfo} " \ "${opts} ${lcdinfo} " \
CONFIG_COMMON_BOOT "; run bootk\0" \ COMMON_BOOT "; run bootk\0" \
"tftpboot=" \ "tftpboot=" \
"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
"${opts} ${lcdinfo} " CONFIG_COMMON_BOOT \ "${opts} ${lcdinfo} " COMMON_BOOT \
"; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \ "; tftp 0x30007FC0 uImage; bootm 0x30007FC0\0" \
"ramboot=" \ "ramboot=" \
"set bootargs " CONFIG_RAMDISK_BOOT \ "set bootargs root=/dev/ram0 rw rootfstype=ext4" \
" ${console} ${meminfo} " \
"initrd=0x33000000,8M ramdisk=8192\0" \ "initrd=0x33000000,8M ramdisk=8192\0" \
"mmcboot=" \ "mmcboot=" \
"set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ "set bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \
"rootfstype=${rootfstype} ${opts} ${lcdinfo} " \ "rootfstype=${rootfstype} ${opts} ${lcdinfo} " \
CONFIG_COMMON_BOOT "; run bootk\0" \ COMMON_BOOT "; run bootk\0" \
"boottrace=setenv opts initcall_debug; run bootcmd\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \
"bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \
"verify=n\0" \ "verify=n\0" \

24
include/configs/smdkc100.h
View File

@ -35,19 +35,14 @@
/* PWM */ /* PWM */
#define CONFIG_PWM 1 #define CONFIG_PWM 1
#define CONFIG_RAMDISK_BOOT "root=/dev/ram0 rw rootfstype=ext2" \ #define COMMON_BOOT "console=ttySAC0,115200n8" \
" console=ttySAC0,115200n8" \
" mem=128M"
#define CONFIG_COMMON_BOOT "console=ttySAC0,115200n8" \
" mem=128M " \ " mem=128M " \
" " CONFIG_MTDPARTS_DEFAULT " " CONFIG_MTDPARTS_DEFAULT
#define CONFIG_UPDATEB "updateb=onenand erase 0x0 0x40000;" \
" onenand write 0x32008000 0x0 0x40000\0"
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_UPDATEB \ "updateb=" \
"onenand erase 0x0 0x40000;" \
"onenand write 0x32008000 0x0 0x40000\0" \
"updatek=" \ "updatek=" \
"onenand erase 0x60000 0x300000;" \ "onenand erase 0x60000 0x300000;" \
"onenand write 0x31008000 0x60000 0x300000\0" \ "onenand write 0x31008000 0x60000 0x300000\0" \
@ -60,25 +55,26 @@
"flashboot=" \ "flashboot=" \
"set bootargs root=/dev/mtdblock${bootblock} " \ "set bootargs root=/dev/mtdblock${bootblock} " \
"rootfstype=${rootfstype} " \ "rootfstype=${rootfstype} " \
"ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT ";" \ "ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT ";" \
"run bootk\0" \ "run bootk\0" \
"ubifsboot=" \ "ubifsboot=" \
"set bootargs root=ubi0!rootfs rootfstype=ubifs " \ "set bootargs root=ubi0!rootfs rootfstype=ubifs " \
" ubi.mtd=${ubiblock} ${opts} " CONFIG_COMMON_BOOT "; " \ " ubi.mtd=${ubiblock} ${opts} " COMMON_BOOT "; " \
"run bootk\0" \ "run bootk\0" \
"boottrace=setenv opts initcall_debug; run bootcmd\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \
"android=" \ "android=" \
"set bootargs root=ubi0!ramdisk ubi.mtd=${ubiblock} " \ "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" \ "run bootk\0" \
"nfsboot=" \ "nfsboot=" \
"set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \ "set bootargs root=/dev/nfs ubi.mtd=${ubiblock} " \
"nfsroot=${nfsroot},nolock " \ "nfsroot=${nfsroot},nolock " \
"ip=${ipaddr}:${serverip}:${gatewayip}:" \ "ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:nowplus:usb0:off " CONFIG_COMMON_BOOT "; " \ "${netmask}:nowplus:usb0:off " COMMON_BOOT "; " \
"run bootk\0" \ "run bootk\0" \
"ramboot=" \ "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" \ " initrd=0x33000000,8M ramdisk=8192\0" \
"rootfstype=cramfs\0" \ "rootfstype=cramfs\0" \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \