Commit b288f75f authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[PATCH] ARM: 2798/1: OMAP update 2/11: Change ARM Kconfig to support omap1 and omap2 



Patch from Tony Lindgren

This patch by Paul Mundt and other OMAP developers modifies
ARM specific Kconfig to allow sharing code between OMAP1 and
OMAP2 architectures.
In order to share code between OMAP1 and OMAP2, all OMAP1
specific code is moved into mach-omap1 directory in the
following patch. A new mach-omap2 directory will be added
later on.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent af973d2a

arch/arm/mach-omap/Kconfig

+8 −130
Original line number Diff line number Diff line
@@ -2,102 +2,23 @@ if ARCH_OMAP 


menu "TI OMAP Implementations"



comment "OMAP Core Type"



config ARCH_OMAP730

	depends on ARCH_OMAP

	bool "OMAP730 Based System"

	select ARCH_OMAP_OTG



config ARCH_OMAP1510

	depends on ARCH_OMAP

	default y

	bool "OMAP1510 Based System"



config ARCH_OMAP16XX

	depends on ARCH_OMAP

	bool "OMAP16XX Based System"

	select ARCH_OMAP_OTG



config ARCH_OMAP_OTG

	bool



comment "OMAP Board Type"



config MACH_OMAP_INNOVATOR

	bool "TI Innovator"

	depends on ARCH_OMAP1510 || ARCH_OMAP16XX

	help

          TI OMAP 1510 or 1610 Innovator board support. Say Y here if you

          have such a board.



config MACH_OMAP_H2

	bool "TI H2 Support"

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 1610/1611B H2 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_H3

	bool "TI H3 Support"

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 1710 H3 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_H4

	bool "TI H4 Support"

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 1610 H4 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_OSK

	bool "TI OSK Support"

	depends on ARCH_OMAP16XX

    	help

	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here

          if you have such a board.



config MACH_OMAP_PERSEUS2

	bool "TI Perseus2"

	depends on ARCH_OMAP730

    	help

	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such

	  a board.

choice

	prompt "OMAP System Type"

	default ARCH_OMAP1



config MACH_VOICEBLUE

	bool "Voiceblue"

	depends on ARCH_OMAP1510

	help

	  Support for Voiceblue GSM/VoIP gateway. Say Y here if you have such

	  board.

config ARCH_OMAP1

	bool "TI OMAP1"



config MACH_NETSTAR

	bool "NetStar"

	depends on ARCH_OMAP1510

	help

	  Support for NetStar PBX. Say Y here if you have such a board.

config ARCH_OMAP2

	bool "TI OMAP2"



config MACH_OMAP_GENERIC

	bool "Generic OMAP board"

	depends on ARCH_OMAP1510 || ARCH_OMAP16XX

	help

          Support for generic OMAP-1510, 1610 or 1710 board with

          no FPGA. Can be used as template for porting Linux to

          custom OMAP boards. Say Y here if you have a custom

          board.

endchoice



comment "OMAP Feature Selections"



#config OMAP_BOOT_TAG

#	bool "OMAP bootloader information passing"

#        depends on ARCH_OMAP

#        default n

#        help

#          Say Y, if you have a bootloader which passes information

#          about your board and its peripheral configuration.



config OMAP_MUX

	bool "OMAP multiplexing support"

        depends on ARCH_OMAP
@@ -173,49 +94,6 @@ config OMAP_LL_DEBUG_UART3 


endchoice



config OMAP_ARM_195MHZ

	bool "OMAP ARM 195 MHz CPU"

	depends on ARCH_OMAP730

	help

          Enable 195MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_192MHZ

	bool "OMAP ARM 192 MHz CPU"

	depends on ARCH_OMAP16XX

	help

          Enable 192MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_182MHZ

	bool "OMAP ARM 182 MHz CPU"

	depends on ARCH_OMAP730

	help

          Enable 182MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_168MHZ

	bool "OMAP ARM 168 MHz CPU"

	depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730

	help

          Enable 168MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_120MHZ

	bool "OMAP ARM 120 MHz CPU"

	depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730

	help

          Enable 120MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_60MHZ

	bool "OMAP ARM 60 MHz CPU"

	depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730

        default y

	help

          Enable 60MHz clock for OMAP CPU. If unsure, say Y.



config OMAP_ARM_30MHZ

	bool "OMAP ARM 30 MHz CPU"

	depends on ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730

	help

          Enable 30MHz clock for OMAP CPU. If unsure, say N.



endmenu



endif

arch/arm/mach-omap/Makefile

+1 −25
Original line number Diff line number Diff line
@@ -3,38 +3,14 @@ 
#



# Common support

obj-y := common.o time.o irq.o dma.o clock.o mux.o gpio.o mcbsp.o usb.o

obj-y := common.o dma.o clock.o mux.o gpio.o mcbsp.o usb.o

obj-m :=

obj-n :=

obj-  :=

led-y := leds.o



# Specific board support

obj-$(CONFIG_MACH_OMAP_H2) += board-h2.o

obj-$(CONFIG_MACH_OMAP_INNOVATOR) += board-innovator.o

obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2) += board-perseus2.o

obj-$(CONFIG_MACH_OMAP_OSK) += board-osk.o

obj-$(CONFIG_MACH_OMAP_H3) += board-h3.o

obj-$(CONFIG_MACH_VOICEBLUE) += board-voiceblue.o

obj-$(CONFIG_MACH_NETSTAR) += board-netstar.o



# OCPI interconnect support for 1710, 1610 and 5912

obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o



# LEDs support

led-$(CONFIG_MACH_OMAP_H2) += leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_INNOVATOR) += leds-innovator.o

led-$(CONFIG_MACH_OMAP_PERSEUS2) += leds-h2p2-debug.o

obj-$(CONFIG_LEDS) += $(led-y)



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o

ifeq ($(CONFIG_ARCH_OMAP1510),y)

# Innovator-1510 FPGA

obj-$(CONFIG_MACH_OMAP_INNOVATOR) += fpga.o

endif



# kgdb support

obj-$(CONFIG_KGDB_SERIAL)	+= kgdb-serial.o

arch/arm/mach-omap1/Kconfig

0 → 100644
+144 −0
Original line number Diff line number Diff line 
comment "OMAP Core Type"

	depends on ARCH_OMAP1



config ARCH_OMAP730

	depends on ARCH_OMAP1

	bool "OMAP730 Based System"

	select ARCH_OMAP_OTG



config ARCH_OMAP1510

	depends on ARCH_OMAP1

	default y

	bool "OMAP1510 Based System"



config ARCH_OMAP16XX

	depends on ARCH_OMAP1

	bool "OMAP16xx Based System"

	select ARCH_OMAP_OTG



comment "OMAP Board Type"

	depends on ARCH_OMAP1



config MACH_OMAP_INNOVATOR

	bool "TI Innovator"

	depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX)

	help

          TI OMAP 1510 or 1610 Innovator board support. Say Y here if you

          have such a board.



config MACH_OMAP_H2

	bool "TI H2 Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

    	help

	  TI OMAP 1610/1611B H2 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_H3

	bool "TI H3 Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

    	help

	  TI OMAP 1710 H3 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_OSK

	bool "TI OSK Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

    	help

	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here

          if you have such a board.



config MACH_OMAP_PERSEUS2

	bool "TI Perseus2"

	depends on ARCH_OMAP1 && ARCH_OMAP730

    	help

	  Support for TI OMAP 730 Perseus2 board. Say Y here if you have such

	  a board.



config MACH_VOICEBLUE

	bool "Voiceblue"

	depends on ARCH_OMAP1 && ARCH_OMAP1510

	help

	  Support for Voiceblue GSM/VoIP gateway. Say Y here if you have

	  such a board.



config MACH_NETSTAR

	bool "NetStar"

	depends on ARCH_OMAP1 && ARCH_OMAP1510

	help

	  Support for NetStar PBX. Say Y here if you have such a board.



config MACH_OMAP_GENERIC

	bool "Generic OMAP board"

	depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX)

	help

          Support for generic OMAP-1510, 1610 or 1710 board with

          no FPGA. Can be used as template for porting Linux to

          custom OMAP boards. Say Y here if you have a custom

          board.



comment "OMAP CPU Speed"

	depends on ARCH_OMAP1



config OMAP_CLOCKS_SET_BY_BOOTLOADER

	bool "OMAP clocks set by bootloader"

	depends on ARCH_OMAP1

	help

	  Enable this option to prevent the kernel from overriding the clock

	  frequencies programmed by bootloader for MPU, DSP, MMUs, TC,

	  internal LCD controller and MPU peripherals.



config OMAP_ARM_216MHZ

	bool "OMAP ARM 216 MHz CPU (1710 only)"

        depends on ARCH_OMAP1 && ARCH_OMAP16XX

        help

          Enable 216 MHz clock for OMAP1710 CPU. If unsure, say N.



config OMAP_ARM_195MHZ

	bool "OMAP ARM 195 MHz CPU"

	depends on ARCH_OMAP1 && ARCH_OMAP730

	help

          Enable 195MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_192MHZ

	bool "OMAP ARM 192 MHz CPU"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	help

          Enable 192MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_182MHZ

	bool "OMAP ARM 182 MHz CPU"

	depends on ARCH_OMAP1 && ARCH_OMAP730

	help

          Enable 182MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_168MHZ

	bool "OMAP ARM 168 MHz CPU"

	depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)

	help

          Enable 168MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_150MHZ

	bool "OMAP ARM 150 MHz CPU"

	depends on ARCH_OMAP1 && ARCH_OMAP1510

	help

	  Enable 150MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_120MHZ

	bool "OMAP ARM 120 MHz CPU"

	depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)

	help

          Enable 120MHz clock for OMAP CPU. If unsure, say N.



config OMAP_ARM_60MHZ

	bool "OMAP ARM 60 MHz CPU"

	depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)

        default y

	help

          Enable 60MHz clock for OMAP CPU. If unsure, say Y.



config OMAP_ARM_30MHZ

	bool "OMAP ARM 30 MHz CPU"

	depends on ARCH_OMAP1 && (ARCH_OMAP1510 || ARCH_OMAP16XX || ARCH_OMAP730)

	help

          Enable 30MHz clock for OMAP CPU. If unsure, say N.

arch/arm/mach-omap1/Makefile

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

# Makefile for the linux kernel.

#



# Common support

obj-y := io.o id.o irq.o time.o serial.o

led-y := leds.o



# Specific board support

obj-$(CONFIG_MACH_OMAP_H2)		+= board-h2.o

obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= board-innovator.o

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_PERSEUS2)	+= board-perseus2.o

obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o

obj-$(CONFIG_MACH_VOICEBLUE)		+= board-voiceblue.o

obj-$(CONFIG_MACH_NETSTAR)		+= board-netstar.o



ifeq ($(CONFIG_ARCH_OMAP1510),y)

# Innovator-1510 FPGA

obj-$(CONFIG_MACH_OMAP_INNOVATOR)	+= fpga.o

endif



# LEDs support

led-$(CONFIG_MACH_OMAP_H2)		+= leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_INNOVATOR)	+= leds-innovator.o

led-$(CONFIG_MACH_OMAP_PERSEUS2)	+= leds-h2p2-debug.o

led-$(CONFIG_MACH_OMAP_OSK)		+= leds-osk.o

obj-$(CONFIG_LEDS)			+= $(led-y)

arch/arm/mach-omap/Makefile.boot→arch/arm/mach-omap1/Makefile.boot

+0 −1
Original line number Diff line number Diff line 
   zreladdr-y		:= 0x10008000

params_phys-y		:= 0x10000100

initrd_phys-y		:= 0x10800000

CRA Git | Maintained and supported by SUSTech CRA and CCSE