[PATCH 1/4] usb: musb: only build musb_barebox if host is enabled

[PATCH 1/4] usb: musb: only build musb_barebox if host is enabled

[Lucas Stach]

musb_barebox.c contains code that is only ever used if CONFIG_MUSB_HOST
is set. Building it uncoditionally breaks the build depending on the link
order.

Fixes:
drivers/usb/musb/musb_barebox.c:64: undefined reference to `musb_urb_enqueue'

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/usb/musb/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
index 364a43fecb62..9f9c21030047 100644
--- a/drivers/usb/musb/Makefile
+++ b/drivers/usb/musb/Makefile
@@ -2,9 +2,9 @@
 # for USB OTG silicon based on Mentor Graphics INVENTRA designs
 #
 
-obj-y += musb_core.o musb_barebox.o
+obj-y += musb_core.o
 
-obj-$(CONFIG_USB_MUSB_HOST) += musb_host.o
+obj-$(CONFIG_USB_MUSB_HOST) += musb_host.o musb_barebox.o
 obj-$(CONFIG_USB_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o
 
 obj-$(CONFIG_USB_MUSB_DSPS)	+= musb_dsps.o
-- 
2.1.3


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

[PATCH 2/4] rtc: select GREGORIAN_CALENDER

[Lucas Stach]

Fixes:
drivers/rtc/rtc-lib.c:109: undefined reference to `mktime'

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

diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 957fee73f8eb..191ad97fb825 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -4,6 +4,7 @@
 
 config RTC_LIB
 	bool
+	select GREGORIAN_CALENDER
 
 menuconfig RTC_CLASS
 	bool "Real Time Clock"
-- 
2.1.3


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

[PATCH 3/4] arm: imx: iim/ocotp: fix link error when !CONFIG_NET

[Lucas Stach]

Don't try to attach mac to device if there is no net support selected.
Fixes:
undefined reference to `dev_add_param_mac' in both iim and ocotp drivers.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/mach-imx/iim.c   | 3 ++-
 arch/arm/mach-imx/ocotp.c | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/iim.c b/arch/arm/mach-imx/iim.c
index 2546b921f109..d082d2d9a5dc 100644
--- a/arch/arm/mach-imx/iim.c
+++ b/arch/arm/mach-imx/iim.c
@@ -371,7 +371,8 @@ static void imx_iim_init_dt(struct device_d *dev, struct iim_priv *iim)
 			dev_err(dev, "cannot read: %s\n", strerror(-ret));
 		}
 
-		imx_iim_add_mac_param(iim, macnum, bank, offset);
+		if (IS_ENABLED(CONFIG_NET))
+			imx_iim_add_mac_param(iim, macnum, bank, offset);
 		macnum++;
 
 		len -= MAC_ADDRESS_PROPLEN;
diff --git a/arch/arm/mach-imx/ocotp.c b/arch/arm/mach-imx/ocotp.c
index 837500fff886..5912d7586684 100644
--- a/arch/arm/mach-imx/ocotp.c
+++ b/arch/arm/mach-imx/ocotp.c
@@ -432,8 +432,10 @@ static int imx_ocotp_probe(struct device_d *dev)
 				NULL, NULL, &priv->permanent_write_enable, NULL);
 	}
 
-	dev_add_param_mac(&(priv->dev), "mac_addr", imx_ocotp_set_mac,
-			imx_ocotp_get_mac, priv->ethaddr, priv);
+	if (IS_ENABLED(CONFIG_NET))
+		dev_add_param_mac(&(priv->dev), "mac_addr", imx_ocotp_set_mac,
+				imx_ocotp_get_mac, priv->ethaddr, priv);
+
 	dev_add_param_bool(&(priv->dev), "sense_enable", NULL, NULL, &priv->sense_enable, priv);
 
 	return 0;
-- 
2.1.3


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

[PATCH 4/4] net: rtl8139: depend on MIPS

[Lucas Stach]

Until we sort out the dma-mapping mess.

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

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 0d32f952422c..ab432d34e708 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -152,6 +152,7 @@ config DRIVER_NET_ORION
 config DRIVER_NET_RTL8139
 	bool "RealTek RTL-8139 PCI Ethernet driver"
 	depends on PCI
+	depends on MIPS
 	select PHYLIB
 	help
 	  This is a driver for the Fast Ethernet PCI network cards based on
-- 
2.1.3


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

Re: [PATCH 1/4] usb: musb: only build musb_barebox if host is enabled

[Sascha Hauer]

On Thu, Nov 27, 2014 at 04:54:17PM +0100, Lucas Stach wrote:
> musb_barebox.c contains code that is only ever used if CONFIG_MUSB_HOST
> is set. Building it uncoditionally breaks the build depending on the link
> order.
> 
> Fixes:
> drivers/usb/musb/musb_barebox.c:64: undefined reference to `musb_urb_enqueue'
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

Applied all, thanks

Sascha

> ---
>  drivers/usb/musb/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile
> index 364a43fecb62..9f9c21030047 100644
> --- a/drivers/usb/musb/Makefile
> +++ b/drivers/usb/musb/Makefile
> @@ -2,9 +2,9 @@
>  # for USB OTG silicon based on Mentor Graphics INVENTRA designs
>  #
>  
> -obj-y += musb_core.o musb_barebox.o
> +obj-y += musb_core.o
>  
> -obj-$(CONFIG_USB_MUSB_HOST) += musb_host.o
> +obj-$(CONFIG_USB_MUSB_HOST) += musb_host.o musb_barebox.o
>  obj-$(CONFIG_USB_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o
>  
>  obj-$(CONFIG_USB_MUSB_DSPS)	+= musb_dsps.o
> -- 
> 2.1.3
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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