Commit d623004f authored by Ye Li's avatar Ye Li Committed by Jason Liu

MLK-16247 imx8/imx8m: Rename env variable fdtaddr to fdt_addr

i.MX6/7 uses fdt_addr while all i.MX8/8M uses fdtaddr, this causes
the env is inconsistent for the autotest u-boot scripts. So rename
the fdtaddr to fdt_addr.
Signed-off-by: 's avatarYe Li <ye.li@nxp.com>
Acked-by: 's avatarPeng Fan <peng.fan@nxp.com>
parent 8a37b2d9
......@@ -101,14 +101,14 @@
"\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffff\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdtaddr};\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \
"script=boot.scr\0" \
"image=Image\0" \
"console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200\0" \
"fdtaddr=0x43000000\0" \
"fdt_addr=0x43000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
"fdt_file=fsl-imx8mq-evk.dtb\0" \
......@@ -123,12 +123,12 @@
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdt_file}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -147,8 +147,8 @@
"fi; " \
"${get_cmd} ${loadaddr} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdtaddr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -163,10 +163,10 @@
"else " \
"if run loadimage; then " \
"run mmcboot; " \
"else booti ${loadaddr} - ${fdtaddr}; " \
"else booti ${loadaddr} - ${fdt_addr}; " \
"fi; " \
"fi; " \
"else booti ${loadaddr} - ${fdtaddr}; fi"
"else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */
#define CONFIG_LOADADDR 0x40280000
......
......@@ -120,7 +120,7 @@
"\0" \
"initrd_addr=0x83800000\0" \
"initrd_high=0xffffffff\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdtaddr};\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
......@@ -130,7 +130,7 @@
"image=Image\0" \
"panel=NULL\0" \
"console=ttyLP0,115200 earlycon=lpuart32,0x5a060000,115200\0" \
"fdtaddr=0x83000000\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
"fdt_file=fsl-imx8qm-lpddr4-arm2.dtb\0" \
......@@ -146,12 +146,12 @@
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdt_file}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -171,8 +171,8 @@
"fi; " \
"${get_cmd} ${loadaddr} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdtaddr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -187,10 +187,10 @@
"else " \
"if run loadimage; then " \
"run mmcboot; " \
"else booti ${loadaddr} - ${fdtaddr}; " \
"else booti ${loadaddr} - ${fdt_addr}; " \
"fi; " \
"fi; " \
"else booti ${loadaddr} - ${fdtaddr}; fi"
"else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */
#define CONFIG_LOADADDR 0x80280000
......
......@@ -108,7 +108,7 @@
"\0" \
"initrd_addr=0x83800000\0" \
"initrd_high=0xffffffff\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdtaddr};\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
......@@ -118,7 +118,7 @@
"image=Image\0" \
"panel=NULL\0" \
"console=ttyLP0,115200 earlycon=lpuart32,0x5a060000,115200\0" \
"fdtaddr=0x83000000\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
"fdt_file=fsl-imx8qxp-lpddr4-arm2.dtb\0" \
......@@ -134,12 +134,12 @@
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdt_file}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -159,8 +159,8 @@
"fi; " \
"${get_cmd} ${loadaddr} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdtaddr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -171,8 +171,8 @@
#ifdef CONFIG_NAND_BOOT
#define CONFIG_BOOTCOMMAND \
"nand read ${loadaddr} 0x4000000 0x800000;"\
"nand read ${fdtaddr} 0x5000000 0x100000;"\
"booti ${loadaddr} - ${fdtaddr}"
"nand read ${fdt_addr} 0x5000000 0x100000;"\
"booti ${loadaddr} - ${fdt_addr}"
#else
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
......@@ -181,10 +181,10 @@
"else " \
"if run loadimage; then " \
"run mmcboot; " \
"else booti ${loadaddr} - ${fdtaddr}; " \
"else booti ${loadaddr} - ${fdt_addr}; " \
"fi; " \
"fi; " \
"else booti ${loadaddr} - ${fdtaddr}; fi"
"else booti ${loadaddr} - ${fdt_addr}; fi"
#endif
/* Link Definitions */
......
......@@ -108,7 +108,7 @@
"\0" \
"initrd_addr=0x83800000\0" \
"initrd_high=0xffffffff\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdtaddr};\0" \
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
......@@ -118,7 +118,7 @@
"image=Image\0" \
"panel=NULL\0" \
"console=ttyLP0,115200 earlycon=lpuart32,0x5a060000,115200\0" \
"fdtaddr=0x83000000\0" \
"fdt_addr=0x83000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"boot_fdt=try\0" \
"fdt_file=fsl-imx8qxp-mek.dtb\0" \
......@@ -134,12 +134,12 @@
"bootscript=echo Running bootscript from mmc ...; " \
"source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdt_file}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
"mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if run loadfdt; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -159,8 +159,8 @@
"fi; " \
"${get_cmd} ${loadaddr} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdtaddr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdtaddr}; " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"booti ${loadaddr} - ${fdt_addr}; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
......@@ -175,10 +175,10 @@
"else " \
"if run loadimage; then " \
"run mmcboot; " \
"else booti ${loadaddr} - ${fdtaddr}; " \
"else booti ${loadaddr} - ${fdt_addr}; " \
"fi; " \
"fi; " \
"else booti ${loadaddr} - ${fdtaddr}; fi"
"else booti ${loadaddr} - ${fdt_addr}; fi"
/* Link Definitions */
#define CONFIG_LOADADDR 0x80280000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment