Skip to content

Commit 0d7bb85

Browse files
arndbarndb
committed
ARM: omap1: remove unused board files
All board support that was marked as 'unused' earlier can now be removed, leaving the five machines that that still had someone using them in 2022, or that are supported in qemu. Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Cc: Janusz Krzysztofik <jmkrzyszt@gmail.com> Cc: Tony Lindgren <tony@atomide.com> Cc: linux-omap@vger.kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 50f6f34 commit 0d7bb85

File tree

28 files changed

+9
-4256
lines changed

28 files changed

+9
-4256
lines changed

‎MAINTAINERS‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15263,7 +15263,6 @@ Q: http://patchwork.kernel.org/project/linux-omap/list/
1526315263
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
1526415264
F: arch/arm/configs/omap1_defconfig
1526515265
F: arch/arm/mach-omap1/
15266-
F: arch/arm/plat-omap/
1526715266
F: drivers/i2c/busses/i2c-omap.c
1526815267
F: include/linux/platform_data/ams-delta-fiq.h
1526915268
F: include/linux/platform_data/i2c-omap.h
@@ -15278,7 +15277,6 @@ Q: http://patchwork.kernel.org/project/linux-omap/list/
1527815277
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
1527915278
F: arch/arm/configs/omap2plus_defconfig
1528015279
F: arch/arm/mach-omap2/
15281-
F: arch/arm/plat-omap/
1528215280
F: drivers/bus/ti-sysc.c
1528315281
F: drivers/i2c/busses/i2c-omap.c
1528415282
F: drivers/irqchip/irq-omap-intc.c

‎arch/arm/Kconfig.debug‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -760,30 +760,6 @@ choice
760760
depends on ARCH_OMAP2PLUS
761761
select DEBUG_UART_8250
762762

763-
config DEBUG_OMAP7XXUART1
764-
bool "Kernel low-level debugging via OMAP730 UART1"
765-
depends on ARCH_OMAP730
766-
select DEBUG_UART_8250
767-
help
768-
Say Y here if you want kernel low-level debugging support
769-
on OMAP730 based platforms on the UART1.
770-
771-
config DEBUG_OMAP7XXUART2
772-
bool "Kernel low-level debugging via OMAP730 UART2"
773-
depends on ARCH_OMAP730
774-
select DEBUG_UART_8250
775-
help
776-
Say Y here if you want kernel low-level debugging support
777-
on OMAP730 based platforms on the UART2.
778-
779-
config DEBUG_OMAP7XXUART3
780-
bool "Kernel low-level debugging via OMAP730 UART3"
781-
depends on ARCH_OMAP730
782-
select DEBUG_UART_8250
783-
help
784-
Say Y here if you want kernel low-level debugging support
785-
on OMAP730 based platforms on the UART3.
786-
787763
config DEBUG_TI81XXUART1
788764
bool "Kernel low-level debugging messages via TI81XX UART1 (ti8148evm)"
789765
depends on ARCH_OMAP2PLUS
@@ -1728,9 +1704,9 @@ config DEBUG_UART_PHYS
17281704
default 0xffe40000 if DEBUG_RCAR_GEN1_SCIF0
17291705
default 0xffe42000 if DEBUG_RCAR_GEN1_SCIF2
17301706
default 0xfff36000 if DEBUG_HIGHBANK_UART
1731-
default 0xfffb0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
1732-
default 0xfffb0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
1733-
default 0xfffb9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
1707+
default 0xfffb0000 if DEBUG_OMAP1UART1
1708+
default 0xfffb0800 if DEBUG_OMAP1UART2
1709+
default 0xfffb9800 if DEBUG_OMAP1UART3
17341710
default 0xfffe8600 if DEBUG_BCM63XX_UART
17351711
default 0xffffee00 if DEBUG_AT91_SAM9263_DBGU
17361712
default 0xfffff200 if DEBUG_AT91_RM9200_DBGU
@@ -1847,9 +1823,9 @@ config DEBUG_UART_VIRT
18471823
default 0xfec00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
18481824
default 0xfec00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
18491825
default 0xfef36000 if DEBUG_HIGHBANK_UART
1850-
default 0xff0b0000 if DEBUG_OMAP1UART1 || DEBUG_OMAP7XXUART1
1851-
default 0xff0b0800 if DEBUG_OMAP1UART2 || DEBUG_OMAP7XXUART2
1852-
default 0xff0b9800 if DEBUG_OMAP1UART3 || DEBUG_OMAP7XXUART3
1826+
default 0xff0b0000 if DEBUG_OMAP1UART1
1827+
default 0xff0b0800 if DEBUG_OMAP1UART2
1828+
default 0xff0b9800 if DEBUG_OMAP1UART3
18531829
default 0xffd01000 if DEBUG_HIP01_UART
18541830
default DEBUG_UART_PHYS if !MMU
18551831
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \

‎arch/arm/configs/omap1_defconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ CONFIG_ARCH_OMAP=y
2020
CONFIG_ARCH_OMAP1=y
2121
CONFIG_OMAP_32K_TIMER=y
2222
CONFIG_OMAP_DM_TIMER=y
23-
CONFIG_ARCH_OMAP730=y
24-
CONFIG_ARCH_OMAP850=y
2523
CONFIG_ARCH_OMAP16XX=y
2624
# CONFIG_OMAP_MUX is not set
2725
CONFIG_OMAP_RESET_CLOCKS=y

‎arch/arm/mach-omap1/Kconfig‎

Lines changed: 0 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,6 @@ menu "TI OMAP1 specific features"
1919

2020
comment "OMAP Core Type"
2121

22-
config ARCH_OMAP730
23-
depends on ARCH_MULTI_V5
24-
bool "OMAP730 Based System"
25-
select ARCH_OMAP_OTG
26-
select CPU_ARM926T
27-
select OMAP_MPU_TIMER
28-
29-
config ARCH_OMAP850
30-
depends on ARCH_MULTI_V5
31-
bool "OMAP850 Based System"
32-
select ARCH_OMAP_OTG
33-
select CPU_ARM926T
34-
3522
config ARCH_OMAP15XX
3623
depends on ARCH_MULTI_V4T
3724
default y
@@ -126,37 +113,6 @@ config ARCH_OMAP_OTG
126113

127114
comment "OMAP Board Type"
128115

129-
config MACH_OMAP_INNOVATOR
130-
bool "TI Innovator"
131-
depends on ARCH_OMAP15XX || ARCH_OMAP16XX
132-
depends on UNUSED_BOARD_FILES
133-
help
134-
TI OMAP 1510 or 1610 Innovator board support. Say Y here if you
135-
have such a board.
136-
137-
config MACH_OMAP_H2
138-
bool "TI H2 Support"
139-
depends on ARCH_OMAP16XX
140-
depends on UNUSED_BOARD_FILES
141-
help
142-
TI OMAP 1610/1611B H2 board support. Say Y here if you have such
143-
a board.
144-
145-
config MACH_OMAP_H3
146-
bool "TI H3 Support"
147-
depends on ARCH_OMAP16XX
148-
depends on UNUSED_BOARD_FILES
149-
help
150-
TI OMAP 1710 H3 board support. Say Y here if you have such
151-
a board.
152-
153-
config MACH_HERALD
154-
bool "HTC Herald"
155-
depends on ARCH_OMAP850
156-
depends on UNUSED_BOARD_FILES
157-
help
158-
HTC Herald smartphone support (AKA T-Mobile Wing, ...)
159-
160116
config MACH_OMAP_OSK
161117
bool "TI OSK Support"
162118
depends on ARCH_OMAP16XX
@@ -167,28 +123,11 @@ config MACH_OMAP_OSK
167123
config OMAP_OSK_MISTRAL
168124
bool "Mistral QVGA board Support"
169125
depends on MACH_OMAP_OSK
170-
depends on UNUSED_BOARD_FILES
171126
help
172127
The OSK supports an optional add-on board with a Quarter-VGA
173128
touchscreen, PDA-ish buttons, a resume button, bicolor LED,
174129
and camera connector. Say Y here if you have this board.
175130

176-
config MACH_OMAP_PERSEUS2
177-
bool "TI Perseus2"
178-
depends on ARCH_OMAP730
179-
depends on UNUSED_BOARD_FILES
180-
help
181-
Support for TI OMAP 730 Perseus2 board. Say Y here if you have such
182-
a board.
183-
184-
config MACH_OMAP_FSAMPLE
185-
bool "TI F-Sample"
186-
depends on ARCH_OMAP730
187-
depends on UNUSED_BOARD_FILES
188-
help
189-
Support for TI OMAP 850 F-Sample board. Say Y here if you have such
190-
a board.
191-
192131
config MACH_OMAP_PALMTE
193132
bool "Palm Tungsten E"
194133
depends on ARCH_OMAP15XX
@@ -198,26 +137,6 @@ config MACH_OMAP_PALMTE
198137
http://palmtelinux.sourceforge.net/ for more information.
199138
Say Y here if you have this PDA model, say N otherwise.
200139

201-
config MACH_OMAP_PALMZ71
202-
bool "Palm Zire71"
203-
depends on ARCH_OMAP15XX
204-
depends on UNUSED_BOARD_FILES
205-
help
206-
Support for the Palm Zire71 PDA. To boot the kernel,
207-
you'll need a PalmOS compatible bootloader; check out
208-
http://hackndev.com/palm/z71 for more information.
209-
Say Y here if you have such a PDA, say N otherwise.
210-
211-
config MACH_OMAP_PALMTT
212-
bool "Palm Tungsten|T"
213-
depends on ARCH_OMAP15XX
214-
depends on UNUSED_BOARD_FILES
215-
help
216-
Support for the Palm Tungsten|T PDA. To boot the kernel, you'll
217-
need a PalmOS compatible bootloader (Garux); check out
218-
http://garux.sourceforge.net/ for more information.
219-
Say Y here if you have this PDA model, say N otherwise.
220-
221140
config MACH_SX1
222141
bool "Siemens SX1"
223142
depends on ARCH_OMAP15XX
@@ -249,16 +168,6 @@ config MACH_AMS_DELTA
249168
Support for the Amstrad E3 (codename Delta) videophone. Say Y here
250169
if you have such a device.
251170

252-
config MACH_OMAP_GENERIC
253-
bool "Generic OMAP board"
254-
depends on ARCH_OMAP15XX || ARCH_OMAP16XX
255-
depends on UNUSED_BOARD_FILES
256-
help
257-
Support for generic OMAP-1510, 1610 or 1710 board with
258-
no FPGA. Can be used as template for porting Linux to
259-
custom OMAP boards. Say Y here if you have a custom
260-
board.
261-
262171
endmenu
263172

264173
endif

‎arch/arm/mach-omap1/Makefile‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,31 +29,13 @@ usb-fs-$(CONFIG_USB_SUPPORT) := usb.o
2929
obj-y += $(usb-fs-m) $(usb-fs-y)
3030

3131
# Specific board support
32-
obj-$(CONFIG_MACH_OMAP_H2) += board-h2.o board-h2-mmc.o \
33-
board-nand.o
34-
obj-$(CONFIG_MACH_OMAP_INNOVATOR) += board-innovator.o
35-
obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o
36-
obj-$(CONFIG_MACH_OMAP_PERSEUS2) += board-perseus2.o board-nand.o
37-
obj-$(CONFIG_MACH_OMAP_FSAMPLE) += board-fsample.o board-nand.o
3832
obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o
39-
obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o board-h3-mmc.o \
40-
board-nand.o
4133
obj-$(CONFIG_MACH_OMAP_PALMTE) += board-palmte.o
42-
obj-$(CONFIG_MACH_OMAP_PALMZ71) += board-palmz71.o
43-
obj-$(CONFIG_MACH_OMAP_PALMTT) += board-palmtt.o
4434
obj-$(CONFIG_MACH_NOKIA770) += board-nokia770.o
4535
obj-$(CONFIG_MACH_AMS_DELTA) += board-ams-delta.o ams-delta-fiq.o \
4636
ams-delta-fiq-handler.o
4737
obj-$(CONFIG_MACH_SX1) += board-sx1.o board-sx1-mmc.o
48-
obj-$(CONFIG_MACH_HERALD) += board-htcherald.o
49-
50-
ifeq ($(CONFIG_ARCH_OMAP15XX),y)
51-
# Innovator-1510 FPGA
52-
obj-$(CONFIG_MACH_OMAP_INNOVATOR) += fpga.o
53-
endif
5438

5539
# GPIO
56-
obj-$(CONFIG_ARCH_OMAP730) += gpio7xx.o
57-
obj-$(CONFIG_ARCH_OMAP850) += gpio7xx.o
5840
obj-$(CONFIG_ARCH_OMAP15XX) += gpio15xx.o
5941
obj-$(CONFIG_ARCH_OMAP16XX) += gpio16xx.o

0 commit comments

Comments
 (0)