Skip to contentSkip to conversation

deletion of the Shark machine

PATCH New Linus Walleij 3 participants 3 messages Sep 13, 2013 – Sep 15, 2013

lore
Share & tools
lore
#0 lore raw

cover deletion of the Shark machine

The RFC series were not met by any protests from active users so this is an iteration of the series as sharp material for v3.13. After collecting ACKs a pull request will be made to the ARM SoC tree.

Linus Walleij (6):
ARM: delete mach-shark
MAINTAINERS: delete Shark machine entry
block: drop dependency on ARCH_SHARK
ide: drop dependency on ARCH_SHARK
input: i8042: drop dependency on ARCH_SHARK
video: drop code for ARCH_SHARK in cyber2000fb

 MAINTAINERS                                    |   5 -
 arch/arm/Kconfig                               |  20 --
 arch/arm/Makefile                              |   1 -
 arch/arm/boot/compressed/Makefile              |   4 -
 arch/arm/boot/compressed/head-shark.S          | 140 -------------
 arch/arm/boot/compressed/ofw-shark.c           | 260 -------------------------
 arch/arm/common/Makefile                       |   1 -
 arch/arm/common/via82c505.c                    |  83 --------
 arch/arm/configs/shark_defconfig               |  80 --------
 arch/arm/include/asm/mach/pci.h                |   4 -
 arch/arm/lib/Makefile                          |   1 -
 arch/arm/lib/io-shark.c                        |  13 --
 arch/arm/mach-shark/Makefile                   |  10 -
 arch/arm/mach-shark/Makefile.boot              |   2 -
 arch/arm/mach-shark/core.c                     | 146 --------------
 arch/arm/mach-shark/dma.c                      |  23 ---
 arch/arm/mach-shark/include/mach/debug-macro.S |  34 ----
 arch/arm/mach-shark/include/mach/entry-macro.S |  36 ----
 arch/arm/mach-shark/include/mach/framebuffer.h |  16 --
 arch/arm/mach-shark/include/mach/hardware.h    |  16 --
 arch/arm/mach-shark/include/mach/irqs.h        |  13 --
 arch/arm/mach-shark/include/mach/isa-dma.h     |  13 --
 arch/arm/mach-shark/include/mach/memory.h      |  26 ---
 arch/arm/mach-shark/include/mach/timex.h       |   7 -
 arch/arm/mach-shark/include/mach/uncompress.h  |  50 -----
 arch/arm/mach-shark/irq.c                      | 108 ----------
 arch/arm/mach-shark/leds.c                     | 117 -----------
 arch/arm/mach-shark/pci.c                      |  57 ------
 drivers/block/Kconfig                          |   2 +-
 drivers/ide/Kconfig                            |   4 +-
 drivers/input/serio/Kconfig                    |   2 +-
 drivers/video/cyber2000fb.c                    |  70 -------
 32 files changed, 4 insertions(+), 1360 deletions(-)
 delete mode 100644 arch/arm/boot/compressed/head-shark.S
 delete mode 100644 arch/arm/boot/compressed/ofw-shark.c
 delete mode 100644 arch/arm/common/via82c505.c
 delete mode 100644 arch/arm/configs/shark_defconfig
 delete mode 100644 arch/arm/lib/io-shark.c
 delete mode 100644 arch/arm/mach-shark/Makefile
 delete mode 100644 arch/arm/mach-shark/Makefile.boot
 delete mode 100644 arch/arm/mach-shark/core.c
 delete mode 100644 arch/arm/mach-shark/dma.c
 delete mode 100644 arch/arm/mach-shark/include/mach/debug-macro.S
 delete mode 100644 arch/arm/mach-shark/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-shark/include/mach/framebuffer.h
 delete mode 100644 arch/arm/mach-shark/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-shark/include/mach/irqs.h
 delete mode 100644 arch/arm/mach-shark/include/mach/isa-dma.h
 delete mode 100644 arch/arm/mach-shark/include/mach/memory.h
 delete mode 100644 arch/arm/mach-shark/include/mach/timex.h
 delete mode 100644 arch/arm/mach-shark/include/mach/uncompress.h
 delete mode 100644 arch/arm/mach-shark/irq.c
 delete mode 100644 arch/arm/mach-shark/leds.c
 delete mode 100644 arch/arm/mach-shark/pci.c
Signature · 1 line
1.8.3.1
#1 lore raw

cover deletion of the Shark machine

Quoted 4 lines · Linus Walleij

The RFC series were not met by any protests from active users so this is an iteration of the series as sharp material for v3.13. After collecting ACKs a pull request will be made to the ARM SoC tree.

Note that although you just ask for Acks from the other subsystem maintainers here, I think it would be just as well to apply some or all of the patches in subsystem trees. Since the code is just going away, there is no requirement to do it atomically.

Arnd

#2 lore raw

cover deletion of the Shark machine

Quoted 6 lines · Arnd Bergmann
Quoted 4 lines · Linus Walleij

The RFC series were not met by any protests from active users so this is an iteration of the series as sharp material for v3.13. After collecting ACKs a pull request will be made to the ARM SoC tree.

Quoted 6 lines

Note that although you just ask for Acks from the other subsystem maintainers here, I think it would be just as well to apply some or all of the patches in subsystem trees. Since the code is just going away, there is no requirement to do it atomically.

Agreed, I was thinking about that the other day too. The main reason to keep the code together would be in case someone speaks up and nacks the platform piece -- if the driver pieces have moved ahead then they'd need to be reverted.

The alternative is to delay the driver patches a bit until the platform has been removed. Either way, we can sort it out in case we need to do a 180 turnaround. :)

-Olof