redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: Arnd Bergmann <arnd@arndb.de>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Acked-by: Mark Brown <broonie@linaro.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Barry Song <Baohua.Song@csr.com>
Acked-by: Mike Turquette <mturquette@linaro.org>
hifive-unleashed-5.1
Arnd Bergmann 2013-06-10 18:07:14 +02:00
parent 9682bcdef1
commit c5dece37c5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Makefile
View File

@ -168,7 +168,7 @@ machine-$(CONFIG_ARCH_OMAP1) += omap1
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
machine-$(CONFIG_ARCH_ORION5X) += orion5x machine-$(CONFIG_ARCH_ORION5X) += orion5x
machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell
machine-$(CONFIG_ARCH_PRIMA2) += prima2 machine-$(CONFIG_ARCH_SIRF) += prima2
machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_PXA) += pxa
machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_REALVIEW) += realview
machine-$(CONFIG_ARCH_RPC) += rpc machine-$(CONFIG_ARCH_RPC) += rpc

2
drivers/clk/Makefile
View File

@ -18,7 +18,7 @@ obj-$(CONFIG_ARCH_SOCFPGA) += socfpga/
obj-$(CONFIG_PLAT_SPEAR) += spear/ obj-$(CONFIG_PLAT_SPEAR) += spear/
obj-$(CONFIG_ARCH_U300) += clk-u300.o obj-$(CONFIG_ARCH_U300) += clk-u300.o
obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ 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/ obj-$(CONFIG_PLAT_ORION) += mvebu/
ifeq ($(CONFIG_COMMON_CLK), y) ifeq ($(CONFIG_COMMON_CLK), y)
obj-$(CONFIG_ARCH_MMP) += mmp/ obj-$(CONFIG_ARCH_MMP) += mmp/

2
drivers/i2c/busses/Kconfig
View File

@ -685,7 +685,7 @@ config I2C_SIMTEC
config I2C_SIRF config I2C_SIRF
tristate "CSR SiRFprimaII I2C interface" tristate "CSR SiRFprimaII I2C interface"
depends on ARCH_PRIMA2 depends on ARCH_SIRF
help help
If you say yes to this option, support will be included for the If you say yes to this option, support will be included for the
CSR SiRFprimaII I2C interface. CSR SiRFprimaII I2C interface.

2
drivers/spi/Kconfig
View File

@ -404,7 +404,7 @@ config SPI_SH_HSPI
config SPI_SIRF config SPI_SIRF
tristate "CSR SiRFprimaII SPI controller" tristate "CSR SiRFprimaII SPI controller"
depends on ARCH_PRIMA2 depends on ARCH_SIRF
select SPI_BITBANG select SPI_BITBANG
help help
SPI driver for CSR SiRFprimaII SoCs SPI driver for CSR SiRFprimaII SoCs

2
drivers/tty/serial/Kconfig
View File

@ -251,7 +251,7 @@ config SERIAL_SAMSUNG_CONSOLE
config SERIAL_SIRFSOC config SERIAL_SIRFSOC
tristate "SiRF SoC Platform Serial port support" tristate "SiRF SoC Platform Serial port support"
depends on ARCH_PRIMA2 depends on ARCH_SIRF
select SERIAL_CORE select SERIAL_CORE
help help
Support for the on-chip UART on the CSR SiRFprimaII series, Support for the on-chip UART on the CSR SiRFprimaII series,