qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imx6: engicam: Use bootm instead of bootz 

Boot Linux with uImage instead of zImage, so update
bootz with bootm.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Matteo Lisi <matteo.lisi@engicam.com>
Cc: Michael Trimarchi <michael@amarulasolutions.com>
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki 2016-12-21 12:00:21 +01:00 committed by Stefano Babic
parent 08d7985b53
commit bfd96402c2
11 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/imx6dl_icore_mmc_defconfig
View File

@ -16,7 +16,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_PROMPT="icorem6qdl> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

1
configs/imx6dl_icore_nand_defconfig
View File

@ -15,7 +15,6 @@ CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_PROMPT="icorem6qdl> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y

1
configs/imx6dl_icore_rqs_mmc_defconfig
View File

@ -15,7 +15,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6dl-icore-rqs.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl-rqs> " CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

1
configs/imx6q_icore_mmc_defconfig
View File

@ -16,7 +16,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6q-icore.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_PROMPT="icorem6qdl> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

1
configs/imx6q_icore_nand_defconfig
View File

@ -15,7 +15,6 @@ CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl> " CONFIG_SYS_PROMPT="icorem6qdl> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y

1
configs/imx6q_icore_rqs_mmc_defconfig
View File

@ -15,7 +15,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6q-icore-rqs.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="icorem6qdl-rqs> " CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

1
configs/imx6ul_geam_mmc_defconfig
View File

@ -15,7 +15,6 @@ CONFIG_DEFAULT_FDT_FILE="imx6ul-geam-kit.dtb"
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="geam6ul> " CONFIG_SYS_PROMPT="geam6ul> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y

1
configs/imx6ul_geam_nand_defconfig
View File

@ -14,7 +14,6 @@ CONFIG_SPL=y
CONFIG_SPL_DMA_SUPPORT=y CONFIG_SPL_DMA_SUPPORT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="geam6ul> " CONFIG_SYS_PROMPT="geam6ul> "
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set # CONFIG_CMD_IMLS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_NAND=y CONFIG_CMD_NAND=y

8
include/configs/imx6qdl_icore.h
View File

@ -38,7 +38,7 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
"splashpos=m,m\0" \ "splashpos=m,m\0" \
"image=zImage\0" \ "image=uImage\0" \
"console=ttymxc3\0" \ "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@ -60,16 +60,16 @@
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \ "if run loadfdt; then " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "bootm ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = try; then " \
"bootz; " \ "bootm; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "echo WARN: Cannot load the DT; " \
"fi; " \ "fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootz; " \ "bootm; " \
"fi\0" "fi\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \

8
include/configs/imx6qdl_icore_rqs.h
View File

@ -33,7 +33,7 @@
/* Default environment */ /* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
"image=zImage\0" \ "image=uImage\0" \
"console=ttymxc3\0" \ "console=ttymxc3\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@ -55,16 +55,16 @@
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \ "if run loadfdt; then " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "bootm ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = try; then " \
"bootz; " \ "bootm; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "echo WARN: Cannot load the DT; " \
"fi; " \ "fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootz; " \ "bootm; " \
"fi\0" "fi\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \

8
include/configs/imx6ul_geam.h
View File

@ -37,7 +37,7 @@
/* Default environment */ /* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
"image=zImage\0" \ "image=uImage\0" \
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@ -59,16 +59,16 @@
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \ "if run loadfdt; then " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "bootm ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = try; then " \
"bootz; " \ "bootm; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "echo WARN: Cannot load the DT; " \
"fi; " \ "fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootz; " \ "bootm; " \
"fi\0" "fi\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \