Skip to content

Commit

Permalink
ARM: footbridge: remove CATS
Browse files Browse the repository at this point in the history
Nobody seems to have a CATS machine any more, so remove
it now, leaving only NetWinder and EBSA285.

Cc: Russell King <linux@armlinux.org.uk>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Jan 10, 2023
1 parent 046cd3c commit 50f6f34
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 182 deletions.
2 changes: 1 addition & 1 deletion arch/arm/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ __create_page_tables:
ldr r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags
#endif

#if defined(CONFIG_ARCH_NETWINDER) || defined(CONFIG_ARCH_CATS)
#if defined(CONFIG_ARCH_NETWINDER)
/*
* If we're using the NetWinder or CATS, we also need to map
* in the 16550-type serial port for the debug messages
Expand Down
12 changes: 0 additions & 12 deletions arch/arm/mach-footbridge/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,6 @@ menuconfig ARCH_FOOTBRIDGE

if ARCH_FOOTBRIDGE

config ARCH_CATS
bool "CATS"
depends on UNUSED_BOARD_FILES
select CLKEVT_I8253
select CLKSRC_I8253
select ISA
select FORCE_PCI
help
Say Y here if you intend to run this kernel on the CATS.

Saying N will reduce the size of the Footbridge kernel.

config ARCH_EBSA285_HOST
bool "EBSA285 (host mode)"
select ARCH_EBSA285
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-footbridge/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,9 @@
obj-y := common.o isa-irq.o isa.o isa-rtc.o dma-isa.o

pci-y += dc21285.o
pci-$(CONFIG_ARCH_CATS) += cats-pci.o
pci-$(CONFIG_ARCH_EBSA285) += ebsa285-pci.o
pci-$(CONFIG_ARCH_NETWINDER) += netwinder-pci.o

obj-$(CONFIG_ARCH_CATS) += cats-hw.o isa-timer.o
obj-$(CONFIG_ARCH_EBSA285) += ebsa285.o dc21285-timer.o
obj-$(CONFIG_ARCH_NETWINDER) += netwinder-hw.o isa-timer.o

Expand Down
98 changes: 0 additions & 98 deletions arch/arm/mach-footbridge/cats-hw.c

This file was deleted.

64 changes: 0 additions & 64 deletions arch/arm/mach-footbridge/cats-pci.c

This file was deleted.

3 changes: 0 additions & 3 deletions arch/arm/mach-footbridge/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,6 @@ void __init footbridge_init_irq(void)
*/
isa_init_irq(IRQ_PCI);

if (machine_is_cats())
isa_init_irq(IRQ_IN2);

if (machine_is_netwinder())
isa_init_irq(IRQ_IN3);
}
Expand Down
2 changes: 0 additions & 2 deletions drivers/watchdog/wdt285.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ static int __init footbridge_watchdog_init(void)
pr_info("Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n",
soft_margin);

if (machine_is_cats())
pr_warn("Warning: Watchdog reset may not work on this machine\n");
return 0;
}

Expand Down

0 comments on commit 50f6f34

Please sign in to comment.