sunxi-common.h: Remove CONFIG_SYS_BOOT_GET_CMDLINE

We undef CONFIG_CMD_NET at line 167, and there is nothing re-defining it between line 167 and the #ifdef CONFIG_CMD_NET, so remove this effectively dead block.

Signed-off-by Hans de Goede <[email protected]>

I see no reason to override the choice to include this from config_cmd_defauls.h .

Signed-off-by Hans de Goede <[email protected]>

config_distro_defaults.h which is include later will redefine CONFIG_CMD_NET, drop the useless / meaningless undef of it.

While at also move the undef of CONFIG_CMD_FPGA up to directly under the include of config_cmd_defaults.h, to make it clear that it overwrites the setting done from config_cmd_defaults.h .

Signed-off-by Hans de Goede <[email protected]>

Use the new standard bootcmd from <config_distro_bootcmd.h>.

Signed-off-by Hans de Goede <[email protected]>

---
 include/configs/sunxi-common.h | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

include/configs/sunxi-common.h +24 -3

index 4c712f3..f5a702a 100644
@@ -123,9 +123,6 @@
 #define CONFIG_ENV_OFFSET		(544 << 10) /* (8 + 24 + 512) KiB */
 #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
 
-#define CONFIG_EXTRA_ENV_SETTINGS \
-	"bootm_size=0x10000000\0"
-
 #include <config_cmd_default.h>
 #undef CONFIG_CMD_FPGA
 

@@ -219,6 +216,30 @@
 
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
+
+#ifdef CONFIG_AHCI
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(SCSI, scsi, 0) \
+	func(USB, usb, 0) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+#else
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(USB, usb, 0) \
+	func(PXE, pxe, na) \
+	func(DHCP, dhcp, na)
+#endif
+
+#include <config_distro_bootcmd.h>
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"bootm_size=0x10000000\0" \
+	BOOTENV
+
+#else /* ifndef CONFIG_SPL_BUILD */
+#define CONFIG_EXTRA_ENV_SETTINGS
 #endif
 
 #endif /* _SUNXI_COMMON_CONFIG_H */

Use the new standard bootcmd from <config_distro_bootcmd.h>.

include/configs/sunxi-common.h +4 -0

 
+#ifdef CONFIG_AHCI
+#define BOOT_TARGET_DEVICES(func) \
+	func(MMC, mmc, 0) \
+	func(SCSI, scsi, 0) \

Quoted 1 line · Hans de Goede

Use the new standard bootcmd from <config_distro_bootcmd.h>.

Acked-by Stephen Warren <[email protected]>

Quoted 6 lines

include/configs/sunxi-common.h +4 -0

 
+#ifdef CONFIG_AHCI
+#define BOOT_TARGET_DEVICES(func) \
+    func(MMC, mmc, 0) \
+    func(SCSI, scsi, 0) \

include/configs/sunxi-common.h line 233

Quoted 10 lines

include/configs/sunxi-common.h +10 -0

+    func(USB, usb, 0) \
+    func(PXE, pxe, na) \
+    func(DHCP, dhcp, na)
+#else
+#define BOOT_TARGET_DEVICES(func) \
+    func(MMC, mmc, 0) \
+    func(USB, usb, 0) \
+    func(PXE, pxe, na) \
+    func(DHCP, dhcp, na)
+#endif

In the spirit of using crazy macros (!) :-) I might code that as:

#ifdef CONFIG_AHCI
#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) #else
#define BOOT_TARGET_DEVICES_SCSI(func)
#endif

#define BOOT_TARGET_DEVICES(func) \
    func(MMC, mmc, 0) \
    BOOT_TARGET_DEVICES_SCSI(func) \
    func(USB, usb, 0) \
    func(PXE, pxe, na) \
    func(DHCP, dhcp, na)

... since it doesn't duplicate the rest of the main macro, but either way is fine by me.

Hi,

Quoted 4 lines · Stephen Warren

Quoted 1 line · Hans de Goede

Use the new standard bootcmd from <config_distro_bootcmd.h>.

Acked-by Stephen Warren <[email protected]>

Thanks for the review.

Quoted 32 lines

Quoted 6 lines

include/configs/sunxi-common.h +4 -0

 
+#ifdef CONFIG_AHCI
+#define BOOT_TARGET_DEVICES(func) \
+    func(MMC, mmc, 0) \
+    func(SCSI, scsi, 0) \

include/configs/sunxi-common.h line 233

Quoted 10 lines

include/configs/sunxi-common.h +10 -0

+    func(USB, usb, 0) \
+    func(PXE, pxe, na) \
+    func(DHCP, dhcp, na)
+#else
+#define BOOT_TARGET_DEVICES(func) \
+    func(MMC, mmc, 0) \
+    func(USB, usb, 0) \
+    func(PXE, pxe, na) \
+    func(DHCP, dhcp, na)
+#endif

In the spirit of using crazy macros (!) :-) I might code that as:

#ifdef CONFIG_AHCI
#define BOOT_TARGET_DEVICES_SCSI(func) func(SCSI, scsi, 0) #else
#define BOOT_TARGET_DEVICES_SCSI(func)
#endif

#define BOOT_TARGET_DEVICES(func) \
    func(MMC, mmc, 0) \
    BOOT_TARGET_DEVICES_SCSI(func) \
    func(USB, usb, 0) \
    func(PXE, pxe, na) \
    func(DHCP, dhcp, na)

Quoted 1 line

... since it doesn't duplicate the rest of the main macro, but either way is fine by me.

Ah, I like, esp. since in the future we may get boards without an USB host (tablets), and then things would get complicated but not with your trick.

I've modified this patch my personal tree to use your approach.

SYS_CPU, SYS_BOARD and SYS_SOC are identical for all sunxi boards, move them to a shared code block.

Signed-off-by Hans de Goede <[email protected]>

Quoted 4 lines · Hans de Goede

SYS_CPU, SYS_BOARD and SYS_SOC are identical for all sunxi boards, move them to a shared code block.

Signed-off-by Hans de Goede <[email protected]>

This is an improvement so:

Acked-by Ian Campbell <[email protected]>

But eventually we could clean up even more, e.g.

config SYS_CONFIG_NAME
string
default "sun4i" if TARGET_SUN4I
default "sun5i" if TARGET_SUN5I
etc

Possibly even some things should be select'd rather than default'd.

Quoted 17 lines · Ian Campbell

Quoted 4 lines · Hans de Goede

SYS_CPU, SYS_BOARD and SYS_SOC are identical for all sunxi boards, move them to a shared code block.

Signed-off-by Hans de Goede <[email protected]>

This is an improvement so:

Acked-by Ian Campbell <[email protected]>

But eventually we could clean up even more, e.g.

config SYS_CONFIG_NAME
string
default "sun4i" if TARGET_SUN4I
default "sun5i" if TARGET_SUN5I
etc

Quoted 1 line

Possibly even some things should be select'd rather than default'd.

Selected sounds better. :)

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

Quoted 9 lines · Dennis Gilmore

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 7 lines

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

What kind of issues?

At least for Tegra, I've carefully chosen the values for the various load addresses so that there won't be issues. (Without that I can easily see the potential for issues.) I've seen far more repeated problems when U-Boot moves the DT/initrd around than than when it didn't (none in that case). Besides, it's completely redundant and unnecessary work if the blobs are already loaded at sane addresses, which they are on Tegra at least.

Quoted 9 lines · Dennis Gilmore

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 7 lines

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

What kind of issues?

At least for Tegra, I've carefully chosen the values for the various load addresses so that there won't be issues. (Without that I can easily see the potential for issues.) I've seen far more repeated problems when U-Boot moves the DT/initrd around than than when it didn't (none in that case). Besides, it's completely redundant and unnecessary work if the blobs are already loaded at sane addresses, which they are on Tegra at least.

Quoted 20 lines · Stephen Warren

Quoted 9 lines · Dennis Gilmore

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 7 lines

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

What kind of issues?

Quoted 7 lines

At least for Tegra, I've carefully chosen the values for the various load addresses so that there won't be issues. (Without that I can easily see the potential for issues.) I've seen far more repeated problems when U-Boot moves the DT/initrd around than than when it didn't (none in that case). Besides, it's completely redundant and unnecessary work if the blobs are already loaded at sane addresses, which they are on Tegra at least.

Just how large of a kernel have you thrown on a Tegra? 32MB might seem reasonable at first but it wouldn't be overly surprised if someone can shove a BSS into there. I know I shoved DT into 128MB by default because a 32bit ARM kernel isn't functional at that size.

Quoted 29 lines · Tom Rini

Quoted 20 lines · Stephen Warren

Quoted 9 lines · Dennis Gilmore

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 7 lines

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

What kind of issues?

Quoted 7 lines

At least for Tegra, I've carefully chosen the values for the various load addresses so that there won't be issues. (Without that I can easily see the potential for issues.) I've seen far more repeated problems when U-Boot moves the DT/initrd around than than when it didn't (none in that case). Besides, it's completely redundant and unnecessary work if the blobs are already loaded at sane addresses, which they are on Tegra at least.

Quoted 4 lines

Just how large of a kernel have you thrown on a Tegra? 32MB might seem reasonable at first but it wouldn't be overly surprised if someone can shove a BSS into there. I know I shoved DT into 128MB by default because a 32bit ARM kernel isn't functional at that size.

There's enough space for the following:

16M decompressed kernel
16M compressed kernel

1M DTB

The kernel I typically boot is ~4.MB zImage, and ~9MB Image (which doesn't include BSS).

Note that if the decompressed/compressed kernel overlap, the kernel decompresser takes care of relocating the compressed kernel before doing the decompression, and IIRC is supposed to take care not to clobber the DTB (or initrd?) when doing so.

Fedora's rawhide zImage is a bit larger at ~6MB. That works fine too.

Quoted 35 lines · Stephen Warren

Quoted 33 lines · Tom Rini

Quoted 20 lines · Stephen Warren

Quoted 9 lines · Dennis Gilmore

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 7 lines

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

What kind of issues?

Quoted 7 lines

At least for Tegra, I've carefully chosen the values for the various load addresses so that there won't be issues. (Without that I can easily see the potential for issues.) I've seen far more repeated problems when U-Boot moves the DT/initrd around than than when it didn't (none in that case). Besides, it's completely redundant and unnecessary work if the blobs are already loaded at sane addresses, which they are on Tegra at least.

Just how large of a kernel have you thrown on a Tegra? 32MB might seem reasonable at first but it wouldn't be overly surprised if someone can shove a BSS into there. I know I shoved DT into 128MB by default because a 32bit ARM kernel isn't functional at that size.

Quoted 4 lines

There's enough space for the following:

16M decompressed kernel
16M compressed kernel

... which is potentially small :)

Quoted 9 lines

1M DTB

The kernel I typically boot is ~4.MB zImage, and ~9MB Image (which doesn't include BSS).

Note that if the decompressed/compressed kernel overlap, the kernel decompresser takes care of relocating the compressed kernel before doing the decompression, and IIRC is supposed to take care not to clobber the DTB (or initrd?) when doing so.

The decompressor is happy to clobber over other things I would swear which is how people end up in the "oops, my DT was eaten" case when things are placed too close and _not_ relocated prior to booting.

Quoted 1 line

Fedora's rawhide zImage is a bit larger at ~6MB. That works fine too.

Right but what's the worst case you can come up with? There's folks out there attempting to feed the same kernel into their testboard farm of relatively wild differnet HW but all works on multi_v7_defconfig.

Quoted 36 lines · Tom Rini

Quoted 35 lines · Stephen Warren

Quoted 33 lines · Tom Rini

Quoted 20 lines · Stephen Warren

Quoted 9 lines · Dennis Gilmore

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 7 lines

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues.

What kind of issues?

Quoted 7 lines

At least for Tegra, I've carefully chosen the values for the various load addresses so that there won't be issues. (Without that I can easily see the potential for issues.) I've seen far more repeated problems when U-Boot moves the DT/initrd around than than when it didn't (none in that case). Besides, it's completely redundant and unnecessary work if the blobs are already loaded at sane addresses, which they are on Tegra at least.

Just how large of a kernel have you thrown on a Tegra? 32MB might seem reasonable at first but it wouldn't be overly surprised if someone can shove a BSS into there. I know I shoved DT into 128MB by default because a 32bit ARM kernel isn't functional at that size.

Quoted 6 lines

Quoted 4 lines

There's enough space for the following:

16M decompressed kernel
16M compressed kernel

... which is potentially small :)

Yes, I suppose we should bump the decompressed kernel size to 24M. The last time we had this conversation, IIRC there was an agreement that since that's the limit of the ARM ISA's branch/jump instruction, that's the largest a kernel image could be (and at that size, no modules could be loaded). That is, unless intermediate trampolines were generated by the linker, which IIRC isn't done.

FWIW, multi_v7_defconfig is only 11MB uncompressed and 5MB compressed, so we're not likely to hit the 16M limit for a while.

Quoted 6 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

Quoted 4 lines

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

There has been quite a few times where using 0xffffff has caused issues. I really think you should set bootm_size to something reasonable.

Quoted 14 lines · Dennis Gilmore

Quoted 10 lines · On Fri, 01 Aug 2014 12:57:31 -0600 Stephen Warren <[email protected]> wrote:

Quoted 2 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

Acked-by Stephen Warren <[email protected]>

I'd personally be tempted to set fdt_high=0xffffffff, initrd_high=0xffffffff to stop U-Boot copying the DT/initrd from the load location to some other location under 256M, but that's just an optimization and entirely optional.

Quoted 3 lines

There has been quite a few times where using 0xffffff has caused issues. I really think you should set bootm_size to something reasonable.

Which we do FWIW, "bootm_size=0x10000000\0" is retained by this patch. I think this was discussed/agreed during the initial upstreaming (but I've not checked the archives to confirm my recollection)

Quoted 6 lines · Hans de Goede

Automatic booting using an extlinux.conf file requires various environment variables to be set.

include/configs/sunxi-common.h +1 -1

-#define CONFIG_SYS_LOAD_ADDR		0x48000000 /* default load address */
+#define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */

include/configs/sunxi-common.h line 106

Quoted 3 lines

/* standalone support */

include/configs/sunxi-common.h +1 -1

-#define CONFIG_STANDALONE_LOAD_ADDR	0x48000000
+#define CONFIG_STANDALONE_LOAD_ADDR	0x42000000

I think these two changes need to be explained in the commit log. Otherwise looks good.

+ "fdtfile=" CONFIG_FTDFILE "\0" \

board/sunxi/Kconfig config SYS_SOC · line 40

Quoted 2 lines · Hans de Goede

board/sunxi/Kconfig +2 -0

+config FTDFILE
+	string "Default ftdfile env setting for this board"

Vagrant just pointed out the typo in all of this to me, whoops ;-)

Quoted 1 line

+ "fdtfile=" CONFIG_FTDFILE "\0" \

At least the actual environment name is correct ;-)

8<------------------------------

From 64aeaa14fc0a7672ee4f89f03354558b09a3116a Mon Sep 17 00:00:00 2001
From: Ian Campbell <[email protected]>
Date: Sat, 30 Aug 2014 22:46:15 +0100
Subject: [PATCH] sunxi: Correct typo CONFIG_FTDFILE => CONFIG_FDTFILE

Patch is the result of:
sed -i -e 's/FTDFILE/FDTFILE/g' board/sunxi/Kconfig configs/* include/configs/sunxi-common.h

Spotted-by Vagrant Cascadian <[email protected]>

Signed-off-by Ian Campbell <[email protected]>

---
 board/sunxi/Kconfig                   | 2 +-
 configs/A10-OLinuXino-Lime_defconfig  | 2 +-
 configs/A10s-OLinuXino-M_defconfig    | 2 +-
 configs/A13-OLinuXinoM_defconfig      | 2 +-
 configs/A13-OLinuXino_defconfig       | 2 +-
 configs/A20-OLinuXino_MICRO_defconfig | 2 +-
 configs/Auxtek-T004_defconfig         | 2 +-
 configs/Bananapi_defconfig            | 2 +-
 configs/Cubieboard2_FEL_defconfig     | 2 +-
 configs/Cubieboard2_defconfig         | 2 +-
 configs/Cubieboard_defconfig          | 2 +-
 configs/Cubietruck_FEL_defconfig      | 2 +-
 configs/Cubietruck_defconfig          | 2 +-
 configs/Linksprite_pcDuino3_defconfig | 2 +-
 configs/Mele_A1000G_defconfig         | 2 +-
 configs/Mele_A1000_defconfig          | 2 +-
 configs/Mini-X-1Gb_defconfig          | 2 +-
 configs/Mini-X_defconfig              | 2 +-
 configs/ba10_tv_box_defconfig         | 2 +-
 configs/i12-tvbox_defconfig           | 2 +-
 configs/qt840a_defconfig              | 2 +-
 configs/r7-tv-dongle_defconfig        | 2 +-
 include/configs/sunxi-common.h        | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

board/sunxi/Kconfig +0 -0

index c61c650..877281b 100644

board/sunxi/Kconfig +0 -0

 endif

configs/A10-OLinuXino-Lime_defconfig +1 -1

index b93ae7d..37dbe9c 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-olinuxino-lime.dtb"
+CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/A10s-OLinuXino-M_defconfig +1 -1

index f206970..8475b16 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,SPL,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
-CONFIG_FTDFILE="sun5i-a10s-olinuxino-micro.dtb"
+CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y

configs/A13-OLinuXinoM_defconfig +1 -1

index 8529dbe..bd135cd 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,SPL,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
-CONFIG_FTDFILE="sun5i-a13-olinuxino-micro.dtb"
+CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y

configs/A13-OLinuXino_defconfig +1 -1

index c3a12cc..eb3a6c0 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,SPL,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
-CONFIG_FTDFILE="sun5i-a13-olinuxino.dtb"
+CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y

configs/A20-OLinuXino_MICRO_defconfig +1 -1

index c91319d..c9170fa 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-olinuxino-micro.dtb"
+CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Auxtek-T004_defconfig +1 -1

index 193019c..0282c08 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
-CONFIG_FTDFILE="sun5i-a10s-auxtek-t004.dtb"
+CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y

configs/Bananapi_defconfig +1 -1

index dc68469..b75215c 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-bananapi.dtb"
+CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Cubieboard2_FEL_defconfig +1 -1

index ae5e25a..353b04a 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
+CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Cubieboard2_defconfig +1 -1

index df87edc..19a2550 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-cubieboard2.dtb"
+CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Cubieboard_defconfig +1 -1

index 57bf045..e4d69ba 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,SPL,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-cubieboard.dtb"
+CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/Cubietruck_FEL_defconfig +1 -1

index 790125a..23c5efb 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
+CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Cubietruck_defconfig +1 -1

index 4ad82e3..710d99a 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-cubietruck.dtb"
+CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Linksprite_pcDuino3_defconfig +1 -1

index 22d0446..ccae5d8 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,SPL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-pcduino3.dtb"
+CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/Mele_A1000G_defconfig +1 -1

index fa47fae..9f5c2f5 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
+CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/Mele_A1000_defconfig +1 -1

index d7c156d..4212f73 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,SPL,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-a1000.dtb"
+CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/Mini-X-1Gb_defconfig +1 -1

index af0b800..9933efe 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,SPL,AXP209_POWER,USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
+CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/Mini-X_defconfig +1 -1

index ea0c786..8a99ba2 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_X,SPL,AXP209_POWER,USB_EHCI"
-CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
+CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/ba10_tv_box_defconfig +1 -1

index c9961bd..f0e475b 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,SPL,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
-CONFIG_FTDFILE="sun4i-a10-ba10-tvbox.dtb"
+CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y

configs/i12-tvbox_defconfig +1 -1

index b267312..31276e3 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
+CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/qt840a_defconfig +1 -1

index 7360212..35a6aee 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="QT840A,SPL,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
-CONFIG_FTDFILE="sun7i-a20-i12-tvbox.dtb"
+CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y

configs/r7-tv-dongle_defconfig +1 -1

index 35b66f0..9033297 100644
@@ -1,5 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,SPL,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
-CONFIG_FTDFILE="sun5i-a10s-r7-tv-dongle.dtb"
+CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y

include/configs/sunxi-common.h +1 -1

index e768921..1d947d7 100644
@@ -244,7 +244,7 @@
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	MEM_LAYOUT_ENV_SETTINGS \
-	"fdtfile=" CONFIG_FTDFILE "\0" \
+	"fdtfile=" CONFIG_FDTFILE "\0" \
 	"console=ttyS0,115200\0" \
 	BOOTENV
 

sunxi does not need this and it should never have been enabled for it in the first place.

Signed-off-by Hans de Goede <[email protected]>