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

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>

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index e700495554c469bc268e154c8c38044e3c9f0834..faa38ba27bba2137579f79745618da260930bedd 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -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"

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index 816ffb56b5faa13e7bca0f42665f6014cd292189..be989ebd79c176c76f57ccf270264bfe656f891b 100644 (file)
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -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

diff --git a/configs/A10s-OLinuXino-M_defconfig b/configs/A10s-OLinuXino-M_defconfig
index 38461d133d97ed24ca7197783da38a3312098ddb..a27a7880b89b5bbbb74901f3e581e2b2744b59bc 100644 (file)
--- a/configs/A10s-OLinuXino-M_defconfig
+++ b/configs/A10s-OLinuXino-M_defconfig
@@ -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

diff --git a/configs/A13-OLinuXinoM_defconfig b/configs/A13-OLinuXinoM_defconfig
index 7a0614d3415bbd6799b636a4ab8f65d023257dbd..f904b50f46da54483ab80dc4f283c32e1b04087b 100644 (file)
--- a/configs/A13-OLinuXinoM_defconfig
+++ b/configs/A13-OLinuXinoM_defconfig
@@ -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

diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig
index 4822449a557459ff614148d4030b9a99475d3042..23dc716d0beec10624d98a407734578745771c15 100644 (file)
--- a/configs/A13-OLinuXino_defconfig
+++ b/configs/A13-OLinuXino_defconfig
@@ -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

diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
index 7933704149c05612f447301f0a5e71f3bc93775e..e7c93b996b6fb7a28fe43582ad0f9239542fed94 100644 (file)
--- a/configs/A20-OLinuXino-Lime2_defconfig
+++ b/configs/A20-OLinuXino-Lime2_defconfig
@@ -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

diff --git a/configs/A20-OLinuXino-Lime_defconfig b/configs/A20-OLinuXino-Lime_defconfig
index eafd73347dea8bb71a86a60c8ac4b9ada81b0987..975472ba474f0c0c42d213dbacb5d30761dbc5b5 100644 (file)
--- a/configs/A20-OLinuXino-Lime_defconfig
+++ b/configs/A20-OLinuXino-Lime_defconfig
@@ -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

diff --git a/configs/A20-OLinuXino_MICRO_defconfig b/configs/A20-OLinuXino_MICRO_defconfig
index 07edef5aa6cef5eaadd40b0a7f1c74eaa2a10f4f..c2c3db6841894181ffcef02d6a801d6d2de5db75 100644 (file)
--- a/configs/A20-OLinuXino_MICRO_defconfig
+++ b/configs/A20-OLinuXino_MICRO_defconfig
@@ -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

diff --git a/configs/Auxtek-T004_defconfig b/configs/Auxtek-T004_defconfig
index a2577b8ab39c5713c103947139858c81dd090d96..b2f4c51076fb6b45cda0fb505650236289fcf2f1 100644 (file)
--- a/configs/Auxtek-T004_defconfig
+++ b/configs/Auxtek-T004_defconfig
@@ -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

diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
index 8f8853fa9db54361456103405a4a08a96d7c3033..ec18b9f0591fabfbe95e93daae108676da6f3213 100644 (file)
--- a/configs/Bananapi_defconfig
+++ b/configs/Bananapi_defconfig
@@ -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

diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index b9ee7c83b95f6558ba89b34d478e9d97434d3593..4c0ea7859a190fc1e914ec22457cc5a81c74e31d 100644 (file)
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -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"

diff --git a/configs/Cubieboard2_FEL_defconfig b/configs/Cubieboard2_FEL_defconfig
index 7ae7a2b55f63968a570011e81af707f569bd2ea5..1e79720ac0cff18f8b1a3013fa03b2d6ef852396 100644 (file)
--- a/configs/Cubieboard2_FEL_defconfig
+++ b/configs/Cubieboard2_FEL_defconfig
@@ -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

diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
index 9c5997dec6a6eb96c9e11b2165ecc3c283025535..f6872c6bca0b558caff958604634a5c6e1e21ed0 100644 (file)
--- a/configs/Cubieboard2_defconfig
+++ b/configs/Cubieboard2_defconfig
@@ -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

diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index eafa09d9952ba8a0f8f0a0893ecee0550ee1f888..9152b253b37a399875f6e38b05e198ae2a9503c6 100644 (file)
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -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

diff --git a/configs/Cubietruck_FEL_defconfig b/configs/Cubietruck_FEL_defconfig
index 6218c58bc20461ecaa5a2f95a17fbeedb898f8a2..963ed5a01775932e876761b8ccd2cccd50600493 100644 (file)
--- a/configs/Cubietruck_FEL_defconfig
+++ b/configs/Cubietruck_FEL_defconfig
@@ -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

diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
index 9a56f180f579576376118409f66dc42f16d27adc..7592658a2e20e11f96eccd109e71ddbd9b870ca5 100644 (file)
--- a/configs/Cubietruck_defconfig
+++ b/configs/Cubietruck_defconfig
@@ -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

diff --git a/configs/Ippo_q8h_v5_defconfig b/configs/Ippo_q8h_v5_defconfig
index d9ea01014ede6d70fdde439af99ad25bacec169d..12ff70147ac890f833d3ebda77704a89b9a287cc 100644 (file)
--- a/configs/Ippo_q8h_v5_defconfig
+++ b/configs/Ippo_q8h_v5_defconfig
@@ -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"

diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
index 046ab6f2157fc1ac208089697a2c2b2d7906460e..935c0555a0bbe1f40cb747f23947f89ef5478338 100644 (file)
--- a/configs/Linksprite_pcDuino3_defconfig
+++ b/configs/Linksprite_pcDuino3_defconfig
@@ -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

diff --git a/configs/Mele_A1000G_defconfig b/configs/Mele_A1000G_defconfig
index c0608a540d0442cbd5dc390169873362500a0b36..17b56126b53bc044a569b8149c3fdaa0cda7253f 100644 (file)
--- a/configs/Mele_A1000G_defconfig
+++ b/configs/Mele_A1000G_defconfig
@@ -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

diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 76239755767576caf028b99c334d546e7b2b4255..c34f9e2853ffe11854624d23fbed513a94d8d905 100644 (file)
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -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

diff --git a/configs/Mele_M3_defconfig b/configs/Mele_M3_defconfig
index 249344631a20ecba72abbbc353c9e441c5695ae5..963ae9f2a22fe157c2b60b3293be818c3e412135 100644 (file)
--- a/configs/Mele_M3_defconfig
+++ b/configs/Mele_M3_defconfig
@@ -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

diff --git a/configs/Mini-X-1Gb_defconfig b/configs/Mini-X-1Gb_defconfig
index cd9ac590316cc4e4151fb6d625edc3fe483d8285..343b53cd7f2b08a776d52e276336d1bec0e9892f 100644 (file)
--- a/configs/Mini-X-1Gb_defconfig
+++ b/configs/Mini-X-1Gb_defconfig
@@ -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

diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index adccb8ba9dd27f7d359dc4f4b43eb9791395921a..0a1885616a166078fd356ce6ed467355331f921e 100644 (file)
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -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

diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 743a617be8afd419d67bc10dfa195fa83b5db733..0a22ddd10928df9d7b71264a341ca43933234827 100644 (file)
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -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

diff --git a/configs/i12-tvbox_defconfig b/configs/i12-tvbox_defconfig
index e8a9eaf3d89ba5a673178d8e649548519240b75d..068c4b5d1a2b4c02693ff46ffe7d47786318ee2e 100644 (file)
--- a/configs/i12-tvbox_defconfig
+++ b/configs/i12-tvbox_defconfig
@@ -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

diff --git a/configs/qt840a_defconfig b/configs/qt840a_defconfig
index df96eecb983ab072a691df493a33be72286e2c09..6ec33a8b1602f2fd64223814eb8aaf2a0c77d9a2 100644 (file)
--- a/configs/qt840a_defconfig
+++ b/configs/qt840a_defconfig
@@ -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

diff --git a/configs/r7-tv-dongle_defconfig b/configs/r7-tv-dongle_defconfig
index 6b8dd97e8748d4fe0c3e9c0594031dc35505aaaa..2780e1480754696c5355180d48c3d25b98263201 100644 (file)
--- a/configs/r7-tv-dongle_defconfig
+++ b/configs/r7-tv-dongle_defconfig
@@ -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