From afe824fc3d8f4922d13ab00921fc238f2e082528 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 24 Aug 2016 23:03:18 +0200 Subject: [PATCH] u-boot: update to hardkernel-61f29bb --- packages/tools/u-boot/package.mk | 2 +- ...0001-use-arm-eabi-for-bl301-scp_task.patch | 23 +++++++++++++++++++ ...u-boot-0001-set-default-boot-options.patch | 2 +- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 packages/tools/u-boot/patches/61f29bb/u-boot-0001-use-arm-eabi-for-bl301-scp_task.patch diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 623ab16f3b..3b6262e152 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -24,7 +24,7 @@ if [ "$UBOOT_VERSION" = "imx6-cuboxi" ]; then # https://github.com/SolidRun/u-boot-imx6.git PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" elif [ "$UBOOT_VERSION" = "hardkernel" ]; then - PKG_VERSION="83bf8f0" + PKG_VERSION="61f29bb" PKG_SITE="https://github.com/hardkernel/u-boot" PKG_URL="https://github.com/hardkernel/u-boot/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-elf:host gcc-linaro-arm-eabi:host" diff --git a/packages/tools/u-boot/patches/61f29bb/u-boot-0001-use-arm-eabi-for-bl301-scp_task.patch b/packages/tools/u-boot/patches/61f29bb/u-boot-0001-use-arm-eabi-for-bl301-scp_task.patch new file mode 100644 index 0000000000..de61acedbe --- /dev/null +++ b/packages/tools/u-boot/patches/61f29bb/u-boot-0001-use-arm-eabi-for-bl301-scp_task.patch @@ -0,0 +1,23 @@ +From 28c3064d6d3a89962e26f5c9ae3ee105d7377090 Mon Sep 17 00:00:00 2001 +From: Jonas Karlman +Date: Mon, 8 Aug 2016 01:59:07 +0200 +Subject: [PATCH] Use arm-eabi for bl301/scp_task + +For use with Linaro toolchain 4.9-2016.02 +--- + arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile b/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile +index 865d142..d905365 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- ++CROSS_COMPILE=arm-eabi- + ASM=$(CROSS_COMPILE)as + CC=$(CROSS_COMPILE)gcc + CPP=$(CROSS_COMPILE)cpp diff --git a/projects/Odroid_C2/patches/u-boot/u-boot-0001-set-default-boot-options.patch b/projects/Odroid_C2/patches/u-boot/u-boot-0001-set-default-boot-options.patch index e24d71098b..9c436f60b9 100644 --- a/projects/Odroid_C2/patches/u-boot/u-boot-0001-set-default-boot-options.patch +++ b/projects/Odroid_C2/patches/u-boot/u-boot-0001-set-default-boot-options.patch @@ -11,7 +11,7 @@ diff -Naur a/include/configs/odroidc2.h b/include/configs/odroidc2.h - "console=ttyS0,115200 " \ - "hdmimode=1080p60hz hdmitx=cecf " \ - "logo=osd1,loaded,0x3f800000,1080p60hz " \ -- "androidboot.hardware=odroidc2 " \ +- "androidboot.hardware=odroidc2 androidboot.serialno=${fbt_id#} " \ - "androidboot.selinux=disabled \0" \ - "bootcmd=cfgload; showlogo ${hdmimode}; movi read dtb 0 ${dtbaddr}; movi read boot 0 ${loadaddr}; booti ${loadaddr} - ${dtbaddr}\0" + "bootcmd=cfgload\0"