diff options
author | R Sricharan <r.sricharan@ti.com> | 2012-04-03 05:24:58 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2012-07-09 09:44:40 -0400 |
commit | 35eb429875cedb6689ccd0c4d11cf219f07e0a9d (patch) | |
tree | 2bc3f893948ac7aa6ca433bbff89a6921c342f49 /arch | |
parent | 6b5de091213cc305d9db4c55819ac9e8270f68cf (diff) |
ARM: OMAP5: Add the build support
Adding the build support required for OMAP5 soc
in to omap2+ config.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: R Sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/Kconfig | 8 | ||||
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index 9854ff4279e0..5c903708974c 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
@@ -236,3 +236,4 @@ CONFIG_CRC_T10DIF=y | |||
236 | CONFIG_CRC_ITU_T=y | 236 | CONFIG_CRC_ITU_T=y |
237 | CONFIG_CRC7=y | 237 | CONFIG_CRC7=y |
238 | CONFIG_LIBCRC32C=y | 238 | CONFIG_LIBCRC32C=y |
239 | CONFIG_SOC_OMAP5=y | ||
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 6c934778357b..90d0f85afba5 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
@@ -9,7 +9,7 @@ config ARCH_OMAP2PLUS_TYPICAL | |||
9 | select REGULATOR | 9 | select REGULATOR |
10 | select PM_RUNTIME | 10 | select PM_RUNTIME |
11 | select VFP | 11 | select VFP |
12 | select NEON if ARCH_OMAP3 || ARCH_OMAP4 | 12 | select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5 |
13 | select SERIAL_OMAP | 13 | select SERIAL_OMAP |
14 | select SERIAL_OMAP_CONSOLE | 14 | select SERIAL_OMAP_CONSOLE |
15 | select I2C | 15 | select I2C |
@@ -61,6 +61,12 @@ config ARCH_OMAP4 | |||
61 | select USB_ARCH_HAS_EHCI if USB_SUPPORT | 61 | select USB_ARCH_HAS_EHCI if USB_SUPPORT |
62 | select ARM_CPU_SUSPEND if PM | 62 | select ARM_CPU_SUSPEND if PM |
63 | 63 | ||
64 | config SOC_OMAP5 | ||
65 | bool "TI OMAP5" | ||
66 | select CPU_V7 | ||
67 | select ARM_GIC | ||
68 | select HAVE_SMP | ||
69 | |||
64 | comment "OMAP Core Type" | 70 | comment "OMAP Core Type" |
65 | depends on ARCH_OMAP2 | 71 | depends on ARCH_OMAP2 |
66 | 72 | ||
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index ad95c7a5d009..dcfb506a592e 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -29,7 +29,7 @@ config ARCH_OMAP2PLUS | |||
29 | select USE_OF | 29 | select USE_OF |
30 | select PROC_DEVICETREE if PROC_FS | 30 | select PROC_DEVICETREE if PROC_FS |
31 | help | 31 | help |
32 | "Systems based on OMAP2, OMAP3 or OMAP4" | 32 | "Systems based on OMAP2, OMAP3, OMAP4 or OMAP5" |
33 | 33 | ||
34 | endchoice | 34 | endchoice |
35 | 35 | ||
@@ -150,7 +150,7 @@ config OMAP_32K_TIMER | |||
150 | This timer saves power compared to the OMAP_MPU_TIMER, and has | 150 | This timer saves power compared to the OMAP_MPU_TIMER, and has |
151 | support for no tick during idle. The 32KHz timer provides less | 151 | support for no tick during idle. The 32KHz timer provides less |
152 | intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is | 152 | intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is |
153 | currently only available for OMAP16XX, 24XX, 34XX and OMAP4. | 153 | currently only available for OMAP16XX, 24XX, 34XX and OMAP4/5. |
154 | 154 | ||
155 | config OMAP3_L2_AUX_SECURE_SAVE_RESTORE | 155 | config OMAP3_L2_AUX_SECURE_SAVE_RESTORE |
156 | bool "OMAP3 HS/EMU save and restore for L2 AUX control register" | 156 | bool "OMAP3 HS/EMU save and restore for L2 AUX control register" |