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

board: lsxl: use CONFIG_DEFAULT_FDT_FILE

Browse Source 
Drop our own CONFIG_FDTFILE handling in favor of the generic
CONFIG_DEFAULT_FDT_FILE one.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Michael Walle 2022-08-17 21:37:59 +02:00 committed by Stefan Roese
parent 7717c2faf8
commit 111e1e110b
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/lschlv2_defconfig
View File

@ -25,6 +25,7 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2" CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}" CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
CONFIG_DEFAULT_FDT_FILE="kirkwood-lschlv2.dtb"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set

1
configs/lsxhl_defconfig
View File

@ -26,6 +26,7 @@ CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2" CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/sda2"
CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}" CONFIG_BOOTCOMMAND="run bootcmd_${bootsource}"
CONFIG_DEFAULT_FDT_FILE="kirkwood-lsxhl.dtb"
CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set

14
include/configs/lsxl.h
View File

@ -22,21 +22,13 @@
/* /*
* Default environment variables * Default environment variables
*/ */
#if defined(CONFIG_LSXHL)
#define CONFIG_FDTFILE "kirkwood-lsxhl.dtb"
#elif defined(CONFIG_LSCHLV2)
#define CONFIG_FDTFILE "kirkwood-lschlv2.dtb"
#else
#error "Unsupported board"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"bootsource=legacy\0" \ "bootsource=legacy\0" \
"hdpart=0:1\0" \ "hdpart=0:1\0" \
"kernel_addr=0x00800000\0" \ "kernel_addr=0x00800000\0" \
"ramdisk_addr=0x01000000\0" \ "ramdisk_addr=0x01000000\0" \
"fdt_addr=0x00ff0000\0" \ "fdt_addr=0x00ff0000\0" \
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
"bootcmd_legacy=sata init " \ "bootcmd_legacy=sata init " \
"&& load sata ${hdpart} ${kernel_addr} /uImage.buffalo "\ "&& load sata ${hdpart} ${kernel_addr} /uImage.buffalo "\
"&& load sata ${hdpart} ${ramdisk_addr} /initrd.buffalo "\ "&& load sata ${hdpart} ${ramdisk_addr} /initrd.buffalo "\
@ -44,7 +36,7 @@
"bootcmd_net=bootp ${kernel_addr} vmlinuz " \ "bootcmd_net=bootp ${kernel_addr} vmlinuz " \
"&& tftpboot ${ramdisk_addr} initrd.img " \ "&& tftpboot ${ramdisk_addr} initrd.img " \
"&& setenv ramdisk_len ${filesize} " \ "&& setenv ramdisk_len ${filesize} " \
"&& tftpboot ${fdt_addr} " CONFIG_FDTFILE " " \ "&& tftpboot ${fdt_addr} ${fdtfile} " \
"&& bootz ${kernel_addr} " \ "&& bootz ${kernel_addr} " \
"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \ "${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \
"bootcmd_hdd=sata init " \ "bootcmd_hdd=sata init " \
@ -58,7 +50,7 @@
"&& load usb 0:1 ${kernel_addr} /vmlinuz " \ "&& load usb 0:1 ${kernel_addr} /vmlinuz " \
"&& load usb 0:1 ${ramdisk_addr} /initrd.img " \ "&& load usb 0:1 ${ramdisk_addr} /initrd.img " \
"&& setenv ramdisk_len ${filesize} " \ "&& setenv ramdisk_len ${filesize} " \
"&& load usb 0:1 ${fdt_addr} " CONFIG_FDTFILE " " \ "&& load usb 0:1 ${fdt_addr} ${fdtfile} " \
"&& bootz ${kernel_addr} " \ "&& bootz ${kernel_addr} " \
"${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \ "${ramdisk_addr}:${ramdisk_len} ${fdt_addr}\0" \
"bootcmd_rescue=run config_nc_dhcp; run nc\0" \ "bootcmd_rescue=run config_nc_dhcp; run nc\0" \