On Sat, Oct 4, 2014 at 4:48 PM, Ian Campbell <i...@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 <i...@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 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot