summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2016-05-27 11:39:58 +0200
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2016-05-27 11:39:58 +0200
commit152b31903a9f9013016bc7f5809d516bf726e37e (patch)
tree047a06331470200421702e94edc0db94c591884e /meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch
parent04dad68c951f206bd100e4dd82f9a77475e81f9d (diff)
Use conditional inclusion for u-boot-tisandbox/jsmoeller/connditionallayer
Conditional inclusion has been added to meta-agl-bsp. Make use of it for the u-boot-ti bbappend. Therefore we can remove the workaround on the dangling bbappends. Change-Id: Iefc4882f733614c8b06312f4916b683245c01e96 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch')
-rw-r--r--meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch
new file mode 100644
index 0000000..c462191
--- /dev/null
+++ b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch
@@ -0,0 +1,26 @@
+Fix the following build break:
+
+drivers/usb/host/xhci-omap.c:35:5: error: ‘board_usb_init’ aliased to external symbol ‘__board_usb_init’
+ int board_usb_init(int index, enum usb_init_type init)
+ ^
+
+Signed-off-by: Felipe Balbi <balbi at ti.com>
+---
+ drivers/usb/host/xhci-omap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c
+index 104e7a7282cf..fd19f79f0fc5 100644
+--- a/drivers/usb/host/xhci-omap.c
++++ b/drivers/usb/host/xhci-omap.c
+@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;
+
+ static struct omap_xhci omap;
+
+-inline int __board_usb_init(int index, enum usb_init_type init)
++__weak int __board_usb_init(int index, enum usb_init_type init)
+ {
+ return 0;
+ }
+--
+2.5.3 \ No newline at end of file