diff options
author | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-02 16:15:26 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2019-07-20 21:56:21 +0100 |
commit | 284664b755c835c44427ee54fba17d32dfa23582 (patch) | |
tree | 889e190c2919ac0671c73057eb3dcd1b70d3900b | |
parent | 9e73b9eb9f24a98fa35e633c7f8916d48030ffa7 (diff) | |
download | meta-raspberrypi-284664b755c835c44427ee54fba17d32dfa23582.tar.gz |
raspberrypi-tools: Update to remove Makefile patch
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-rw-r--r-- | recipes-bsp/armstubs/armstubs.bb | 2 | ||||
-rw-r--r-- | recipes-bsp/armstubs/armstubs/0001-armstubs-makefile-external-toolchain.patch | 32 | ||||
-rw-r--r-- | recipes-bsp/common/raspberrypi-tools.inc | 6 |
3 files changed, 3 insertions, 37 deletions
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 | |||
7 | 7 | ||
8 | include recipes-bsp/common/raspberrypi-tools.inc | 8 | include recipes-bsp/common/raspberrypi-tools.inc |
9 | 9 | ||
10 | SRC_URI_append = " file://0001-armstubs-makefile-external-toolchain.patch" | ||
11 | |||
12 | COMPATIBLE_MACHINE = "^rpi$" | 10 | COMPATIBLE_MACHINE = "^rpi$" |
13 | 11 | ||
14 | S = "${RPITOOLS_S}/armstubs" | 12 | 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 @@ | |||
1 | armstubs: Allow using external toolchain variables in Makefile | ||
2 | |||
3 | Upstream-status: Pending | ||
4 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
5 | |||
6 | Index: armstubs/Makefile | ||
7 | =================================================================== | ||
8 | --- armstubs.orig/Makefile | ||
9 | +++ armstubs/Makefile | ||
10 | @@ -1,14 +1,14 @@ | ||
11 | BINS=armstub.bin armstub7.bin armstub8-32.bin armstub8-32-gic.bin armstub8.bin armstub8-gic.bin | ||
12 | |||
13 | -CC8=aarch64-linux-gnu-gcc | ||
14 | -LD8=aarch64-linux-gnu-ld | ||
15 | -OBJCOPY8=aarch64-linux-gnu-objcopy | ||
16 | -OBJDUMP8=aarch64-linux-gnu-objdump -maarch64 | ||
17 | +CC8?=aarch64-linux-gnu-gcc | ||
18 | +LD8?=aarch64-linux-gnu-ld | ||
19 | +OBJCOPY8?=aarch64-linux-gnu-objcopy | ||
20 | +OBJDUMP8?=aarch64-linux-gnu-objdump -maarch64 | ||
21 | |||
22 | -CC=arm-linux-gnueabihf-gcc -march=armv7-a | ||
23 | -LD=arm-linux-gnueabihf-ld | ||
24 | -OBJCOPY=arm-linux-gnueabihf-objcopy | ||
25 | -OBJDUMP=arm-linux-gnueabihf-objdump -marm | ||
26 | +CC?=arm-linux-gnueabihf-gcc -march=armv7-a | ||
27 | +LD?=arm-linux-gnueabihf-ld | ||
28 | +OBJCOPY?=arm-linux-gnueabihf-objcopy | ||
29 | +OBJDUMP?=arm-linux-gnueabihf-objdump -marm | ||
30 | |||
31 | BIN2C=./bin2c | ||
32 | |||
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 @@ | |||
1 | SRCREV ?= "7f4a937e1bacbc111a22552169bc890b4bb26a94" | 1 | SRCREV ?= "76f64a28dc4685507d12f57fe5cfc89f6c32f8e6" |
2 | RPITOOLS_SRC_URI ?= "https://github.com/raspberrypi/tools/archive/${SRCREV}.tar.gz" | 2 | RPITOOLS_SRC_URI ?= "https://github.com/raspberrypi/tools/archive/${SRCREV}.tar.gz" |
3 | RPITOOLS_S ?= "${WORKDIR}/tools-${SRCREV}" | 3 | RPITOOLS_S ?= "${WORKDIR}/tools-${SRCREV}" |
4 | 4 | ||
5 | SRC_URI = "${RPITOOLS_SRC_URI}" | 5 | SRC_URI = "${RPITOOLS_SRC_URI}" |
6 | SRC_URI[md5sum] = "f03672c57a4f285d0583ba7028f46a83" | 6 | SRC_URI[md5sum] = "e2d4709b62e1536aeaaeabcbae82a03e" |
7 | SRC_URI[sha256sum] = "85e884cd95207780bc03fc7dacea1f17d2462c1e8c7499b0ff30070ca1d4d48a" | 7 | SRC_URI[sha256sum] = "5f1c5eb8af9dff71b7cae30ffa6541d689d269a7b86013b365215adfb4c1c27d" |
8 | 8 | ||
9 | PV = "0.0+git${SRCREV}" | 9 | PV = "0.0+git${SRCREV}" |