iMX/i2som-imx-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify booting arguments

Browse Source
This commit is contained in:
SteveChen
2017-12-03 17:09:51 +08:00
parent ef5d2a46b0
commit 15e52e5063
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
board/i2som/i2c_6ull_14x14/i2c_6ull_14x14.c
View File

@ -943,7 +943,13 @@ int board_late_init(void)
#endif
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
setenv("board_name", "I2S-MX6ULL");
#ifdef CONFIG_SYS_BOOT_NAND
setenv("board_name", "i2S-6ULL-NAND");
#elif defined(CONFIG_SYS_BOOT_QSPI)
setenv("board_name", "i2S-6ULL-QSPI");
#else
setenv("board_name", "i2S-6ULL-eMMC");
#endif
if (is_mx6ull_9x9_evk())
setenv("board_rev", "9X9");

24
include/configs/i2som_6ull_14x14.h
View File

@ -90,24 +90,26 @@
#define CONFIG_SYS_MMC_IMG_LOAD_PART 1
#ifdef CONFIG_SYS_BOOT_NAND
/* i2S-6ULL NAND Variant */
#define CONFIG_MFG_NAND_PARTITION "mtdparts=gpmi-nand:5m(boot),10m(kernel),1m(dtb),-(rootfs) "
#define CONFIG_FDT_FILE "findfdt="\
"if test $fdt_file = undefined; then " \
"if test $board_name = EVK && test $board_rev = 9X9; then " \
"setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \
"if test $board_name = I2S-MX6ULL && test $board_rev = 14X14; then " \
"setenv fdt_file i2c-b6ull-nand.dtb; fi; " \
"if test $board_name = i2S-6ULL-eMMC && test $board_rev = 14X14; then " \
"setenv fdt_file zImage-i2c-b6ull-nand.dtb; fi; " \
"if test $fdt_file = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; " \
"fi;\0"
#else
/* i2S-6ULL eMMC Variant */
#define CONFIG_MFG_NAND_PARTITION ""
#define CONFIG_FDT_FILE "findfdt="\
"if test $fdt_file = undefined; then " \
"if test $board_name = EVK && test $board_rev = 9X9; then " \
"setenv fdt_file imx6ull-9x9-evk.dtb; fi; " \
"if test $board_name = I2S-MX6ULL && test $board_rev = 14X14; then " \
"setenv fdt_file i2c-b6ull-emmc.dtb; fi; " \
"if test $board_name = i2S-6ULL-eMMC && test $board_rev = 14X14; then " \
"setenv fdt_file zImage-i2c-b6ull-emmc.dtb; fi; " \
"if test $fdt_file = undefined; then " \
"echo WARNING: Could not determine dtb to use; fi; " \
"fi;\0"
@ -130,6 +132,7 @@
"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
#if defined(CONFIG_SYS_BOOT_NAND)
/* i2S-6ULL NAND Variant */
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \
"panel=TFT43AB\0" \
@ -145,10 +148,11 @@
"bootz ${loadaddr} - ${fdt_addr}\0"
#else
/* i2S-6ULL eMMC Variant */
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \
"script=boot.scr\0" \
"image=zImage\0" \
"image=zImage-i2c-b6ull.bin\0" \
"console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
@ -157,13 +161,15 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"panel=TFT43AB\0" \
"default_bootargs=console=ttymxc0,115200\0" \
"opt_args=quiet \0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"mmcautodetect=yes\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"mmcargs=setenv bootargs ${default_bootargs} " \
CONFIG_BOOTARGS_CMA_SIZE \
"root=${mmcroot}\0" \
"root=${mmcroot} ${opt_args}\0" \
"loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from mmc ...; " \
@ -214,8 +220,8 @@
#define CONFIG_BOOTCOMMAND \
"run findfdt;" \
"mmc dev ${mmcdev};" \
"mmc dev ${mmcdev}; if mmc rescan; then " \
"mmc dev ${mmcdev} ${mmcpart};" \
"mmc dev ${mmcdev} ${mmcpart}; if mmc rescan; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \