From 70de6562572072848d19d3056998e627c17ae6a2 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 7 Jul 2005 07:35:17 -0700 Subject: [PATCH] ARM: OMAP: Make kernel boot after moving the directories Make kernel boot after moving the directories --- arch/arm/Kconfig | 4 ++- arch/arm/Makefile | 6 ++++- arch/arm/mach-omap1/Kconfig | 2 +- arch/arm/mach-omap1/board-generic.c | 3 +-- arch/arm/mach-omap1/board-h2.c | 3 +-- arch/arm/mach-omap1/board-h3.c | 3 +-- arch/arm/mach-omap1/board-innovator.c | 3 +-- arch/arm/mach-omap1/board-netstar.c | 3 +-- arch/arm/mach-omap1/board-osk.c | 4 +-- arch/arm/mach-omap1/board-perseus2.c | 3 +-- arch/arm/mach-omap1/board-voiceblue.c | 3 +-- arch/arm/mach-omap1/io.c | 2 -- arch/arm/plat-omap/Kconfig | 2 -- arch/arm/plat-omap/Makefile | 3 --- arch/arm/plat-omap/common.h | 36 --------------------------- 15 files changed, 17 insertions(+), 63 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c8a5f095b15..cc134d2b835 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -223,7 +223,9 @@ source "arch/arm/mach-pxa/Kconfig" source "arch/arm/mach-sa1100/Kconfig" -source "arch/arm/mach-omap/Kconfig" +source "arch/arm/plat-omap/Kconfig" + +source "arch/arm/mach-omap1/Kconfig" source "arch/arm/mach-s3c2410/Kconfig" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 8330495e244..b1a566e40e6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -91,7 +91,8 @@ textaddr-$(CONFIG_ARCH_FORTUNET) := 0xc0008000 machine-$(CONFIG_ARCH_IOP3XX) := iop3xx machine-$(CONFIG_ARCH_IXP4XX) := ixp4xx machine-$(CONFIG_ARCH_IXP2000) := ixp2000 - machine-$(CONFIG_ARCH_OMAP) := omap + machine-$(CONFIG_ARCH_OMAP1) := omap1 + incdir-$(CONFIG_ARCH_OMAP) := omap machine-$(CONFIG_ARCH_S3C2410) := s3c2410 machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_VERSATILE) := versatile @@ -142,6 +143,9 @@ core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ core-$(CONFIG_FPE_FASTFPE) += $(FASTFPE_OBJ) core-$(CONFIG_VFP) += arch/arm/vfp/ +# If we have a common platform directory, then include it in the build. +core-$(CONFIG_ARCH_OMAP) += arch/arm/plat-omap/ + drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/ drivers-$(CONFIG_ARCH_L7200) += drivers/acorn/char/ diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 478e0d6a51d..e09dba6cbd3 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -142,5 +142,5 @@ config OMAP_ARM_30MHZ help Enable 30MHz clock for OMAP CPU. If unsure, say N. -source "arch/arm/mach-omap/dsp/Kconfig" +source "arch/arm/plat-omap/dsp/Kconfig" diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c index 61178f69b7a..5d3370b121b 100644 --- a/arch/arm/mach-omap1/board-generic.c +++ b/arch/arm/mach-omap1/board-generic.c @@ -26,8 +26,7 @@ #include #include #include - -#include "../common.h" +#include static int __initdata generic_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1}; diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index ad05605f7f7..4818db551aa 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c @@ -36,8 +36,7 @@ #include #include #include - -#include "../common.h" +#include extern int omap_gpio_init(void); diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 34cbd421995..4c9a13490ef 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c @@ -37,8 +37,7 @@ #include #include #include - -#include "../common.h" +#include extern int omap_gpio_init(void); diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c index 535836c5d3f..309a147db50 100644 --- a/arch/arm/mach-omap1/board-innovator.c +++ b/arch/arm/mach-omap1/board-innovator.c @@ -34,8 +34,7 @@ #include #include #include - -#include "../common.h" +#include static int __initdata innovator_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1}; diff --git a/arch/arm/mach-omap1/board-netstar.c b/arch/arm/mach-omap1/board-netstar.c index f315ef6ef36..ab9410f976f 100644 --- a/arch/arm/mach-omap1/board-netstar.c +++ b/arch/arm/mach-omap1/board-netstar.c @@ -26,8 +26,7 @@ #include #include #include - -#include "common.h" +#include extern void __init omap_init_time(void); extern int omap_gpio_init(void); diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c index 7186cb11965..722ff95c041 100644 --- a/arch/arm/mach-omap1/board-osk.c +++ b/arch/arm/mach-omap1/board-osk.c @@ -42,9 +42,7 @@ #include #include #include - -#include "../common.h" - +#include static int __initdata osk_serial_ports[OMAP_MAX_NR_PORTS] = {1, 0, 0}; diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c index f5200e007f9..f97bb41140f 100644 --- a/arch/arm/mach-omap1/board-perseus2.c +++ b/arch/arm/mach-omap1/board-perseus2.c @@ -27,8 +27,7 @@ #include #include #include - -#include "../common.h" +#include static struct resource smc91x_resources[] = { [0] = { diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index 1cff4a415cd..ffe4fa1e857 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -32,8 +32,7 @@ #include #include #include - -#include "../common.h" +#include extern void omap_init_time(void); extern int omap_gpio_init(void); diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 8b60563b31c..8d3601467b9 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -17,8 +17,6 @@ #include #include -#include "../clock.h" - extern void omap_check_revision(void); extern void omap_sram_init(void); diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 8a8b043e04d..ddbba1c0a1b 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -17,8 +17,6 @@ config ARCH_OMAP2 endchoice -source "arch/arm/mach-omap/omap1/Kconfig" - comment "OMAP Feature Selections" config OMAP_RESET_CLOCKS diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index d3900309a72..092e7405e47 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -8,9 +8,6 @@ obj-m := obj-n := obj- := -# OMAP System type support -obj-$(CONFIG_ARCH_OMAP1) += omap1/ - # OCPI interconnect support for 1710, 1610 and 5912 obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o diff --git a/arch/arm/plat-omap/common.h b/arch/arm/plat-omap/common.h index bb257344f52..e69de29bb2d 100644 --- a/arch/arm/plat-omap/common.h +++ b/arch/arm/plat-omap/common.h @@ -1,36 +0,0 @@ -/* - * linux/arch/arm/mach-omap/common.h - * - * Header for code common to all OMAP machines. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN - * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * 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., - * 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H -#define __ARCH_ARM_MACH_OMAP_COMMON_H - -struct sys_timer; - -extern void omap_map_common_io(void); -extern struct sys_timer omap_timer; -extern void omap_serial_init(int ports[]); - -#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */ -- 2.41.1