From: Mirza Krak <mirza.k...@gmail.com>
U-boot has been updated to 2016.11 in OE-core Which means that we can
use the upstream patches instead of the backports and no need for the third
patch which causes a build error when used with 2016.11.
Signed-off-by: Mirza Krak <mirza.k...@gmail.com>
---
...0001-arm-add-save_boot_params-for-ARM1176.patch | 4 +---
...through-of-the-firmware-provided-FDT-blob.patch | 7 ++----
.../0003-Include-lowlevel_init.o-for-rpi2.patch | 25 ----------------------
recipes-bsp/u-boot/u-boot_%.bbappend | 1 -
4 files changed, 3 insertions(+), 34 deletions(-)
delete mode 100644
recipes-bsp/u-boot/files/0003-Include-lowlevel_init.o-for-rpi2.patch
diff --git
a/recipes-bsp/u-boot/files/0001-arm-add-save_boot_params-for-ARM1176.patch
b/recipes-bsp/u-boot/files/0001-arm-add-save_boot_params-for-ARM1176.patch
index a5ebff5..97a4144 100644
--- a/recipes-bsp/u-boot/files/0001-arm-add-save_boot_params-for-ARM1176.patch
+++ b/recipes-bsp/u-boot/files/0001-arm-add-save_boot_params-for-ARM1176.patch
@@ -1,7 +1,7 @@
From 3e10fcde3f3c24a488866dd33fa3f5d46ff3d7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Schieli?= <cschi...@gmail.com>
Date: Fri, 11 Nov 2016 11:59:06 +0100
-Subject: [PATCH] arm: add save_boot_params for ARM1176
+Subject: [PATCH 1/1] arm: add save_boot_params for ARM1176
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -13,8 +13,6 @@ feature mirrors the equivalent ARMv7 feature.
Signed-off-by: Cédric Schieli <cschi...@gmail.com>
Acked-by: Stephen Warren <swar...@nvidia.com>
-Signed-off-by: Paul Barker <p...@paulbarker.me.uk>
-Upstream-status: Backport
---
arch/arm/cpu/arm1176/start.S | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git
a/recipes-bsp/u-boot/files/0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch
b/recipes-bsp/u-boot/files/0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch
index 323b7ab..95ad94c 100644
---
a/recipes-bsp/u-boot/files/0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch
+++
b/recipes-bsp/u-boot/files/0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch
@@ -1,7 +1,7 @@
From ade243a211d62327e9ebadce27bbbff7981e37f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Schieli?= <cschi...@gmail.com>
Date: Fri, 11 Nov 2016 11:59:07 +0100
-Subject: [PATCH] rpi: passthrough of the firmware provided FDT blob
+Subject: [PATCH 1/1] rpi: passthrough of the firmware provided FDT blob
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -34,11 +34,8 @@ ${fdt_addr} and pass it to the kernel.
[1] https://www.raspberrypi.org/forums//viewtopic.php?f=107&t=134018
-Upstream-Status: Backport
-
Signed-off-by: Cédric Schieli <cschi...@gmail.com>
Acked-by: Stephen Warren <swar...@nvidia.com>
-Signed-off-by: Jonathan Liu <net...@gmail.com>
---
board/raspberrypi/rpi/Makefile | 1 +
board/raspberrypi/rpi/lowlevel_init.S | 36 +++++++++++++++++++++++++++++++++++
@@ -152,5 +149,5 @@ index 6245b36..ffd6d31 100644
set_usbethaddr();
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
--
-2.10.2
+2.1.4
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 @@
-From 1eb01436bc57ad32519a4567a1c9ec82d52d60a1 Mon Sep 17 00:00:00 2001
-From: Paul Barker <p...@paulbarker.me.uk>
-Date: Tue, 29 Nov 2016 19:47:49 +0000
-Subject: [PATCH] Include lowlevel_init.o for rpi2
-
-Signed-off-by: Paul Barker <p...@paulbarker.me.uk>
-Upstream-status: Inappropriate
- (not needed upstream as rpi_2 board directory is removed in latest
- version)
----
- board/raspberrypi/rpi_2/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/board/raspberrypi/rpi_2/Makefile
b/board/raspberrypi/rpi_2/Makefile
-index d82cd21..9f865c5 100644
---- a/board/raspberrypi/rpi_2/Makefile
-+++ b/board/raspberrypi/rpi_2/Makefile
-@@ -5,3 +5,4 @@
- #
-
- obj-y := ../rpi/rpi.o
-+obj-y += ../rpi/lowlevel_init.o
---
-2.1.4
-
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"
SRC_URI_append_rpi = " \
file://0001-arm-add-save_boot_params-for-ARM1176.patch \
file://0002-rpi-passthrough-of-the-firmware-provided-FDT-blob.patch \
- file://0003-Include-lowlevel_init.o-for-rpi2.patch \
"
--
2.1.4
--
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
