From f70a899eb9c4ef4b63bb0bf66e1dd4724710928d Mon Sep 17 00:00:00 2001 From: Anderson Lizardo Date: Mon, 3 Oct 2005 16:38:57 +0300 Subject: [PATCH] [PATCH] ARM: OMAP: Replace last occurrences of ARCH_OMAP1510 with ARCH_OMAP15XX The attached patch fixes a problem noticed when compiling the kernel for the OSK 5912 board using default config: make omap_osk_5912_defconfig make uImage --- arch/arm/configs/omap_generic_1510_defconfig | 2 +- arch/arm/configs/omap_generic_1610_defconfig | 2 +- arch/arm/configs/omap_generic_1710_defconfig | 2 +- arch/arm/configs/omap_h2_1610_defconfig | 2 +- arch/arm/configs/omap_h3_1710_defconfig | 2 +- arch/arm/configs/omap_innovator_1510_defconfig | 2 +- arch/arm/configs/omap_innovator_1610_defconfig | 2 +- arch/arm/configs/omap_osk_5912_defconfig | 2 +- arch/arm/configs/omap_perseus2_730_defconfig | 2 +- arch/arm/configs/palmte_defconfig | 2 +- arch/arm/mach-omap1/Kconfig | 2 +- arch/arm/mach-omap1/time.c | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm/configs/omap_generic_1510_defconfig b/arch/arm/configs/omap_generic_1510_defconfig index 5d0fd228edb..5091946f1a3 100644 --- a/arch/arm/configs/omap_generic_1510_defconfig +++ b/arch/arm/configs/omap_generic_1510_defconfig @@ -96,7 +96,7 @@ CONFIG_ARCH_OMAP=y # # TI OMAP Implementations # -CONFIG_ARCH_OMAP1510=y +CONFIG_ARCH_OMAP15XX=y # CONFIG_ARCH_OMAP1610 is not set # CONFIG_OMAP_INNOVATOR is not set CONFIG_MACH_OMAP_GENERIC=y diff --git a/arch/arm/configs/omap_generic_1610_defconfig b/arch/arm/configs/omap_generic_1610_defconfig index 97400c20109..b772e7ed441 100644 --- a/arch/arm/configs/omap_generic_1610_defconfig +++ b/arch/arm/configs/omap_generic_1610_defconfig @@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP_OTG=y diff --git a/arch/arm/configs/omap_generic_1710_defconfig b/arch/arm/configs/omap_generic_1710_defconfig index 834eb06ce92..579cff1b056 100644 --- a/arch/arm/configs/omap_generic_1710_defconfig +++ b/arch/arm/configs/omap_generic_1710_defconfig @@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP_OTG=y diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig index d7406db4389..8cb032e02a2 100644 --- a/arch/arm/configs/omap_h2_1610_defconfig +++ b/arch/arm/configs/omap_h2_1610_defconfig @@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP_OTG=y diff --git a/arch/arm/configs/omap_h3_1710_defconfig b/arch/arm/configs/omap_h3_1710_defconfig index f63dad46912..b5560178743 100644 --- a/arch/arm/configs/omap_h3_1710_defconfig +++ b/arch/arm/configs/omap_h3_1710_defconfig @@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP_OTG=y diff --git a/arch/arm/configs/omap_innovator_1510_defconfig b/arch/arm/configs/omap_innovator_1510_defconfig index ed3a7f6bb28..fc5850b3215 100644 --- a/arch/arm/configs/omap_innovator_1510_defconfig +++ b/arch/arm/configs/omap_innovator_1510_defconfig @@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -CONFIG_ARCH_OMAP1510=y +CONFIG_ARCH_OMAP15XX=y # CONFIG_ARCH_OMAP1610 is not set # CONFIG_ARCH_OMAP1710 is not set # CONFIG_ARCH_OMAP5912 is not set diff --git a/arch/arm/configs/omap_innovator_1610_defconfig b/arch/arm/configs/omap_innovator_1610_defconfig index cd4ab86ca46..460c7a18d5a 100644 --- a/arch/arm/configs/omap_innovator_1610_defconfig +++ b/arch/arm/configs/omap_innovator_1610_defconfig @@ -84,7 +84,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP_OTG=y diff --git a/arch/arm/configs/omap_osk_5912_defconfig b/arch/arm/configs/omap_osk_5912_defconfig index 82cd3f8aed2..dae95ee1c50 100644 --- a/arch/arm/configs/omap_osk_5912_defconfig +++ b/arch/arm/configs/omap_osk_5912_defconfig @@ -95,7 +95,7 @@ CONFIG_ARCH_OMAP1=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set CONFIG_ARCH_OMAP16XX=y # diff --git a/arch/arm/configs/omap_perseus2_730_defconfig b/arch/arm/configs/omap_perseus2_730_defconfig index 075d23b6b03..f61fae6218b 100644 --- a/arch/arm/configs/omap_perseus2_730_defconfig +++ b/arch/arm/configs/omap_perseus2_730_defconfig @@ -88,7 +88,7 @@ CONFIG_ARCH_OMAP=y # OMAP Core Type # CONFIG_ARCH_OMAP730=y -# CONFIG_ARCH_OMAP1510 is not set +# CONFIG_ARCH_OMAP15XX is not set # CONFIG_ARCH_OMAP16XX is not set CONFIG_ARCH_OMAP_OTG=y diff --git a/arch/arm/configs/palmte_defconfig b/arch/arm/configs/palmte_defconfig index 781886dee4a..26a8999e366 100644 --- a/arch/arm/configs/palmte_defconfig +++ b/arch/arm/configs/palmte_defconfig @@ -103,7 +103,7 @@ CONFIG_OMAP_SERIAL_WAKE=y # OMAP Core Type # # CONFIG_ARCH_OMAP730 is not set -CONFIG_ARCH_OMAP1510=y +CONFIG_ARCH_OMAP15XX=y # CONFIG_ARCH_OMAP16XX is not set # diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index b7814bab653..a8d2d9aec30 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -77,7 +77,7 @@ config MACH_NETSTAR config MACH_OMAP_PALMTE bool "Palm Tungsten E" - depends on ARCH_OMAP1 && ARCH_OMAP1510 + depends on ARCH_OMAP1 && ARCH_OMAP15XX help Support for the Palm Tungsten E PDA. Currently only the LCD panel is supported. To boot the kernel, you'll need a PalmOS compatible diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 5b969a19436..cdbf4d7620c 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -227,7 +227,7 @@ unsigned long long sched_clock(void) #ifdef CONFIG_OMAP_32K_TIMER #ifdef CONFIG_ARCH_OMAP15XX -#error OMAP 32KHz timer does not currently work on 1510! +#error OMAP 32KHz timer does not currently work on 15XX! #endif /* -- 2.41.1