[PATCH v2 1/5] arm: imx: pca100: only try to enable USB if USB_ULPI is configured

[PATCH v2 1/5] arm: imx: pca100: only try to enable USB if USB_ULPI is configured

[Lucas Stach]

Avoids a build failure if the config does not include ULPI support.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boards/phytec-phycard-imx27/pca100.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c
index 895a3a395777..9475bfafcaa7 100644
--- a/arch/arm/boards/phytec-phycard-imx27/pca100.c
+++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c
@@ -41,6 +41,7 @@
 #include <mach/iomux-mx27.h>
 #include <mach/devices-imx27.h>
 
+#if defined(CONFIG_USB) && defined(CONFIG_USB_ULPI)
 static void pca100_usb_register(void)
 {
 	mdelay(10);
@@ -55,6 +56,9 @@ static void pca100_usb_register(void)
 	ulpi_setup((void *)(MX27_USB_OTG_BASE_ADDR + 0x570), 1);
 	add_generic_usb_ehci_device(DEVICE_ID_DYNAMIC, MX27_USB_OTG_BASE_ADDR + 0x400, NULL);
 }
+#else
+static void pca100_usb_register(void) { };
+#endif
 
 static void pca100_usb_init(void)
 {
@@ -131,8 +135,7 @@ static int pca100_devices_init(void)
 	for (i = 0; i < ARRAY_SIZE(mode); i++)
 		imx_gpio_mode(mode[i]);
 
-	if (IS_ENABLED(CONFIG_USB))
-		pca100_usb_register();
+	pca100_usb_register();
 
 	imx_bbu_external_nand_register_handler("nand", "/dev/nand0.boot",
 			BBU_HANDLER_FLAG_DEFAULT);
-- 
2.1.3


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

[PATCH v2 2/5] envfs: include errno.h

[Lucas Stach]

Fixes: include/envfs.h:124:10: error: 'ENOSYS' undeclared

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 include/envfs.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/envfs.h b/include/envfs.h
index fdcb8a8d97c3..27c4b42c6b60 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -2,6 +2,7 @@
 #define _ENVFS_H
 
 #ifdef __BAREBOX__
+#include <errno.h>
 #include <asm/byteorder.h>
 #include <linux/stringify.h>
 #endif
-- 
2.1.3


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

[PATCH v2 3/5] net: ethoc: depend on OPENRISC

[Lucas Stach]

This driver currently only works on OpenRISC, as it uses
the cache flush/invalidate functions of this arch.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
The situation with cache functions scatterd into different files
for the various arches is a mess currently. We should really aim
to unify this into a common dma-mapping.h, to make it easier for
driver writers.
---
 drivers/net/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 24b984462d15..0d32f952422c 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -97,6 +97,7 @@ config DRIVER_NET_EP93XX
 
 config DRIVER_NET_ETHOC
 	bool "OpenCores ethernet MAC driver"
+	depends on OPENRISC
 	depends on HAS_CACHE
 	select PHYLIB
 	help
-- 
2.1.3


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

[PATCH v2 4/5] blspec: depend on, not select flexible bootargs

[Lucas Stach]

Blspec is a consumer of the flexible bootargs mechanism, so it should
depend on it rather than select it.

Fixes:
warning: (BLSPEC && DEFAULT_ENVIRONMENT_GENERIC_NEW) selects FLEXIBLE_BOOTARGS
which has unmet direct dependencies (COMMAND_SUPPORT && CMD_GLOBAL)

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
v2:
fix mvebu defconfig
---
 arch/arm/configs/mvebu_defconfig | 1 +
 common/Kconfig                   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 253cb0934db1..9309084cdc05 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -24,6 +24,7 @@ CONFIG_CMD_IOMEM=y
 CONFIG_CMD_IMD=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_ARM_MMUINFO=y
+CONFIG_FLEXIBLE_BOOTARGS=y
 CONFIG_CMD_BOOT=y
 CONFIG_CMD_BOOTM_SHOW_TYPE=y
 CONFIG_CMD_BOOTM_VERBOSE=y
diff --git a/common/Kconfig b/common/Kconfig
index 6eba3951989f..562798063b81 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -479,8 +479,8 @@ config TIMESTAMP
 
 config BLSPEC
 	depends on BLOCK
+	depends on FLEXIBLE_BOOTARGS
 	select OFTREE
-	select FLEXIBLE_BOOTARGS
 	bool
 	prompt "Support bootloader spec"
 	help
-- 
2.1.3


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

[PATCH v2 5/5] usb: host: only activate Efika MX ULPI workaround if ULPI is selected

[Lucas Stach]

Fixes a build failure with disabled ULPI support.

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

diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index d2e129679601..133561659c37 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -437,7 +437,7 @@ fail:
 	return -1;
 }
 
-#ifdef CONFIG_MACH_EFIKA_MX_SMARTBOOK
+#if defined(CONFIG_MACH_EFIKA_MX_SMARTBOOK) && defined(CONFIG_USB_ULPI)
 #include <usb/ulpi.h>
 /*
  * Add support for setting CHRGVBUS to workaround a hardware bug on efika mx/sb
-- 
2.1.3


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

Re: [PATCH v2 1/5] arm: imx: pca100: only try to enable USB if USB_ULPI is configured

[Sascha Hauer]

On Tue, Nov 25, 2014 at 06:02:46PM +0100, Lucas Stach wrote:
> Avoids a build failure if the config does not include ULPI support.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

Applied all, thanks

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