[U-Boot] [PATCH 1/7] sunxi-common.h: Remove CONFIG_SYS_BOOT_GET_CMDLINE

[U-Boot] [PATCH 1/7] sunxi-common.h: Remove CONFIG_SYS_BOOT_GET_CMDLINE

[Hans de Goede]

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 include/configs/sunxi-common.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 6a3044f..e3dc9c4 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -126,8 +126,6 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"bootm_size=0x10000000\0"
 
-#define CONFIG_SYS_BOOT_GET_CMDLINE
-
 #include <config_cmd_default.h>
 
 #define CONFIG_FAT_WRITE	/* enable write access */
-- 
2.0.3

[U-Boot] [PATCH 2/7] sunxi-common.h: Remove dead #ifdef CONFIG_CMD_NET code block

[Hans de Goede]

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 <hdegoede@redhat.com>
---
 include/configs/sunxi-common.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index e3dc9c4..9d4801a 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -205,14 +205,6 @@
 #define CONFIG_PHYLIB
 #endif
 
-#ifdef CONFIG_CMD_NET
-#define CONFIG_CMD_NFS
-#define CONFIG_CMD_DNS
-#define CONFIG_NETCONSOLE
-#define CONFIG_BOOTP_DNS2
-#define CONFIG_BOOTP_SEND_HOSTNAME
-#endif
-
 #ifdef CONFIG_USB_EHCI
 #define CONFIG_CMD_USB
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 1
-- 
2.0.3

[U-Boot] [PATCH 3/7] sunxi-common.h: Don't undefine CONFIG_CMD_NFS

[Hans de Goede]

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 include/configs/sunxi-common.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 9d4801a..cbe8b40 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -168,7 +168,6 @@
 
 #undef CONFIG_CMD_FPGA
 #undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
 
 /* I2C */
 #define CONFIG_SPL_I2C_SUPPORT
-- 
2.0.3

[U-Boot] [PATCH 4/7] sunxi-common.h: Don't undef CONFIG_CMD_NET only to redefine it again later

[Hans de Goede]

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 <hdegoede@redhat.com>
---
 include/configs/sunxi-common.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index cbe8b40..4c712f3 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -127,6 +127,7 @@
 	"bootm_size=0x10000000\0"
 
 #include <config_cmd_default.h>
+#undef CONFIG_CMD_FPGA
 
 #define CONFIG_FAT_WRITE	/* enable write access */
 
@@ -166,9 +167,6 @@
 #define CONFIG_SYS_SPL_MALLOC_START	0x4ff00000
 #define CONFIG_SYS_SPL_MALLOC_SIZE	0x00080000	/* 512 KiB */
 
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_NET
-
 /* I2C */
 #define CONFIG_SPL_I2C_SUPPORT
 #define CONFIG_SYS_I2C
-- 
2.0.3

[U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd

[Hans de Goede]

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 include/configs/sunxi-common.h | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 4c712f3..f5a702a 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -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 */
-- 
2.0.3

[U-Boot] [PATCH 6/7] sunxi: Kconfig: move common settings into a shared code block

[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 <hdegoede@redhat.com>
---
 board/sunxi/Kconfig | 32 ++++++--------------------------
 1 file changed, 6 insertions(+), 26 deletions(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index b06b5e0..24cca47 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -1,17 +1,5 @@
 if TARGET_SUN4I
 
-config SYS_CPU
-	string
-	default "armv7"
-
-config SYS_BOARD
-	string
-	default "sunxi"
-
-config SYS_SOC
-	string
-	default "sunxi"
-
 config SYS_CONFIG_NAME
 	string
 	default "sun4i"
@@ -20,25 +8,21 @@ endif
 
 if TARGET_SUN5I
 
-config SYS_CPU
+config SYS_CONFIG_NAME
 	string
-	default "armv7"
+	default "sun5i"
 
-config SYS_BOARD
-	string
-	default "sunxi"
+endif
 
-config SYS_SOC
-	string
-	default "sunxi"
+if TARGET_SUN7I
 
 config SYS_CONFIG_NAME
 	string
-	default "sun5i"
+	default "sun7i"
 
 endif
 
-if TARGET_SUN7I
+if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN7I
 
 config SYS_CPU
 	string
@@ -52,8 +36,4 @@ config SYS_SOC
 	string
 	default "sunxi"
 
-config SYS_CONFIG_NAME
-	string
-	default "sun7i"
-
 endif
-- 
2.0.3

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Hans de Goede]

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

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 board/sunxi/Kconfig                   |  3 +++
 configs/A10-OLinuXino-Lime_defconfig  |  1 +
 configs/A10s-OLinuXino-M_defconfig    |  1 +
 configs/A13-OLinuXinoM_defconfig      |  1 +
 configs/A13-OLinuXino_defconfig       |  1 +
 configs/A20-OLinuXino_MICRO_defconfig |  1 +
 configs/Auxtek-T004_defconfig         |  1 +
 configs/Bananapi_defconfig            |  1 +
 configs/Cubieboard2_FEL_defconfig     |  1 +
 configs/Cubieboard2_defconfig         |  1 +
 configs/Cubieboard_defconfig          |  1 +
 configs/Cubietruck_FEL_defconfig      |  1 +
 configs/Cubietruck_defconfig          |  1 +
 configs/Linksprite_pcDuino3_defconfig |  1 +
 configs/Mele_A1000G_defconfig         |  1 +
 configs/Mele_A1000_defconfig          |  1 +
 configs/Mini-X-1Gb_defconfig          |  1 +
 configs/Mini-X_defconfig              |  1 +
 configs/ba10_tv_box_defconfig         |  1 +
 configs/i12-tvbox_defconfig           |  1 +
 configs/qt840a_defconfig              |  1 +
 configs/r7-tv-dongle_defconfig        |  1 +
 include/configs/sunxi-common.h        | 18 +++++++++++++++---
 23 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 24cca47..c61c650 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -36,4 +36,7 @@ config SYS_SOC
 	string
 	default "sunxi"
 
+config FTDFILE
+	string "Default ftdfile env setting for this board"
+
 endif
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index a414953..b93ae7d 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 1560ab1..f206970 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index fb510d5..8529dbe 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index ba21136..c3a12cc 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 52a857a..c91319d 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index 643e628..193019c 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index be3d815..dc68469 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
index 63636b0..ae5e25a 100644
--- a/configs/Cubieboard2_FEL_defconfig
+++ b/configs/Cubieboard2_FEL_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index fa34c51..df87edc 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 774029c..57bf045 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
index 7ebf635..790125a 100644
--- a/configs/Cubietruck_FEL_defconfig
+++ b/configs/Cubietruck_FEL_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index fbc9127..4ad82e3 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 10ebcef..22d0446 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig
index 2079279..fa47fae 100644
--- a/configs/Mele_A1000G_defconfig
+++ b/configs/Mele_A1000G_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 13528ab..d7c156d 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig
index 61fa1de..af0b800 100644
--- a/configs/Mini-X-1Gb_defconfig
+++ b/configs/Mini-X-1Gb_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,SPL,AXP209_POWER,USB_EHCI"
+CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index ceb02c5..ea0c786 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_X,SPL,AXP209_POWER,USB_EHCI"
+CONFIG_FTDFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 02a2538..c9961bd 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index ff86841..b267312 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig
index acb100c..7360212 100644
--- a/configs/qt840a_defconfig
+++ b/configs/qt840a_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index f0f97b0..35b66f0 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -1,4 +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"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index f5a702a..b7708c6 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -100,10 +100,10 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
 
-#define CONFIG_SYS_LOAD_ADDR		0x48000000 /* default load address */
+#define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
 
 /* standalone support */
-#define CONFIG_STANDALONE_LOAD_ADDR	0x48000000
+#define CONFIG_STANDALONE_LOAD_ADDR	0x42000000
 
 #define CONFIG_SYS_HZ			1000
 
@@ -217,6 +217,16 @@
 #ifndef CONFIG_SPL_BUILD
 #include <config_distro_defaults.h>
 
+/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
+ * 1M script, 1M pxe and the ramdisk at the end */
+#define MEM_LAYOUT_ENV_SETTINGS \
+	"bootm_size=0x10000000\0" \
+	"kernel_addr_r=0x42000000\0" \
+	"fdt_addr_r=0x43000000\0" \
+	"scriptaddr=0x43100000\0" \
+	"pxefile_addr_r=0x43200000\0" \
+	"ramdisk_addr_r=0x43300000\0"
+
 #ifdef CONFIG_AHCI
 #define BOOT_TARGET_DEVICES(func) \
 	func(MMC, mmc, 0) \
@@ -235,7 +245,9 @@
 #include <config_distro_bootcmd.h>
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
-	"bootm_size=0x10000000\0" \
+	MEM_LAYOUT_ENV_SETTINGS \
+	"fdtfile=" CONFIG_FTDFILE "\0" \
+	"console=ttyS0,115200\0" \
 	BOOTENV
 
 #else /* ifndef CONFIG_SPL_BUILD */
-- 
2.0.3

[U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd

[Hans de Goede]

Hi,
On 08/01/2014 09:46 AM, Hans de Goede wrote:
> Use the new standard bootcmd from <config_distro_bootcmd.h>.

Note this applies on top of Stephen Warren's
"[PATCH 1/3] config: introduce a generic $bootcmd"

Regards,

Hans


> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
>  include/configs/sunxi-common.h | 27 ++++++++++++++++++++++++---
>  1 file changed, 24 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 4c712f3..f5a702a 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -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 */
> 

[U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd

[Stephen Warren]

On 08/01/2014 01:46 AM, Hans de Goede wrote:
> Use the new standard bootcmd from <config_distro_bootcmd.h>.

Acked-by: Stephen Warren <swarren@nvidia.com>

> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.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

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.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Stephen Warren]

On 08/01/2014 01:46 AM, Hans de Goede wrote:
> Automatic booting using an extlinux.conf file requires various environment
> variables to be set.

Acked-by: Stephen Warren <swarren@nvidia.com>

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.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Dennis Gilmore]

On Fri, 01 Aug 2014 12:57:31 -0600
Stephen Warren <swarren@wwwdotorg.org> wrote:

> On 08/01/2014 01:46 AM, Hans de Goede wrote:
> > Automatic booting using an extlinux.conf file requires various
> > environment variables to be set.
> 
> Acked-by: Stephen Warren <swarren@nvidia.com>
> 
> 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. beaglebones for instance has to be 0x10000000 as the
beaglebone white only has 256M of ram. and let u-boot move things
around, ensuring we do not get into a place where the decompressed
kernel overwrites memory. This behaviour is what I had in the docs I
had written earlier in the year.

Dennis

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Stephen Warren]

On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
> On Fri, 01 Aug 2014 12:57:31 -0600
> Stephen Warren <swarren@wwwdotorg.org> wrote:
>
>> On 08/01/2014 01:46 AM, Hans de Goede wrote:
>>> Automatic booting using an extlinux.conf file requires various
>>> environment variables to be set.
>>
>> Acked-by: Stephen Warren <swarren@nvidia.com>
>>
>> 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.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Dennis Gilmore]

On Fri, 01 Aug 2014 14:22:40 -0600
Stephen Warren <swarren@wwwdotorg.org> wrote:

> On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
> > On Fri, 01 Aug 2014 12:57:31 -0600
> > Stephen Warren <swarren@wwwdotorg.org> wrote:
> >
> >> On 08/01/2014 01:46 AM, Hans de Goede wrote:
> >>> Automatic booting using an extlinux.conf file requires various
> >>> environment variables to be set.
> >>
> >> Acked-by: Stephen Warren <swarren@nvidia.com>
> >>
> >> 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.

Mostly to do with the decompressed kernel overwriting the initrd or dtb
resulting in machines that would hang on boot. it came up quite a few
times earlier this year on both imx and omap.

Dennis

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Tom Rini]

On Fri, Aug 01, 2014 at 02:22:40PM -0600, Stephen Warren wrote:
> On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
> >On Fri, 01 Aug 2014 12:57:31 -0600
> >Stephen Warren <swarren@wwwdotorg.org> wrote:
> >
> >>On 08/01/2014 01:46 AM, Hans de Goede wrote:
> >>>Automatic booting using an extlinux.conf file requires various
> >>>environment variables to be set.
> >>
> >>Acked-by: Stephen Warren <swarren@nvidia.com>
> >>
> >>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.

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.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140801/d16ac361/attachment.pgp>

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Stephen Warren]

On 08/01/2014 02:43 PM, Tom Rini wrote:
> On Fri, Aug 01, 2014 at 02:22:40PM -0600, Stephen Warren wrote:
>> On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
>>> On Fri, 01 Aug 2014 12:57:31 -0600
>>> Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>
>>>> On 08/01/2014 01:46 AM, Hans de Goede wrote:
>>>>> Automatic booting using an extlinux.conf file requires various
>>>>> environment variables to be set.
>>>>
>>>> Acked-by: Stephen Warren <swarren@nvidia.com>
>>>>
>>>> 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.
>
> 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.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Tom Rini]

On Fri, Aug 01, 2014 at 03:43:23PM -0600, Stephen Warren wrote:
> On 08/01/2014 02:43 PM, Tom Rini wrote:
> >On Fri, Aug 01, 2014 at 02:22:40PM -0600, Stephen Warren wrote:
> >>On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
> >>>On Fri, 01 Aug 2014 12:57:31 -0600
> >>>Stephen Warren <swarren@wwwdotorg.org> wrote:
> >>>
> >>>>On 08/01/2014 01:46 AM, Hans de Goede wrote:
> >>>>>Automatic booting using an extlinux.conf file requires various
> >>>>>environment variables to be set.
> >>>>
> >>>>Acked-by: Stephen Warren <swarren@nvidia.com>
> >>>>
> >>>>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.
> >
> >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

... which is potentially small :)

> 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.

> 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.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140801/c963e06d/attachment.pgp>

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Stephen Warren]

On 08/01/2014 07:53 PM, Tom Rini wrote:
> On Fri, Aug 01, 2014 at 03:43:23PM -0600, Stephen Warren wrote:
>> On 08/01/2014 02:43 PM, Tom Rini wrote:
>>> On Fri, Aug 01, 2014 at 02:22:40PM -0600, Stephen Warren wrote:
>>>> On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
>>>>> On Fri, 01 Aug 2014 12:57:31 -0600
>>>>> Stephen Warren <swarren@wwwdotorg.org> wrote:
>>>>>
>>>>>> On 08/01/2014 01:46 AM, Hans de Goede wrote:
>>>>>>> Automatic booting using an extlinux.conf file requires various
>>>>>>> environment variables to be set.
>>>>>>
>>>>>> Acked-by: Stephen Warren <swarren@nvidia.com>
>>>>>>
>>>>>> 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.
>>>
>>> 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
>
> ... 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.

>> 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.
>
>> 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.

Hmm. Some experimentation shows that if the DTB is loaded where the 
kernel will be decompressed to, then the DTB does indeed get clobbered.

Still, the Tegra default environment already places the DTB 32MB after 
the decompressed kernel location, so that won't be an issue (unless 
there's a 24MB kernel with 8MB BSS, which is very unlikely). If we fix 
the size allocated to the decompressed kernel to be the full 24MB, the 
issue would then only occur with a 24MB uncompressed kernel with 16MB 
BSS. That's even more unlikely. For tegra_defconfig or 
multi_v7_defconfig, BSS is currently 3/8MB and 1/4MB respectively.

[U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd

[Hans de Goede]

Hi,

On 08/01/2014 08:54 PM, Stephen Warren wrote:
> On 08/01/2014 01:46 AM, Hans de Goede wrote:
>> Use the new standard bootcmd from <config_distro_bootcmd.h>.
> 
> Acked-by: Stephen Warren <swarren@nvidia.com>

Thanks for the review.

>> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.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
> 
> 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.

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.

Regards,

Hans

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Tom Rini]

On Mon, Aug 04, 2014 at 11:31:14AM -0600, Stephen Warren wrote:
> On 08/01/2014 07:53 PM, Tom Rini wrote:
> >On Fri, Aug 01, 2014 at 03:43:23PM -0600, Stephen Warren wrote:
> >>On 08/01/2014 02:43 PM, Tom Rini wrote:
> >>>On Fri, Aug 01, 2014 at 02:22:40PM -0600, Stephen Warren wrote:
> >>>>On 08/01/2014 02:05 PM, Dennis Gilmore wrote:
> >>>>>On Fri, 01 Aug 2014 12:57:31 -0600
> >>>>>Stephen Warren <swarren@wwwdotorg.org> wrote:
> >>>>>
> >>>>>>On 08/01/2014 01:46 AM, Hans de Goede wrote:
> >>>>>>>Automatic booting using an extlinux.conf file requires various
> >>>>>>>environment variables to be set.
> >>>>>>
> >>>>>>Acked-by: Stephen Warren <swarren@nvidia.com>
> >>>>>>
> >>>>>>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.
> >>>
> >>>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
> >
> >... 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.

Part of why I harp on this is that I've had vendor kernels run past this
16MB limit (some test file had be included in the kernel binary due to
some _other_ problem).  That's why I moved the am33xx stuff (and other
TI bits I could test) to the worst-case must-be-safe limits because you
never know what less-than-ideal thing might get thrown at us later on.

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140804/f8ea1fb1/attachment.pgp>

[U-Boot] [PATCH 1/7] sunxi-common.h: Remove CONFIG_SYS_BOOT_GET_CMDLINE

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> sunxi does not need this and it should never have been enabled for it in
> the first place.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH 2/7] sunxi-common.h: Remove dead #ifdef CONFIG_CMD_NET code block

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> 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 <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH 3/7] sunxi-common.h: Don't undefine CONFIG_CMD_NFS

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> I see no reason to override the choice to include this from
> config_cmd_defauls.h .
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH 4/7] sunxi-common.h: Don't undef CONFIG_CMD_NET only to redefine it again later

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> 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 <hdegoede@redhat.com>

Acked-by: Ian Campbell <ijc@hellion.org.uk>

[U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd

[Ian Campbell]

On Mon, 2014-08-04 at 20:35 +0200, Hans de Goede wrote:
> Hi,
> 
> On 08/01/2014 08:54 PM, Stephen Warren wrote:
> > On 08/01/2014 01:46 AM, Hans de Goede wrote:
> >> Use the new standard bootcmd from <config_distro_bootcmd.h>.
> > 
> > Acked-by: Stephen Warren <swarren@nvidia.com>
> 
> Thanks for the review.
> 
> >> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.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
> > 
> > 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.
> 
> 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.

Agreed, Stephen's way is much better and more flexible. We could use it
even for the non-optional stuff right away I suppose but I'm not sure
there is much point.

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

Ack to that in principal.

Ian.

[U-Boot] [PATCH 6/7] sunxi: Kconfig: move common settings into a shared code block

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> 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 <hdegoede@redhat.com>

This is an improvement so:
Acked-by: Ian Campbell <ijc@hellion.org.uk>

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.

Ian.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> Automatic booting using an extlinux.conf file requires various environment
> variables to be set.
>  
> -#define CONFIG_SYS_LOAD_ADDR		0x48000000 /* default load address */
> +#define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
>  
>  /* standalone support */
> -#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.

Ian.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Ian Campbell]

On Fri, 2014-08-01 at 15:05 -0500, Dennis Gilmore wrote:
> On Fri, 01 Aug 2014 12:57:31 -0600
> Stephen Warren <swarren@wwwdotorg.org> wrote:
> 
> > On 08/01/2014 01:46 AM, Hans de Goede wrote:
> > > Automatic booting using an extlinux.conf file requires various
> > > environment variables to be set.
> > 
> > Acked-by: Stephen Warren <swarren@nvidia.com>
> > 
> > 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.

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)

Ian.

[U-Boot] [PATCH 6/7] sunxi: Kconfig: move common settings into a shared code block

[Chen-Yu Tsai]

On Tue, Aug 5, 2014 at 5:26 AM, Ian Campbell <ijc@hellion.org.uk> wrote:
> On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
>> 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 <hdegoede@redhat.com>
>
> This is an improvement so:
> Acked-by: Ian Campbell <ijc@hellion.org.uk>
>
> 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.

Selected sounds better. :)

[U-Boot] [PATCH 6/7] sunxi: Kconfig: move common settings into a shared code block

[Ian Campbell]

On Tue, 2014-08-05 at 09:24 +0800, Chen-Yu Tsai wrote:
> On Tue, Aug 5, 2014 at 5:26 AM, Ian Campbell <ijc@hellion.org.uk> wrote:
> > On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> >> 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 <hdegoede@redhat.com>
> >
> > This is an improvement so:
> > Acked-by: Ian Campbell <ijc@hellion.org.uk>
> >
> > 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.
> 
> Selected sounds better. :)

The main thing I know about select is that one needs to be very careful
about when it is used, since it can have odd side effects....

Ian.

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Hans de Goede]

Hi,

On 08/04/2014 11:29 PM, Ian Campbell wrote:
> On Fri, 2014-08-01 at 15:05 -0500, Dennis Gilmore wrote:
>> On Fri, 01 Aug 2014 12:57:31 -0600
>> Stephen Warren <swarren@wwwdotorg.org> wrote:
>>
>>> On 08/01/2014 01:46 AM, Hans de Goede wrote:
>>>> Automatic booting using an extlinux.conf file requires various
>>>> environment variables to be set.
>>>
>>> Acked-by: Stephen Warren <swarren@nvidia.com>
>>>
>>> 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.
> 
> 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)

Right, and that is 256M which is the smallest amount of memory found
on any allwinner board (there is only one 256M board, all others
are 512M or more).

Regards,

Hans

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Hans de Goede]

Hi,

On 08/04/2014 11:27 PM, Ian Campbell wrote:
> On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
>> Automatic booting using an extlinux.conf file requires various environment
>> variables to be set.
>>  
>> -#define CONFIG_SYS_LOAD_ADDR		0x48000000 /* default load address */
>> +#define CONFIG_SYS_LOAD_ADDR		0x42000000 /* default load address */
>>  
>>  /* standalone support */
>> -#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.

Good idea, I'll amend the commit log for this.

Regards,

Hans

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Ian Campbell]

On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
> +config FTDFILE
> +	string "Default ftdfile env setting for this board"

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

> +       "fdtfile=" CONFIG_FTDFILE "\0" \

At least the actual environment name is correct ;-)

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

[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work

[Hans de Goede]

Hi,

On 08/30/2014 11:57 PM, Ian Campbell wrote:
> On Fri, 2014-08-01 at 09:46 +0200, Hans de Goede wrote:
>> +config FTDFILE
>> +	string "Default ftdfile env setting for this board"
> 
> Vagrant just pointed out the typo in all of this to me, whoops ;-)
> 
>> +       "fdtfile=" CONFIG_FTDFILE "\0" \

Oops.

> At least the actual environment name is correct ;-)

Yeah, well if it wasn't I would have noticed as I tested extlinux.conf
booting using the fdtfile env. variable to get the dt.



> 
> 8<------------------------------
> 
> From 64aeaa14fc0a7672ee4f89f03354558b09a3116a Mon Sep 17 00:00:00 2001
> From: Ian Campbell <ijc@hellion.org.uk>
> 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 <vagrant@debian.org>
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> ---
>  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(-)
> 
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index c61c650..877281b 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -36,7 +36,7 @@ config SYS_SOC
>  	string
>  	default "sunxi"
>  
> -config FTDFILE
> +config FDTFILE
>  	string "Default ftdfile env setting for this board"

The typo is present in the help text too, the patch should probably fix it
there too.

Regards,

Hans


>  
>  endif
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index b93ae7d..37dbe9c 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -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
> diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
> index f206970..8475b16 100644
> --- a/configs/A10s-OLinuXino-M_defconfig
> +++ b/configs/A10s-OLinuXino-M_defconfig
> @@ -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
> diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
> index 8529dbe..bd135cd 100644
> --- a/configs/A13-OLinuXinoM_defconfig
> +++ b/configs/A13-OLinuXinoM_defconfig
> @@ -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
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index c3a12cc..eb3a6c0 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -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
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index c91319d..c9170fa 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -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
> diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
> index 193019c..0282c08 100644
> --- a/configs/Auxtek-T004_defconfig
> +++ b/configs/Auxtek-T004_defconfig
> @@ -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
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index dc68469..b75215c 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -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
> diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
> index ae5e25a..353b04a 100644
> --- a/configs/Cubieboard2_FEL_defconfig
> +++ b/configs/Cubieboard2_FEL_defconfig
> @@ -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
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index df87edc..19a2550 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -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
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index 57bf045..e4d69ba 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -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
> diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
> index 790125a..23c5efb 100644
> --- a/configs/Cubietruck_FEL_defconfig
> +++ b/configs/Cubietruck_FEL_defconfig
> @@ -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
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 4ad82e3..710d99a 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -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
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index 22d0446..ccae5d8 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -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
> diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig
> index fa47fae..9f5c2f5 100644
> --- a/configs/Mele_A1000G_defconfig
> +++ b/configs/Mele_A1000G_defconfig
> @@ -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
> diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
> index d7c156d..4212f73 100644
> --- a/configs/Mele_A1000_defconfig
> +++ b/configs/Mele_A1000_defconfig
> @@ -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
> diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig
> index af0b800..9933efe 100644
> --- a/configs/Mini-X-1Gb_defconfig
> +++ b/configs/Mini-X-1Gb_defconfig
> @@ -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
> diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
> index ea0c786..8a99ba2 100644
> --- a/configs/Mini-X_defconfig
> +++ b/configs/Mini-X_defconfig
> @@ -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
> diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
> index c9961bd..f0e475b 100644
> --- a/configs/ba10_tv_box_defconfig
> +++ b/configs/ba10_tv_box_defconfig
> @@ -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
> diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
> index b267312..31276e3 100644
> --- a/configs/i12-tvbox_defconfig
> +++ b/configs/i12-tvbox_defconfig
> @@ -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
> diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig
> index 7360212..35a6aee 100644
> --- a/configs/qt840a_defconfig
> +++ b/configs/qt840a_defconfig
> @@ -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
> diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
> index 35b66f0..9033297 100644
> --- a/configs/r7-tv-dongle_defconfig
> +++ b/configs/r7-tv-dongle_defconfig
> @@ -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
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index e768921..1d947d7 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -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
>  
>