From cc319d5762cc708575ec14cfd22cb1f79ce177eb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 19 Mar 2014 18:24:36 -0500 Subject: apply fixes for panda and beaglebone --- ...a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch | 5 +- ...Update-the-ramdisk-args-we-pass-things-in.patch | 4 +- ...Update-the-ramdisk-args-we-pass-things-in.patch | 4 +- 0004-add-README.distro.patch | 4 +- 0005-add-generic-bootcmd-header.patch | 4 +- ...rt-wandboard-to-use-generic-boot-commands.patch | 4 +- ...t-beaglebone-to-use-generic-boot-commands.patch | 4 +- ...t-pandaboard-to-use-generic-boot-commands.patch | 4 +- 0009-fix-up-some-sillies.patch | 4 +- ...wandboard-to-ensure-the-environment-is-co.patch | 59 ++ 0011-convert-fdt_file-to-fdtfile-globally.patch | 738 +++++++++++++++++++++ ...dtfile-and-fdt_file-to-find-the-devicetre.patch | 31 + ...leanups-to-make-panda-and-beaglebone-work.patch | 52 ++ uboot-tools.spec | 13 +- 14 files changed, 911 insertions(+), 19 deletions(-) create mode 100644 0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch create mode 100644 0011-convert-fdt_file-to-fdtfile-globally.patch create mode 100644 0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch create mode 100644 0013-cleanups-to-make-panda-and-beaglebone-work.patch diff --git a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch index 1fedff6..a1a8966 100644 --- a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch +++ b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch @@ -1,7 +1,8 @@ -From b2f0945f9542a53960d8e394725f9de199059974 Mon Sep 17 00:00:00 2001 +From 45742e6678a80a8503c58c06c7c81e144ef370eb Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 11 Mar 2014 15:42:01 -0400 -Subject: [PATCH 1/9] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string +Subject: [PATCH 01/13] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment + string To deal with a reoccurring problem properly we need to specify addresses for the Linux kernel, Flatted Device Tree and ramdisk that obey the diff --git a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch index 0262e85..ea426e6 100644 --- a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch +++ b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch @@ -1,7 +1,7 @@ -From d501ece818fe10845bb0a005d986acf1e143a313 Mon Sep 17 00:00:00 2001 +From 05e9d82d71560140a58c3e430b788b3058129fe7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 11 Mar 2014 15:42:02 -0400 -Subject: [PATCH 2/9] am335x_evm: Update the ramdisk args, we pass things in +Subject: [PATCH 02/13] am335x_evm: Update the ramdisk args, we pass things in just fine via DT Signed-off-by: Tom Rini diff --git a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch index ecafec6..3d6a999 100644 --- a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch +++ b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch @@ -1,7 +1,7 @@ -From 59459e211168e3465c2bdb1b78bfc9c594c9b479 Mon Sep 17 00:00:00 2001 +From ccfaf09da55fa9f107a6866fa2bc00af6764c453 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 11 Mar 2014 15:42:03 -0400 -Subject: [PATCH 3/9] am43xx_evm: Update the ramdisk args, we pass things in +Subject: [PATCH 03/13] am43xx_evm: Update the ramdisk args, we pass things in just fine via DT Signed-off-by: Tom Rini diff --git a/0004-add-README.distro.patch b/0004-add-README.distro.patch index 7635ef5..e89be24 100644 --- a/0004-add-README.distro.patch +++ b/0004-add-README.distro.patch @@ -1,7 +1,7 @@ -From 2ef279ec9eb812e4d67e7ae5eb695eadc63d8570 Mon Sep 17 00:00:00 2001 +From 2e52b4b057bf022f00da378186ae9a5a0b6dba13 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 Mar 2014 10:42:34 -0600 -Subject: [PATCH 4/9] add README.distro +Subject: [PATCH 04/13] add README.distro Add instructions on how to setup a system to boot using the generic boot framework. diff --git a/0005-add-generic-bootcmd-header.patch b/0005-add-generic-bootcmd-header.patch index e83b118..04963eb 100644 --- a/0005-add-generic-bootcmd-header.patch +++ b/0005-add-generic-bootcmd-header.patch @@ -1,7 +1,7 @@ -From db270067bf3b35802fdd8ecc647a80f25bbd7851 Mon Sep 17 00:00:00 2001 +From a25d030a4cea61e7ea08cf3175c886cc1959526e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 15 Mar 2014 10:13:39 -0500 -Subject: [PATCH 5/9] add generic bootcmd header +Subject: [PATCH 05/13] add generic bootcmd header --- include/config_distro_bootcmd.h | 208 ++++++++++++++++++++++++++++++++++++++++ diff --git a/0006-convert-wandboard-to-use-generic-boot-commands.patch b/0006-convert-wandboard-to-use-generic-boot-commands.patch index 1c0cfb8..8908f3d 100644 --- a/0006-convert-wandboard-to-use-generic-boot-commands.patch +++ b/0006-convert-wandboard-to-use-generic-boot-commands.patch @@ -1,7 +1,7 @@ -From 4a7a3fb87348895c605ec36e4ff1e8272d41ce7c Mon Sep 17 00:00:00 2001 +From 3cc8719c60bb9d4bea7484c8f5533345390a6986 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 Mar 2014 10:59:00 -0600 -Subject: [PATCH 6/9] convert wandboard to use generic boot commands +Subject: [PATCH 06/13] convert wandboard to use generic boot commands --- include/configs/wandboard.h | 91 +++++++-------------------------------------- diff --git a/0007-convert-beaglebone-to-use-generic-boot-commands.patch b/0007-convert-beaglebone-to-use-generic-boot-commands.patch index 3e79ad2..038fe8b 100644 --- a/0007-convert-beaglebone-to-use-generic-boot-commands.patch +++ b/0007-convert-beaglebone-to-use-generic-boot-commands.patch @@ -1,7 +1,7 @@ -From 4998ea8d57088973c5d4b0306c9c226b85e29bfa Mon Sep 17 00:00:00 2001 +From f602391354fdfc12c15e06e45fbf1b40c590f008 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 15 Mar 2014 10:24:26 -0500 -Subject: [PATCH 7/9] convert beaglebone to use generic boot commands +Subject: [PATCH 07/13] convert beaglebone to use generic boot commands --- include/configs/am335x_evm.h | 62 +++++++++------------------------------ diff --git a/0008-convert-pandaboard-to-use-generic-boot-commands.patch b/0008-convert-pandaboard-to-use-generic-boot-commands.patch index 54096ae..2286959 100644 --- a/0008-convert-pandaboard-to-use-generic-boot-commands.patch +++ b/0008-convert-pandaboard-to-use-generic-boot-commands.patch @@ -1,7 +1,7 @@ -From dfdd6312dc00d1b2dde14f00fe7bd7fb4e8bdd2c Mon Sep 17 00:00:00 2001 +From 1afa628d19c3ab8bb4059f9d8af34b897cca8a12 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 15 Mar 2014 10:26:49 -0500 -Subject: [PATCH 8/9] convert pandaboard to use generic boot commands +Subject: [PATCH 08/13] convert pandaboard to use generic boot commands --- include/configs/omap4_panda.h | 3 --- diff --git a/0009-fix-up-some-sillies.patch b/0009-fix-up-some-sillies.patch index 507333d..0544121 100644 --- a/0009-fix-up-some-sillies.patch +++ b/0009-fix-up-some-sillies.patch @@ -1,7 +1,7 @@ -From 1f6136261de93467a4e9d7e48df55df74715af6a Mon Sep 17 00:00:00 2001 +From 5b08e934e4e76f434297fc6de11764a615bc65ab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 15 Mar 2014 11:52:33 -0500 -Subject: [PATCH 9/9] fix up some sillies +Subject: [PATCH 09/13] fix up some sillies --- include/config_distro_bootcmd.h | 8 ++++---- diff --git a/0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch b/0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch new file mode 100644 index 0000000..806815b --- /dev/null +++ b/0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch @@ -0,0 +1,59 @@ +From e0c237a890aa404caf941c8f5e05c9748a7e8344 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 17 Mar 2014 10:30:41 -0500 +Subject: [PATCH 10/13] fixups for wandboard to ensure the environment is + correct + +--- + include/configs/wandboard.h | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h +index 6aaa439..386fe78 100644 +--- a/include/configs/wandboard.h ++++ b/include/configs/wandboard.h +@@ -41,11 +41,6 @@ + #define CONFIG_CONS_INDEX 1 + #define CONFIG_BAUDRATE 115200 + +-#ifndef CONFIG_SPL_BUILD +-#include +-#include +-#endif +- + /* Command definition */ + #include + +@@ -96,6 +91,11 @@ + #define CONFIG_IPUV3_CLK 260000000 + #define CONFIG_IMX_HDMI + ++#ifndef CONFIG_SPL_BUILD ++#include ++#include ++#endif ++ + #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) + #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" + #elif defined(CONFIG_MX6Q) +@@ -107,15 +107,14 @@ + "image=zImage\0" \ + "console=ttymxc0\0" \ + "splashpos=m,m\0" \ +- "fdt_high=0xa0000000\0" \ +- "initrd_high=0xa0000000\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr_r=0x18000000\0" \ + "boot_fdt=try\0" \ + "pxefile_addr_r=0x17f00000\0" \ + "scriptaddr=0x17e00000\0" \ + "kernel_addr_r=0x11000000\0" \ + "ramdisk_addr_r=0x18100000\0" \ ++ "bootm_size=0x20000000\0" \ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "mmcpart=1\0" \ +-- +1.9.0 + diff --git a/0011-convert-fdt_file-to-fdtfile-globally.patch b/0011-convert-fdt_file-to-fdtfile-globally.patch new file mode 100644 index 0000000..4d2b596 --- /dev/null +++ b/0011-convert-fdt_file-to-fdtfile-globally.patch @@ -0,0 +1,738 @@ +From e3a1ae5aa03d5d3e4dd4e7981f44f06eb851f83e Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 17 Mar 2014 10:45:14 -0500 +Subject: [PATCH 11/13] convert fdt_file to fdtfile globally + +cmd_pxe.c requires that the veriable for the fdt file name be called +fdtfile. Some boards are using fdt_file so this patch converts them +all to fdtfile. thei will enable any board to be converted to using +the generic framework in development +--- + include/configs/PMC440.h | 4 ++-- + include/configs/TQM5200.h | 4 ++-- + include/configs/TQM834x.h | 2 +- + include/configs/alpr.h | 4 ++-- + include/configs/amcc-common.h | 6 +++--- + include/configs/cgtqmx6eval.h | 4 ++-- + include/configs/charon.h | 2 +- + include/configs/cm5200.h | 4 ++-- + include/configs/digsy_mtc.h | 2 +- + include/configs/enbw_cmc.h | 4 ++-- + include/configs/hummingboard.h | 6 +++--- + include/configs/manroland/common.h | 4 ++-- + include/configs/motionpro.h | 6 +++--- + include/configs/muas3001.h | 8 ++++---- + include/configs/mx23_olinuxino.h | 6 +++--- + include/configs/mx23evk.h | 4 ++-- + include/configs/mx28evk.h | 8 ++++---- + include/configs/mx51evk.h | 6 +++--- + include/configs/mx53ard.h | 6 +++--- + include/configs/mx53loco.h | 6 +++--- + include/configs/mx6sabre_common.h | 6 +++--- + include/configs/mx6slevk.h | 6 +++--- + include/configs/nitrogen6x.h | 6 +++--- + include/configs/o2dnt-common.h | 4 ++-- + include/configs/socrates.h | 6 +++--- + include/configs/udoo.h | 6 +++--- + include/configs/vf610twr.h | 6 +++--- + 27 files changed, 68 insertions(+), 68 deletions(-) + +diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h +index c5e2f16..53d0385 100644 +--- a/include/configs/PMC440.h ++++ b/include/configs/PMC440.h +@@ -200,7 +200,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_SYS_BOOTFILE \ + CONFIG_SYS_ROOTPATH \ +- "fdt_file=/tftpboot/pmc440/pmc440.dtb\0" \ ++ "fdtfile=/tftpboot/pmc440/pmc440.dtb\0" \ + "netdev=eth0\0" \ + "ethrotate=no\0" \ + "nfsargs=setenv bootargs root=/dev/nfs rw " \ +@@ -215,7 +215,7 @@ + "nand_boot_fdt=run nandargs addip addtty addmisc;" \ + "bootm ${kernel_addr} - ${fdt_addr}\0" \ + "net_nfs_fdt=tftp ${kernel_addr_r} ${bootfile};" \ +- "tftp ${fdt_addr_r} ${fdt_file};" \ ++ "tftp ${fdt_addr_r} ${fdtfile};" \ + "run nfsargs addip addtty addmisc;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "kernel_addr=ffc00000\0" \ +diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h +index 69c0336..db32819 100644 +--- a/include/configs/TQM5200.h ++++ b/include/configs/TQM5200.h +@@ -241,7 +241,7 @@ + #define CUSTOM_ENV_SETTINGS \ + "hostname=tqm5200\0" \ + "bootfile=/tftpboot/tqm5200/uImage\0" \ +- "fdt_file=/tftpboot/tqm5200/tqm5200.dtb\0" \ ++ "fdtfile=/tftpboot/tqm5200/tqm5200.dtb\0" \ + "u-boot=/tftpboot/tqm5200/u-boot.bin\0" + #elif defined(CONFIG_CAM5200) + #define CUSTOM_ENV_SETTINGS \ +@@ -295,7 +295,7 @@ + "net_nfs_old=tftp ${kernel_addr_r} ${bootfile};" \ + "sete console ttyS0; run nfsargs addip addcons;bootm\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; " \ ++ "tftp ${fdt_addr_r} ${fdtfile}; " \ + "run nfsargs addip addcons addmtd; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + CUSTOM_ENV_SETTINGS \ +diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h +index 6762e3a..1e23d95 100644 +--- a/include/configs/TQM834x.h ++++ b/include/configs/TQM834x.h +@@ -535,7 +535,7 @@ + "net_nfs_old=tftp 400000 ${bootfile};" \ + "run nfsargs addip addcons;bootm\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; " \ ++ "tftp ${fdt_addr_r} ${fdtfile}; " \ + "run nfsargs addip addcons; " \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "rootpath=/opt/eldk/ppc_6xx\0" \ +diff --git a/include/configs/alpr.h b/include/configs/alpr.h +index 7849b22..af43e8e 100644 +--- a/include/configs/alpr.h ++++ b/include/configs/alpr.h +@@ -132,7 +132,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth3\0" \ + "hostname=alpr\0" \ +- "fdt_file=alpr/alpr.dtb\0" \ ++ "fdtfile=alpr/alpr.dtb\0" \ + "fdt_addr=400000\0" \ + "nfsargs=setenv bootargs root=/dev/nfs rw " \ + "nfsroot=${serverip}:${rootpath} ${init}\0" \ +@@ -149,7 +149,7 @@ + "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ + "bootm\0" \ + "net_nfs_fdt=tftp 200000 ${bootfile};" \ +- "tftp ${fdt_addr} ${fdt_file};" \ ++ "tftp ${fdt_addr} ${fdtfile};" \ + "run nfsargs addip addtty;" \ + "bootm 200000 - ${fdt_addr}\0" \ + "rootpath=/opt/projects/alpr/nfs_root\0" \ +diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h +index 2aea899..95d42ac 100644 +--- a/include/configs/amcc-common.h ++++ b/include/configs/amcc-common.h +@@ -208,16 +208,16 @@ + "flash_nfs=run nfsargs addip addtty addmisc;" \ + "bootm ${kernel_addr} - ${fdt_addr}\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; " \ ++ "tftp ${fdt_addr_r} ${fdtfile}; " \ + "run nfsargs addip addtty addmisc;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \ +- "tftp ${fdt_addr_r} ${fdt_file};" \ ++ "tftp ${fdt_addr_r} ${fdtfile};" \ + "tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \ + "net_self=run net_self_load;" \ + "run ramargs addip addtty addmisc;" \ + "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0" \ +- "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" __stringify(CONFIG_HOSTNAME) ".dtb\0" ++ "fdtfile=" __stringify(CONFIG_HOSTNAME) "/" __stringify(CONFIG_HOSTNAME) ".dtb\0" + + /* + * Default environment for arch/ppc booting, +diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h +index b189bf1..dac7e65 100644 +--- a/include/configs/cgtqmx6eval.h ++++ b/include/configs/cgtqmx6eval.h +@@ -76,7 +76,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "image=zImage\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "boot_dir=/boot\0" \ + "console=ttymxc1\0" \ + "fdt_high=0xffffffff\0" \ +@@ -95,7 +95,7 @@ + "loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ + "${boot_dir}/${image}\0" \ + "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \ +- "${boot_dir}/${fdt_file}\0" \ ++ "${boot_dir}/${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +diff --git a/include/configs/charon.h b/include/configs/charon.h +index 2f537e0..dfcc01e 100644 +--- a/include/configs/charon.h ++++ b/include/configs/charon.h +@@ -29,7 +29,7 @@ + #undef CUSTOM_ENV_SETTINGS + #define CUSTOM_ENV_SETTINGS \ + "bootfile=/tftpboot/charon/uImage\0" \ +- "fdt_file=/tftpboot/charon/charon.dtb\0" \ ++ "fdtfile=/tftpboot/charon/charon.dtb\0" \ + "u-boot=/tftpboot/charon/u-boot.bin\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" +diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h +index 7c693d6..8c41892 100644 +--- a/include/configs/cm5200.h ++++ b/include/configs/cm5200.h +@@ -98,7 +98,7 @@ + "rootpath=/opt/eldk-4.1/ppc_6xx\0" \ + "u-boot=/tftpboot/cm5200/u-boot.bin\0" \ + "bootfile_fdt=/tftpboot/cm5200/uImage\0" \ +- "fdt_file=/tftpboot/cm5200/cm5200.dtb\0" \ ++ "fdtfile=/tftpboot/cm5200/cm5200.dtb\0" \ + "load=tftp ${u-boot_addr} ${u-boot}\0" \ + "update=prot off fc000000 +${filesize}; " \ + "era fc000000 +${filesize}; " \ +@@ -117,7 +117,7 @@ + "flash_flash=run flashargs addinit addip addcons;" \ + "bootm ${kernel_addr_flash} - ${fdt_addr_flash}\0" \ + "net_nfs_fdt=tftp ${kernel_addr} ${bootfile_fdt}; " \ +- "tftp ${fdt_addr} ${fdt_file}; run nfsargs addip " \ ++ "tftp ${fdt_addr} ${fdtfile}; run nfsargs addip " \ + "addcons; bootm ${kernel_addr} - ${fdt_addr}\0" \ + "" + #define CONFIG_BOOTCOMMAND "run flash_flash" +diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h +index 2a8cb39..b012539 100644 +--- a/include/configs/digsy_mtc.h ++++ b/include/configs/digsy_mtc.h +@@ -223,7 +223,7 @@ + "addcons=setenv bootargs ${bootargs} console=${console},${baudrate}\0"\ + "rootpath=/opt/eldk/ppc_6xx\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ +- "tftp ${fdt_addr_r} ${fdt_file};" \ ++ "tftp ${fdt_addr_r} ${fdtfile};" \ + "run nfsargs addip addcons;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "load=tftp 200000 ${u-boot}\0" \ +diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h +index 03b74a2..97fd539 100644 +--- a/include/configs/enbw_cmc.h ++++ b/include/configs/enbw_cmc.h +@@ -188,14 +188,14 @@ + "kernel_addr_r=c0700000\0" \ + "fdt_addr_r=c0600000\0" \ + "ramdisk_addr_r=c0b00000\0" \ +- "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" \ ++ "fdtfile=" __stringify(CONFIG_HOSTNAME) "/" \ + __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ + "nand_ld_ramdsk=nand read ${ramdisk_addr_r} 320000 400000\0" \ + "nand_ld_kernel=nand read ${kernel_addr_r} 20000 300000\0" \ + "nand_ld_fdt=nand read ${fdt_addr_r} 0 2000\0" \ + "load_kernel=tftp ${kernel_addr_r} ${kernel_file}\0" \ +- "load_fdt=tftp ${fdt_addr_r} ${fdt_file}\0" \ ++ "load_fdt=tftp ${fdt_addr_r} ${fdtfile}\0" \ + "load_nand=run nand_ld_ramdsk nand_ld_kernel nand_ld_fdt\0" \ + "addcon=setenv bootargs ${bootargs} console=ttyS2," \ + "${baudrate}n8\0" \ +diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h +index 2895523..0fd8f1d 100644 +--- a/include/configs/hummingboard.h ++++ b/include/configs/hummingboard.h +@@ -97,7 +97,7 @@ + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr=0x18000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -125,7 +125,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -153,7 +153,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h +index ab4a471..2295530 100644 +--- a/include/configs/manroland/common.h ++++ b/include/configs/manroland/common.h +@@ -72,10 +72,10 @@ + "rootpath=/opt/eldk/ppc_82xx\0" \ + "kernel_addr_r=300000\0" \ + "fdt_addr_r=200000\0" \ +- "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" \ ++ "fdtfile=" __stringify(CONFIG_HOSTNAME) "/" \ + __stringify(CONFIG_HOSTNAME) ".dtb\0" \ + "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ +- "load_fdt=tftp ${fdt_addr_r} ${fdt_file};\0" \ ++ "load_fdt=tftp ${fdt_addr_r} ${fdtfile};\0" \ + "load_kernel=tftp ${kernel_addr_r} ${kernel_file};\0" \ + "addcon=setenv bootargs ${bootargs} console=ttyPSC0,${baudrate}\0"\ + "net_nfs=run load_fdt load_kernel; " \ +diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h +index e8b0593..0b52580 100644 +--- a/include/configs/motionpro.h ++++ b/include/configs/motionpro.h +@@ -108,7 +108,7 @@ + "rootpath=/opt/eldk-4.2/ppc_6xx\0" \ + "u-boot=/tftpboot/motionpro/u-boot.bin\0" \ + "bootfile=/tftpboot/motionpro/uImage\0" \ +- "fdt_file=/tftpboot/motionpro/motionpro.dtb\0" \ ++ "fdtfile=/tftpboot/motionpro/motionpro.dtb\0" \ + "ramdisk_file=/tftpboot/motionpro/uRamdisk\0" \ + "multi_image_file=kernel+initrd+dtb.img\0" \ + "load=tftp ${u-boot_addr} ${u-boot}\0" \ +@@ -131,11 +131,11 @@ + "${netmask}:${hostname}:${netdev}:off panic=1 " \ + "console=${console}\0" \ + "net_nfs=tftp ${kernel_addr} ${bootfile}; " \ +- "tftp ${fdt_addr} ${fdt_file}; " \ ++ "tftp ${fdt_addr} ${fdtfile}; " \ + "run nfsargs addip addmtd; " \ + "bootm ${kernel_addr} - ${fdt_addr}\0" \ + "net_self=tftp ${kernel_addr} ${bootfile}; " \ +- "tftp ${fdt_addr} ${fdt_file}; " \ ++ "tftp ${fdt_addr} ${fdtfile}; " \ + "tftp ${ramdisk_addr} ${ramdisk_file}; " \ + "nfs ${ramdisk_addr} ${serverip}:${rootpath}/images/uRamdisk; " \ + "run ramargs addip addcons addmtd; " \ +diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h +index 7343c94..2142140 100644 +--- a/include/configs/muas3001.h ++++ b/include/configs/muas3001.h +@@ -134,7 +134,7 @@ + "rootpath=/opt/eldk/ppc_6xx\0" \ + "u-boot=muas3001/u-boot.bin\0" \ + "bootfile=muas3001/uImage\0" \ +- "fdt_file=muas3001/muas3001.dtb\0" \ ++ "fdtfile=muas3001/muas3001.dtb\0" \ + "ramdisk_file=uRamdisk\0" \ + "load=tftp ${u-boot_addr_r} ${u-boot}\0" \ + "update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; " \ +@@ -149,10 +149,10 @@ + "ip=${ipaddr}:${serverip}:${gatewayip}:" \ + "${netmask}:${hostname}:${netdev}:off panic=1\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; run nfsargs addip addcons;" \ ++ "tftp ${fdt_addr_r} ${fdtfile}; run nfsargs addip addcons;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "net_self=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; " \ ++ "tftp ${fdt_addr_r} ${fdtfile}; " \ + "tftp ${ramdisk_addr} ${ramdisk_file}; " \ + "run ramargs addip; " \ + "bootm ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}\0" \ +@@ -167,7 +167,7 @@ + "updatekernel=era ${kernel_addr} +1b0000;tftpb ${kernel_addr_r}" \ + " ${bootfile};" \ + "cp.b ${kernel_addr_r} ${kernel_addr} ${filesize}\0" \ +- "updatefdt=era ${fdt_addr} +10000;tftpb ${fdt_addr_r} ${fdt_file};" \ ++ "updatefdt=era ${fdt_addr} +10000;tftpb ${fdt_addr_r} ${fdtfile};" \ + "cp.b ${fdt_addr_r} ${fdt_addr} ${filesize}\0" \ + "" + +diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h +index e377fea..881d5d4 100644 +--- a/include/configs/mx23_olinuxino.h ++++ b/include/configs/mx23_olinuxino.h +@@ -85,7 +85,7 @@ + "script=boot.scr\0" \ + "uimage=uImage\0" \ + "console=ttyAMA0\0" \ +- "fdt_file=imx23-olinuxino.dtb\0" \ ++ "fdtfile=imx23-olinuxino.dtb\0" \ + "fdt_addr=0x41000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -99,7 +99,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -128,7 +128,7 @@ + "fi; " \ + "${get_cmd} ${uimage}; " \ + "if test ${boot_fdt} = yes; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h +index b496892..b7cba30 100644 +--- a/include/configs/mx23evk.h ++++ b/include/configs/mx23evk.h +@@ -86,7 +86,7 @@ + "script=boot.scr\0" \ + "image=zImage\0" \ + "console=ttyAMA0\0" \ +- "fdt_file=imx23-evk.dtb\0" \ ++ "fdtfile=imx23-evk.dtb\0" \ + "fdt_addr=0x41000000\0" \ + "boot_fdt=try\0" \ + "mmcdev=0\0" \ +@@ -99,7 +99,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h +index 9b9124a..071e510 100644 +--- a/include/configs/mx28evk.h ++++ b/include/configs/mx28evk.h +@@ -208,7 +208,7 @@ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ +- "${get_cmd} ${fdt_file}; " \ ++ "${get_cmd} ${fdtfile}; " \ + "nand write ${loadaddr} fdt ${filesize}\0" \ + "update_nand_filesystem=" /* Update filesystem */ \ + "mtdparts default; " \ +@@ -251,7 +251,7 @@ + "image=zImage\0" \ + "console_fsl=ttyAM0\0" \ + "console_mainline=ttyAMA0\0" \ +- "fdt_file=imx28-evk.dtb\0" \ ++ "fdtfile=imx28-evk.dtb\0" \ + "fdt_addr=0x41000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -265,7 +265,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -293,7 +293,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h +index b389475..f573434 100644 +--- a/include/configs/mx51evk.h ++++ b/include/configs/mx51evk.h +@@ -144,7 +144,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "image=zImage\0" \ +- "fdt_file=imx51-babbage.dtb\0" \ ++ "fdtfile=imx51-babbage.dtb\0" \ + "fdt_addr=0x91000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -158,7 +158,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -186,7 +186,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h +index 797a637..d4e4161 100644 +--- a/include/configs/mx53ard.h ++++ b/include/configs/mx53ard.h +@@ -98,7 +98,7 @@ + "console=ttymxc0\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr=0x71000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -126,7 +126,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -154,7 +154,7 @@ + "fi; " \ + "${get_cmd} ${uimage}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h +index 1415584..cfc8f1e 100644 +--- a/include/configs/mx53loco.h ++++ b/include/configs/mx53loco.h +@@ -105,7 +105,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "image=zImage\0" \ +- "fdt_file=imx53-qsb.dtb\0" \ ++ "fdtfile=imx53-qsb.dtb\0" \ + "fdt_addr=0x71000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -118,7 +118,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -146,7 +146,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h +index 7a2c172..df5060c 100644 +--- a/include/configs/mx6sabre_common.h ++++ b/include/configs/mx6sabre_common.h +@@ -120,7 +120,7 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "image=zImage\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr=0x18000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -151,7 +151,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -179,7 +179,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h +index 1876dbf..74e411e 100644 +--- a/include/configs/mx6slevk.h ++++ b/include/configs/mx6slevk.h +@@ -80,7 +80,7 @@ + "console=ttymxc0\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=imx6sl-evk.dtb\0" \ ++ "fdtfile=imx6sl-evk.dtb\0" \ + "fdt_addr=0x88000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -94,7 +94,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -122,7 +122,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h +index f2db8c5..a8a477e 100644 +--- a/include/configs/nitrogen6x.h ++++ b/include/configs/nitrogen6x.h +@@ -180,7 +180,7 @@ + "console=ttymxc1\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=imx6q-sabrelite.dtb\0" \ ++ "fdtfile=imx6q-sabrelite.dtb\0" \ + "fdt_addr=0x18000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -194,7 +194,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -222,7 +222,7 @@ + "fi; " \ + "${get_cmd} ${uimage}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h +index 133dc6f..83f9d50 100644 +--- a/include/configs/o2dnt-common.h ++++ b/include/configs/o2dnt-common.h +@@ -135,13 +135,13 @@ + + #define CONFIG_IFM_DEFAULT_ENV_NEW \ + "fdt_addr_r=900000\0" \ +- "fdt_file="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME".dtb\0" \ ++ "fdtfile="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME".dtb\0" \ + "flash_self=run ramargs addip addtty addmisc;" \ + "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ + "flash_nfs=run nfsargs addip addtty addmisc;" \ + "bootm ${kernel_addr} - ${fdt_addr}\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; " \ ++ "tftp ${fdt_addr_r} ${fdtfile}; " \ + "run nfsargs addip addtty addmisc;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + +diff --git a/include/configs/socrates.h b/include/configs/socrates.h +index c654a0e..27bc358 100644 +--- a/include/configs/socrates.h ++++ b/include/configs/socrates.h +@@ -380,7 +380,7 @@ + "consdev=ttyS0\0" \ + "uboot_file=/home/tftp/syscon3/u-boot.bin\0" \ + "bootfile=/home/tftp/syscon3/uImage\0" \ +- "fdt_file=/home/tftp/syscon3/socrates.dtb\0" \ ++ "fdtfile=/home/tftp/syscon3/socrates.dtb\0" \ + "initrd_file=/home/tftp/syscon3/uinitrd.gz\0" \ + "uboot_addr=FFFA0000\0" \ + "kernel_addr=FE000000\0" \ +@@ -401,7 +401,7 @@ + "boot_nor=run ramargs addcons;" \ + "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ + "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ +- "tftp ${fdt_addr_r} ${fdt_file}; " \ ++ "tftp ${fdt_addr_r} ${fdtfile}; " \ + "run nfsargs addip addcons;" \ + "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ + "update_uboot=tftp 100000 ${uboot_file};" \ +@@ -413,7 +413,7 @@ + "era fe000000 fe1dffff;" \ + "cp.b 100000 fe000000 ${filesize};" \ + "setenv filesize;saveenv\0" \ +- "update_fdt=tftp 100000 ${fdt_file};" \ ++ "update_fdt=tftp 100000 ${fdtfile};" \ + "era fe1e0000 fe1fffff;" \ + "cp.b 100000 fe1e0000 ${filesize};" \ + "setenv filesize;saveenv\0" \ +diff --git a/include/configs/udoo.h b/include/configs/udoo.h +index a0306de..88e503b 100644 +--- a/include/configs/udoo.h ++++ b/include/configs/udoo.h +@@ -105,7 +105,7 @@ + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr=0x18000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -133,7 +133,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -161,7 +161,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h +index 500fd2f..208c2cc 100644 +--- a/include/configs/vf610twr.h ++++ b/include/configs/vf610twr.h +@@ -85,7 +85,7 @@ + "console=ttyLP1\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=vf610-twr.dtb\0" \ ++ "fdtfile=vf610-twr.dtb\0" \ + "fdt_addr=0x81000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ +@@ -113,7 +113,7 @@ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ ++ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +@@ -141,7 +141,7 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ ++ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ +-- +1.9.0 + diff --git a/0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch b/0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch new file mode 100644 index 0000000..bbe566e --- /dev/null +++ b/0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch @@ -0,0 +1,31 @@ +From 3f7058a106fde4bf69b76933a1e2f56a051d8466 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Tue, 18 Mar 2014 16:13:38 -0500 +Subject: [PATCH 12/13] check for fdtfile and fdt_file to find the devicetree + file + +--- + common/cmd_pxe.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c +index 3483328..c58e471 100644 +--- a/common/cmd_pxe.c ++++ b/common/cmd_pxe.c +@@ -712,6 +712,13 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) + char *f1, *f2, *f3, *f4, *slash; + + f1 = getenv("fdtfile"); ++ /* ++ * some boards have used fdt_file as the environment variable for ++ * defining the device tree file so lets check for fdt_file also. ++ */ ++ if (!f1) { ++ f1 = getenv("fdt_file"); ++ } + if (f1) { + f2 = ""; + f3 = ""; +-- +1.9.0 + diff --git a/0013-cleanups-to-make-panda-and-beaglebone-work.patch b/0013-cleanups-to-make-panda-and-beaglebone-work.patch new file mode 100644 index 0000000..41082bf --- /dev/null +++ b/0013-cleanups-to-make-panda-and-beaglebone-work.patch @@ -0,0 +1,52 @@ +From 1138de5f8cd27f376186058a4eb791262e4592c4 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Wed, 19 Mar 2014 18:09:42 -0500 +Subject: [PATCH 13/13] cleanups to make panda and beaglebone work + +--- + include/configs/am335x_evm.h | 2 +- + include/configs/ti_omap4_common.h | 5 ++++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index a291a2f..1dd4486 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -140,7 +140,7 @@ + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "for target in ${boot_targets}; do run bootcmd_${target}; done" \ ++ "for target in ${boot_targets}; do run bootcmd_${target}; done " \ + "run nandboot;" + + /* NS16550 Configuration */ +diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h +index eb3240a..f9baa50 100644 +--- a/include/configs/ti_omap4_common.h ++++ b/include/configs/ti_omap4_common.h +@@ -86,6 +86,7 @@ + /* + * Environment setup + */ ++#ifndef CONFIG_SPL_BUILD + #define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ + "console=ttyO2,115200n8\0" \ +@@ -124,10 +125,12 @@ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0" \ + "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \ ++ BOOTCMDS_COMMON ++#endif + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "for target in ${boot_targets}; do run bootcmd_${target}; done" ++ "for target in ${boot_targets}; do run bootcmd_${target}; done " + /* + * Defines for SPL + * It is known that this will break HS devices. Since the current size of +-- +1.9.0 + diff --git a/uboot-tools.spec b/uboot-tools.spec index 6c6cf40..5e5558f 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -2,7 +2,7 @@ Name: uboot-tools Version: 2014.04 -Release: 0.3%{?candidate:.%{candidate}}%{?dist} +Release: 0.4%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -21,6 +21,10 @@ Patch15: 0006-convert-wandboard-to-use-generic-boot-commands.patch Patch16: 0007-convert-beaglebone-to-use-generic-boot-commands.patch Patch17: 0008-convert-pandaboard-to-use-generic-boot-commands.patch Patch18: 0009-fix-up-some-sillies.patch +Patch19: 0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch +Patch20: 0011-convert-fdt_file-to-fdtfile-globally.patch +Patch21: 0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch +Patch22: 0013-cleanups-to-make-panda-and-beaglebone-work.patch %ifnarch %{arm} BuildRequires: gcc-arm-linux-gnu @@ -164,6 +168,10 @@ u-boot bootloader binaries for Wandboard i.MX6 Solo %patch16 -p1 %patch17 -p1 %patch18 -p1 +%patch19 -p1 +%patch20 -p1 +%patch21 -p1 +%patch22 -p1 mkdir builds # convert fedora logo to bmp for use in u-boot @@ -444,6 +452,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Mar 19 2014 Dennis Gilmore - 2014.04-0.4.rc2 +- apply fixes for panda and beaglebone + * Sat Mar 15 2014 Dennis Gilmore - 2014.04-0.3.rc2 - Add missing header - pull in patches on their way upstream to fix some issues with ti -- cgit