diff options
author | Mirza Krak <mirza.krak@gmail.com> | 2017-01-24 19:16:38 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2017-01-25 16:32:28 +0100 |
commit | 73980301cf6c4d1d968266bbc2adb0ca35a91912 (patch) | |
tree | 84fac15947f16be5f983a24428f479e528bf4ff1 | |
parent | 69c56754bdd6417de5b69d3c8c3684ecff8e4651 (diff) | |
download | meta-raspberrypi-73980301cf6c4d1d968266bbc2adb0ca35a91912.tar.gz |
Revert "u-boot: drop patch to include lowlevel_init"
Not applicable on U-boot 2016.03 which is used in poky/morty and causes an build
error when KERNEL_IMAGETYPE = "uImage".
This reverts commit 031e26954b95d49a66ea4677b9e867d08441f450.
[Issue #43]
Signed-off-by: Mirza Krak <mirza.krak@gmail.com>
-rw-r--r-- | recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch | 25 | ||||
-rw-r--r-- | recipes-bsp/u-boot/u-boot_%.bbappend | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch b/recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch new file mode 100644 index 0000000..1431a2e --- /dev/null +++ b/recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | From 1eb01436bc57ad32519a4567a1c9ec82d52d60a1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Paul Barker <paul@paulbarker.me.uk> | ||
3 | Date: Tue, 29 Nov 2016 19:47:49 +0000 | ||
4 | Subject: [PATCH] Include lowlevel_init.o for rpi2 | ||
5 | |||
6 | Signed-off-by: Paul Barker <paul@paulbarker.me.uk> | ||
7 | Upstream-status: Inappropriate | ||
8 | (not needed upstream as rpi_2 board directory is removed in latest | ||
9 | version) | ||
10 | --- | ||
11 | board/raspberrypi/rpi_2/Makefile | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/board/raspberrypi/rpi_2/Makefile b/board/raspberrypi/rpi_2/Makefile | ||
15 | index d82cd21..9f865c5 100644 | ||
16 | --- a/board/raspberrypi/rpi_2/Makefile | ||
17 | +++ b/board/raspberrypi/rpi_2/Makefile | ||
18 | @@ -5,3 +5,4 @@ | ||
19 | # | ||
20 | |||
21 | obj-y := ../rpi/rpi.o | ||
22 | +obj-y += ../rpi/lowlevel_init.o | ||
23 | -- | ||
24 | 2.1.4 | ||
25 | |||
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 0edc8dc..a4545f0 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend | |||
@@ -3,4 +3,5 @@ RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr" | |||
3 | SRC_URI_append_rpi = " \ | 3 | SRC_URI_append_rpi = " \ |
4 | file://0001-arm-add-save_boot_params-for-ARM1176.patch \ | 4 | file://0001-arm-add-save_boot_params-for-ARM1176.patch \ |
5 | file://0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch \ | 5 | file://0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch \ |
6 | file://0003-Include-lowlevel_init.o-for-rpi2.patch \ | ||
6 | " | 7 | " |