From 73980301cf6c4d1d968266bbc2adb0ca35a91912 Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Tue, 24 Jan 2017 19:16:38 +0100 Subject: [PATCH] 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 --- ...003-Include-lowlevel_init.o-for-rpi2.patch | 25 +++++++++++++++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 1 + 2 files changed, 26 insertions(+) create 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 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 @@ +From 1eb01436bc57ad32519a4567a1c9ec82d52d60a1 Mon Sep 17 00:00:00 2001 +From: Paul Barker +Date: Tue, 29 Nov 2016 19:47:49 +0000 +Subject: [PATCH] Include lowlevel_init.o for rpi2 + +Signed-off-by: Paul Barker +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 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" 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 \ "