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

sunxi: kconfig: Rename TARGET_SUN[45678]I to MACH_SUN[45678]I.

Browse Source 
Now we have CONFIG_ARCH_SUNXI as the toplevel, CONFIG_MACH_SUN[45678]I as the
per-SoC option and leave CONFIG_TARGET_BLAH free for individual boards in the
future.

Done automatically with:
    sed -i -e 's/TARGET_\(SUN[45678]I\)/MACH_\1/g' $(git grep -l TARGET_SUN[45678]I)

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 11 years ago committed by Hans de Goede
parent 2c7e3b9046
commit c3be279322
27 changed files with 36 additions and 36 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. 20
      board/sunxi/Kconfig
  2. 2
      configs/A10-OLinuXino-Lime_defconfig
  3. 2
      configs/A10s-OLinuXino-M_defconfig
  4. 2
      configs/A13-OLinuXinoM_defconfig
  5. 2
      configs/A13-OLinuXino_defconfig
  6. 2
      configs/A20-OLinuXino-Lime2_defconfig
  7. 2
      configs/A20-OLinuXino-Lime_defconfig
  8. 2
      configs/A20-OLinuXino_MICRO_defconfig
  9. 2
      configs/Auxtek-T004_defconfig
  10. 2
      configs/Bananapi_defconfig
  11. 2
      configs/Colombus_defconfig
  12. 2
      configs/Cubieboard2_FEL_defconfig
  13. 2
      configs/Cubieboard2_defconfig
  14. 2
      configs/Cubieboard_defconfig
  15. 2
      configs/Cubietruck_FEL_defconfig
  16. 2
      configs/Cubietruck_defconfig
  17. 2
      configs/Ippo_q8h_v5_defconfig
  18. 2
      configs/Linksprite_pcDuino3_defconfig
  19. 2
      configs/Mele_A1000G_defconfig
  20. 2
      configs/Mele_A1000_defconfig
  21. 2
      configs/Mele_M3_defconfig
  22. 2
      configs/Mini-X-1Gb_defconfig
  23. 2
      configs/Mini-X_defconfig
  24. 2
      configs/ba10_tv_box_defconfig
  25. 2
      configs/i12-tvbox_defconfig
  26. 2
      configs/qt840a_defconfig
  27. 2
      configs/r7-tv-dongle_defconfig

20
board/sunxi/Kconfig
Unescape View File

@ -3,26 +3,26 @@ if ARCH_SUNXI
choice
prompt "Sunxi SoC Variant"
config TARGET_SUN4I
config MACH_SUN4I
bool "sun4i (Allwinner A10)"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN5I
config MACH_SUN5I
bool "sun5i (Allwinner A13)"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN6I
config MACH_SUN6I
bool "sun6i (Allwinner A31)"
select CPU_V7
config TARGET_SUN7I
config MACH_SUN7I
bool "sun7i (Allwinner A20)"
select CPU_V7
select SUPPORT_SPL
config TARGET_SUN8I
config MACH_SUN8I
bool "sun8i (Allwinner A23)"
select CPU_V7
@ -30,11 +30,11 @@ endchoice
config SYS_CONFIG_NAME
string
default "sun4i" if TARGET_SUN4I
default "sun5i" if TARGET_SUN5I
default "sun6i" if TARGET_SUN6I
default "sun7i" if TARGET_SUN7I
default "sun8i" if TARGET_SUN8I
default "sun4i" if MACH_SUN4I
default "sun5i" if MACH_SUN5I
default "sun6i" if MACH_SUN6I
default "sun7i" if MACH_SUN7I
default "sun8i" if MACH_SUN8I
config SYS_BOARD
default "sunxi"

2
configs/A10-OLinuXino-Lime_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A10_OLINUXINO_L,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=S
CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y
+S:CONFIG_MACH_SUN4I=y

2
configs/A10s-OLinuXino-M_defconfig
Unescape View File

@ -6,4 +6,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=1
+S:CONFIG_MMC1_CD_PIN="PG13"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y
+S:CONFIG_MACH_SUN5I=y

2
configs/A13-OLinuXinoM_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINOM,CONS_INDEX=2,USB_EHCI,SUNXI_USB_VBUS0_G
CONFIG_FDTFILE="sun5i-a13-olinuxino-micro.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y
+S:CONFIG_MACH_SUN5I=y

2
configs/A13-OLinuXino_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A13_OLINUXINO,CONS_INDEX=2,AXP209_POWER,USB_EHCI,SUNXI
CONFIG_FDTFILE="sun5i-a13-olinuxino.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y
+S:CONFIG_MACH_SUN5I=y

2
configs/A20-OLinuXino-Lime2_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L2,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SA
CONFIG_FDTFILE="sun7i-a20-olinuxino-lime2.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/A20-OLinuXino-Lime_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="A20_OLINUXINO_L,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=S
CONFIG_FDTFILE="sun7i-a20-olinuxino-lime.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/A20-OLinuXino_MICRO_defconfig
Unescape View File

@ -6,4 +6,4 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=3
+S:CONFIG_MMC3_CD_PIN="PH11"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Auxtek-T004_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="AUXTEK_T004,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO
CONFIG_FDTFILE="sun5i-a10s-auxtek-t004.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y
+S:CONFIG_MACH_SUN5I=y

2
configs/Bananapi_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="BANANAPI,AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GP
CONFIG_FDTFILE="sun7i-a20-bananapi.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Colombus_defconfig
Unescape View File

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

2
configs/Cubieboard2_FEL_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,SPL_FEL,AXP209_POWER,SUNXI_GMAC,AHCI,SATAP
CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Cubieboard2_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD2,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI
CONFIG_FDTFILE="sun7i-a20-cubieboard2.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Cubieboard_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIEBOARD,AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_
CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y
+S:CONFIG_MACH_SUN4I=y

2
configs/Cubietruck_FEL_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,SPL_FEL,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,
CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Cubietruck_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="CUBIETRUCK,AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=
CONFIG_FDTFILE="sun7i-a20-cubietruck.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Ippo_q8h_v5_defconfig
Unescape View File

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

2
configs/Linksprite_pcDuino3_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="PCDUINO3,AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GP
CONFIG_FDTFILE="sun7i-a20-pcduino3.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/Mele_A1000G_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000G,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(1
CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y
+S:CONFIG_MACH_SUN4I=y

2
configs/Mele_A1000_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="MELE_A1000,AXP209_POWER,SUNXI_EMAC,MACPWR=SUNXI_GPH(15
CONFIG_FDTFILE="sun4i-a10-a1000.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y
+S:CONFIG_MACH_SUN4I=y

2
configs/Mele_M3_defconfig
Unescape View File

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

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

@ -3,4 +3,4 @@ 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
+S:CONFIG_MACH_SUN4I=y

2
configs/Mini-X_defconfig
Unescape View File

@ -3,4 +3,4 @@ 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
+S:CONFIG_MACH_SUN4I=y

2
configs/ba10_tv_box_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="BA10_TV_BOX,AXP209_POWER,SUNXI_EMAC,USB_EHCI,SUNXI_USB
CONFIG_FDTFILE="sun4i-a10-ba10-tvbox.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN4I=y
+S:CONFIG_MACH_SUN4I=y

2
configs/i12-tvbox_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="I12_TVBOX,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21)
CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/qt840a_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="QT840A,AXP209_POWER,SUNXI_GMAC,MACPWR=SUNXI_GPH(21),US
CONFIG_FDTFILE="sun7i-a20-i12-tvbox.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN7I=y
+S:CONFIG_MACH_SUN7I=y

2
configs/r7-tv-dongle_defconfig
Unescape View File

@ -3,4 +3,4 @@ CONFIG_SYS_EXTRA_OPTIONS="R7DONGLE,AXP152_POWER,USB_EHCI,SUNXI_USB_VBUS0_GPIO=SU
CONFIG_FDTFILE="sun5i-a10s-r7-tv-dongle.dtb"
+S:CONFIG_ARM=y
+S:CONFIG_ARCH_SUNXI=y
+S:CONFIG_TARGET_SUN5I=y
+S:CONFIG_MACH_SUN5I=y

Write Preview
Loading…
Cancel
Save