arm: imx: Switch mx6cuboxi to use config_distro_bootcmd.h.
This allows for more flexible and standardized boot across multiple platforms. Remove redundant legacy boot environment. Cc: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
This commit is contained in:
Vagrant Cascadian
Stefano Babic
parent
acc6bb5693
commit
1c5e6b6fbb
1 changed files with 24 additions and 64 deletions
|
|
@ -81,23 +81,26 @@
|
||||||
|
|
||||||
#define CONFIG_MXC_UART_BASE UART1_BASE
|
#define CONFIG_MXC_UART_BASE UART1_BASE
|
||||||
#define CONFIG_CONSOLE_DEV "ttymxc0"
|
#define CONFIG_CONSOLE_DEV "ttymxc0"
|
||||||
#define CONFIG_MMCROOT "/dev/mmcblk0p2"
|
|
||||||
#define CONFIG_SYS_FSL_USDHC_NUM 1
|
#define CONFIG_SYS_FSL_USDHC_NUM 1
|
||||||
#define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
|
#define CONFIG_SYS_MMC_ENV_DEV 0 /* SDHC2 */
|
||||||
|
|
||||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||||
|
#ifndef CONFIG_SPL_BUILD
|
||||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||||
"script=boot.scr\0" \
|
|
||||||
"image=zImage\0" \
|
|
||||||
"fdtfile=undefined\0" \
|
"fdtfile=undefined\0" \
|
||||||
"fdt_addr_r=0x18000000\0" \
|
"fdt_addr_r=0x18000000\0" \
|
||||||
"boot_fdt=try\0" \
|
"fdt_addr=0x18000000\0" \
|
||||||
|
"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||||
|
"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||||
|
"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
|
||||||
|
"ramdisk_addr_r=0x13000000\0" \
|
||||||
|
"ramdiskaddr=0x13000000\0" \
|
||||||
|
"initrd_high=0xffffffff\0" \
|
||||||
|
"fdt_high=0xffffffff\0" \
|
||||||
"ip_dyn=yes\0" \
|
"ip_dyn=yes\0" \
|
||||||
"console=" CONFIG_CONSOLE_DEV "\0" \
|
"console=" CONFIG_CONSOLE_DEV "\0" \
|
||||||
"bootm_size=0x10000000\0" \
|
"bootm_size=0x10000000\0" \
|
||||||
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
|
||||||
"mmcpart=1\0" \
|
|
||||||
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
|
|
||||||
"update_sd_firmware=" \
|
"update_sd_firmware=" \
|
||||||
"if test ${ip_dyn} = yes; then " \
|
"if test ${ip_dyn} = yes; then " \
|
||||||
"setenv get_cmd dhcp; " \
|
"setenv get_cmd dhcp; " \
|
||||||
|
|
@ -111,53 +114,6 @@
|
||||||
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
|
||||||
"fi; " \
|
"fi; " \
|
||||||
"fi\0" \
|
"fi\0" \
|
||||||
"mmcargs=setenv bootargs console=${console},${baudrate} " \
|
|
||||||
"root=${mmcroot}\0" \
|
|
||||||
"loadbootscript=" \
|
|
||||||
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
|
|
||||||
"bootscript=echo Running bootscript from mmc ...; " \
|
|
||||||
"source\0" \
|
|
||||||
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
|
|
||||||
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}\0" \
|
|
||||||
"mmcboot=echo Booting from mmc ...; " \
|
|
||||||
"run mmcargs; " \
|
|
||||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
||||||
"if run loadfdt; then " \
|
|
||||||
"bootz ${loadaddr} - ${fdt_addr_r}; " \
|
|
||||||
"else " \
|
|
||||||
"if test ${boot_fdt} = try; then " \
|
|
||||||
"bootz; " \
|
|
||||||
"else " \
|
|
||||||
"echo WARN: Cannot load the DT; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi; " \
|
|
||||||
"else " \
|
|
||||||
"bootz; " \
|
|
||||||
"fi;\0" \
|
|
||||||
"netargs=setenv bootargs console=${console},${baudrate} " \
|
|
||||||
"root=/dev/nfs " \
|
|
||||||
"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
|
|
||||||
"netboot=echo Booting from net ...; " \
|
|
||||||
"run netargs; " \
|
|
||||||
"if test ${ip_dyn} = yes; then " \
|
|
||||||
"setenv get_cmd dhcp; " \
|
|
||||||
"else " \
|
|
||||||
"setenv get_cmd tftp; " \
|
|
||||||
"fi; " \
|
|
||||||
"${get_cmd} ${image}; " \
|
|
||||||
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
||||||
"if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then " \
|
|
||||||
"bootz ${loadaddr} - ${fdt_addr_r}; " \
|
|
||||||
"else " \
|
|
||||||
"if test ${boot_fdt} = try; then " \
|
|
||||||
"bootz; " \
|
|
||||||
"else " \
|
|
||||||
"echo WARN: Cannot load the DT; " \
|
|
||||||
"fi; " \
|
|
||||||
"fi; " \
|
|
||||||
"else " \
|
|
||||||
"bootz; " \
|
|
||||||
"fi;\0" \
|
|
||||||
"findfdt="\
|
"findfdt="\
|
||||||
"if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
|
"if test $board_name = HUMMINGBOARD && test $board_rev = MX6Q ; then " \
|
||||||
"setenv fdtfile imx6q-hummingboard.dtb; fi; " \
|
"setenv fdtfile imx6q-hummingboard.dtb; fi; " \
|
||||||
|
|
@ -169,20 +125,24 @@
|
||||||
"setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
|
"setenv fdtfile imx6dl-cubox-i.dtb; fi; " \
|
||||||
"if test $fdtfile = undefined; then " \
|
"if test $fdtfile = undefined; then " \
|
||||||
"echo WARNING: Could not determine dtb to use; fi; \0" \
|
"echo WARNING: Could not determine dtb to use; fi; \0" \
|
||||||
|
BOOTENV
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
"run findfdt; " \
|
"run findfdt; " \
|
||||||
"mmc dev ${mmcdev};" \
|
"run distro_bootcmd"
|
||||||
"if mmc rescan; then " \
|
|
||||||
"if run loadbootscript; then " \
|
#define BOOT_TARGET_DEVICES(func) \
|
||||||
"run bootscript; " \
|
func(MMC, mmc, 0) \
|
||||||
"else " \
|
func(USB, usb, 0) \
|
||||||
"if run loadimage; then " \
|
func(PXE, pxe, na) \
|
||||||
"run mmcboot; " \
|
func(DHCP, dhcp, na)
|
||||||
"else run netboot; " \
|
|
||||||
"fi; " \
|
#include <config_distro_defaults.h>
|
||||||
"fi; " \
|
#include <config_distro_bootcmd.h>
|
||||||
"else run netboot; fi"
|
|
||||||
|
#else
|
||||||
|
#define CONFIG_EXTRA_ENV_SETTINGS
|
||||||
|
#endif /* CONFIG_SPL_BUILD */
|
||||||
|
|
||||||
/* Physical Memory Map */
|
/* Physical Memory Map */
|
||||||
#define CONFIG_NR_DRAM_BANKS 1
|
#define CONFIG_NR_DRAM_BANKS 1
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue