* [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
@ 2013-06-10 15:36 Arnd Bergmann
2013-06-10 15:44 ` Mark Brown
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Arnd Bergmann @ 2013-06-10 15:36 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 3380c4f..fcb4b48 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -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
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
index f41e3e3..a9f616f 100644
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@ -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/
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 2d030df..11c8eb8 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -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.
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 2015897..89cbbab 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -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
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 95e66ac..7b4aa69 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -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,
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
2013-06-10 15:36 [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary Arnd Bergmann
@ 2013-06-10 15:44 ` Mark Brown
2013-06-10 16:01 ` Wolfram Sang
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-06-10 15:44 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 10, 2013 at 05:36:44PM +0200, Arnd Bergmann wrote:
> 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.
Acked-by: Mark Brown <broonie@linaro.org>
-------------- 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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
2013-06-10 15:36 [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary Arnd Bergmann
2013-06-10 15:44 ` Mark Brown
@ 2013-06-10 16:01 ` Wolfram Sang
2013-06-10 17:38 ` Greg Kroah-Hartman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2013-06-10 16:01 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 10, 2013 at 05:36:44PM +0200, Arnd Bergmann wrote:
> 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>
> ---
>
> 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?
Acked-by: Wolfram Sang <wsa@the-dreams.de>
-------------- 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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
2013-06-10 15:36 [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary Arnd Bergmann
2013-06-10 15:44 ` Mark Brown
2013-06-10 16:01 ` Wolfram Sang
@ 2013-06-10 17:38 ` Greg Kroah-Hartman
2013-06-11 0:44 ` Barry Song
2013-06-16 18:23 ` Mike Turquette
4 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2013-06-10 17:38 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jun 10, 2013 at 05:36:44PM +0200, Arnd Bergmann wrote:
> 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>
> ---
>
> 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:
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
2013-06-10 15:36 [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary Arnd Bergmann
` (2 preceding siblings ...)
2013-06-10 17:38 ` Greg Kroah-Hartman
@ 2013-06-11 0:44 ` Barry Song
2013-06-16 18:23 ` Mike Turquette
4 siblings, 0 replies; 6+ messages in thread
From: Barry Song @ 2013-06-11 0:44 UTC (permalink / raw)
To: linux-arm-kernel
2013/6/10 Arnd Bergmann <arnd@arndb.de>:
> 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>
> ---
>
> Barry, can you see if this patch makes sense to you?
>
Acked-by: Barry Song <Baohua.Song@csr.com>
> 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(-)
>
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 3380c4f..fcb4b48 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -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
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index f41e3e3..a9f616f 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -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/
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 2d030df..11c8eb8 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -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.
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 2015897..89cbbab 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -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
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 95e66ac..7b4aa69 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -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,
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
2013-06-10 15:36 [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary Arnd Bergmann
` (3 preceding siblings ...)
2013-06-11 0:44 ` Barry Song
@ 2013-06-16 18:23 ` Mike Turquette
4 siblings, 0 replies; 6+ messages in thread
From: Mike Turquette @ 2013-06-16 18:23 UTC (permalink / raw)
To: linux-arm-kernel
Quoting Arnd Bergmann (2013-06-10 08:36:44)
> 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: Mike Turquette <mturquette@linaro.org>
> ---
>
> 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(-)
>
> diff --git a/arch/arm/Makefile b/arch/arm/Makefile
> index 3380c4f..fcb4b48 100644
> --- a/arch/arm/Makefile
> +++ b/arch/arm/Makefile
> @@ -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
> diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
> index f41e3e3..a9f616f 100644
> --- a/drivers/clk/Makefile
> +++ b/drivers/clk/Makefile
> @@ -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/
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 2d030df..11c8eb8 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -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.
> diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
> index 2015897..89cbbab 100644
> --- a/drivers/spi/Kconfig
> +++ b/drivers/spi/Kconfig
> @@ -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
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 95e66ac..7b4aa69 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -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,
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-06-16 18:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-10 15:36 [PATCH] ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary Arnd Bergmann
2013-06-10 15:44 ` Mark Brown
2013-06-10 16:01 ` Wolfram Sang
2013-06-10 17:38 ` Greg Kroah-Hartman
2013-06-11 0:44 ` Barry Song
2013-06-16 18:23 ` Mike Turquette
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.