From 769eb7d12a719a71fe441dc2e960a8c2d201e301 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Fri, 12 Aug 2016 15:38:53 +0200 Subject: Move adaptations specific to meta-ti into subfolder with conditional inclusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I826ce3d15d54098356ada353e155a21064560450 Signed-off-by: Jan-Simon Möller --- .../u-boot/files/fix_builderror_gcc5.patch | 26 ++++++++++++++++++++++ .../u-boot/u-boot-ti-staging_2015.07.bbappend | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch create mode 100644 meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bbappend (limited to 'meta-agl-bsp/meta-ti') 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 000000000..c462191ae --- /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 +--- + 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 diff --git a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bbappend b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bbappend new file mode 100644 index 000000000..50050ab6b --- /dev/null +++ b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_2015.07.bbappend @@ -0,0 +1,4 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +# This applies to the JACINTO 6 vayu board ... essentially it is dra7_evm. +SRC_URI_vayu += "file://fix_builderror_gcc5.patch" -- cgit 1.2.3-korg