Commit 40d0cdda3e2667260100b75d79a9a53f206a0739

Authored by Hans de Goede
1 parent c13f60d92a

sunxi: Remove CONFIG_TARGET_FOO for sun5i and sun7i boards

CONFIG_TARGET_FOO was 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), all sun5i and sun7i
boards have been moved over to using a single dram_sun5i_autoconfig file,
and the tx clk delay handling for the Banana boards now has its own Kconfig.

IOW nothing is using CONFIG_TARGET_FOO anymore, so remove it.

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

Showing 20 changed files with 8 additions and 101 deletions Side-by-side Diff

... ... @@ -64,88 +64,6 @@
64 64 default "sun7i" if MACH_SUN7I
65 65 default "sun8i" if MACH_SUN8I
66 66  
67   -choice
68   - prompt "Board"
69   -
70   -config TARGET_A10S_OLINUXINO_M
71   - bool "A10S_OLINUXINO_M"
72   - depends on MACH_SUN5I
73   -
74   -config TARGET_A13_OLINUXINOM
75   - bool "A13_OLINUXINOM"
76   - depends on MACH_SUN5I
77   -
78   -config TARGET_A13_OLINUXINO
79   - bool "A13_OLINUXINO"
80   - depends on MACH_SUN5I
81   -
82   -config TARGET_A20_OLINUXINO_L2
83   - bool "A20_OLINUXINO_L2"
84   - depends on MACH_SUN7I
85   -
86   -config TARGET_A20_OLINUXINO_L
87   - bool "A20_OLINUXINO_L"
88   - depends on MACH_SUN7I
89   -
90   -config TARGET_A20_OLINUXINO_M
91   - bool "A20_OLINUXINO_M"
92   - depends on MACH_SUN7I
93   -
94   -config TARGET_AUXTEK_T004
95   - bool "AUXTEK_T004"
96   - depends on MACH_SUN5I
97   -
98   -config TARGET_BANANAPI
99   - bool "BANANAPI"
100   - depends on MACH_SUN7I
101   -
102   -config TARGET_BANANAPRO
103   - bool "BANANAPRO"
104   - depends on MACH_SUN7I
105   -
106   -config TARGET_CUBIEBOARD2
107   - bool "CUBIEBOARD2"
108   - depends on MACH_SUN7I
109   -
110   -config TARGET_CUBIETRUCK
111   - bool "CUBIETRUCK"
112   - depends on MACH_SUN7I
113   -
114   -config TARGET_PCDUINO3
115   - bool "PCDUINO3"
116   - depends on MACH_SUN7I
117   -
118   -config TARGET_MELE_M3
119   - bool "MELE_M3"
120   - depends on MACH_SUN7I
121   -
122   -config TARGET_MK802_A10S
123   - bool "MK802_A10S"
124   - depends on MACH_SUN5I
125   -
126   -config TARGET_MSI_PRIMO73
127   - bool "MSI Primo73 (7\" tablet)"
128   - depends on MACH_SUN7I
129   - ---help---
130   - The MSI Primo73 is an A20 based tablet, with 1G RAM, 16G NAND,
131   - 1024x600 TN LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
132   - rear camera, 3000 mAh battery, gt911 touchscreen, mma8452 accelerometer
133   - and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
134   - (both volume buttons are also connected to the UBOOT_SEL pin). The
135   - external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
136   - OTG and 3.5mm headphone jack. More details are available at
137   - http://linux-sunxi.org/MSI_Primo73
138   -
139   -config TARGET_I12_TVBOX
140   - bool "I12_TVBOX"
141   - depends on MACH_SUN7I
142   -
143   -config TARGET_R7DONGLE
144   - bool "R7DONGLE"
145   - depends on MACH_SUN5I
146   -
147   -endchoice
148   -
149 67 config SYS_BOARD
150 68 default "sunxi"
151 69  
configs/A10s-OLinuXino-M_defconfig
... ... @@ -8,7 +8,6 @@
8 8 +S:CONFIG_ARM=y
9 9 +S:CONFIG_ARCH_SUNXI=y
10 10 +S:CONFIG_MACH_SUN5I=y
11   -+S:CONFIG_TARGET_A10S_OLINUXINO_M=y
12 11 +S:CONFIG_DRAM_CLK=432
13 12 +S:CONFIG_DRAM_ZQ=123
14 13 +S:CONFIG_DRAM_EMR1=4
configs/A13-OLinuXinoM_defconfig
... ... @@ -12,7 +12,6 @@
12 12 +S:CONFIG_ARM=y
13 13 +S:CONFIG_ARCH_SUNXI=y
14 14 +S:CONFIG_MACH_SUN5I=y
15   -+S:CONFIG_TARGET_A13_OLINUXINOM=y
16 15 +S:CONFIG_DRAM_CLK=408
17 16 +S:CONFIG_DRAM_ZQ=123
18 17 +S:CONFIG_DRAM_EMR1=0
configs/A13-OLinuXino_defconfig
... ... @@ -12,7 +12,6 @@
12 12 +S:CONFIG_ARM=y
13 13 +S:CONFIG_ARCH_SUNXI=y
14 14 +S:CONFIG_MACH_SUN5I=y
15   -+S:CONFIG_TARGET_A13_OLINUXINO=y
16 15 +S:CONFIG_DRAM_CLK=408
17 16 +S:CONFIG_DRAM_ZQ=123
18 17 +S:CONFIG_DRAM_EMR1=0
configs/A20-OLinuXino-Lime2_defconfig
... ... @@ -4,7 +4,6 @@
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_ARCH_SUNXI=y
6 6 +S:CONFIG_MACH_SUN7I=y
7   -+S:CONFIG_TARGET_A20_OLINUXINO_L2=y
8 7 +S:CONFIG_DRAM_CLK=480
9 8 +S:CONFIG_DRAM_ZQ=127
10 9 +S:CONFIG_DRAM_EMR1=4
configs/A20-OLinuXino-Lime_defconfig
... ... @@ -4,7 +4,6 @@
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_ARCH_SUNXI=y
6 6 +S:CONFIG_MACH_SUN7I=y
7   -+S:CONFIG_TARGET_A20_OLINUXINO_L=y
8 7 +S:CONFIG_DRAM_CLK=480
9 8 +S:CONFIG_DRAM_ZQ=127
10 9 +S:CONFIG_DRAM_EMR1=4
configs/A20-OLinuXino_MICRO_defconfig
... ... @@ -8,7 +8,6 @@
8 8 +S:CONFIG_ARM=y
9 9 +S:CONFIG_ARCH_SUNXI=y
10 10 +S:CONFIG_MACH_SUN7I=y
11   -+S:CONFIG_TARGET_A20_OLINUXINO_M=y
12 11 +S:CONFIG_DRAM_CLK=384
13 12 +S:CONFIG_DRAM_ZQ=127
14 13 +S:CONFIG_DRAM_EMR1=4
configs/Auxtek-T004_defconfig
... ... @@ -5,7 +5,6 @@
5 5 +S:CONFIG_ARM=y
6 6 +S:CONFIG_ARCH_SUNXI=y
7 7 +S:CONFIG_MACH_SUN5I=y
8   -+S:CONFIG_TARGET_AUXTEK_T004=y
9 8 +S:CONFIG_DRAM_CLK=432
10 9 +S:CONFIG_DRAM_ZQ=123
11 10 +S:CONFIG_DRAM_EMR1=4
configs/Bananapi_defconfig
... ... @@ -5,7 +5,6 @@
5 5 +S:CONFIG_ARM=y
6 6 +S:CONFIG_ARCH_SUNXI=y
7 7 +S:CONFIG_MACH_SUN7I=y
8   -+S:CONFIG_TARGET_BANANAPI=y
9 8 +S:CONFIG_DRAM_CLK=432
10 9 +S:CONFIG_DRAM_ZQ=127
11 10 +S:CONFIG_DRAM_EMR1=4
configs/Bananapro_defconfig
... ... @@ -7,7 +7,6 @@
7 7 +S:CONFIG_ARM=y
8 8 +S:CONFIG_ARCH_SUNXI=y
9 9 +S:CONFIG_MACH_SUN7I=y
10   -+S:CONFIG_TARGET_BANANAPRO=y
11 10 +S:CONFIG_DRAM_CLK=432
12 11 +S:CONFIG_DRAM_ZQ=127
13 12 +S:CONFIG_DRAM_EMR1=4
configs/Cubieboard2_defconfig
... ... @@ -4,7 +4,6 @@
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_ARCH_SUNXI=y
6 6 +S:CONFIG_MACH_SUN7I=y
7   -+S:CONFIG_TARGET_CUBIEBOARD2=y
8 7 +S:CONFIG_DRAM_CLK=480
9 8 +S:CONFIG_DRAM_ZQ=127
10 9 +S:CONFIG_DRAM_EMR1=4
configs/Cubietruck_defconfig
... ... @@ -5,7 +5,6 @@
5 5 +S:CONFIG_ARM=y
6 6 +S:CONFIG_ARCH_SUNXI=y
7 7 +S:CONFIG_MACH_SUN7I=y
8   -+S:CONFIG_TARGET_CUBIETRUCK=y
9 8 +S:CONFIG_DRAM_CLK=432
10 9 +S:CONFIG_DRAM_ZQ=127
11 10 +S:CONFIG_DRAM_EMR1=4
configs/Ippo_q8h_v5_defconfig
... ... @@ -11,7 +11,6 @@
11 11 +S:CONFIG_ARM=y
12 12 +S:CONFIG_ARCH_SUNXI=y
13 13 +S:CONFIG_MACH_SUN8I=y
14   -+S:CONFIG_TARGET_IPPO_Q8H_V5=y
15 14 +S:CONFIG_DRAM_CLK=480
16 15 # zq = 0xf777
17 16 +S:CONFIG_DRAM_ZQ=63351
configs/Linksprite_pcDuino3_defconfig
... ... @@ -4,7 +4,6 @@
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_ARCH_SUNXI=y
6 6 +S:CONFIG_MACH_SUN7I=y
7   -+S:CONFIG_TARGET_PCDUINO3=y
8 7 +S:CONFIG_DRAM_CLK=480
9 8 +S:CONFIG_DRAM_ZQ=122
10 9 +S:CONFIG_DRAM_EMR1=4
configs/Linksprite_pcDuino3_fdt_defconfig
... ... @@ -8,7 +8,6 @@
8 8 +S:CONFIG_ARM=y
9 9 +S:CONFIG_ARCH_SUNXI=y
10 10 +S:CONFIG_MACH_SUN7I=y
11   -+S:CONFIG_TARGET_PCDUINO3=y
12 11 +S:CONFIG_DRAM_CLK=480
13 12 +S:CONFIG_DRAM_ZQ=122
14 13 +S:CONFIG_DRAM_EMR1=4
configs/MSI_Primo73_defconfig
  1 +# The MSI Primo73 is an A20 based tablet, with 1G RAM, 16G NAND,
  2 +# 1024x600 TN LCD display, mono speaker, 0.3 MP front camera, 2.0 MP
  3 +# rear camera, 3000 mAh battery, gt911 touchscreen, mma8452 accelerometer
  4 +# and rtl8188etv usb wifi. Has "power", "volume+" and "volume-" buttons
  5 +# (both volume buttons are also connected to the UBOOT_SEL pin). The
  6 +# external connectors are represented by MicroSD slot, MiniHDMI, MicroUSB
  7 +# OTG and 3.5mm headphone jack. More details are available at
  8 +# http://linux-sunxi.org/MSI_Primo73
1 9 CONFIG_SPL=y
2 10 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
3 11 CONFIG_FDTFILE="sun7i-a20-primo73.dtb"
... ... @@ -10,7 +18,6 @@
10 18 +S:CONFIG_ARM=y
11 19 +S:CONFIG_ARCH_SUNXI=y
12 20 +S:CONFIG_MACH_SUN7I=y
13   -+S:CONFIG_TARGET_MSI_PRIMO73=y
14 21 +S:CONFIG_DRAM_CLK=384
15 22 +S:CONFIG_DRAM_ZQ=127
16 23 +S:CONFIG_DRAM_EMR1=4
configs/Mele_M3_defconfig
... ... @@ -7,7 +7,6 @@
7 7 +S:CONFIG_ARM=y
8 8 +S:CONFIG_ARCH_SUNXI=y
9 9 +S:CONFIG_MACH_SUN7I=y
10   -+S:CONFIG_TARGET_MELE_M3=y
11 10 +S:CONFIG_DRAM_CLK=384
12 11 +S:CONFIG_DRAM_ZQ=127
13 12 +S:CONFIG_DRAM_EMR1=4
configs/i12-tvbox_defconfig
... ... @@ -4,7 +4,6 @@
4 4 +S:CONFIG_ARM=y
5 5 +S:CONFIG_ARCH_SUNXI=y
6 6 +S:CONFIG_MACH_SUN7I=y
7   -+S:CONFIG_TARGET_I12_TVBOX=y
8 7 +S:CONFIG_DRAM_CLK=384
9 8 +S:CONFIG_DRAM_ZQ=127
10 9 +S:CONFIG_DRAM_EMR1=4
configs/mk802_a10s_defconfig
... ... @@ -5,7 +5,6 @@
5 5 +S:CONFIG_ARM=y
6 6 +S:CONFIG_ARCH_SUNXI=y
7 7 +S:CONFIG_MACH_SUN5I=y
8   -+S:CONFIG_TARGET_MK802_A10S=y
9 8 +S:CONFIG_DRAM_CLK=432
10 9 +S:CONFIG_DRAM_ZQ=123
11 10 +S:CONFIG_DRAM_EMR1=0
configs/r7-tv-dongle_defconfig
... ... @@ -5,7 +5,6 @@
5 5 +S:CONFIG_ARM=y
6 6 +S:CONFIG_ARCH_SUNXI=y
7 7 +S:CONFIG_MACH_SUN5I=y
8   -+S:CONFIG_TARGET_R7DONGLE=y
9 8 +S:CONFIG_DRAM_CLK=384
10 9 +S:CONFIG_DRAM_ZQ=123
11 10 +S:CONFIG_DRAM_EMR1=4