[U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

* [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup
@ 2014-10-04  8:47 Ian Campbell
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings Ian Campbell
                   ` (3 more replies)
  0 siblings, 4 replies; 22+ messages in thread
From: Ian Campbell @ 2014-10-04  8:47 UTC (permalink / raw)
  To: u-boot

A few simple patches which consolidate some Kconfig options and make
SPL_FEL a first class .config member instead of putting it in
CONFIG_SYS_EXTRA_OPTIONS.

This means it is possible to do a FEL build for any board with:
        make <board>_config
        echo CONFIG_SPL_FEL=y >> .config
        echo CONFIG_SPL_FEL=y >> spl/.config
or better
        make <board>_config
        sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y/g' .config spl/.config
which is still one more step than I would like but still preferable IMHO
to:
	sed -i -e 's/^CONFIG_SYS_EXTRA_OPTIONS="[^"]*/&,SPL_FEL/g' .config spl/.config

I've been using a little hack (below) to MAKEALL to help build test
this.

There's still plenty of stuff in sunxi CONFIG_SYS_EXTRA_OPTIONS which
could be moved out, but most of it is dependent on drivers/*/Kconfig
switching first.

Probably the board and power controller selection could be moved out
without any dependencies, although the board one in particular will be
quite a big patch I think it would be worth it.

Ian.

My MAKEALL hack, surely not upstreamable ;-)

diff --git a/MAKEALL b/MAKEALL
index 7c16319..3a8d1d0 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -660,6 +660,11 @@ build_target() {
 	echo "Building ${target} board..."
 	${MAKE} -s ${target}_defconfig >/dev/null
 
+	if [ -n "$SUNXI_FORCE_FEL" ] ; then
+	    sed -i -e 's/\# CONFIG_SPL_FEL is not set/CONFIG_SPL_FEL=y/g' \
+		.config spl/.config
+	fi
+
 	${MAKE} ${JOBS} ${CHECK} all \
 		>${LOG_DIR}/$target.MAKELOG 2> ${LOG_DIR}/$target.ERR
 

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings
  2014-10-04  8:47 [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
@ 2014-10-04  8:48 ` Ian Campbell
  2014-10-06  7:48   ` Hans de Goede
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI Ian Campbell
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 22+ messages in thread
From: Ian Campbell @ 2014-10-04  8:48 UTC (permalink / raw)
  To: u-boot

No need to be so repetitive.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
 board/sunxi/Kconfig | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 05defac..c4b3167 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -1,31 +1,8 @@
-if TARGET_SUN4I
-
-config SYS_CONFIG_NAME
-	default "sun4i"
-
-endif
-
-if TARGET_SUN5I
-
-config SYS_CONFIG_NAME
-	default "sun5i"
-
-endif
-
-if TARGET_SUN6I
-
 config SYS_CONFIG_NAME
-	string
-	default "sun6i"
-
-endif
-
-if TARGET_SUN7I
-
-config SYS_CONFIG_NAME
-	default "sun7i"
-
-endif
+	default "sun4i" if TARGET_SUN4I
+	default "sun5i" if TARGET_SUN5I
+	default "sun6i" if TARGET_SUN6I
+	default "sun7i" if TARGET_SUN7I
 
 if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
 
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings Ian Campbell
@ 2014-10-06  7:48   ` Hans de Goede
  2014-10-06  8:23     ` Ian Campbell
  0 siblings, 1 reply; 22+ messages in thread
From: Hans de Goede @ 2014-10-06  7:48 UTC (permalink / raw)
  To: u-boot

Hi,

On 10/04/2014 10:48 AM, Ian Campbell wrote:
> No need to be so repetitive.

Hmm, I also have a version of this in my tree, I thought I had already send
that out, but maybe I did not, see:

https://github.com/jwrdegoede/u-boot-sunxi/commit/387033b669d72b8621eeb52c4cdc503e0d63b86d

Note this needs to be rebased on top current next, as it does not take
the SUN6I changes into account.

> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> ---
>  board/sunxi/Kconfig | 31 ++++---------------------------
>  1 file changed, 4 insertions(+), 27 deletions(-)
> 
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index 05defac..c4b3167 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -1,31 +1,8 @@
> -if TARGET_SUN4I
> -
> -config SYS_CONFIG_NAME
> -	default "sun4i"
> -
> -endif
> -
> -if TARGET_SUN5I
> -
> -config SYS_CONFIG_NAME
> -	default "sun5i"
> -
> -endif
> -
> -if TARGET_SUN6I
> -
>  config SYS_CONFIG_NAME
> -	string
> -	default "sun6i"
> -
> -endif
> -
> -if TARGET_SUN7I
> -
> -config SYS_CONFIG_NAME
> -	default "sun7i"
> -
> -endif
> +	default "sun4i" if TARGET_SUN4I
> +	default "sun5i" if TARGET_SUN5I
> +	default "sun6i" if TARGET_SUN6I
> +	default "sun7i" if TARGET_SUN7I
>  
>  if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I

You need to move this up to the top of the Kconfig file, as it
gets unconditionally sourced from arch/arm/Kconfig, and if this is
not at the top, you will be unconditionally adding a SYS_CONFIG_NAME
section which may conflict with other targets which also define it.

With that fixed this is:

Acked-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings
  2014-10-06  7:48   ` Hans de Goede
@ 2014-10-06  8:23     ` Ian Campbell
  0 siblings, 0 replies; 22+ messages in thread
From: Ian Campbell @ 2014-10-06  8:23 UTC (permalink / raw)
  To: u-boot

On Mon, 2014-10-06 at 09:48 +0200, Hans de Goede wrote:
> Hi,
> 
> On 10/04/2014 10:48 AM, Ian Campbell wrote:
> > No need to be so repetitive.
> 
> Hmm, I also have a version of this in my tree, I thought I had already send
> that out, but maybe I did not,

Ah, it seemed familiar as I was writing it, but I decided it had just
been discussed and not implemented.

> You need to move this up to the top of the Kconfig file, as it
> gets unconditionally sourced from arch/arm/Kconfig, and if this is
> not at the top, you will be unconditionally adding a SYS_CONFIG_NAME
> section which may conflict with other targets which also define it.

Makes sense.

> With that fixed this is:
> 
> Acked-by: Hans de Goede <hdegoede@redhat.com>

Thanks.
Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-04  8:47 [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings Ian Campbell
@ 2014-10-04  8:48 ` Ian Campbell
  2014-10-05  2:37   ` Chen-Yu Tsai
                     ` (2 more replies)
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option Ian Campbell
  2014-10-04  9:32 ` [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
  3 siblings, 3 replies; 22+ messages in thread
From: Ian Campbell @ 2014-10-04  8:48 UTC (permalink / raw)
  To: u-boot

And make TARGET_SUN[457]I a choice variable under this.

configs updated with:
    sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
 arch/arm/Kconfig                      | 13 ++-----------
 board/sunxi/Kconfig                   | 21 +++++++++++++++++++--
 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-Lime_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 +
 24 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e3e7e78..54d2fbb 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -438,17 +438,8 @@ config TARGET_SMDKC100
 config TARGET_SOCFPGA_CYCLONE5
 	bool "Support socfpga_cyclone5"
 
-config TARGET_SUN4I
-	bool "Support sun4i"
-
-config TARGET_SUN5I
-	bool "Support sun5i"
-
-config TARGET_SUN6I
-	bool "Support sun6i"
-
-config TARGET_SUN7I
-	bool "Support sun7i"
+config TARGET_SUNXI
+	bool "Support sunxi"
 
 config TARGET_SNOWBALL
 	bool "Support snowball"
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index c4b3167..6e9308d 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -1,11 +1,28 @@
+if TARGET_SUNXI
+
+choice
+	prompt "Sunxi SoC"
+
+config TARGET_SUN4I
+	bool "sun4i family"
+
+config TARGET_SUN5I
+	bool "sun5i family"
+
+config TARGET_SUN6I
+	bool "sun6i family"
+
+config TARGET_SUN7I
+	bool "sun7i family"
+
+endchoice
+
 config SYS_CONFIG_NAME
 	default "sun4i" if TARGET_SUN4I
 	default "sun5i" if TARGET_SUN5I
 	default "sun6i" if TARGET_SUN6I
 	default "sun7i" if TARGET_SUN7I
 
-if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
-
 config SYS_CPU
 	default "armv7"
 
diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index f992293..35cc2ca 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index a578c06..2ab8d3e 100644
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
 CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 9ae7b12..5fb3556 100644
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
 CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 2c726f3..3632f95 100644
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
 CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index ca79fd5..2317d1f 100644
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 20a947c..ca68a9f 100644
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index ed06f57..bc2e8f3 100644
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
 CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN5I=y
diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index d59cf72..062bd02 100644
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
index 353b04a..967be18 100644
--- a/configs/Cubieboard2_FEL_defconfig
+++ b/configs/Cubieboard2_FEL_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 11a0c5f..b7947fb 100644
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index 8c1ff95..f4b93cf 100644
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
index 23c5efb..1cda577 100644
--- a/configs/Cubietruck_FEL_defconfig
+++ b/configs/Cubietruck_FEL_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 1389f21..6c9a530 100644
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index efc5301..1178f5b 100644
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig
index 06c4cac..1095b4b 100644
--- a/configs/Mele_A1000G_defconfig
+++ b/configs/Mele_A1000G_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index d386c79..1d5d0cd 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig
index 5db4aa3..b40bde4 100644
--- a/configs/Mini-X-1Gb_defconfig
+++ b/configs/Mini-X-1Gb_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index 6718dcb..c0f645e 100644
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI"
 CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 6f64875..bd46520 100644
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
 CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN4I=y
diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index 2ef0f91..71c04f9 100644
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig
index a8d4bb8..03bbe6d 100644
--- a/configs/qt840a_defconfig
+++ b/configs/qt840a_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN7I=y
diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 6aba942..49c0fb4 100644
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -2,4 +2,5 @@ CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
 CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
 +S:CONFIG_ARM=y
++S:CONFIG_TARGET_SUNXI=y
 +S:CONFIG_TARGET_SUN5I=y
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI Ian Campbell
@ 2014-10-05  2:37   ` Chen-Yu Tsai
  2014-10-06  1:39   ` Masahiro Yamada
  2014-10-06  7:55   ` Hans de Goede
  2 siblings, 0 replies; 22+ messages in thread
From: Chen-Yu Tsai @ 2014-10-05  2:37 UTC (permalink / raw)
  To: u-boot

On Sat, Oct 4, 2014 at 4:48 PM, Ian Campbell <ijc@hellion.org.uk> wrote:
> And make TARGET_SUN[457]I a choice variable under this.
>
> configs updated with:
>     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
>
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> ---
>  arch/arm/Kconfig                      | 13 ++-----------
>  board/sunxi/Kconfig                   | 21 +++++++++++++++++++--
>  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-Lime_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 +
>  24 files changed, 43 insertions(+), 13 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index e3e7e78..54d2fbb 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -438,17 +438,8 @@ config TARGET_SMDKC100
>  config TARGET_SOCFPGA_CYCLONE5
>         bool "Support socfpga_cyclone5"
>
> -config TARGET_SUN4I
> -       bool "Support sun4i"
> -
> -config TARGET_SUN5I
> -       bool "Support sun5i"
> -
> -config TARGET_SUN6I
> -       bool "Support sun6i"
> -
> -config TARGET_SUN7I
> -       bool "Support sun7i"
> +config TARGET_SUNXI
> +       bool "Support sunxi"

Should we mention "Allwinner SoCs"?

>
>  config TARGET_SNOWBALL
>         bool "Support snowball"
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index c4b3167..6e9308d 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -1,11 +1,28 @@
> +if TARGET_SUNXI
> +
> +choice
> +       prompt "Sunxi SoC"
> +
> +config TARGET_SUN4I
> +       bool "sun4i family"

And name the SoC models?
It would be easier for users to find what they need.

> +
> +config TARGET_SUN5I
> +       bool "sun5i family"
> +
> +config TARGET_SUN6I
> +       bool "sun6i family"
> +
> +config TARGET_SUN7I
> +       bool "sun7i family"
> +
> +endchoice
> +
>  config SYS_CONFIG_NAME
>         default "sun4i" if TARGET_SUN4I
>         default "sun5i" if TARGET_SUN5I
>         default "sun6i" if TARGET_SUN6I
>         default "sun7i" if TARGET_SUN7I
>
> -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
> -
>  config SYS_CPU
>         default "armv7"
>
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index f992293..35cc2ca 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
> index a578c06..2ab8d3e 100644
> --- a/configs/A10s-OLinuXino-M_defconfig
> +++ b/configs/A10s-OLinuXino-M_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
>  CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
> index 9ae7b12..5fb3556 100644
> --- a/configs/A13-OLinuXinoM_defconfig
> +++ b/configs/A13-OLinuXinoM_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
>  CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index 2c726f3..3632f95 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
>  CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index ca79fd5..2317d1f 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index 20a947c..ca68a9f 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
> index ed06f57..bc2e8f3 100644
> --- a/configs/Auxtek-T004_defconfig
> +++ b/configs/Auxtek-T004_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
>  CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index d59cf72..062bd02 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
> index 353b04a..967be18 100644
> --- a/configs/Cubieboard2_FEL_defconfig
> +++ b/configs/Cubieboard2_FEL_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index 11a0c5f..b7947fb 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index 8c1ff95..f4b93cf 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
> index 23c5efb..1cda577 100644
> --- a/configs/Cubietruck_FEL_defconfig
> +++ b/configs/Cubietruck_FEL_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 1389f21..6c9a530 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index efc5301..1178f5b 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig
> index 06c4cac..1095b4b 100644
> --- a/configs/Mele_A1000G_defconfig
> +++ b/configs/Mele_A1000G_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
> index d386c79..1d5d0cd 100644
> --- a/configs/Mele_A1000_defconfig
> +++ b/configs/Mele_A1000_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig
> index 5db4aa3..b40bde4 100644
> --- a/configs/Mini-X-1Gb_defconfig
> +++ b/configs/Mini-X-1Gb_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
> index 6718dcb..c0f645e 100644
> --- a/configs/Mini-X_defconfig
> +++ b/configs/Mini-X_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
> index 6f64875..bd46520 100644
> --- a/configs/ba10_tv_box_defconfig
> +++ b/configs/ba10_tv_box_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
>  CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
> index 2ef0f91..71c04f9 100644
> --- a/configs/i12-tvbox_defconfig
> +++ b/configs/i12-tvbox_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig
> index a8d4bb8..03bbe6d 100644
> --- a/configs/qt840a_defconfig
> +++ b/configs/qt840a_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
> index 6aba942..49c0fb4 100644
> --- a/configs/r7-tv-dongle_defconfig
> +++ b/configs/r7-tv-dongle_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
>  CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> --
> 2.1.0

Cheers
ChenYu

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI Ian Campbell
  2014-10-05  2:37   ` Chen-Yu Tsai
@ 2014-10-06  1:39   ` Masahiro Yamada
  2014-10-06  8:27     ` Ian Campbell
  2014-10-06  7:55   ` Hans de Goede
  2 siblings, 1 reply; 22+ messages in thread
From: Masahiro Yamada @ 2014-10-06  1:39 UTC (permalink / raw)
  To: u-boot

Hi Ian,

On Sat,  4 Oct 2014 09:48:11 +0100
Ian Campbell <ijc@hellion.org.uk> wrote:

> And make TARGET_SUN[457]I a choice variable under this.
> 
> configs updated with:
>     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> 
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>


Perhaps, is ARCH_SUNXI more familiar?



Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-06  1:39   ` Masahiro Yamada
@ 2014-10-06  8:27     ` Ian Campbell
  2014-10-06 10:54       ` Masahiro Yamada
  0 siblings, 1 reply; 22+ messages in thread
From: Ian Campbell @ 2014-10-06  8:27 UTC (permalink / raw)
  To: u-boot

On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
> Hi Ian,
> 
> On Sat,  4 Oct 2014 09:48:11 +0100
> Ian Campbell <ijc@hellion.org.uk> wrote:
> 
> > And make TARGET_SUN[457]I a choice variable under this.
> > 
> > configs updated with:
> >     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> > 
> > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> 
> 
> Perhaps, is ARCH_SUNXI more familiar?

I've no idea ;-)

I think this is something which ought to be consistent within u-boot as
a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
individual boards though, which would make it inappropriate for SUNXI or
even SUN[4567]I.

Ultimately I'm happy to follow any guidance anyone has to give.

Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-06  8:27     ` Ian Campbell
@ 2014-10-06 10:54       ` Masahiro Yamada
  2014-10-22 19:14         ` Ian Campbell
  0 siblings, 1 reply; 22+ messages in thread
From: Masahiro Yamada @ 2014-10-06 10:54 UTC (permalink / raw)
  To: u-boot

Hi Ian

On Mon, 06 Oct 2014 09:27:19 +0100
Ian Campbell <ijc@hellion.org.uk> wrote:
Hi Ian,

> On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
> > Hi Ian,
> > 
> > On Sat,  4 Oct 2014 09:48:11 +0100
> > Ian Campbell <ijc@hellion.org.uk> wrote:
> > 
> > > And make TARGET_SUN[457]I a choice variable under this.
> > > 
> > > configs updated with:
> > >     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> > > 
> > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> > 
> > 
> > Perhaps, is ARCH_SUNXI more familiar?
> 
> I've no idea ;-)
> 
> I think this is something which ought to be consistent within u-boot as
> a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
> EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
> individual boards though, which would make it inappropriate for SUNXI or
> even SUN[4567]I.

SoC/board select menu clean-up is on the way.
I have to admit the naming convention is inconsistent now.

CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
If Xilinx/NVIDIA developers argree, we can rename
CONFIG_{TEGRA, ZYNQ} -> CONFIG_ARCH_{TEGRA, ZYNQ} at some point.



> Ultimately I'm happy to follow any guidance anyone has to give.
> 
> Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-06 10:54       ` Masahiro Yamada
@ 2014-10-22 19:14         ` Ian Campbell
  2014-10-24 11:46           ` Masahiro Yamada
  0 siblings, 1 reply; 22+ messages in thread
From: Ian Campbell @ 2014-10-22 19:14 UTC (permalink / raw)
  To: u-boot

On Mon, 2014-10-06 at 19:54 +0900, Masahiro Yamada wrote:
> Hi Ian
> 
> On Mon, 06 Oct 2014 09:27:19 +0100
> Ian Campbell <ijc@hellion.org.uk> wrote:
> Hi Ian,
> 
> > On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
> > > Hi Ian,
> > > 
> > > On Sat,  4 Oct 2014 09:48:11 +0100
> > > Ian Campbell <ijc@hellion.org.uk> wrote:
> > > 
> > > > And make TARGET_SUN[457]I a choice variable under this.
> > > > 
> > > > configs updated with:
> > > >     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> > > > 
> > > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> > > 
> > > 
> > > Perhaps, is ARCH_SUNXI more familiar?
> > 
> > I've no idea ;-)
> > 
> > I think this is something which ought to be consistent within u-boot as
> > a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
> > EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
> > individual boards though, which would make it inappropriate for SUNXI or
> > even SUN[4567]I.
> 
> SoC/board select menu clean-up is on the way.
> I have to admit the naming convention is inconsistent now.
> 
> CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
> If Xilinx/NVIDIA developers argree, we can rename
> CONFIG_{TEGRA, ZYNQ} -> CONFIG_ARCH_{TEGRA, ZYNQ} at some point.

So we want CONFIG_ARCH_SUNXI as well as CONFIG_ARCH_SUN[45678]I? Or did
you mean for the latter to remain CONFIG_TARGET_SUN[45678]I?

Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-22 19:14         ` Ian Campbell
@ 2014-10-24 11:46           ` Masahiro Yamada
  2014-10-24 13:22             ` Ian Campbell
  0 siblings, 1 reply; 22+ messages in thread
From: Masahiro Yamada @ 2014-10-24 11:46 UTC (permalink / raw)
  To: u-boot

Hi Ian,


On Wed, 22 Oct 2014 20:14:29 +0100
Ian Campbell <ijc@hellion.org.uk> wrote:

> On Mon, 2014-10-06 at 19:54 +0900, Masahiro Yamada wrote:
> > Hi Ian
> > 
> > On Mon, 06 Oct 2014 09:27:19 +0100
> > Ian Campbell <ijc@hellion.org.uk> wrote:
> > Hi Ian,
> > 
> > > On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
> > > > Hi Ian,
> > > > 
> > > > On Sat,  4 Oct 2014 09:48:11 +0100
> > > > Ian Campbell <ijc@hellion.org.uk> wrote:
> > > > 
> > > > > And make TARGET_SUN[457]I a choice variable under this.
> > > > > 
> > > > > configs updated with:
> > > > >     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> > > > > 
> > > > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> > > > 
> > > > 
> > > > Perhaps, is ARCH_SUNXI more familiar?
> > > 
> > > I've no idea ;-)
> > > 
> > > I think this is something which ought to be consistent within u-boot as
> > > a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
> > > EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
> > > individual boards though, which would make it inappropriate for SUNXI or
> > > even SUN[4567]I.
> > 
> > SoC/board select menu clean-up is on the way.
> > I have to admit the naming convention is inconsistent now.
> > 
> > CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
> > If Xilinx/NVIDIA developers argree, we can rename
> > CONFIG_{TEGRA, ZYNQ} -> CONFIG_ARCH_{TEGRA, ZYNQ} at some point.
> 
> So we want CONFIG_ARCH_SUNXI as well as CONFIG_ARCH_SUN[45678]I? Or did
> you mean for the latter to remain CONFIG_TARGET_SUN[45678]I?


I think the latter should remain CONFIG_TARGET_*.
Or I think it is also OK to follow arch/arm/mach-sunxi/Kconfig of Linux.

Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-24 11:46           ` Masahiro Yamada
@ 2014-10-24 13:22             ` Ian Campbell
  2014-10-24 14:04               ` Hans de Goede
  2014-10-26 16:55               ` Masahiro YAMADA
  0 siblings, 2 replies; 22+ messages in thread
From: Ian Campbell @ 2014-10-24 13:22 UTC (permalink / raw)
  To: u-boot

On Fri, 2014-10-24 at 20:46 +0900, Masahiro Yamada wrote:
> Hi Ian,
> 
> 
> On Wed, 22 Oct 2014 20:14:29 +0100
> Ian Campbell <ijc@hellion.org.uk> wrote:
> 
> > On Mon, 2014-10-06 at 19:54 +0900, Masahiro Yamada wrote:
> > > Hi Ian
> > > 
> > > On Mon, 06 Oct 2014 09:27:19 +0100
> > > Ian Campbell <ijc@hellion.org.uk> wrote:
> > > Hi Ian,
> > > 
> > > > On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
> > > > > Hi Ian,
> > > > > 
> > > > > On Sat,  4 Oct 2014 09:48:11 +0100
> > > > > Ian Campbell <ijc@hellion.org.uk> wrote:
> > > > > 
> > > > > > And make TARGET_SUN[457]I a choice variable under this.
> > > > > > 
> > > > > > configs updated with:
> > > > > >     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> > > > > > 
> > > > > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> > > > > 
> > > > > 
> > > > > Perhaps, is ARCH_SUNXI more familiar?
> > > > 
> > > > I've no idea ;-)
> > > > 
> > > > I think this is something which ought to be consistent within u-boot as
> > > > a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
> > > > EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
> > > > individual boards though, which would make it inappropriate for SUNXI or
> > > > even SUN[4567]I.
> > > 
> > > SoC/board select menu clean-up is on the way.
> > > I have to admit the naming convention is inconsistent now.
> > > 
> > > CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
> > > If Xilinx/NVIDIA developers argree, we can rename
> > > CONFIG_{TEGRA, ZYNQ} -> CONFIG_ARCH_{TEGRA, ZYNQ} at some point.
> > 
> > So we want CONFIG_ARCH_SUNXI as well as CONFIG_ARCH_SUN[45678]I? Or did
> > you mean for the latter to remain CONFIG_TARGET_SUN[45678]I?
> 
> 
> I think the latter should remain CONFIG_TARGET_*.
> Or I think it is also OK to follow arch/arm/mach-sunxi/Kconfig of Linux.

So either: CONFIG_ARCH_SUNXI + CONFIG_TARGET_SUN[45678]I
Or: CONFIG_ARCH_SUNXI + CONFIG_MACH_SUN[45679]I?

I'm not too fussed but I think the second sounds good and leaves
CONFIG_TARGET_* available for the individual boards if we end up
wanting/needing that. Sound good to everyone?

Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-24 13:22             ` Ian Campbell
@ 2014-10-24 14:04               ` Hans de Goede
  2014-10-26 16:55               ` Masahiro YAMADA
  1 sibling, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2014-10-24 14:04 UTC (permalink / raw)
  To: u-boot

Hi,

On 10/24/2014 03:22 PM, Ian Campbell wrote:
> On Fri, 2014-10-24 at 20:46 +0900, Masahiro Yamada wrote:
>> Hi Ian,
>>
>>
>> On Wed, 22 Oct 2014 20:14:29 +0100
>> Ian Campbell <ijc@hellion.org.uk> wrote:
>>
>>> On Mon, 2014-10-06 at 19:54 +0900, Masahiro Yamada wrote:
>>>> Hi Ian
>>>>
>>>> On Mon, 06 Oct 2014 09:27:19 +0100
>>>> Ian Campbell <ijc@hellion.org.uk> wrote:
>>>> Hi Ian,
>>>>
>>>>> On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
>>>>>> Hi Ian,
>>>>>>
>>>>>> On Sat,  4 Oct 2014 09:48:11 +0100
>>>>>> Ian Campbell <ijc@hellion.org.uk> wrote:
>>>>>>
>>>>>>> And make TARGET_SUN[457]I a choice variable under this.
>>>>>>>
>>>>>>> configs updated with:
>>>>>>>     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
>>>>>>>
>>>>>>> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
>>>>>>
>>>>>>
>>>>>> Perhaps, is ARCH_SUNXI more familiar?
>>>>>
>>>>> I've no idea ;-)
>>>>>
>>>>> I think this is something which ought to be consistent within u-boot as
>>>>> a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
>>>>> EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
>>>>> individual boards though, which would make it inappropriate for SUNXI or
>>>>> even SUN[4567]I.
>>>>
>>>> SoC/board select menu clean-up is on the way.
>>>> I have to admit the naming convention is inconsistent now.
>>>>
>>>> CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
>>>> If Xilinx/NVIDIA developers argree, we can rename
>>>> CONFIG_{TEGRA, ZYNQ} -> CONFIG_ARCH_{TEGRA, ZYNQ} at some point.
>>>
>>> So we want CONFIG_ARCH_SUNXI as well as CONFIG_ARCH_SUN[45678]I? Or did
>>> you mean for the latter to remain CONFIG_TARGET_SUN[45678]I?
>>
>>
>> I think the latter should remain CONFIG_TARGET_*.
>> Or I think it is also OK to follow arch/arm/mach-sunxi/Kconfig of Linux.
> 
> So either: CONFIG_ARCH_SUNXI + CONFIG_TARGET_SUN[45678]I
> Or: CONFIG_ARCH_SUNXI + CONFIG_MACH_SUN[45679]I?
> 
> I'm not too fussed but I think the second sounds good and leaves
> CONFIG_TARGET_* available for the individual boards if we end up
> wanting/needing that. Sound good to everyone?

Works for me.

Regards,

Hans

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-24 13:22             ` Ian Campbell
  2014-10-24 14:04               ` Hans de Goede
@ 2014-10-26 16:55               ` Masahiro YAMADA
  1 sibling, 0 replies; 22+ messages in thread
From: Masahiro YAMADA @ 2014-10-26 16:55 UTC (permalink / raw)
  To: u-boot

Hi Ian,

2014-10-24 22:22 GMT+09:00 Ian Campbell <ijc@hellion.org.uk>:
> On Fri, 2014-10-24 at 20:46 +0900, Masahiro Yamada wrote:
>> Hi Ian,
>>
>>
>> On Wed, 22 Oct 2014 20:14:29 +0100
>> Ian Campbell <ijc@hellion.org.uk> wrote:
>>
>> > On Mon, 2014-10-06 at 19:54 +0900, Masahiro Yamada wrote:
>> > > Hi Ian
>> > >
>> > > On Mon, 06 Oct 2014 09:27:19 +0100
>> > > Ian Campbell <ijc@hellion.org.uk> wrote:
>> > > Hi Ian,
>> > >
>> > > > On Mon, 2014-10-06 at 10:39 +0900, Masahiro Yamada wrote:
>> > > > > Hi Ian,
>> > > > >
>> > > > > On Sat,  4 Oct 2014 09:48:11 +0100
>> > > > > Ian Campbell <ijc@hellion.org.uk> wrote:
>> > > > >
>> > > > > > And make TARGET_SUN[457]I a choice variable under this.
>> > > > > >
>> > > > > > configs updated with:
>> > > > > >     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
>> > > > > >
>> > > > > > Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
>> > > > >
>> > > > >
>> > > > > Perhaps, is ARCH_SUNXI more familiar?
>> > > >
>> > > > I've no idea ;-)
>> > > >
>> > > > I think this is something which ought to be consistent within u-boot as
>> > > > a whole. Seems we have a mixture of ARCH_FOO (DAVINCI, VERSATILE,
>> > > > EXYNOS) and just FOO (TEGRA, ZYNQ). It does look like TARGET_FOO is all
>> > > > individual boards though, which would make it inappropriate for SUNXI or
>> > > > even SUN[4567]I.
>> > >
>> > > SoC/board select menu clean-up is on the way.
>> > > I have to admit the naming convention is inconsistent now.
>> > >
>> > > CONFIG_ARCH_{DAVINCI, VERSATILE, EXYNOS} were added recently.
>> > > If Xilinx/NVIDIA developers argree, we can rename
>> > > CONFIG_{TEGRA, ZYNQ} -> CONFIG_ARCH_{TEGRA, ZYNQ} at some point.
>> >
>> > So we want CONFIG_ARCH_SUNXI as well as CONFIG_ARCH_SUN[45678]I? Or did
>> > you mean for the latter to remain CONFIG_TARGET_SUN[45678]I?
>>
>>
>> I think the latter should remain CONFIG_TARGET_*.
>> Or I think it is also OK to follow arch/arm/mach-sunxi/Kconfig of Linux.
>
> So either: CONFIG_ARCH_SUNXI + CONFIG_TARGET_SUN[45678]I
> Or: CONFIG_ARCH_SUNXI + CONFIG_MACH_SUN[45679]I?

I personally prefer the latter.

> I'm not too fussed but I think the second sounds good and leaves
> CONFIG_TARGET_* available for the individual boards if we end up
> wanting/needing that. Sound good to everyone?

Fully agreed with your
"[U-Boot,v2,0/7] sunxi: Kconfig consolidation and cleanup" series.

Thank you!




-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI Ian Campbell
  2014-10-05  2:37   ` Chen-Yu Tsai
  2014-10-06  1:39   ` Masahiro Yamada
@ 2014-10-06  7:55   ` Hans de Goede
  2 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2014-10-06  7:55 UTC (permalink / raw)
  To: u-boot

Hi,

On 10/04/2014 10:48 AM, Ian Campbell wrote:
> And make TARGET_SUN[457]I a choice variable under this.
> 
> configs updated with:
>     sed -i -e 's/^\+S:CONFIG_TARGET_SUN.I=y/+S:CONFIG_TARGET_SUNXI=y\n&/g' configs/*
> 
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>

Looks good:

Acked-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>  arch/arm/Kconfig                      | 13 ++-----------
>  board/sunxi/Kconfig                   | 21 +++++++++++++++++++--
>  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-Lime_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 +
>  24 files changed, 43 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index e3e7e78..54d2fbb 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -438,17 +438,8 @@ config TARGET_SMDKC100
>  config TARGET_SOCFPGA_CYCLONE5
>  	bool "Support socfpga_cyclone5"
>  
> -config TARGET_SUN4I
> -	bool "Support sun4i"
> -
> -config TARGET_SUN5I
> -	bool "Support sun5i"
> -
> -config TARGET_SUN6I
> -	bool "Support sun6i"
> -
> -config TARGET_SUN7I
> -	bool "Support sun7i"
> +config TARGET_SUNXI
> +	bool "Support sunxi"
>  
>  config TARGET_SNOWBALL
>  	bool "Support snowball"
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index c4b3167..6e9308d 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -1,11 +1,28 @@
> +if TARGET_SUNXI
> +
> +choice
> +	prompt "Sunxi SoC"
> +
> +config TARGET_SUN4I
> +	bool "sun4i family"
> +
> +config TARGET_SUN5I
> +	bool "sun5i family"
> +
> +config TARGET_SUN6I
> +	bool "sun6i family"
> +
> +config TARGET_SUN7I
> +	bool "sun7i family"
> +
> +endchoice
> +
>  config SYS_CONFIG_NAME
>  	default "sun4i" if TARGET_SUN4I
>  	default "sun5i" if TARGET_SUN5I
>  	default "sun6i" if TARGET_SUN6I
>  	default "sun7i" if TARGET_SUN7I
>  
> -if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I
> -
>  config SYS_CPU
>  	default "armv7"
>  
> diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
> index f992293..35cc2ca 100644
> --- a/configs/A10-OLinuXino-Lime_defconfig
> +++ b/configs/A10-OLinuXino-Lime_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
> index a578c06..2ab8d3e 100644
> --- a/configs/A10s-OLinuXino-M_defconfig
> +++ b/configs/A10s-OLinuXino-M_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A10S_OLINUXINO_M,AXP152_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPB(10)"
>  CONFIG_FDTFILE="sun5i-a10s-olinuxino-micro.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
> index 9ae7b12..5fb3556 100644
> --- a/configs/A13-OLinuXinoM_defconfig
> +++ b/configs/A13-OLinuXinoM_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
>  CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
> index 2c726f3..3632f95 100644
> --- a/configs/A13-OLinuXino_defconfig
> +++ b/configs/A13-OLinuXino_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(11)"
>  CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
> index ca79fd5..2317d1f 100644
> --- a/configs/A20-OLinuXino-Lime_defconfig
> +++ b/configs/A20-OLinuXino-Lime_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
> index 20a947c..ca68a9f 100644
> --- a/configs/A20-OLinuXino_MICRO_defconfig
> +++ b/configs/A20-OLinuXino_MICRO_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_M,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-olinuxino-micro.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
> index ed06f57..bc2e8f3 100644
> --- a/configs/Auxtek-T004_defconfig
> +++ b/configs/Auxtek-T004_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
>  CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
> index d59cf72..062bd02 100644
> --- a/configs/Bananapi_defconfig
> +++ b/configs/Bananapi_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
> index 353b04a..967be18 100644
> --- a/configs/Cubieboard2_FEL_defconfig
> +++ b/configs/Cubieboard2_FEL_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
> index 11a0c5f..b7947fb 100644
> --- a/configs/Cubieboard2_defconfig
> +++ b/configs/Cubieboard2_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
> index 8c1ff95..f4b93cf 100644
> --- a/configs/Cubieboard_defconfig
> +++ b/configs/Cubieboard_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
> index 23c5efb..1cda577 100644
> --- a/configs/Cubietruck_FEL_defconfig
> +++ b/configs/Cubietruck_FEL_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
> index 1389f21..6c9a530 100644
> --- a/configs/Cubietruck_defconfig
> +++ b/configs/Cubietruck_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
> index efc5301..1178f5b 100644
> --- a/configs/Linksprite_pcDuino3_defconfig
> +++ b/configs/Linksprite_pcDuino3_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPH(2),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig
> index 06c4cac..1095b4b 100644
> --- a/configs/Mele_A1000G_defconfig
> +++ b/configs/Mele_A1000G_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
> index d386c79..1d5d0cd 100644
> --- a/configs/Mele_A1000_defconfig
> +++ b/configs/Mele_A1000_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15),AHCI,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig
> index 5db4aa3..b40bde4 100644
> --- a/configs/Mini-X-1Gb_defconfig
> +++ b/configs/Mini-X-1Gb_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MINI_X_1GB,AXP209_POWER,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
> index 6718dcb..c0f645e 100644
> --- a/configs/Mini-X_defconfig
> +++ b/configs/Mini-X_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="MINI_X,AXP209_POWER,USB_EHCI"
>  CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
> index 6f64875..bd46520 100644
> --- a/configs/ba10_tv_box_defconfig
> +++ b/configs/ba10_tv_box_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB_VBUS1_GPIO=SUNXI_GPH(12)"
>  CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN4I=y
> diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
> index 2ef0f91..71c04f9 100644
> --- a/configs/i12-tvbox_defconfig
> +++ b/configs/i12-tvbox_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig
> index a8d4bb8..03bbe6d 100644
> --- a/configs/qt840a_defconfig
> +++ b/configs/qt840a_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN7I=y
> diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
> index 6aba942..49c0fb4 100644
> --- a/configs/r7-tv-dongle_defconfig
> +++ b/configs/r7-tv-dongle_defconfig
> @@ -2,4 +2,5 @@ CONFIG_SPL=y
>  CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SUNXI_GPG(13)"
>  CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
>  +S:CONFIG_ARM=y
> ++S:CONFIG_TARGET_SUNXI=y
>  +S:CONFIG_TARGET_SUN5I=y
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
  2014-10-04  8:47 [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings Ian Campbell
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI Ian Campbell
@ 2014-10-04  8:48 ` Ian Campbell
  2014-10-06  7:58   ` Hans de Goede
  2014-10-04  9:32 ` [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
  3 siblings, 1 reply; 22+ messages in thread
From: Ian Campbell @ 2014-10-04  8:48 UTC (permalink / raw)
  To: u-boot

It's unfortunate that this needs to be present in both .config and spl/.config
since it makes it slightly hard to enable FEL mode for a regular defconfig. It
can be done with:
    echo CONFIG_SPL_FEL=y >> .config
    echo CONFIG_SPL_FEL=y >> spl/.config

Ideally only one of those would be needed.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
---
 board/sunxi/Kconfig               | 4 ++++
 configs/Cubieboard2_FEL_defconfig | 3 ++-
 configs/Cubietruck_FEL_defconfig  | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 6e9308d..f467ade 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -32,6 +32,10 @@ config SYS_BOARD
 config SYS_SOC
 	default "sunxi"
 
+config SPL_FEL
+	bool "SPL/FEL mode support"
+	default n
+
 config FDTFILE
 	string "Default fdtfile env setting for this board"
 
diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
index 967be18..8d68275 100644
--- a/configs/Cubieboard2_FEL_defconfig
+++ b/configs/Cubieboard2_FEL_defconfig
@@ -1,5 +1,6 @@
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
++S:CONFIG_SPL_FEL=y
+CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUNXI=y
diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
index 1cda577..64fbc34 100644
--- a/configs/Cubietruck_FEL_defconfig
+++ b/configs/Cubietruck_FEL_defconfig
@@ -1,5 +1,6 @@
 CONFIG_SPL=y
-CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
++S:CONFIG_SPL_FEL=y
+CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
 CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_TARGET_SUNXI=y
-- 
2.1.0

^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option Ian Campbell
@ 2014-10-06  7:58   ` Hans de Goede
  2014-10-06  8:28     ` Ian Campbell
  0 siblings, 1 reply; 22+ messages in thread
From: Hans de Goede @ 2014-10-06  7:58 UTC (permalink / raw)
  To: u-boot

Hi,

On 10/04/2014 10:48 AM, Ian Campbell wrote:
> It's unfortunate that this needs to be present in both .config and spl/.config
> since it makes it slightly hard to enable FEL mode for a regular defconfig. It
> can be done with:
>     echo CONFIG_SPL_FEL=y >> .config
>     echo CONFIG_SPL_FEL=y >> spl/.config
> 
> Ideally only one of those would be needed.
> 
> Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
> ---
>  board/sunxi/Kconfig               | 4 ++++
>  configs/Cubieboard2_FEL_defconfig | 3 ++-
>  configs/Cubietruck_FEL_defconfig  | 3 ++-
>  3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
> index 6e9308d..f467ade 100644
> --- a/board/sunxi/Kconfig
> +++ b/board/sunxi/Kconfig
> @@ -32,6 +32,10 @@ config SYS_BOARD
>  config SYS_SOC
>  	default "sunxi"
>  
> +config SPL_FEL
> +	bool "SPL/FEL mode support"
> +	default n
> +
>  config FDTFILE
>  	string "Default fdtfile env setting for this board"
>  

Ack to this bit.

> diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
> index 967be18..8d68275 100644
> --- a/configs/Cubieboard2_FEL_defconfig
> +++ b/configs/Cubieboard2_FEL_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_SPL=y
> -CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
> ++S:CONFIG_SPL_FEL=y
> +CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
>  +S:CONFIG_ARM=y
>  +S:CONFIG_TARGET_SUNXI=y
> diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
> index 1cda577..64fbc34 100644
> --- a/configs/Cubietruck_FEL_defconfig
> +++ b/configs/Cubietruck_FEL_defconfig
> @@ -1,5 +1,6 @@
>  CONFIG_SPL=y
> -CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
> ++S:CONFIG_SPL_FEL=y
> +CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPH(12),USB_EHCI"
>  CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
>  +S:CONFIG_ARM=y
>  +S:CONFIG_TARGET_SUNXI=y
> 

But not do this but, I don't see how these 2 are so special that they have to get
a FEL version of the defconfig, where others do not. I was planning to do a similar
patch (but have not gotten around to it), but my plan was to simply remove these 2
defconfigs then.

This is:

Acked-by: Hans de Goede <hdegoede@redhat.com>

With the 2 FEL defconfigs completely removed. If you disagree with removing them,
this is going to need some more discussion :)

Regards,

Hans

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
  2014-10-06  7:58   ` Hans de Goede
@ 2014-10-06  8:28     ` Ian Campbell
  2014-10-06  8:43       ` Hans de Goede
  0 siblings, 1 reply; 22+ messages in thread
From: Ian Campbell @ 2014-10-06  8:28 UTC (permalink / raw)
  To: u-boot

On Mon, 2014-10-06 at 09:58 +0200, Hans de Goede wrote:
> With the 2 FEL defconfigs completely removed. If you disagree with removing them,
> this is going to need some more discussion :)

I think they should be removed but in a separate patch, rather than
mixing two changes in this one. I'll add such a patch to the next
version.

Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option
  2014-10-06  8:28     ` Ian Campbell
@ 2014-10-06  8:43       ` Hans de Goede
  0 siblings, 0 replies; 22+ messages in thread
From: Hans de Goede @ 2014-10-06  8:43 UTC (permalink / raw)
  To: u-boot

Hi,

On 10/06/2014 10:28 AM, Ian Campbell wrote:
> On Mon, 2014-10-06 at 09:58 +0200, Hans de Goede wrote:
>> With the 2 FEL defconfigs completely removed. If you disagree with removing them,
>> this is going to need some more discussion :)
> 
> I think they should be removed but in a separate patch, rather than
> mixing two changes in this one. I'll add such a patch to the next
> version.

Ok, that works for me.

Regards,

Hans

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup
  2014-10-04  8:47 [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
                   ` (2 preceding siblings ...)
  2014-10-04  8:48 ` [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option Ian Campbell
@ 2014-10-04  9:32 ` Ian Campbell
  2014-10-06  2:16   ` Masahiro Yamada
  3 siblings, 1 reply; 22+ messages in thread
From: Ian Campbell @ 2014-10-04  9:32 UTC (permalink / raw)
  To: u-boot

On Sat, 2014-10-04 at 09:47 +0100, Ian Campbell wrote:
> Probably the board [...] selection could be moved out
> without any dependencies, although the board one in particular will be
> quite a big patch I think it would be worth it.

On the topic of board selection which way round should the SoC vs. board
options be arrange? Should we have invisible TARGET_SUN?I options which
are selected by each board, or should we have the boards depend on the
appropriate TARGET?

In the first case a user would need to choose from a pretty long list of
boards, in the second case they would need to know which SoC the board
has.

I'm leaning towards the first.

I don't think either would be an impediment to an eventually single
common binary which I'm imagining would appear as a "Generic board"
option which depends/selects all appropriate SoCs.

Ian.

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup
  2014-10-04  9:32 ` [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
@ 2014-10-06  2:16   ` Masahiro Yamada
  2014-10-06  8:22     ` Ian Campbell
  0 siblings, 1 reply; 22+ messages in thread
From: Masahiro Yamada @ 2014-10-06  2:16 UTC (permalink / raw)
  To: u-boot

Hi Ian,

On Sat, 04 Oct 2014 10:32:04 +0100
Ian Campbell <ijc@hellion.org.uk> wrote:

> On Sat, 2014-10-04 at 09:47 +0100, Ian Campbell wrote:
> > Probably the board [...] selection could be moved out
> > without any dependencies, although the board one in particular will be
> > quite a big patch I think it would be worth it.
> 
> On the topic of board selection which way round should the SoC vs. board
> options be arrange? Should we have invisible TARGET_SUN?I options which
> are selected by each board, or should we have the boards depend on the
> appropriate TARGET?
> 
> In the first case a user would need to choose from a pretty long list of
> boards, in the second case they would need to know which SoC the board
> has.
> 
> I'm leaning towards the first.


Either would work, but as for Tegra, the second one has been chosen.


 Architecture select (CONFIG_ARCH)
     -> Tegra Platform (CONFIG_TEGRA)
         -> Tegra SoC select (CONFIG_TEGRA20 / 30 / 114 / 124)
             -> Board select
 



> I don't think either would be an impediment to an eventually single
> common binary which I'm imagining would appear as a "Generic board"
> option which depends/selects all appropriate SoCs.




Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup
  2014-10-06  2:16   ` Masahiro Yamada
@ 2014-10-06  8:22     ` Ian Campbell
  0 siblings, 0 replies; 22+ messages in thread
From: Ian Campbell @ 2014-10-06  8:22 UTC (permalink / raw)
  To: u-boot

On Mon, 2014-10-06 at 11:16 +0900, Masahiro Yamada wrote:
> Hi Ian,
> 
> On Sat, 04 Oct 2014 10:32:04 +0100
> Ian Campbell <ijc@hellion.org.uk> wrote:
> 
> > On Sat, 2014-10-04 at 09:47 +0100, Ian Campbell wrote:
> > > Probably the board [...] selection could be moved out
> > > without any dependencies, although the board one in particular will be
> > > quite a big patch I think it would be worth it.
> > 
> > On the topic of board selection which way round should the SoC vs. board
> > options be arrange? Should we have invisible TARGET_SUN?I options which
> > are selected by each board, or should we have the boards depend on the
> > appropriate TARGET?
> > 
> > In the first case a user would need to choose from a pretty long list of
> > boards, in the second case they would need to know which SoC the board
> > has.
> > 
> > I'm leaning towards the first.
> 
> 
> Either would work, but as for Tegra, the second one has been chosen.

Thanks. I think global consistency is a worthwhile goal, so sunxi should
follow the same pattern.

> 
> 
>  Architecture select (CONFIG_ARCH)
>      -> Tegra Platform (CONFIG_TEGRA)
>          -> Tegra SoC select (CONFIG_TEGRA20 / 30 / 114 / 124)
>              -> Board select
>  
> 
> 
> 
> > I don't think either would be an impediment to an eventually single
> > common binary which I'm imagining would appear as a "Generic board"
> > option which depends/selects all appropriate SoCs.
> 
> 
> 
> 
> Best Regards
> Masahiro Yamada
> 
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2014-10-26 16:55 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-04  8:47 [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
2014-10-04  8:48 ` [U-Boot] [PATCH for-next 1/3] sunxi: Kconfig: Consolidate SYS_CONFIG_NAME settings Ian Campbell
2014-10-06  7:48   ` Hans de Goede
2014-10-06  8:23     ` Ian Campbell
2014-10-04  8:48 ` [U-Boot] [PATCH for-next 2/3] sunxi: kconfig: Add top-level TARGET_SUNXI Ian Campbell
2014-10-05  2:37   ` Chen-Yu Tsai
2014-10-06  1:39   ` Masahiro Yamada
2014-10-06  8:27     ` Ian Campbell
2014-10-06 10:54       ` Masahiro Yamada
2014-10-22 19:14         ` Ian Campbell
2014-10-24 11:46           ` Masahiro Yamada
2014-10-24 13:22             ` Ian Campbell
2014-10-24 14:04               ` Hans de Goede
2014-10-26 16:55               ` Masahiro YAMADA
2014-10-06  7:55   ` Hans de Goede
2014-10-04  8:48 ` [U-Boot] [PATCH for-next 3/3] sunxi: Kconfig: Make SPL_FEL a toplevel Kconfig option Ian Campbell
2014-10-06  7:58   ` Hans de Goede
2014-10-06  8:28     ` Ian Campbell
2014-10-06  8:43       ` Hans de Goede
2014-10-04  9:32 ` [U-Boot] [PATCH for-next 0/3] sunxi: Kconfig consolidation and cleanup Ian Campbell
2014-10-06  2:16   ` Masahiro Yamada
2014-10-06  8:22     ` Ian Campbell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox