[U-Boot] [PATCH 7/7] sunxi: Add environment settings to make extlinux.conf booting work
Hans de Goede
hdegoede at redhat.com
Sun Aug 31 12:07:27 CEST 2014
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 at 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 at debian.org>
> Signed-off-by: Ian Campbell <ijc at 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
>
>
More information about the U-Boot
mailing list