From 315806cb19f9d375dccbc2d60fa14e16afdcd5ac Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 15 Jul 2008 18:44:34 +0100 Subject: [PATCH] [MIPS] Malta: Cleanup organization of code into directories. Signed-off-by: Ralf Baechle --- arch/mips/Makefile | 5 ++-- arch/mips/mips-boards/generic/Makefile | 29 ------------------- arch/mips/mips-boards/malta/Makefile | 27 ----------------- arch/mips/mti-malta/Makefile | 21 ++++++++++++++ .../generic/amon.c => mti-malta/malta-amon.c} | 0 .../cmdline.c => mti-malta/malta-cmdline.c} | 0 .../console.c => mti-malta/malta-console.c} | 0 .../display.c => mti-malta/malta-display.c} | 0 .../generic/init.c => mti-malta/malta-init.c} | 0 .../malta_int.c => mti-malta/malta-int.c} | 0 .../gdb_hook.c => mti-malta/malta-kgdb.c} | 0 .../memory.c => mti-malta/malta-memory.c} | 0 .../malta_mtd.c => mti-malta/malta-mtd.c} | 0 .../generic/pci.c => mti-malta/malta-pci.c} | 0 .../malta-platform.c} | 0 .../reset.c => mti-malta/malta-reset.c} | 0 .../malta_setup.c => mti-malta/malta-setup.c} | 0 .../malta_smtc.c => mti-malta/malta-smtc.c} | 0 .../generic/time.c => mti-malta/malta-time.c} | 0 .../cpu-feature-overrides.h | 0 .../asm-mips/{mach-mips => mach-malta}/irq.h | 0 .../kernel-entry-init.h | 0 .../{mach-mips => mach-malta}/mach-gt64120.h | 0 .../{mach-mips => mach-malta}/mc146818rtc.h | 0 .../asm-mips/{mach-mips => mach-malta}/war.h | 0 25 files changed, 23 insertions(+), 59 deletions(-) delete mode 100644 arch/mips/mips-boards/generic/Makefile delete mode 100644 arch/mips/mips-boards/malta/Makefile create mode 100644 arch/mips/mti-malta/Makefile rename arch/mips/{mips-boards/generic/amon.c => mti-malta/malta-amon.c} (100%) rename arch/mips/{mips-boards/generic/cmdline.c => mti-malta/malta-cmdline.c} (100%) rename arch/mips/{mips-boards/generic/console.c => mti-malta/malta-console.c} (100%) rename arch/mips/{mips-boards/generic/display.c => mti-malta/malta-display.c} (100%) rename arch/mips/{mips-boards/generic/init.c => mti-malta/malta-init.c} (100%) rename arch/mips/{mips-boards/malta/malta_int.c => mti-malta/malta-int.c} (100%) rename arch/mips/{mips-boards/generic/gdb_hook.c => mti-malta/malta-kgdb.c} (100%) rename arch/mips/{mips-boards/generic/memory.c => mti-malta/malta-memory.c} (100%) rename arch/mips/{mips-boards/malta/malta_mtd.c => mti-malta/malta-mtd.c} (100%) rename arch/mips/{mips-boards/generic/pci.c => mti-malta/malta-pci.c} (100%) rename arch/mips/{mips-boards/malta/malta_platform.c => mti-malta/malta-platform.c} (100%) rename arch/mips/{mips-boards/generic/reset.c => mti-malta/malta-reset.c} (100%) rename arch/mips/{mips-boards/malta/malta_setup.c => mti-malta/malta-setup.c} (100%) rename arch/mips/{mips-boards/malta/malta_smtc.c => mti-malta/malta-smtc.c} (100%) rename arch/mips/{mips-boards/generic/time.c => mti-malta/malta-time.c} (100%) rename include/asm-mips/{mach-mips => mach-malta}/cpu-feature-overrides.h (100%) rename include/asm-mips/{mach-mips => mach-malta}/irq.h (100%) rename include/asm-mips/{mach-mips => mach-malta}/kernel-entry-init.h (100%) rename include/asm-mips/{mach-mips => mach-malta}/mach-gt64120.h (100%) rename include/asm-mips/{mach-mips => mach-malta}/mc146818rtc.h (100%) rename include/asm-mips/{mach-mips => mach-malta}/war.h (100%) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index ed8821ac8a8e..36aa690484c8 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -307,9 +307,8 @@ cflags-$(CONFIG_LEMOTE_FULONG) += -Iinclude/asm-mips/mach-lemote # # MIPS Malta board # -core-$(CONFIG_MIPS_MALTA) += arch/mips/mips-boards/generic/ \ - arch/mips/mips-boards/malta/ -cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-mips +core-$(CONFIG_MIPS_MALTA) += arch/mips/mti-malta/ +cflags-$(CONFIG_MIPS_MALTA) += -Iinclude/asm-mips/mach-malta load-$(CONFIG_MIPS_MALTA) += 0xffffffff80100000 all-$(CONFIG_MIPS_MALTA) := vmlinux.bin diff --git a/arch/mips/mips-boards/generic/Makefile b/arch/mips/mips-boards/generic/Makefile deleted file mode 100644 index f7f87fc09d1e..000000000000 --- a/arch/mips/mips-boards/generic/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -# Carsten Langgaard, carstenl@mips.com -# Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. -# -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License (Version 2) as -# published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Makefile for the MIPS boards generic routines under Linux. -# - -obj-y := reset.o display.o init.o memory.o \ - cmdline.o time.o -obj-y += amon.o - -obj-$(CONFIG_EARLY_PRINTK) += console.o -obj-$(CONFIG_PCI) += pci.o -obj-$(CONFIG_KGDB) += gdb_hook.o - -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/mips-boards/malta/Makefile b/arch/mips/mips-boards/malta/Makefile deleted file mode 100644 index db4ad654a6d3..000000000000 --- a/arch/mips/mips-boards/malta/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Carsten Langgaard, carstenl@mips.com -# Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. -# -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License (Version 2) as -# published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. -# -# Makefile for the MIPS Malta specific kernel interface routines -# under Linux. -# - -obj-y := malta_int.o malta_mtd.o malta_platform.o malta_setup.o - -# FIXME FIXME FIXME -obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o - -EXTRA_CFLAGS += -Werror diff --git a/arch/mips/mti-malta/Makefile b/arch/mips/mti-malta/Makefile new file mode 100644 index 000000000000..f8064446e812 --- /dev/null +++ b/arch/mips/mti-malta/Makefile @@ -0,0 +1,21 @@ +# +# Carsten Langgaard, carstenl@mips.com +# Copyright (C) 1999,2000 MIPS Technologies, Inc. All rights reserved. +# +# Copyright (C) 2008 Wind River Systems, Inc. +# written by Ralf Baechle +# +obj-y := malta-amon.o malta-cmdline.o \ + malta-display.o malta-init.o malta-int.o \ + malta-memory.o malta-mtd.o \ + malta-platform.o malta-reset.o \ + malta-setup.o malta-time.o + +obj-$(CONFIG_EARLY_PRINTK) += malta-console.o +obj-$(CONFIG_PCI) += malta-pci.o +obj-$(CONFIG_KGDB) += malta-kgdb.o + +# FIXME FIXME FIXME +obj-$(CONFIG_MIPS_MT_SMTC) += malta_smtc.o + +EXTRA_CFLAGS += -Werror diff --git a/arch/mips/mips-boards/generic/amon.c b/arch/mips/mti-malta/malta-amon.c similarity index 100% rename from arch/mips/mips-boards/generic/amon.c rename to arch/mips/mti-malta/malta-amon.c diff --git a/arch/mips/mips-boards/generic/cmdline.c b/arch/mips/mti-malta/malta-cmdline.c similarity index 100% rename from arch/mips/mips-boards/generic/cmdline.c rename to arch/mips/mti-malta/malta-cmdline.c diff --git a/arch/mips/mips-boards/generic/console.c b/arch/mips/mti-malta/malta-console.c similarity index 100% rename from arch/mips/mips-boards/generic/console.c rename to arch/mips/mti-malta/malta-console.c diff --git a/arch/mips/mips-boards/generic/display.c b/arch/mips/mti-malta/malta-display.c similarity index 100% rename from arch/mips/mips-boards/generic/display.c rename to arch/mips/mti-malta/malta-display.c diff --git a/arch/mips/mips-boards/generic/init.c b/arch/mips/mti-malta/malta-init.c similarity index 100% rename from arch/mips/mips-boards/generic/init.c rename to arch/mips/mti-malta/malta-init.c diff --git a/arch/mips/mips-boards/malta/malta_int.c b/arch/mips/mti-malta/malta-int.c similarity index 100% rename from arch/mips/mips-boards/malta/malta_int.c rename to arch/mips/mti-malta/malta-int.c diff --git a/arch/mips/mips-boards/generic/gdb_hook.c b/arch/mips/mti-malta/malta-kgdb.c similarity index 100% rename from arch/mips/mips-boards/generic/gdb_hook.c rename to arch/mips/mti-malta/malta-kgdb.c diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mti-malta/malta-memory.c similarity index 100% rename from arch/mips/mips-boards/generic/memory.c rename to arch/mips/mti-malta/malta-memory.c diff --git a/arch/mips/mips-boards/malta/malta_mtd.c b/arch/mips/mti-malta/malta-mtd.c similarity index 100% rename from arch/mips/mips-boards/malta/malta_mtd.c rename to arch/mips/mti-malta/malta-mtd.c diff --git a/arch/mips/mips-boards/generic/pci.c b/arch/mips/mti-malta/malta-pci.c similarity index 100% rename from arch/mips/mips-boards/generic/pci.c rename to arch/mips/mti-malta/malta-pci.c diff --git a/arch/mips/mips-boards/malta/malta_platform.c b/arch/mips/mti-malta/malta-platform.c similarity index 100% rename from arch/mips/mips-boards/malta/malta_platform.c rename to arch/mips/mti-malta/malta-platform.c diff --git a/arch/mips/mips-boards/generic/reset.c b/arch/mips/mti-malta/malta-reset.c similarity index 100% rename from arch/mips/mips-boards/generic/reset.c rename to arch/mips/mti-malta/malta-reset.c diff --git a/arch/mips/mips-boards/malta/malta_setup.c b/arch/mips/mti-malta/malta-setup.c similarity index 100% rename from arch/mips/mips-boards/malta/malta_setup.c rename to arch/mips/mti-malta/malta-setup.c diff --git a/arch/mips/mips-boards/malta/malta_smtc.c b/arch/mips/mti-malta/malta-smtc.c similarity index 100% rename from arch/mips/mips-boards/malta/malta_smtc.c rename to arch/mips/mti-malta/malta-smtc.c diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mti-malta/malta-time.c similarity index 100% rename from arch/mips/mips-boards/generic/time.c rename to arch/mips/mti-malta/malta-time.c diff --git a/include/asm-mips/mach-mips/cpu-feature-overrides.h b/include/asm-mips/mach-malta/cpu-feature-overrides.h similarity index 100% rename from include/asm-mips/mach-mips/cpu-feature-overrides.h rename to include/asm-mips/mach-malta/cpu-feature-overrides.h diff --git a/include/asm-mips/mach-mips/irq.h b/include/asm-mips/mach-malta/irq.h similarity index 100% rename from include/asm-mips/mach-mips/irq.h rename to include/asm-mips/mach-malta/irq.h diff --git a/include/asm-mips/mach-mips/kernel-entry-init.h b/include/asm-mips/mach-malta/kernel-entry-init.h similarity index 100% rename from include/asm-mips/mach-mips/kernel-entry-init.h rename to include/asm-mips/mach-malta/kernel-entry-init.h diff --git a/include/asm-mips/mach-mips/mach-gt64120.h b/include/asm-mips/mach-malta/mach-gt64120.h similarity index 100% rename from include/asm-mips/mach-mips/mach-gt64120.h rename to include/asm-mips/mach-malta/mach-gt64120.h diff --git a/include/asm-mips/mach-mips/mc146818rtc.h b/include/asm-mips/mach-malta/mc146818rtc.h similarity index 100% rename from include/asm-mips/mach-mips/mc146818rtc.h rename to include/asm-mips/mach-malta/mc146818rtc.h diff --git a/include/asm-mips/mach-mips/war.h b/include/asm-mips/mach-malta/war.h similarity index 100% rename from include/asm-mips/mach-mips/war.h rename to include/asm-mips/mach-malta/war.h