sunxi: Remove CONFIG_TARGET_FOO for sun4i, sun6i and sun8i boards

CONFIG_TARGET_FOO is only used in board/sunxi/Makefile to select the
dram config for sun5i and sun7i boards and in board/sunxi/gmac.c for some
special handling of the bananapi/bananapro (both sun7i), iow it is not used
at all on any sun4i, sun6i and sun8i boards so lets get rid of it there.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 514e02236a23ed0e15833a69c2f1ae12617bd6a2..74b3b2174b48bd88b52125cdb79de1900feacb40 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -70,10 +70,6 @@ config SYS_CONFIG_NAME
 choice
        prompt "Board"
 
-config TARGET_A10_OLINUXINO_L
-       bool "A10_OLINUXINO_L"
-       depends on MACH_SUN4I
-
 config TARGET_A10S_OLINUXINO_M
        bool "A10S_OLINUXINO_M"
        depends on MACH_SUN5I
@@ -110,54 +106,22 @@ config TARGET_BANANAPRO
        bool "BANANAPRO"
        depends on MACH_SUN7I
 
-config TARGET_COLOMBUS
-       bool "COLOMBUS"
-       depends on MACH_SUN6I
-
 config TARGET_CUBIEBOARD2
        bool "CUBIEBOARD2"
        depends on MACH_SUN7I
 
-config TARGET_CUBIEBOARD
-       bool "CUBIEBOARD"
-       depends on MACH_SUN4I
-
 config TARGET_CUBIETRUCK
        bool "CUBIETRUCK"
        depends on MACH_SUN7I
 
-config TARGET_HUMMINGBIRD_A31
-       bool "HUMMINGBIRD_A31"
-       depends on MACH_SUN6I
-
-config TARGET_IPPO_Q8H_V5
-       bool "IPPO_Q8H_V5"
-       depends on MACH_SUN8I
-
-config TARGET_PCDUINO
-       bool "PCDUINO"
-       depends on MACH_SUN4I
-
 config TARGET_PCDUINO3
        bool "PCDUINO3"
        depends on MACH_SUN7I
 
-config TARGET_MELE_A1000
-       bool "MELE_A1000"
-       depends on MACH_SUN4I
-
 config TARGET_MELE_M3
        bool "MELE_M3"
        depends on MACH_SUN7I
 
-config TARGET_MELE_M9
-       bool "MELE_M9"
-       depends on MACH_SUN6I
-
-config TARGET_MINI_X
-       bool "MINI_X"
-       depends on MACH_SUN4I
-
 config TARGET_MSI_PRIMO73
        bool "MSI Primo73 (7\" tablet)"
        depends on MACH_SUN7I
@@ -171,23 +135,6 @@ config TARGET_MSI_PRIMO73
        OTG and 3.5mm headphone jack. More details are available at
            http://linux-sunxi.org/MSI_Primo73
 
-config TARGET_MSI_PRIMO81
-       bool "MSI Primo81 (7.85\" tablet)"
-       depends on MACH_SUN6I
-       ---help---
-       The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
-       1024x768 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
-       rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
-       and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
-       (both volume buttons are also connected to the UBOOT_SEL pin). The
-       external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
-       OTG and 3.5mm headphone jack. More details are available at
-           http://linux-sunxi.org/MSI_Primo81
-
-config TARGET_BA10_TV_BOX
-       bool "BA10_TV_BOX"
-       depends on MACH_SUN4I
-
 config TARGET_I12_TVBOX
        bool "I12_TVBOX"
        depends on MACH_SUN7I

diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
index ac7adc89ee8fb1f6fcc4ca80f939073530c9e5a5..8fa1a330cd34e1a8202892595c549971b3275169 100644 (file)
--- a/configs/A10-OLinuXino-Lime_defconfig
+++ b/configs/A10-OLinuXino-Lime_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-olinuxino-lime.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN4I=y
-+S:CONFIG_TARGET_A10_OLINUXINO_L=y
 +S:CONFIG_DRAM_CLK=480
 +S:CONFIG_DRAM_ZQ=123
 +S:CONFIG_DRAM_EMR1=4

diff --git a/configs/CSQ_CS908_defconfig b/configs/CSQ_CS908_defconfig
index 1b6cdbf811b3bfdb4f9fece099b69d5174b4275f..4040beea69e4dfb7ccf89c29f3d1346ccd4d74d4 100644 (file)
--- a/configs/CSQ_CS908_defconfig
+++ b/configs/CSQ_CS908_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun6i-a31s-cs908.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_TARGET_CSQ_CS908=y
 +S:CONFIG_DRAM_CLK=432
 +S:CONFIG_DRAM_ZQ=123
 # Ethernet phy power

diff --git a/configs/Colombus_defconfig b/configs/Colombus_defconfig
index f42ae5222e17022a6ccddd604c4915a0fe25df37..33edcc4205d66b332cd26d1ca89bd396fced28db 100644 (file)
--- a/configs/Colombus_defconfig
+++ b/configs/Colombus_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun6i-a31-colombus.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_TARGET_COLOMBUS=y
 +S:CONFIG_DRAM_CLK=240
 +S:CONFIG_DRAM_ZQ=251
 # Wifi power

diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
index b256b95c8331a387759d1828274cb6b5f96e8b25..4efc6e147e88c0b4f8d263f531db5f1c49ee22c9 100644 (file)
--- a/configs/Cubieboard_defconfig
+++ b/configs/Cubieboard_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-cubieboard.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN4I=y
-+S:CONFIG_TARGET_CUBIEBOARD=y
 +S:CONFIG_DRAM_CLK=480
 +S:CONFIG_DRAM_ZQ=123
 +S:CONFIG_DRAM_EMR1=0

diff --git a/configs/Hummingbird_A31_defconfig b/configs/Hummingbird_A31_defconfig
index 8896999e1e38a37086a29f5c0f3e1baf2b0bc740..027546391f16638184dede90512798c0b8b89f43 100644 (file)
--- a/configs/Hummingbird_A31_defconfig
+++ b/configs/Hummingbird_A31_defconfig
@@ -6,7 +6,6 @@ CONFIG_VIDEO_VGA_EXTERNAL_DAC_EN="PH25"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_TARGET_HUMMINGBIRD_A31=y
 +S:CONFIG_DRAM_CLK=312
 +S:CONFIG_DRAM_ZQ=251
 # Wifi power

diff --git a/configs/Linksprite_pcDuino_defconfig b/configs/Linksprite_pcDuino_defconfig
index 0bf329e585d501576bb0108fd0653a14cf292178..1ba37bb3fbdd1d9a00c74053143512ffec648a9d 100644 (file)
--- a/configs/Linksprite_pcDuino_defconfig
+++ b/configs/Linksprite_pcDuino_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-pcduino.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN4I=y
-+S:CONFIG_TARGET_PCDUINO=y
 +S:CONFIG_DRAM_CLK=408
 +S:CONFIG_DRAM_ZQ=123
 +S:CONFIG_DRAM_EMR1=0

diff --git a/configs/MSI_Primo81_defconfig b/configs/MSI_Primo81_defconfig
index b4b0f6d0e2362de0fa4720fa168fe748d4ee6b74..140f864764629d661d0dcf577309e33f239e22ef 100644 (file)
--- a/configs/MSI_Primo81_defconfig
+++ b/configs/MSI_Primo81_defconfig
@@ -1,3 +1,12 @@
+# The MSI Primo81 is an A31s based tablet, with 1G RAM, 16G NAND,
+# 1024x768 IPS LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
+# rear camera, 3500 mAh battery, gt911 touchscreen, mma8452 accelerometer
+# and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
+# (both volume buttons are also connected to the UBOOT_SEL pin). The
+# external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
+# OTG and 3.5mm headphone jack. More details are available at
+#     http://linux-sunxi.org/MSI_Primo81
+
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS=""
 CONFIG_FDTFILE="sun6i-a31s-primo81.dtb"
@@ -5,7 +14,6 @@ CONFIG_USB_KEYBOARD=n
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_TARGET_MSI_PRIMO81=y
 +S:CONFIG_DRAM_CLK=360
 +S:CONFIG_DRAM_ZQ=122
 # Wifi power

diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 3b4a19ec4ed60848a5cbe8d5578129497ec41fd6..1a0a025bd9eaa3b67ea6f3fb6c626b0af6f71076 100644 (file)
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -5,7 +5,6 @@ CONFIG_VIDEO_VGA=y
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN4I=y
-+S:CONFIG_TARGET_MELE_A1000=y
 +S:CONFIG_DRAM_CLK=360
 +S:CONFIG_DRAM_ZQ=123
 +S:CONFIG_DRAM_EMR1=0

diff --git a/configs/Mele_M9_defconfig b/configs/Mele_M9_defconfig
index e5ab0ec3029c62b478f06c76556feb969988c674..eaf9a7e349b3c765228398ccbbe4f3f34aff807a 100644 (file)
--- a/configs/Mele_M9_defconfig
+++ b/configs/Mele_M9_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun6i-a31-m9.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN6I=y
-+S:CONFIG_TARGET_MELE_M9=y
 +S:CONFIG_DRAM_CLK=312
 +S:CONFIG_DRAM_ZQ=120
 # The Mele M9 uses 3.3V for general IO

diff --git a/configs/Mini-X_defconfig b/configs/Mini-X_defconfig
index bb394641cef9ab8b8ee9b390b6c3e4b032faec6e..6aea77716d35e62f608e67dc8fd20fb40e99e665 100644 (file)
--- a/configs/Mini-X_defconfig
+++ b/configs/Mini-X_defconfig
@@ -4,7 +4,6 @@ CONFIG_FDTFILE="sun4i-a10-mini-xplus.dtb"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN4I=y
-+S:CONFIG_TARGET_MINI_X=y
 +S:CONFIG_DRAM_CLK=360
 +S:CONFIG_DRAM_ZQ=123
 +S:CONFIG_DRAM_EMR1=0

diff --git a/configs/ba10_tv_box_defconfig b/configs/ba10_tv_box_defconfig
index 0bfb5bd84b5f84122b3e5628ce9e6c44592fe8ff..400906d3779408f423517985b06ac7b950999328 100644 (file)
--- a/configs/ba10_tv_box_defconfig
+++ b/configs/ba10_tv_box_defconfig
@@ -5,7 +5,6 @@ CONFIG_USB2_VBUS_PIN="PH12"
 +S:CONFIG_ARM=y
 +S:CONFIG_ARCH_SUNXI=y
 +S:CONFIG_MACH_SUN4I=y
-+S:CONFIG_TARGET_BA10_TV_BOX=y
 +S:CONFIG_DRAM_CLK=384
 +S:CONFIG_DRAM_ZQ=123
 +S:CONFIG_DRAM_EMR1=4