Skip to content

Commit a069486

Browse files
tmlindtmlind
committed
ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support
Flip on multiplatform support for omap2+. No changes to omap2plus_defconfig needed, but please note that you may need to update your custom config files to make sure you have: CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_OMAP2PLUS=y And may need CONFIG_ARCH_MULTI_V6=y if booting omap2 boards. Cc: Russell King <linux@arm.linux.org.uk> Tested-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
1 parent a62a6e9 commit a069486

File tree

6 files changed

+39
-34
lines changed

6 files changed

+39
-34
lines changed

‎arch/arm/Kconfig

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -937,17 +937,24 @@ config ARCH_DAVINCI
937937
help
938938
Support for TI's DaVinci platform.
939939

940-
config ARCH_OMAP
941-
bool "TI OMAP"
940+
config ARCH_OMAP1
941+
bool "TI OMAP1"
942942
depends on MMU
943943
select ARCH_HAS_CPUFREQ
944944
select ARCH_HAS_HOLES_MEMORYMODEL
945+
select ARCH_OMAP
945946
select ARCH_REQUIRE_GPIOLIB
947+
select CLKDEV_LOOKUP
946948
select CLKSRC_MMIO
947949
select GENERIC_CLOCKEVENTS
950+
select GENERIC_IRQ_CHIP
948951
select HAVE_CLK
952+
select HAVE_IDE
953+
select IRQ_DOMAIN
954+
select NEED_MACH_IO_H if PCCARD
955+
select NEED_MACH_MEMORY_H
949956
help
950-
Support for TI's OMAP platform (OMAP1/2/3/4).
957+
Support for older TI OMAP1 (omap7xx, omap15xx or omap16xx)
951958

952959
config ARCH_VT8500_SINGLE
953960
bool "VIA/WonderMedia 85xx"

‎arch/arm/configs/omap2plus_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y
2020
CONFIG_MODVERSIONS=y
2121
CONFIG_MODULE_SRCVERSION_ALL=y
2222
# CONFIG_BLK_DEV_BSG is not set
23-
CONFIG_ARCH_OMAP=y
23+
CONFIG_ARCH_OMAP2PLUS=y
2424
CONFIG_OMAP_RESET_CLOCKS=y
2525
CONFIG_OMAP_MUX_DEBUG=y
2626
CONFIG_ARM_THUMBEE=y

‎arch/arm/mach-omap2/Kconfig

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
config ARCH_OMAP
2+
bool
3+
4+
config ARCH_OMAP2PLUS
5+
bool "TI OMAP2/3/4/5 SoCs with device tree support" if (ARCH_MULTI_V6 || ARCH_MULTI_V7)
6+
select ARCH_HAS_CPUFREQ
7+
select ARCH_HAS_HOLES_MEMORYMODEL
8+
select ARCH_OMAP
9+
select ARCH_REQUIRE_GPIOLIB
10+
select CLKDEV_LOOKUP
11+
select CLKSRC_MMIO
12+
select GENERIC_CLOCKEVENTS
13+
select GENERIC_IRQ_CHIP
14+
select HAVE_CLK
15+
select OMAP_DM_TIMER
16+
select PINCTRL
17+
select PROC_DEVICETREE if PROC_FS
18+
select SPARSE_IRQ
19+
select USE_OF
20+
help
21+
Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
22+
23+
124
if ARCH_OMAP2PLUS
225

326
menu "TI OMAP2/3/4 Specific Features"

‎arch/arm/mach-omap2/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# Makefile for the linux kernel.
33
#
44

5+
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
6+
-I$(srctree)/arch/arm/plat-omap/include
7+
58
# Common support
69
obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
710
common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

‎arch/arm/plat-omap/Kconfig

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,6 @@ menu "TI OMAP Common Features"
55
config ARCH_OMAP_OTG
66
bool
77

8-
choice
9-
prompt "OMAP System Type"
10-
default ARCH_OMAP2PLUS
11-
12-
config ARCH_OMAP1
13-
bool "TI OMAP1"
14-
select CLKDEV_LOOKUP
15-
select CLKSRC_MMIO
16-
select GENERIC_IRQ_CHIP
17-
select HAVE_IDE
18-
select IRQ_DOMAIN
19-
select NEED_MACH_IO_H if PCCARD
20-
select NEED_MACH_MEMORY_H
21-
help
22-
"Systems based on omap7xx, omap15xx or omap16xx"
23-
24-
config ARCH_OMAP2PLUS
25-
bool "TI OMAP2/3/4"
26-
select CLKDEV_LOOKUP
27-
select GENERIC_IRQ_CHIP
28-
select OMAP_DM_TIMER
29-
select PINCTRL
30-
select PROC_DEVICETREE if PROC_FS
31-
select SPARSE_IRQ
32-
select USE_OF
33-
help
34-
"Systems based on OMAP2, OMAP3, OMAP4 or OMAP5"
35-
36-
endchoice
37-
388
comment "OMAP Feature Selections"
399

4010
config OMAP_DEBUG_DEVICES

‎arch/arm/plat-omap/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# Makefile for the linux kernel.
33
#
44

5+
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include
6+
57
# Common support
68
obj-y := sram.o dma.o counter_32k.o
79
obj-m :=

0 commit comments

Comments
 (0)