From 29f5c9b429686c1d41b7b5e653fdfe648a803ebb Mon Sep 17 00:00:00 2001 From: Karthik Ramanan Date: Tue, 21 Mar 2017 14:40:35 +0530 Subject: dra7xx: u-boot: Remove patch for compilation fix The patch has been integrated into u-boot git repo Change-Id: I540db7bd3658300a3dffc218d228d43e7e87a2b8 Signed-off-by: Karthik Ramanan --- .../u-boot/files/fix_builderror_gcc5.patch | 26 ---------------------- .../u-boot/u-boot-ti-staging_%.bbappend | 4 ++-- 2 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch 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 deleted file mode 100644 index c462191ae..000000000 --- a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/files/fix_builderror_gcc5.patch +++ /dev/null @@ -1,26 +0,0 @@ -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_%.bbappend b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend index 6cbb28edc..d1b9b2704 100644 --- a/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend +++ b/meta-agl-bsp/meta-ti/recipes-bsp/u-boot/u-boot-ti-staging_%.bbappend @@ -1,7 +1,7 @@ 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" +PR_append = "_agl" + SRC_URI += " file://${UBOOT_ENV_BINARY}" UBOOT_ENV = "uEnv" -- cgit 1.2.3-korg