aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2010-02-15 12:27:25 -0500
committerTony Lindgren <tony@atomide.com>2010-02-15 12:27:25 -0500
commitfd17a25fe9423bbde16a326466330ad486321dfc (patch)
tree121bd649e07a38fbf96681e91066af7da5a51323 /arch/arm
parenta3a9b36e6b1c420088460af8e83ba7b83330669f (diff)
omap2/3/4: Add omap4 into omap3_defconfig
Add omap4 into omap3_defconfig. Note that this does not yet boot on omap4, but boots on omap2 and omap3. Also note that CONFIG_SMP does not currently work on uniprocessor ARMs. Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/omap3_defconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_defconfig b/arch/arm/configs/omap3_defconfig
index 2bc80d7532b9..714835e5ebec 100644
--- a/arch/arm/configs/omap3_defconfig
+++ b/arch/arm/configs/omap3_defconfig
@@ -239,7 +239,7 @@ CONFIG_ARCH_OMAP_OTG=y
239CONFIG_ARCH_OMAP2PLUS=y 239CONFIG_ARCH_OMAP2PLUS=y
240CONFIG_ARCH_OMAP2=y 240CONFIG_ARCH_OMAP2=y
241CONFIG_ARCH_OMAP3=y 241CONFIG_ARCH_OMAP3=y
242# CONFIG_ARCH_OMAP4 is not set 242CONFIG_ARCH_OMAP4=y
243 243
244# 244#
245# OMAP Feature Selections 245# OMAP Feature Selections
@@ -295,6 +295,7 @@ CONFIG_MACH_OMAP_ZOOM3=y
295CONFIG_MACH_CM_T35=y 295CONFIG_MACH_CM_T35=y
296CONFIG_MACH_IGEP0020=y 296CONFIG_MACH_IGEP0020=y
297CONFIG_MACH_OMAP_3630SDP=y 297CONFIG_MACH_OMAP_3630SDP=y
298CONFIG_MACH_OMAP_4430SDP=y
298# CONFIG_OMAP3_EMU is not set 299# CONFIG_OMAP3_EMU is not set
299# CONFIG_OMAP3_SDRC_AC_TIMING is not set 300# CONFIG_OMAP3_SDRC_AC_TIMING is not set
300 301
@@ -334,6 +335,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
334# CONFIG_ARM_ERRATA_430973 is not set 335# CONFIG_ARM_ERRATA_430973 is not set
335# CONFIG_ARM_ERRATA_458693 is not set 336# CONFIG_ARM_ERRATA_458693 is not set
336# CONFIG_ARM_ERRATA_460075 is not set 337# CONFIG_ARM_ERRATA_460075 is not set
338CONFIG_ARM_GIC=y
337CONFIG_COMMON_CLKDEV=y 339CONFIG_COMMON_CLKDEV=y
338 340
339# 341#
@@ -350,6 +352,7 @@ CONFIG_TICK_ONESHOT=y
350CONFIG_NO_HZ=y 352CONFIG_NO_HZ=y
351CONFIG_HIGH_RES_TIMERS=y 353CONFIG_HIGH_RES_TIMERS=y
352CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 354CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
355# CONFIG_SMP is not set
353CONFIG_VMSPLIT_3G=y 356CONFIG_VMSPLIT_3G=y
354# CONFIG_VMSPLIT_2G is not set 357# CONFIG_VMSPLIT_2G is not set
355# CONFIG_VMSPLIT_1G is not set 358# CONFIG_VMSPLIT_1G is not set
@@ -361,6 +364,7 @@ CONFIG_HZ=128
361# CONFIG_THUMB2_KERNEL is not set 364# CONFIG_THUMB2_KERNEL is not set
362CONFIG_AEABI=y 365CONFIG_AEABI=y
363CONFIG_OABI_COMPAT=y 366CONFIG_OABI_COMPAT=y
367CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
364# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set 368# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
365# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set 369# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
366# CONFIG_HIGHMEM is not set 370# CONFIG_HIGHMEM is not set