Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sunxi: kconfig: Add top-level ARCH_SUNXI

Browse Source 
And make TARGET_SUN[45678]I a choice variable under this.

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

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
master
Ian Campbell 10 years ago committed by Hans de Goede
parent d6aac671b6
commit 2c7e3b9046
28 changed files with 57 additions and 25 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 26
      arch/arm/Kconfig
  2. 30
      board/sunxi/Kconfig
  3. 1
      configs/A10-OLinuXino-Lime_defconfig
  4. 1
      configs/A10s-OLinuXino-M_defconfig
  5. 1
      configs/A13-OLinuXinoM_defconfig
  6. 1
      configs/A13-OLinuXino_defconfig
  7. 1
      configs/A20-OLinuXino-Lime2_defconfig
  8. 1
      configs/A20-OLinuXino-Lime_defconfig
  9. 1
      configs/A20-OLinuXino_MICRO_defconfig
  10. 1
      configs/Auxtek-T004_defconfig
  11. 1
      configs/Bananapi_defconfig
  12. 1
      configs/Colombus_defconfig
  13. 1
      configs/Cubieboard2_FEL_defconfig
  14. 1
      configs/Cubieboard2_defconfig
  15. 1
      configs/Cubieboard_defconfig
  16. 1
      configs/Cubietruck_FEL_defconfig
  17. 1
      configs/Cubietruck_defconfig
  18. 1
      configs/Ippo_q8h_v5_defconfig
  19. 1
      configs/Linksprite_pcDuino3_defconfig
  20. 1
      configs/Mele_A1000G_defconfig
  21. 1
      configs/Mele_A1000_defconfig
  22. 1
      configs/Mele_M3_defconfig
  23. 1
      configs/Mini-X-1Gb_defconfig
  24. 1
      configs/Mini-X_defconfig
  25. 1
      configs/ba10_tv_box_defconfig
  26. 1
      configs/i12-tvbox_defconfig
  27. 1
      configs/qt840a_defconfig
  28. 1
      configs/r7-tv-dongle_defconfig

26
arch/arm/Kconfig
Unescape View File

@ -663,30 +663,8 @@ config TARGET_SOCFPGA_CYCLONE5
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN4I
bool "Support sun4i"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN5I
bool "Support sun5i"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN6I
bool "Support sun6i"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN7I
bool "Support sun7i"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN8I
bool "Support sun8i"
select CPU_V7
select SUPPORT_SPL
config ARCH_SUNXI
bool "Support sunxi (Allwinner) SoCs"
config TARGET_SNOWBALL
bool "Support snowball"

30
board/sunxi/Kconfig
Unescape View File

@ -1,4 +1,32 @@
if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN6I || TARGET_SUN7I || TARGET_SUN8I
if ARCH_SUNXI
choice
prompt "Sunxi SoC Variant"
config TARGET_SUN4I
bool "sun4i (Allwinner A10)"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN5I
bool "sun5i (Allwinner A13)"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN6I
bool "sun6i (Allwinner A31)"
select CPU_V7
config TARGET_SUN7I
bool "sun7i (Allwinner A20)"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN8I
bool "sun8i (Allwinner A23)"
select CPU_V7
endchoice
config SYS_CONFIG_NAME
string

1
configs/A10-OLinuXino-Lime_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/A10s-OLinuXino-M_defconfig
Unescape View File

@ -5,4 +5,5 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=1
+S:CONFIG_MMC0_CD_PIN="PG1"
+S:CONFIG_MMC1_CD_PIN="PG13"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y

1
configs/A13-OLinuXinoM_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y

1
configs/A13-OLinuXino_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y

1
configs/A20-OLinuXino-Lime2_defconfig
Unescape View File

@ -2,4 +2,5 @@ CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L2,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/A20-OLinuXino-Lime_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/A20-OLinuXino_MICRO_defconfig
Unescape View File

@ -5,4 +5,5 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+S:CONFIG_MMC0_CD_PIN="PH1"
+S:CONFIG_MMC3_CD_PIN="PH11"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Auxtek-T004_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y

1
configs/Bananapi_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Colombus_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="COLOMBUS"
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_TARGET_SUN6I=y
CONFIG_FDTFILE="sun6i-a31-colombus.dtb"

1
configs/Cubieboard2_FEL_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Cubieboard2_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Cubieboard_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/Cubietruck_FEL_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Cubietruck_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Ippo_q8h_v5_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_SYS_EXTRA_OPTIONS="IPPO_Q8H_V5,CONS_INDEX=5"
CONFIG_ARM=y
CONFIG_ARCH_SUNXI=y
CONFIG_TARGET_SUN8I=y
CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5.dtb"

1
configs/Linksprite_pcDuino3_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Mele_A1000G_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/Mele_A1000_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/Mele_M3_defconfig
Unescape View File

@ -4,4 +4,5 @@ CONFIG_FDTFILE="sun7i-a20-m3.dtb"
+S:CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+S:CONFIG_MMC0_CD_PIN="PH1"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/Mini-X-1Gb_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/Mini-X_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/ba10_tv_box_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y

1
configs/i12-tvbox_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/qt840a_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y

1
configs/r7-tv-dongle_defconfig
Unescape View File

@ -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_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y

Write Preview
Loading…
Cancel
Save