Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=d00677255077c3b085a32c1a104fc42a64d17e6f
Commit:     d00677255077c3b085a32c1a104fc42a64d17e6f
Parent:     4e99b0b8d2e5a72b0fd27136fb3c0f08fc1da395
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 1 16:20:41 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Mon Oct 1 16:20:41 2007 +0900

    sh64: Kill off dead ROM-RAM and generic boards.
    
    The generic board stubs were never added, and the ROM-RAM boards
    never made it in to the wild. Neither one has any users, and both
    are utterly broken in-tree (likely since 2.4). Kill them both off.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh64/Kconfig              |    6 --
 arch/sh64/Makefile             |    1 -
 arch/sh64/mach-romram/Makefile |   14 ----
 arch/sh64/mach-romram/setup.c  |  141 ----------------------------------------
 4 files changed, 0 insertions(+), 162 deletions(-)

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 5664631..e177e41 100644
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -58,18 +58,12 @@ choice
        prompt "SuperH system type"
        default SH_SIMULATOR
 
-config SH_GENERIC
-       bool "Generic"
-
 config SH_SIMULATOR
        bool "Simulator"
 
 config SH_CAYMAN
        bool "Cayman"
 
-config SH_ROMRAM
-       bool "ROM/RAM"
-
 config SH_HARP
        bool "ST50-Harp"
 
diff --git a/arch/sh64/Makefile b/arch/sh64/Makefile
index ebf2004..186de5b 100644
--- a/arch/sh64/Makefile
+++ b/arch/sh64/Makefile
@@ -47,7 +47,6 @@ endif
 machine-$(CONFIG_SH_CAYMAN)    := cayman
 machine-$(CONFIG_SH_SIMULATOR) := sim
 machine-$(CONFIG_SH_HARP)      := harp
-machine-$(CONFIG_SH_ROMRAM)    := romram
 
 head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
diff --git a/arch/sh64/mach-romram/Makefile b/arch/sh64/mach-romram/Makefile
deleted file mode 100644
index 02d05c0..0000000
--- a/arch/sh64/mach-romram/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for the SH-5 ROM/RAM specific parts of the kernel
-#
-# Note! Dependencies are done automagically by 'make dep', which also
-# removes any old dependencies. DON'T put your own dependencies here
-# unless it's something special (ie not a .c file).
-#
-
-O_TARGET := romram.o
-
-obj-y := setup.o
-
-include $(TOPDIR)/Rules.make
-
diff --git a/arch/sh64/mach-romram/setup.c b/arch/sh64/mach-romram/setup.c
deleted file mode 100644
index eb98a16..0000000
--- a/arch/sh64/mach-romram/setup.c
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * arch/sh64/mach-romram/setup.c
- *
- * SH-5 ROM/RAM Platform Support
- *
- * This file handles the architecture-dependent parts of initialization
- *
- * Copyright (C) 2000, 2001  Paolo Alberelli
- *
- * [EMAIL PROTECTED]:   3rd May 2002
- *    Added support for ramdisk, removing statically linked romfs at the same 
time. *
- *
- * [EMAIL PROTECTED]:          15th May 2003
- *    Use the generic procfs cpuinfo interface, just return a valid board name.
- *
- * [EMAIL PROTECTED]   17th Feb 2004
- *     copied from arch/sh64/mach-harp/setup.c
- */
-
-#include <linux/stddef.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/bootmem.h>
-#include <linux/delay.h>
-#include <linux/kernel.h>
-#include <asm/processor.h>
-#include <asm/platform.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/page.h>
-
-#define RES_COUNT(res) ((sizeof((res))/sizeof(struct resource)))
-
-/*
- * Platform Dependent Interrupt Priorities.
- */
-
-/* Using defaults defined in irq.h */
-#define        RES NO_PRIORITY         /* Disabled */
-#define IR0 IRL0_PRIORITY      /* IRLs */
-#define IR1 IRL1_PRIORITY
-#define IR2 IRL2_PRIORITY
-#define IR3 IRL3_PRIORITY
-#define PCA INTA_PRIORITY      /* PCI Ints */
-#define PCB INTB_PRIORITY
-#define PCC INTC_PRIORITY
-#define PCD INTD_PRIORITY
-#define SER TOP_PRIORITY
-#define ERR TOP_PRIORITY
-#define PW0 TOP_PRIORITY
-#define PW1 TOP_PRIORITY
-#define PW2 TOP_PRIORITY
-#define PW3 TOP_PRIORITY
-#define DM0 NO_PRIORITY                /* DMA Ints */
-#define DM1 NO_PRIORITY
-#define DM2 NO_PRIORITY
-#define DM3 NO_PRIORITY
-#define DAE NO_PRIORITY
-#define TU0 TIMER_PRIORITY     /* TMU Ints */
-#define TU1 NO_PRIORITY
-#define TU2 NO_PRIORITY
-#define TI2 NO_PRIORITY
-#define ATI NO_PRIORITY                /* RTC Ints */
-#define PRI NO_PRIORITY
-#define CUI RTC_PRIORITY
-#define ERI SCIF_PRIORITY      /* SCIF Ints */
-#define RXI SCIF_PRIORITY
-#define BRI SCIF_PRIORITY
-#define TXI SCIF_PRIORITY
-#define ITI TOP_PRIORITY       /* WDT Ints */
-
-/*
- * Platform dependent structures: maps and parms block.
- */
-struct resource io_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource kram_resources[] = {
-       { "Kernel code", 0, 0 },        /* These must be last in the array */
-       { "Kernel data", 0, 0 }         /* These must be last in the array */
-};
-
-struct resource xram_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct resource rom_resources[] = {
-       /* To be updated with external devices */
-};
-
-struct sh64_platform platform_parms = {
-       .readonly_rootfs =      1,
-       .initial_root_dev =     0x0100,
-       .loader_type =          1,
-       .io_res_p =             io_resources,
-       .io_res_count =         RES_COUNT(io_resources),
-       .kram_res_p =           kram_resources,
-       .kram_res_count =       RES_COUNT(kram_resources),
-       .xram_res_p =           xram_resources,
-       .xram_res_count =       RES_COUNT(xram_resources),
-       .rom_res_p =            rom_resources,
-       .rom_res_count =        RES_COUNT(rom_resources),
-};
-
-int platform_int_priority[NR_INTC_IRQS] = {
-       IR0, IR1, IR2, IR3, PCA, PCB, PCC, PCD, /* IRQ  0- 7 */
-       RES, RES, RES, RES, SER, ERR, PW3, PW2, /* IRQ  8-15 */
-       PW1, PW0, DM0, DM1, DM2, DM3, DAE, RES, /* IRQ 16-23 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 24-31 */
-       TU0, TU1, TU2, TI2, ATI, PRI, CUI, ERI, /* IRQ 32-39 */
-       RXI, BRI, TXI, RES, RES, RES, RES, RES, /* IRQ 40-47 */
-       RES, RES, RES, RES, RES, RES, RES, RES, /* IRQ 48-55 */
-       RES, RES, RES, RES, RES, RES, RES, ITI, /* IRQ 56-63 */
-};
-
-void __init platform_setup(void)
-{
-       /* ROM/RAM platform leaves the decision to head.S, for now */
-       platform_parms.fpu_flags = fpu_in_use;
-}
-
-void __init platform_monitor(void)
-{
-       /* Nothing yet .. */
-}
-
-void __init platform_reserve(void)
-{
-       /* Nothing yet .. */
-}
-
-const char *get_system_type(void)
-{
-       return "ROM/RAM";
-}
-
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to