[meta-raspberrypi][PATCH V2] u-boot: drop patch to include lowlevel_init

[meta-raspberrypi][PATCH V2] u-boot: drop patch to include lowlevel_init

[Mirza Krak]

From: Mirza Krak <mirza.krak@gmail.com>

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>
---

Changes in V2:
- droped changes to patch 0001 and 0002 to perserve the backport tags, based on comments from Paul Barker.

 .../0003-Include-lowlevel_init.o-for-rpi2.patch    | 25 ----------------------
 recipes-bsp/u-boot/u-boot_%.bbappend               |  1 -
 2 files changed, 26 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/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 <paul@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 <paul@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

Re: [meta-raspberrypi][PATCH V2] u-boot: drop patch to include lowlevel_init

[Andrei Gherzan]

[-- Attachment #1: Type: text/plain, Size: 2705 bytes --]

On Fri, Dec 09, 2016 at 12:20:29PM +0100, Mirza Krak wrote:
> From: Mirza Krak <mirza.krak@gmail.com>
>
> 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>
> ---
>
> Changes in V2:
> - droped changes to patch 0001 and 0002 to perserve the backport tags, based on comments from Paul Barker.
>
>  .../0003-Include-lowlevel_init.o-for-rpi2.patch    | 25 ----------------------
>  recipes-bsp/u-boot/u-boot_%.bbappend               |  1 -
>  2 files changed, 26 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/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 <paul@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 <paul@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

Merged to master. Thanks.

--
Andrei Gherzan

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 817 bytes --]