From f0293d77bf6e161ffa1a113e171ba700c59eb725 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sat, 20 Aug 2016 21:58:55 +0300 Subject: [PATCH] Fix for building Odroid C2 u-boot --- general.sh | 2 +- .../u-boot-odroidc2-default/clean-sdfuse.patch | 13 +++++++++++++ .../firmware-override-toolchain-version.patch | 13 +++++++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 patch/u-boot/u-boot-odroidc2-default/clean-sdfuse.patch create mode 100644 patch/u-boot/u-boot-odroidc2-default/firmware-override-toolchain-version.patch diff --git a/general.sh b/general.sh index 661da3d91..e789e8abe 100644 --- a/general.sh +++ b/general.sh @@ -501,7 +501,7 @@ prepare_host() { gawk gcc-arm-linux-gnueabihf gcc-arm-linux-gnueabi qemu-user-static u-boot-tools uuid-dev zlib1g-dev unzip libusb-1.0-0-dev ntpdate \ parted pkg-config libncurses5-dev whiptail debian-keyring debian-archive-keyring f2fs-tools libfile-fcntllock-perl rsync libssl-dev \ nfs-kernel-server btrfs-tools gcc-aarch64-linux-gnu ncurses-term p7zip-full dos2unix dosfstools libc6-dev-armhf-cross libc6-dev-armel-cross\ - libc6-dev-arm64-cross curl pdftk" + libc6-dev-arm64-cross curl pdftk gcc-arm-none-eabi" local codename=$(lsb_release -sc) display_alert "Build host OS release" "${codename:-(unknown)}" "info" diff --git a/patch/u-boot/u-boot-odroidc2-default/clean-sdfuse.patch b/patch/u-boot/u-boot-odroidc2-default/clean-sdfuse.patch new file mode 100644 index 000000000..0c35eab31 --- /dev/null +++ b/patch/u-boot/u-boot-odroidc2-default/clean-sdfuse.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 27153d8..ae30482 100644 +--- a/Makefile ++++ b/Makefile +@@ -1339,6 +1339,8 @@ CLEAN_DIRS += $(MODVERDIR) \ + $(foreach d, spl tpl, $(patsubst %,$d/%, \ + $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) + ++CLEAN_FILES += sd_fuse/u-boot.bin ++ + CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ + u-boot* MLO* SPL System.map + diff --git a/patch/u-boot/u-boot-odroidc2-default/firmware-override-toolchain-version.patch b/patch/u-boot/u-boot-odroidc2-default/firmware-override-toolchain-version.patch new file mode 100644 index 000000000..5a916157e --- /dev/null +++ b/patch/u-boot/u-boot-odroidc2-default/firmware-override-toolchain-version.patch @@ -0,0 +1,13 @@ +diff --git a/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile b/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile +index 865d142..cf5a48e 100644 +--- a/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile ++++ b/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile +@@ -6,7 +6,7 @@ include $(buildtree)/include/autoconf.mk + include $(buildtree)/.config + + # Select ARMv7-m bare-metal toolchain +-CROSS_COMPILE=arm-none-eabi- ++override CROSS_COMPILE=arm-none-eabi- + ASM=$(CROSS_COMPILE)as + CC=$(CROSS_COMPILE)gcc + CPP=$(CROSS_COMPILE)cpp