Commit f70a899e authored by Anderson Lizardo's avatar Anderson Lizardo Committed by Tony Lindgren

[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
parent 6aeec2b7
...@@ -96,7 +96,7 @@ CONFIG_ARCH_OMAP=y ...@@ -96,7 +96,7 @@ CONFIG_ARCH_OMAP=y
# #
# TI OMAP Implementations # TI OMAP Implementations
# #
CONFIG_ARCH_OMAP1510=y CONFIG_ARCH_OMAP15XX=y
# CONFIG_ARCH_OMAP1610 is not set # CONFIG_ARCH_OMAP1610 is not set
# CONFIG_OMAP_INNOVATOR is not set # CONFIG_OMAP_INNOVATOR is not set
CONFIG_MACH_OMAP_GENERIC=y CONFIG_MACH_OMAP_GENERIC=y
......
...@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y ...@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP16XX=y
CONFIG_ARCH_OMAP_OTG=y CONFIG_ARCH_OMAP_OTG=y
......
...@@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y ...@@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP16XX=y
CONFIG_ARCH_OMAP_OTG=y CONFIG_ARCH_OMAP_OTG=y
......
...@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y ...@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP16XX=y
CONFIG_ARCH_OMAP_OTG=y CONFIG_ARCH_OMAP_OTG=y
......
...@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y ...@@ -85,7 +85,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP16XX=y
CONFIG_ARCH_OMAP_OTG=y CONFIG_ARCH_OMAP_OTG=y
......
...@@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y ...@@ -80,7 +80,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
CONFIG_ARCH_OMAP1510=y CONFIG_ARCH_OMAP15XX=y
# CONFIG_ARCH_OMAP1610 is not set # CONFIG_ARCH_OMAP1610 is not set
# CONFIG_ARCH_OMAP1710 is not set # CONFIG_ARCH_OMAP1710 is not set
# CONFIG_ARCH_OMAP5912 is not set # CONFIG_ARCH_OMAP5912 is not set
......
...@@ -84,7 +84,7 @@ CONFIG_ARCH_OMAP=y ...@@ -84,7 +84,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP16XX=y
CONFIG_ARCH_OMAP_OTG=y CONFIG_ARCH_OMAP_OTG=y
......
...@@ -95,7 +95,7 @@ CONFIG_ARCH_OMAP1=y ...@@ -95,7 +95,7 @@ CONFIG_ARCH_OMAP1=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
CONFIG_ARCH_OMAP16XX=y CONFIG_ARCH_OMAP16XX=y
# #
......
...@@ -88,7 +88,7 @@ CONFIG_ARCH_OMAP=y ...@@ -88,7 +88,7 @@ CONFIG_ARCH_OMAP=y
# OMAP Core Type # OMAP Core Type
# #
CONFIG_ARCH_OMAP730=y CONFIG_ARCH_OMAP730=y
# CONFIG_ARCH_OMAP1510 is not set # CONFIG_ARCH_OMAP15XX is not set
# CONFIG_ARCH_OMAP16XX is not set # CONFIG_ARCH_OMAP16XX is not set
CONFIG_ARCH_OMAP_OTG=y CONFIG_ARCH_OMAP_OTG=y
......
...@@ -103,7 +103,7 @@ CONFIG_OMAP_SERIAL_WAKE=y ...@@ -103,7 +103,7 @@ CONFIG_OMAP_SERIAL_WAKE=y
# OMAP Core Type # OMAP Core Type
# #
# CONFIG_ARCH_OMAP730 is not set # CONFIG_ARCH_OMAP730 is not set
CONFIG_ARCH_OMAP1510=y CONFIG_ARCH_OMAP15XX=y
# CONFIG_ARCH_OMAP16XX is not set # CONFIG_ARCH_OMAP16XX is not set
# #
......
...@@ -77,7 +77,7 @@ config MACH_NETSTAR ...@@ -77,7 +77,7 @@ config MACH_NETSTAR
config MACH_OMAP_PALMTE config MACH_OMAP_PALMTE
bool "Palm Tungsten E" bool "Palm Tungsten E"
depends on ARCH_OMAP1 && ARCH_OMAP1510 depends on ARCH_OMAP1 && ARCH_OMAP15XX
help help
Support for the Palm Tungsten E PDA. Currently only the LCD panel Support for the Palm Tungsten E PDA. Currently only the LCD panel
is supported. To boot the kernel, you'll need a PalmOS compatible is supported. To boot the kernel, you'll need a PalmOS compatible
......
...@@ -227,7 +227,7 @@ unsigned long long sched_clock(void) ...@@ -227,7 +227,7 @@ unsigned long long sched_clock(void)
#ifdef CONFIG_OMAP_32K_TIMER #ifdef CONFIG_OMAP_32K_TIMER
#ifdef CONFIG_ARCH_OMAP15XX #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 #endif
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment