diff --git a/recipes-bsp/armstubs/armstubs.bb b/recipes-bsp/armstubs/armstubs.bb index 06f3f33..066f7c3 100644 --- a/recipes-bsp/armstubs/armstubs.bb +++ b/recipes-bsp/armstubs/armstubs.bb @@ -7,8 +7,6 @@ inherit deploy nopackages include recipes-bsp/common/raspberrypi-tools.inc -SRC_URI_append = " file://0001-armstubs-makefile-external-toolchain.patch" - COMPATIBLE_MACHINE = "^rpi$" S = "${RPITOOLS_S}/armstubs" diff --git a/recipes-bsp/armstubs/armstubs/0001-armstubs-makefile-external-toolchain.patch b/recipes-bsp/armstubs/armstubs/0001-armstubs-makefile-external-toolchain.patch deleted file mode 100644 index 4e226ec..0000000 --- a/recipes-bsp/armstubs/armstubs/0001-armstubs-makefile-external-toolchain.patch +++ /dev/null @@ -1,32 +0,0 @@ -armstubs: Allow using external toolchain variables in Makefile - -Upstream-status: Pending -Signed-off-by: Andrei Gherzan - -Index: armstubs/Makefile -=================================================================== ---- armstubs.orig/Makefile -+++ armstubs/Makefile -@@ -1,14 +1,14 @@ - BINS=armstub.bin armstub7.bin armstub8-32.bin armstub8-32-gic.bin armstub8.bin armstub8-gic.bin - --CC8=aarch64-linux-gnu-gcc --LD8=aarch64-linux-gnu-ld --OBJCOPY8=aarch64-linux-gnu-objcopy --OBJDUMP8=aarch64-linux-gnu-objdump -maarch64 -+CC8?=aarch64-linux-gnu-gcc -+LD8?=aarch64-linux-gnu-ld -+OBJCOPY8?=aarch64-linux-gnu-objcopy -+OBJDUMP8?=aarch64-linux-gnu-objdump -maarch64 - --CC=arm-linux-gnueabihf-gcc -march=armv7-a --LD=arm-linux-gnueabihf-ld --OBJCOPY=arm-linux-gnueabihf-objcopy --OBJDUMP=arm-linux-gnueabihf-objdump -marm -+CC?=arm-linux-gnueabihf-gcc -march=armv7-a -+LD?=arm-linux-gnueabihf-ld -+OBJCOPY?=arm-linux-gnueabihf-objcopy -+OBJDUMP?=arm-linux-gnueabihf-objdump -marm - - BIN2C=./bin2c - diff --git a/recipes-bsp/common/raspberrypi-tools.inc b/recipes-bsp/common/raspberrypi-tools.inc index 8228e08..1ea65db 100644 --- a/recipes-bsp/common/raspberrypi-tools.inc +++ b/recipes-bsp/common/raspberrypi-tools.inc @@ -1,9 +1,9 @@ -SRCREV ?= "7f4a937e1bacbc111a22552169bc890b4bb26a94" +SRCREV ?= "76f64a28dc4685507d12f57fe5cfc89f6c32f8e6" RPITOOLS_SRC_URI ?= "https://github.com/raspberrypi/tools/archive/${SRCREV}.tar.gz" RPITOOLS_S ?= "${WORKDIR}/tools-${SRCREV}" SRC_URI = "${RPITOOLS_SRC_URI}" -SRC_URI[md5sum] = "f03672c57a4f285d0583ba7028f46a83" -SRC_URI[sha256sum] = "85e884cd95207780bc03fc7dacea1f17d2462c1e8c7499b0ff30070ca1d4d48a" +SRC_URI[md5sum] = "e2d4709b62e1536aeaaeabcbae82a03e" +SRC_URI[sha256sum] = "5f1c5eb8af9dff71b7cae30ffa6541d689d269a7b86013b365215adfb4c1c27d" PV = "0.0+git${SRCREV}"