Commit c5dece37 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary 



I got a build error today that made me realize that it is not
possible to build a kernel for a SiRF platform without enabling
CONFIG_PRIMA2, since a lot of common code depends on CONFIG_PRIMA2.

This fixes all occurences that appear like common SiRF code.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Acked-by: default avatarMark Brown <broonie@linaro.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarBarry Song <Baohua.Song@csr.com>
Acked-by: default avatarMike Turquette <mturquette@linaro.org>
parent 9682bcde

arch/arm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ machine-$(CONFIG_ARCH_OMAP1) += omap1 
machine-$(CONFIG_ARCH_OMAP2PLUS)	+= omap2

machine-$(CONFIG_ARCH_ORION5X)		+= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	+= picoxcell

machine-$(CONFIG_ARCH_PRIMA2)		+= prima2

machine-$(CONFIG_ARCH_SIRF)		+= prima2

machine-$(CONFIG_ARCH_PXA)		+= pxa

machine-$(CONFIG_ARCH_REALVIEW)		+= realview

machine-$(CONFIG_ARCH_RPC)		+= rpc

drivers/clk/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/ 
obj-$(CONFIG_PLAT_SPEAR)	+= spear/

obj-$(CONFIG_ARCH_U300)		+= clk-u300.o

obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/

obj-$(CONFIG_ARCH_PRIMA2)	+= clk-prima2.o

obj-$(CONFIG_ARCH_SIRF)		+= clk-prima2.o

obj-$(CONFIG_PLAT_ORION)	+= mvebu/

ifeq ($(CONFIG_COMMON_CLK), y)

obj-$(CONFIG_ARCH_MMP)		+= mmp/

drivers/i2c/busses/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ config I2C_SIMTEC 


config I2C_SIRF

	tristate "CSR SiRFprimaII I2C interface"

	depends on ARCH_PRIMA2

	depends on ARCH_SIRF

	help

	  If you say yes to this option, support will be included for the

	  CSR SiRFprimaII I2C interface.

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ config SPI_SH_HSPI 


config SPI_SIRF

	tristate "CSR SiRFprimaII SPI controller"

	depends on ARCH_PRIMA2

	depends on ARCH_SIRF

	select SPI_BITBANG

	help

	  SPI driver for CSR SiRFprimaII SoCs

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ config SERIAL_SAMSUNG_CONSOLE 


config SERIAL_SIRFSOC

        tristate "SiRF SoC Platform Serial port support"

        depends on ARCH_PRIMA2

        depends on ARCH_SIRF

        select SERIAL_CORE

        help

          Support for the on-chip UART on the CSR SiRFprimaII series,

CRA Git | Maintained and supported by SUSTech CRA and CCSE