[PATCH 1/5] usb: gadget: pxa27x: depend on right symbol

[PATCH 1/5] usb: gadget: pxa27x: depend on right symbol

[Lucas Stach]

Now that we also have PXA3XX support the dependency on
ARCH_PXA is too broad for this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/usb/gadget/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 5d9158ffae9f..04847b4bf30a 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -25,7 +25,7 @@ config USB_GADGET_DRIVER_AT91
 config USB_GADGET_DRIVER_PXA27X
 	bool
 	prompt "PXA27x gadget driver"
-	depends on ARCH_PXA
+	depends on ARCH_PXA2XX
 	default y
 	select USB_GADGET_DUALSPEED
 
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/5] MCI: pxa: depend on right symbol

[Lucas Stach]

Now that we also have PXA3XX support the dependency on
ARCH_PXA is too broad for this driver.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/mci/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig
index 31f7d2d4eae6..ebd8da9591ec 100644
--- a/drivers/mci/Kconfig
+++ b/drivers/mci/Kconfig
@@ -95,7 +95,7 @@ config MCI_OMAP_HSMMC
 
 config MCI_PXA
 	bool "PXA"
-	depends on ARCH_PXA
+	depends on ARCH_PXA2XX
 	help
 	  Enable this entry to add support to read and write SD cards on a
 	  XScale PXA25x / PXA27x based system.
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/5] ARM: omap: move GPMC calls under config define

[Lucas Stach]

Fixes build failures on a few boards if CONFIG_OMAP_GPMC
is not set.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/beagle/board.c                   |  4 +++-
 arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c  | 11 +++++++----
 arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 10 +++++++---
 arch/arm/boards/phytec-phycore-omap4460/board.c  |  9 +++++++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
index 775621069c27..c7fd5a30542e 100644
--- a/arch/arm/boards/beagle/board.c
+++ b/arch/arm/boards/beagle/board.c
@@ -74,11 +74,13 @@ static struct i2c_board_info i2c_devices[] = {
 	},
 };
 
+#ifdef CONFIG_OMAP_GPMC
 static struct gpmc_nand_platform_data nand_plat = {
 	.device_width = 16,
 	.ecc_mode = OMAP_ECC_HAMMING_CODE_HW_ROMCODE,
 	.nand_cfg = &omap3_nand_cfg,
 };
+#endif
 
 static int beagle_mem_init(void)
 {
@@ -100,8 +102,8 @@ static int beagle_devices_init(void)
 #ifdef CONFIG_OMAP_GPMC
 	/* WP is made high and WAIT1 active Low */
 	gpmc_generic_init(0x10);
-#endif
 	omap_add_gpmc_nand_device(&nand_plat);
+#endif
 
 	omap3_add_mmc1(NULL);
 
diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
index 1c2e7f7429a2..0f3b79752d26 100644
--- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
+++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
@@ -77,7 +77,7 @@ static int pcaal1_init_console(void)
 }
 console_initcall(pcaal1_init_console);
 
-#ifdef CONFIG_DRIVER_NET_SMC911X
+#if defined(CONFIG_DRIVER_NET_SMC911X) && defined(CONFIG_OMAP_GPMC)
 /** GPMC timing for our SMSC9221 device */
 static struct gpmc_config smsc_cfg = {
 	.cfg = {
@@ -132,23 +132,26 @@ struct omap_hsmmc_platform_data pcaal1_hsmmc_plat = {
 	.f_max = 26000000,
 };
 
+#ifdef CONFIG_OMAP_GPMC
 static struct gpmc_nand_platform_data nand_plat = {
 	.device_width = 16,
 	.ecc_mode = OMAP_ECC_BCH8_CODE_HW,
 	.nand_cfg = &omap3_nand_cfg,
 };
+#endif
 
 static int pcaal1_init_devices(void)
 {
+#ifdef CONFIG_OMAP_GPMC
 	omap_add_gpmc_nand_device(&nand_plat);
-
-	omap3_add_mmc1(&pcaal1_hsmmc_plat);
-
 #ifdef CONFIG_DRIVER_NET_SMC911X
 	pcaal1_setup_net_chip();
 	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, SMC911X_BASE, SZ_4K,
 			   IORESOURCE_MEM, NULL);
 #endif
+#endif
+
+	omap3_add_mmc1(&pcaal1_hsmmc_plat);
 
 	armlinux_set_architecture(MACH_TYPE_PCAAL1);
 
diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
index 78890ba5a978..e2ce6060e20a 100644
--- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
+++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
@@ -60,6 +60,7 @@ static int pcaaxl2_mem_init(void)
 }
 mem_initcall(pcaaxl2_mem_init);
 
+#ifdef CONFIG_OMAP_GPMC
 static struct gpmc_config net_cfg = {
 	.cfg = {
 		0x00001000, /* CONF1 */
@@ -80,6 +81,7 @@ static void pcaaxl2_network_init(void)
 	add_ks8851_device(DEVICE_ID_DYNAMIC, net_cfg.base, net_cfg.base + 2,
 				IORESOURCE_MEM_16BIT, NULL);
 }
+#endif
 
 static struct i2c_board_info i2c_devices[] = {
 	{
@@ -96,11 +98,13 @@ static struct omap_hsmmc_platform_data mmc_device = {
 #define OMAP4_MMC1_PBIASLITE_PWRDNZ		(1<<22)
 #define OMAP4_MMC1_PWRDNZ			(1<<26)
 
+#ifdef CONFIG_OMAP_GPMC
 static struct gpmc_nand_platform_data nand_plat = {
 	.device_width = 16,
 	.ecc_mode = OMAP_ECC_BCH8_CODE_HW,
 	.nand_cfg = &omap4_nand_cfg,
 };
+#endif
 
 static int pcaaxl2_devices_init(void)
 {
@@ -116,11 +120,11 @@ static int pcaaxl2_devices_init(void)
 
 	omap44xx_add_mmc1(&mmc_device);
 
+#ifdef CONFIG_OMAP_GPMC
 	gpmc_generic_init(0x10);
-
-	pcaaxl2_network_init();
-
 	omap_add_gpmc_nand_device(&nand_plat);
+	pcaaxl2_network_init();
+#endif
 
 #ifdef CONFIG_PARTITION
 	devfs_add_partition("nand0", 0x00000, SZ_128K,
diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c
index 6495a6f6ab0a..1cee75ddb946 100644
--- a/arch/arm/boards/phytec-phycore-omap4460/board.c
+++ b/arch/arm/boards/phytec-phycore-omap4460/board.c
@@ -64,6 +64,7 @@ static int pcm049_mem_init(void)
 }
 mem_initcall(pcm049_mem_init);
 
+#ifdef CONFIG_OMAP_GPMC
 static struct gpmc_config net_cfg = {
 	.cfg = {
 		0xc1001000,	/* CONF1 */
@@ -84,6 +85,7 @@ static void pcm049_network_init(void)
 	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x2C000000, 0x4000,
 			   IORESOURCE_MEM, NULL);
 }
+#endif
 
 static struct i2c_board_info i2c_devices[] = {
 	{
@@ -91,11 +93,13 @@ static struct i2c_board_info i2c_devices[] = {
 	},
 };
 
+#ifdef CONFIG_OMAP_GPMC
 static struct gpmc_nand_platform_data nand_plat = {
 	.wait_mon_pin = 1,
 	.ecc_mode = OMAP_ECC_BCH8_CODE_HW,
 	.nand_cfg = &omap4_nand_cfg,
 };
+#endif
 
 static struct omapfb_display const pcm049_displays[] = {
 	{
@@ -287,12 +291,13 @@ static int pcm049_devices_init(void)
 	omap44xx_add_i2c1(NULL);
 	omap44xx_add_mmc1(NULL);
 
+#ifdef CONFIG_OMAP_GPMC
 	gpmc_generic_init(0x10);
+	omap_add_gpmc_nand_device(&nand_plat);
 
 	if (IS_ENABLED(CONFIG_DRIVER_NET_SMC911X))
 		pcm049_network_init();
-
-	omap_add_gpmc_nand_device(&nand_plat);
+#endif
 
 #ifdef CONFIG_PARTITION
 	devfs_add_partition("nand0", 0x00000, SZ_128K, DEVFS_PARTITION_FIXED, "xload_raw");
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 4/5] ARM: socfpga: add default ARCH_TEXT_BASE

[Lucas Stach]

As SoCFPGA is multi-image enabled there is no real reason
to bother the user with asking for the text base. Fixes a
bunch of randcfg failures.

Regenerate defconfig to drop the explicit config there, which
unfortunately introduces quite a bit of churn.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/configs/socfpga_defconfig | 70 ++++++++++++++++++--------------------
 arch/arm/mach-socfpga/Kconfig      |  4 +++
 2 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index ca54a1a491b9..ec369ae42efb 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -1,70 +1,68 @@
 CONFIG_ARCH_SOCFPGA=y
-CONFIG_ARCH_SOCFPGA_FPGA=y
 CONFIG_MACH_SOCFPGA_EBV_SOCRATES=y
 CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT=y
 CONFIG_THUMB2_BAREBOX=y
-CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 CONFIG_MMU=y
-CONFIG_TEXT_BASE=0x0
 CONFIG_MALLOC_SIZE=0x0
 CONFIG_MALLOC_TLSF=y
 CONFIG_KALLSYMS=y
 CONFIG_RELOCATABLE=y
-CONFIG_LONGHELP=y
 CONFIG_HUSH_FANCY_PROMPT=y
 CONFIG_CMDLINE_EDITING=y
 CONFIG_AUTO_COMPLETE=y
 CONFIG_MENU=y
 # CONFIG_TIMESTAMP is not set
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
-CONFIG_CMD_EDIT=y
-CONFIG_CMD_SLEEP=y
-CONFIG_CMD_MSLEEP=y
-CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_EXPORT=y
-CONFIG_CMD_PRINTENV=y
-CONFIG_CMD_READLINE=y
-CONFIG_CMD_LET=y
-CONFIG_CMD_MENU=y
-CONFIG_CMD_MENU_MANAGEMENT=y
-CONFIG_CMD_TIME=y
-CONFIG_CMD_LN=y
-CONFIG_CMD_FILETYPE=y
-CONFIG_CMD_ECHO_E=y
-CONFIG_CMD_MEMINFO=y
+CONFIG_LONGHELP=y
 CONFIG_CMD_IOMEM=y
-CONFIG_CMD_MM=y
-CONFIG_CMD_CRC=y
-CONFIG_CMD_CRC_CMP=y
-CONFIG_CMD_MD5SUM=y
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_ARM_MMUINFO=y
 CONFIG_CMD_BOOTM_SHOW_TYPE=y
 CONFIG_CMD_BOOTM_VERBOSE=y
 CONFIG_CMD_BOOTM_INITRD=y
 CONFIG_CMD_BOOTM_OFTREE=y
-CONFIG_CMD_RESET=y
 CONFIG_CMD_GO=y
-CONFIG_CMD_OFTREE=y
-CONFIG_CMD_OF_PROPERTY=y
-CONFIG_CMD_OF_NODE=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_BAREBOX_UPDATE=y
-CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_RESET=y
 CONFIG_CMD_PARTITION=y
+CONFIG_CMD_EXPORT=y
+CONFIG_CMD_PRINTENV=y
 CONFIG_CMD_MAGICVAR=y
 CONFIG_CMD_MAGICVAR_HELP=y
-CONFIG_CMD_GPIO=y
+CONFIG_CMD_SAVEENV=y
+CONFIG_CMD_FILETYPE=y
+CONFIG_CMD_LN=y
+CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_UNCOMPRESS=y
-CONFIG_CMD_SPI=y
-CONFIG_CMD_LED=y
-CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_LET=y
+CONFIG_CMD_MSLEEP=y
+CONFIG_CMD_SLEEP=y
+CONFIG_CMD_DHCP=y
 CONFIG_CMD_MIITOOL=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_ECHO_E=y
+CONFIG_CMD_EDIT=y
+CONFIG_CMD_MENU=y
+CONFIG_CMD_MENU_MANAGEMENT=y
+CONFIG_CMD_READLINE=y
+CONFIG_CMD_TIMEOUT=y
+CONFIG_CMD_CRC=y
+CONFIG_CMD_CRC_CMP=y
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_MM=y
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DETECT=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_LED=y
+CONFIG_CMD_SPI=y
+CONFIG_CMD_LED_TRIGGER=y
+CONFIG_CMD_BAREBOX_UPDATE=y
+CONFIG_CMD_OF_NODE=y
+CONFIG_CMD_OF_PROPERTY=y
+CONFIG_CMD_OFTREE=y
+CONFIG_CMD_TIME=y
 CONFIG_NET=y
-CONFIG_CMD_DHCP=y
-CONFIG_CMD_PING=y
 CONFIG_NET_NETCONSOLE=y
 CONFIG_NET_RESOLV=y
 CONFIG_OFDEVICE=y
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 90b3533b1ffb..73b26efd2031 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -1,5 +1,9 @@
 if ARCH_SOCFPGA
 
+config ARCH_TEXT_BASE
+	hex
+	default 0x0
+
 config ARCH_SOCFPGA_XLOAD
 	bool
 	prompt "Build preloader image"
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 5/5] ARM: pxa: move lubbock TEXTBASE to Kconfig

[Lucas Stach]

So we can drop it from the defconfig and stop bothering
the user with this choice by default.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/configs/lubbock_defconfig | 1 -
 arch/arm/mach-pxa/Kconfig          | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig
index bf04fa3b18e1..224854c7cc60 100644
--- a/arch/arm/configs/lubbock_defconfig
+++ b/arch/arm/configs/lubbock_defconfig
@@ -6,7 +6,6 @@ CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_ARM_UNWIND=y
 # CONFIG_BANNER is not set
 CONFIG_MMU=y
-CONFIG_TEXT_BASE=0xa3d00000
 CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0x80000
 CONFIG_MALLOC_SIZE=0x1000000
 CONFIG_EXPERIMENTAL=y
diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 610fb1c80e4d..2b7f631757b7 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -4,6 +4,7 @@ config ARCH_TEXT_BASE
 	hex
 	default 0xa0000000 if MACH_MIOA701
 	default 0xa3f00000 if MACH_PCM027
+	default 0xa3d00000 if MACH_LUBBOCK
 	default 0x83f00000 if MACH_ZYLONITE
 
 # ----------------------------------------------------------
-- 
2.1.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/5] ARM: omap: move GPMC calls under config define

[Marc Kleine-Budde]

[-- Attachment #1.1: Type: text/plain, Size: 5637 bytes --]

On 04/20/2015 10:55 AM, Lucas Stach wrote:
> Fixes build failures on a few boards if CONFIG_OMAP_GPMC
> is not set.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/boards/beagle/board.c                   |  4 +++-
>  arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c  | 11 +++++++----
>  arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 10 +++++++---
>  arch/arm/boards/phytec-phycore-omap4460/board.c  |  9 +++++++--
>  4 files changed, 24 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
> index 775621069c27..c7fd5a30542e 100644
> --- a/arch/arm/boards/beagle/board.c
> +++ b/arch/arm/boards/beagle/board.c
> @@ -74,11 +74,13 @@ static struct i2c_board_info i2c_devices[] = {
>  	},
>  };
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_nand_platform_data nand_plat = {
>  	.device_width = 16,
>  	.ecc_mode = OMAP_ECC_HAMMING_CODE_HW_ROMCODE,
>  	.nand_cfg = &omap3_nand_cfg,
>  };
> +#endif
>  
>  static int beagle_mem_init(void)
>  {
> @@ -100,8 +102,8 @@ static int beagle_devices_init(void)
>  #ifdef CONFIG_OMAP_GPMC
>  	/* WP is made high and WAIT1 active Low */
>  	gpmc_generic_init(0x10);
> -#endif
>  	omap_add_gpmc_nand_device(&nand_plat);
> +#endif
>  
>  	omap3_add_mmc1(NULL);
>  
> diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
> index 1c2e7f7429a2..0f3b79752d26 100644
> --- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
> +++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c
> @@ -77,7 +77,7 @@ static int pcaal1_init_console(void)
>  }
>  console_initcall(pcaal1_init_console);
>  
> -#ifdef CONFIG_DRIVER_NET_SMC911X
> +#if defined(CONFIG_DRIVER_NET_SMC911X) && defined(CONFIG_OMAP_GPMC)
>  /** GPMC timing for our SMSC9221 device */
>  static struct gpmc_config smsc_cfg = {
>  	.cfg = {
> @@ -132,23 +132,26 @@ struct omap_hsmmc_platform_data pcaal1_hsmmc_plat = {
>  	.f_max = 26000000,
>  };
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_nand_platform_data nand_plat = {
>  	.device_width = 16,
>  	.ecc_mode = OMAP_ECC_BCH8_CODE_HW,
>  	.nand_cfg = &omap3_nand_cfg,
>  };
> +#endif
>  
>  static int pcaal1_init_devices(void)
>  {
> +#ifdef CONFIG_OMAP_GPMC
>  	omap_add_gpmc_nand_device(&nand_plat);
> -
> -	omap3_add_mmc1(&pcaal1_hsmmc_plat);
> -
>  #ifdef CONFIG_DRIVER_NET_SMC911X
>  	pcaal1_setup_net_chip();
>  	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, SMC911X_BASE, SZ_4K,
>  			   IORESOURCE_MEM, NULL);
>  #endif
> +#endif
> +
> +	omap3_add_mmc1(&pcaal1_hsmmc_plat);
>  
>  	armlinux_set_architecture(MACH_TYPE_PCAAL1);
>  
> diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
> index 78890ba5a978..e2ce6060e20a 100644
> --- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
> +++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c
> @@ -60,6 +60,7 @@ static int pcaaxl2_mem_init(void)
>  }
>  mem_initcall(pcaaxl2_mem_init);
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_config net_cfg = {
>  	.cfg = {
>  		0x00001000, /* CONF1 */
> @@ -80,6 +81,7 @@ static void pcaaxl2_network_init(void)
>  	add_ks8851_device(DEVICE_ID_DYNAMIC, net_cfg.base, net_cfg.base + 2,
>  				IORESOURCE_MEM_16BIT, NULL);
>  }
> +#endif
>  
>  static struct i2c_board_info i2c_devices[] = {
>  	{
> @@ -96,11 +98,13 @@ static struct omap_hsmmc_platform_data mmc_device = {
>  #define OMAP4_MMC1_PBIASLITE_PWRDNZ		(1<<22)
>  #define OMAP4_MMC1_PWRDNZ			(1<<26)
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_nand_platform_data nand_plat = {
>  	.device_width = 16,
>  	.ecc_mode = OMAP_ECC_BCH8_CODE_HW,
>  	.nand_cfg = &omap4_nand_cfg,
>  };
> +#endif
>  
>  static int pcaaxl2_devices_init(void)
>  {
> @@ -116,11 +120,11 @@ static int pcaaxl2_devices_init(void)
>  
>  	omap44xx_add_mmc1(&mmc_device);
>  
> +#ifdef CONFIG_OMAP_GPMC
>  	gpmc_generic_init(0x10);
> -
> -	pcaaxl2_network_init();
> -
>  	omap_add_gpmc_nand_device(&nand_plat);
> +	pcaaxl2_network_init();
> +#endif
>  
>  #ifdef CONFIG_PARTITION
>  	devfs_add_partition("nand0", 0x00000, SZ_128K,
> diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c
> index 6495a6f6ab0a..1cee75ddb946 100644
> --- a/arch/arm/boards/phytec-phycore-omap4460/board.c
> +++ b/arch/arm/boards/phytec-phycore-omap4460/board.c
> @@ -64,6 +64,7 @@ static int pcm049_mem_init(void)
>  }
>  mem_initcall(pcm049_mem_init);
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_config net_cfg = {
>  	.cfg = {
>  		0xc1001000,	/* CONF1 */
> @@ -84,6 +85,7 @@ static void pcm049_network_init(void)
>  	add_generic_device("smc911x", DEVICE_ID_DYNAMIC, NULL, 0x2C000000, 0x4000,
>  			   IORESOURCE_MEM, NULL);
>  }
> +#endif
>  
>  static struct i2c_board_info i2c_devices[] = {
>  	{
> @@ -91,11 +93,13 @@ static struct i2c_board_info i2c_devices[] = {
>  	},
>  };
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_nand_platform_data nand_plat = {
>  	.wait_mon_pin = 1,
>  	.ecc_mode = OMAP_ECC_BCH8_CODE_HW,
>  	.nand_cfg = &omap4_nand_cfg,
>  };
> +#endif

You can use __maybe_unused to avoid the ifdef.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/5] ARM: omap: move GPMC calls under config define

[Sascha Hauer]

On Mon, Apr 20, 2015 at 10:55:50AM +0200, Lucas Stach wrote:
> Fixes build failures on a few boards if CONFIG_OMAP_GPMC
> is not set.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  arch/arm/boards/beagle/board.c                   |  4 +++-
>  arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c  | 11 +++++++----
>  arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c | 10 +++++++---
>  arch/arm/boards/phytec-phycore-omap4460/board.c  |  9 +++++++--
>  4 files changed, 24 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c
> index 775621069c27..c7fd5a30542e 100644
> --- a/arch/arm/boards/beagle/board.c
> +++ b/arch/arm/boards/beagle/board.c
> @@ -74,11 +74,13 @@ static struct i2c_board_info i2c_devices[] = {
>  	},
>  };
>  
> +#ifdef CONFIG_OMAP_GPMC
>  static struct gpmc_nand_platform_data nand_plat = {
>  	.device_width = 16,
>  	.ecc_mode = OMAP_ECC_HAMMING_CODE_HW_ROMCODE,
>  	.nand_cfg = &omap3_nand_cfg,
>  };
> +#endif
>  
>  static int beagle_mem_init(void)
>  {
> @@ -100,8 +102,8 @@ static int beagle_devices_init(void)
>  #ifdef CONFIG_OMAP_GPMC
>  	/* WP is made high and WAIT1 active Low */
>  	gpmc_generic_init(0x10);
> -#endif
>  	omap_add_gpmc_nand_device(&nand_plat);
> +#endif

Maybe add a static inline no-op wrapper instead? This would save us some
ifdefs.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/5] usb: gadget: pxa27x: depend on right symbol

[Robert Jarzmik]

Lucas Stach <l.stach@pengutronix.de> writes:

> Now that we also have PXA3XX support the dependency on
> ARCH_PXA is too broad for this driver.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
> ---
>  drivers/usb/gadget/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 5d9158ffae9f..04847b4bf30a 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -25,7 +25,7 @@ config USB_GADGET_DRIVER_AT91
>  config USB_GADGET_DRIVER_PXA27X
>  	bool
>  	prompt "PXA27x gadget driver"
> -	depends on ARCH_PXA
> +	depends on ARCH_PXA2XX
ARCH_PXA27X please.

Cheers.

-- 
Robert

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/5] MCI: pxa: depend on right symbol

[Robert Jarzmik]

Lucas Stach <l.stach@pengutronix.de> writes:

> Now that we also have PXA3XX support the dependency on
> ARCH_PXA is too broad for this driver.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

-- 
Robert

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 5/5] ARM: pxa: move lubbock TEXTBASE to Kconfig

[Robert Jarzmik]

Lucas Stach <l.stach@pengutronix.de> writes:

> So we can drop it from the defconfig and stop bothering
> the user with this choice by default.
>
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>

-- 
Robert

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox