ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
Subsystems (5)
PATCH 1/1 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.
---
Barry, can you see if this patch makes sense to you?
Mark, Grant, Mike, Greg, Wolfram: would you like to get a split-out patch, or should I apply it in one piece to arm-soc?
There is no harm in changing just one file, they are all equally wrong and don't depend on one another.
arch/arm/Makefile | 2 +- drivers/clk/Makefile | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/tty/serial/Kconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/Makefile +1 -1
@@ -169,7 +169,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
@@ -19,7 +19,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
@@ -676,7 +676,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
@@ -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
@@ -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,
Mark Brown
maintainerPATCH 1/1 ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
Quoted 5 lines · Arnd Bergmann
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 onCONFIG_PRIMA2.This fixes all occurences that appear like common SiRF code.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130610/8d318e01/attachment.sig>
PATCH 1/1 ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
In reply to Arnd BergmannQuoted 6 lines · Arnd Bergmann
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 onCONFIG_PRIMA2.This fixes all occurences that appear like common SiRF code.
Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>---
Barry, can you see if this patch makes sense to you?
Mark, Grant, Mike, Greg, Wolfram: would you like to get a split-out patch, or should I apply it in one piece to arm-soc?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130610/64166980/attachment.sig>
Greg Kroah-Hartman
maintainerPATCH 1/1 ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
In reply to Arnd BergmannQuoted 6 lines · Arnd Bergmann
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 onCONFIG_PRIMA2.This fixes all occurences that appear like common SiRF code.
Quoted 7 lines
Signed-off-by Arnd Bergmann <[email protected]>---
Barry, can you see if this patch makes sense to you?
Mark, Grant, Mike, Greg, Wolfram: would you like to get a split-out patch, or should I apply it in one piece to arm-soc?
Feel free to apply it to your tree:
PATCH 1/1 ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
In reply to Arnd Bergmann2013/6/10 Arnd Bergmann <[email protected]>:
Quoted 11 lines
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 onCONFIG_PRIMA2.This fixes all occurences that appear like common SiRF code.
Signed-off-by Arnd Bergmann <[email protected]>---
Barry, can you see if this patch makes sense to you?
Quoted 78 lines
Mark, Grant, Mike, Greg, Wolfram: would you like to get a split-out patch, or should I apply it in one piece to arm-soc?
There is no harm in changing just one file, they are all equally wrong and don't depend on one another.
arch/arm/Makefile | 2 +- drivers/clk/Makefile | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/tty/serial/Kconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)arch/arm/Makefile +1
-1@@ -169,7 +169,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) += rpcdrivers/clk/Makefile +1
-1@@ -19,7 +19,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@@ -676,7 +676,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@@ -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 SoCsdrivers/tty/serial/Kconfig +1
-1@@ -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,
PATCH 1/1 ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
In reply to Arnd BergmannQuoting Arnd Bergmann (2013-06-10 08:36:44)
Quoted 7 lines
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 onCONFIG_PRIMA2.This fixes all occurences that appear like common SiRF code.
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 82 lines
---
Barry, can you see if this patch makes sense to you?
Mark, Grant, Mike, Greg, Wolfram: would you like to get a split-out patch, or should I apply it in one piece to arm-soc?
There is no harm in changing just one file, they are all equally wrong and don't depend on one another.
arch/arm/Makefile | 2 +- drivers/clk/Makefile | 2 +- drivers/i2c/busses/Kconfig | 2 +- drivers/spi/Kconfig | 2 +- drivers/tty/serial/Kconfig | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)arch/arm/Makefile +1
-1@@ -169,7 +169,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) += rpcdrivers/clk/Makefile +1
-1@@ -19,7 +19,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@@ -676,7 +676,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@@ -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 SoCsdrivers/tty/serial/Kconfig +1
-1@@ -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,