Commit 156a0997 authored by Barry Song's avatar Barry Song Committed by Barry Song
Browse files

ARM: PRIMA2: adjust Kconfig to support select SoC features



Now we have primaII, but will include Marco and Polo in mach-prima2
as well. We add Kconfig menu so that we can select necessary SoC
features.

Signed-off-by: default avatarBarry Song <Baohua.Song@csr.com>
parent d0ec63f8
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -407,9 +407,8 @@ config ARCH_GEMINI
	help
	  Support for the Cortina Systems Gemini family SoCs

config ARCH_PRIMA2
	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
	select CPU_V7
config ARCH_SIRF
	bool "CSR SiRF"
	select NO_IOPORT
	select ARCH_REQUIRE_GPIOLIB
	select GENERIC_CLOCKEVENTS
@@ -419,9 +418,8 @@ config ARCH_PRIMA2
	select PINCTRL
	select PINCTRL_SIRF
	select USE_OF
	select ZONE_DMA
	help
          Support for CSR SiRFSoC ARM Cortex A9 Platform
	  Support for CSR SiRFprimaII/Marco/Polo platforms

config ARCH_EBSA110
	bool "EBSA-110"
@@ -1118,6 +1116,8 @@ source "arch/arm/mach-exynos/Kconfig"

source "arch/arm/mach-shmobile/Kconfig"

source "arch/arm/mach-prima2/Kconfig"

source "arch/arm/mach-tegra/Kconfig"

source "arch/arm/mach-u300/Kconfig"
+3 −4
Original line number Diff line number Diff line
CONFIG_EXPERIMENTAL=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_RELAY=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_KALLSYMS_ALL=y
@@ -8,9 +10,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_PARTITION_ADVANCED=y
CONFIG_BSD_DISKLABEL=y
CONFIG_SOLARIS_X86_PARTITION=y
CONFIG_ARCH_PRIMA2=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_ARCH_SIRF=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_KEXEC=y
@@ -36,7 +36,6 @@ CONFIG_SPI=y
CONFIG_SPI_SIRF=y
CONFIG_SPI_SPIDEV=y
# CONFIG_HWMON is not set
# CONFIG_HID_SUPPORT is not set
CONFIG_USB_GADGET=y
CONFIG_USB_FILE_STORAGE=m
CONFIG_USB_MASS_STORAGE=m
+15 −0
Original line number Diff line number Diff line
if ARCH_SIRF

menu "CSR SiRF primaII/Marco/Polo Specific Features"

config ARCH_PRIMA2
	bool "CSR SiRFSoC PRIMA2 ARM Cortex A9 Platform"
	default y
	select CPU_V7
	select ZONE_DMA
	help
          Support for CSR SiRFSoC ARM Cortex A9 Platform

endmenu

endif