提交 3c525ecf 编写于 作者: F Fabio Estevam 提交者: Stefano Babic

mx53ard: Move to booting zImage

Move to booting a zImage kernel by default to align with the other
i.MX boards.

While at it, adjust the fdt_addr so that we can boot a standard
mainline kernel.
Signed-off-by: NFabio Estevam <fabio.estevam@nxp.com>
上级 9feec162
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_BOARD_EARLY_INIT_F
#define CONFIG_MXC_GPIO #define CONFIG_MXC_GPIO
#define CONFIG_CMD_BOOTZ
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR_AXI #define CONFIG_SYS_NAND_BASE NFC_BASE_ADDR_AXI
#define CONFIG_NAND_MXC #define CONFIG_NAND_MXC
...@@ -93,12 +95,12 @@ ...@@ -93,12 +95,12 @@
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \ "script=boot.scr\0" \
"uimage=uImage\0" \ "uimage=zImage\0" \
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
"fdt_addr=0x71000000\0" \ "fdt_addr=0x78000000\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
...@@ -130,16 +132,16 @@ ...@@ -130,16 +132,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 " \
"bootm ${loadaddr} - ${fdt_addr}; " \ "bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = try; then " \
"bootm; " \ "bootz; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "echo WARN: Cannot load the DT; " \
"fi; " \ "fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootm; " \ "bootz; " \
"fi;\0" \ "fi;\0" \
"netargs=setenv bootargs console=${console},${baudrate} " \ "netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs " \ "root=/dev/nfs " \
...@@ -154,16 +156,16 @@ ...@@ -154,16 +156,16 @@
"${get_cmd} ${uimage}; " \ "${get_cmd} ${uimage}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"bootm ${loadaddr} - ${fdt_addr}; " \ "bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"if test ${boot_fdt} = try; then " \ "if test ${boot_fdt} = try; then " \
"bootm; " \ "bootz; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "echo WARN: Cannot load the DT; " \
"fi; " \ "fi; " \
"fi; " \ "fi; " \
"else " \ "else " \
"bootm; " \ "bootz; " \
"fi;\0" "fi;\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册