summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMirza Krak <mirza.krak@gmail.com>2016-12-09 12:20:29 +0100
committerAndrei Gherzan <andrei@gherzan.ro>2016-12-29 20:00:55 +0100
commit031e26954b95d49a66ea4677b9e867d08441f450 (patch)
treedca9a9fbd199e9f1d31bf1e54e87f367b7df444d
parentc40558173ffd96c499d101155f6c4c2be85d9f0f (diff)
downloadmeta-raspberrypi-031e26954b95d49a66ea4677b9e867d08441f450.tar.gz
u-boot: drop patch to include lowlevel_init
The patch 0003-Include-lowlevel_init.o-for-rpi2.patch does not apply on 2016.11 and causes an build error. Patch 0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch provides the inclusion of lowlever_init.o. Signed-off-by: Mirza Krak <mirza.krak@gmail.com>
-rw-r--r--recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch25
-rw-r--r--recipes-bsp/u-boot/u-boot_%.bbappend1
2 files changed, 0 insertions, 26 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
deleted file mode 100644
index ce0273f..0000000
--- a/recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From 1eb01436bc57ad32519a4567a1c9ec82d52d60a1 Mon Sep 17 00:00:00 2001
2From: Paul Barker <paul@paulbarker.me.uk>
3Date: Tue, 29 Nov 2016 19:47:49 +0000
4Subject: [PATCH] Include lowlevel_init.o for rpi2
5
6Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
7Upstream-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
14diff --git a/board/raspberrypi/rpi_2/Makefile b/board/raspberrypi/rpi_2/Makefile
15index 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--
242.1.4
25
diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index a4545f0..0edc8dc 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -3,5 +3,4 @@ RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr"
3SRC_URI_append_rpi = " \ 3SRC_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 \
7 " 6 "