All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot
@ 2016-06-18 11:07 Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 1/4] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Paul Barker @ 2016-06-18 11:07 UTC (permalink / raw)
  To: yocto

Following discussion on the Raspberry Pi tools bug tracker it was found that
rpi-mkimage is no longer needed with recent firmware. It can therefore be
dropped from the layer completely.

Whilst looking into this I also found that the u-boot-rpi recipe in
meta-raspberrypi can now be replaced by direct use of the mainline u-boot recipe
from oe-core. The 2016.03 release of u-boot supports the original Raspberry Pi
and the Raspberry Pi 2. Configuration of the u-boot environment to directly boot
the uImage file on the SD card must still be done manually - I'm going to look
into making this work by default in the near future.

Changes for V2:
    * Don't remove linux-raspberrypi 3.18 just yet
    * Drop move of PV setting out of linux-raspberrypi.inc

Changes for V3:
    * Rebase onto latest master

Paul Barker (4):
  linux-raspberrypi: rpi-mkimage is no longer needed
  u-boot: Use mainline u-boot recipe from oe-core
  rpi-mkimage: Remove unused recipe
  sdcard_image-rpi: Always install dtb files

 classes/sdcard_image-rpi.bbclass                   | 42 +++++++++++-----------
 conf/machine/include/rpi-default-providers.inc     |  1 -
 conf/machine/raspberrypi.conf                      |  2 ++
 conf/machine/raspberrypi2.conf                     |  2 ++
 recipes-bsp/rpi-mkimage/rpi-mkimage/License        | 25 -------------
 .../open-files-relative-to-script.patch            | 17 ---------
 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb         | 22 ------------
 recipes-bsp/u-boot/u-boot-rpi_git.bb               | 29 ---------------
 recipes-kernel/linux/linux-raspberrypi.inc         | 20 -----------
 9 files changed, 25 insertions(+), 135 deletions(-)
 delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/License
 delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
 delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
 delete mode 100644 recipes-bsp/u-boot/u-boot-rpi_git.bb

-- 
2.1.4



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [meta-raspberrypi][PATCH V3 1/4] linux-raspberrypi: rpi-mkimage is no longer needed
  2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
@ 2016-06-18 11:07 ` Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 2/4] u-boot: Use mainline u-boot recipe from oe-core Paul Barker
                   ` (4 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Paul Barker @ 2016-06-18 11:07 UTC (permalink / raw)
  To: yocto

Recent versions of the Raspberry Pi firmware can directly handle kernel images
which use device tree. The modifications made by rpi-mkimage are no longer
needed.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 recipes-kernel/linux/linux-raspberrypi.inc | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/recipes-kernel/linux/linux-raspberrypi.inc b/recipes-kernel/linux/linux-raspberrypi.inc
index 6133b02..6184402 100644
--- a/recipes-kernel/linux/linux-raspberrypi.inc
+++ b/recipes-kernel/linux/linux-raspberrypi.inc
@@ -35,13 +35,6 @@ python __anonymous () {
     kerneltype = d.getVar('KERNEL_IMAGETYPE', True)
     kerneldt = get_dts(d, d.getVar('LINUX_VERSION', True))
     d.setVar("KERNEL_DEVICETREE", kerneldt)
-
-    # Add dependency to 'rpi-mkimage-native' package only if RPi bootloader is used with DT-enable kernel
-    if kerneldt:
-        if kerneltype != 'uImage' and len(kerneldt.strip()) > 1:
-            depends = d.getVar("DEPENDS", True)
-            depends = "%s rpi-mkimage-native" % depends
-            d.setVar("DEPENDS", depends)
 }
 
 do_kernel_configme_prepend() {
@@ -62,17 +55,6 @@ do_deploy_append() {
     echo "${CMDLINE}${PITFT_PARAMS}" > ${DEPLOYDIR}/bcm2835-bootfiles/cmdline.txt
 }
 
-do_rpiboot_mkimage() {
-    if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
-        if test -n "${KERNEL_DEVICETREE}"; then
-            # Add RPi bootloader trailer to kernel image to enable DeviceTree support
-            for type in ${KERNEL_IMAGETYPES} ; do
-                ${STAGING_BINDIR_NATIVE}/mkknlimg --dtok ${KERNEL_OUTPUT_DIR}/$type ${KERNEL_OUTPUT_DIR}/$type
-            done
-        fi
-    fi
-}
-
 do_bundle_initramfs_append() {
     if [ ! -z "${INITRAMFS_IMAGE}" -a x"${INITRAMFS_IMAGE_BUNDLE}" = x1 ]; then
         if test "x${KERNEL_IMAGETYPE}" != "xuImage" ; then
@@ -85,5 +67,3 @@ do_bundle_initramfs_append() {
         fi
     fi
 }
-
-addtask rpiboot_mkimage before do_install after do_compile
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-raspberrypi][PATCH V3 2/4] u-boot: Use mainline u-boot recipe from oe-core
  2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 1/4] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
@ 2016-06-18 11:07 ` Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 3/4] rpi-mkimage: Remove unused recipe Paul Barker
                   ` (3 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Paul Barker @ 2016-06-18 11:07 UTC (permalink / raw)
  To: yocto

The repository used by u-boot-rpi has not been updated since 2012. In the
meantime, mailine u-boot has gained Raspberry Pi support. All we need to do is
set UBOOT_MACHINE to an appropriate value in the machine config files.

Currently configs are only provided for raspberrypi and raspberrypi2. The master
branch of u-boot now also appears to have a config file for raspberrypi3 so
support for this can be added in the future when u-boot is upgraded in oe-core.

The mainline u-boot recipe creates the file "u-boot.bin" instead of
"u-boot.img".

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 classes/sdcard_image-rpi.bbclass               |  2 +-
 conf/machine/include/rpi-default-providers.inc |  1 -
 conf/machine/raspberrypi.conf                  |  2 ++
 conf/machine/raspberrypi2.conf                 |  2 ++
 recipes-bsp/u-boot/u-boot-rpi_git.bb           | 29 --------------------------
 5 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 recipes-bsp/u-boot/u-boot-rpi_git.bb

diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 4dfd7a3..20bd314 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -105,7 +105,7 @@ IMAGE_CMD_rpi-sdimg () {
 	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
 	case "${KERNEL_IMAGETYPE}" in
 	"uImage")
-		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.img ::${SDIMG_KERNELIMAGE}
+		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE}
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
 		;;
 	*)
diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc
index cabbd43..359870d 100644
--- a/conf/machine/include/rpi-default-providers.inc
+++ b/conf/machine/include/rpi-default-providers.inc
@@ -1,7 +1,6 @@
 # RaspberryPi BSP default providers
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-raspberrypi"
-PREFERRED_PROVIDER_u-boot ?= "u-boot-rpi"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_virtual/egl ?= "userland"
 PREFERRED_PROVIDER_virtual/libgles2 ?= "userland"
diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf
index 0f95f1a..72beeb8 100644
--- a/conf/machine/raspberrypi.conf
+++ b/conf/machine/raspberrypi.conf
@@ -8,3 +8,5 @@ require conf/machine/include/tune-arm1176jzf-s.inc
 include conf/machine/include/rpi-base.inc
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
+
+UBOOT_MACHINE = "rpi_config"
diff --git a/conf/machine/raspberrypi2.conf b/conf/machine/raspberrypi2.conf
index b6346e6..d50ef70 100644
--- a/conf/machine/raspberrypi2.conf
+++ b/conf/machine/raspberrypi2.conf
@@ -8,3 +8,5 @@ require conf/machine/include/tune-cortexa7.inc
 include conf/machine/include/rpi-base.inc
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
+
+UBOOT_MACHINE = "rpi_2_config"
diff --git a/recipes-bsp/u-boot/u-boot-rpi_git.bb b/recipes-bsp/u-boot/u-boot-rpi_git.bb
deleted file mode 100644
index 3e8d377..0000000
--- a/recipes-bsp/u-boot/u-boot-rpi_git.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-DESCRIPTION = "U-Boot port for RaspberryPi"
-
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "rpi-mkimage-native"
-
-PROVIDES += "u-boot"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
-
-SRCREV = "6709570cdc947c2a546f96d571551acf4474778c"
-SRC_URI = "git://github.com/gonzoua/u-boot-pi.git;branch=rpi"
-
-S = "${WORKDIR}/git"
-
-UBOOT_MACHINE = "rpi_b"
-UBOOT_MAKE_TARGET = "u-boot.bin"
-UBOOT_SUFFIX = "img"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-COMPATIBLE_MACHINE = "raspberrypi"
-
-do_compile_append() {
-    # Create kernel.img from uboot.bin and name it u-boot.img
-    ${STAGING_BINDIR_NATIVE}/imagetool-uncompressed.py u-boot.bin
-    mv kernel.img u-boot.img
-}
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-raspberrypi][PATCH V3 3/4] rpi-mkimage: Remove unused recipe
  2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 1/4] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 2/4] u-boot: Use mainline u-boot recipe from oe-core Paul Barker
@ 2016-06-18 11:07 ` Paul Barker
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 4/4] sdcard_image-rpi: Always install dtb files Paul Barker
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 7+ messages in thread
From: Paul Barker @ 2016-06-18 11:07 UTC (permalink / raw)
  To: yocto

The rpi-mkimage tools are no longer used. Recent Raspberry Pi firmware can
directly boot a Linux kernel image using device tree and mainline u-boot
supports Raspberry Pi without the use of these tools.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 recipes-bsp/rpi-mkimage/rpi-mkimage/License        | 25 ----------------------
 .../open-files-relative-to-script.patch            | 17 ---------------
 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb         | 22 -------------------
 3 files changed, 64 deletions(-)
 delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/License
 delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
 delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb

diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage/License b/recipes-bsp/rpi-mkimage/rpi-mkimage/License
deleted file mode 100644
index 2582681..0000000
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/License
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2012, Broadcom Europe Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holder nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch b/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
deleted file mode 100644
index fa9e88b..0000000
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-When using open, use path relative to imagetool-uncompressed.py
-
-Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-
-Index: git/mkimage/imagetool-uncompressed.py
-===================================================================
---- a/mkimage/imagetool-uncompressed.py
-+++ b/mkimage/imagetool-uncompressed.py
-@@ -18,7 +18,7 @@ re_line = re.compile(r"0x(?P<value>[0-9a
- mem = [0 for i in range(32768)]
- 
- def load_to_mem(name, addr):
--   f = open(name)
-+   f = open(os.path.dirname(__file__) + '/' + name)
- 
-    for l in f.readlines():
-       m = re_line.match(l)
diff --git a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb b/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
deleted file mode 100644
index cce91d7..0000000
--- a/recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SUMMARY = "RaspberryPi tool to produce kernel.img"
-LICENSE = "Broadcom"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/License;md5=957f6640d5e2d2acfce73a36a56cb32f"
-SECTION = "bootloader"
-
-DEPENDS = "python"
-
-SRCREV = "f5642106425d430e1f82ee064121a5fd0e05a386"
-SRC_URI = " \
-    git://github.com/raspberrypi/tools.git;branch=master;protocol=git \
-    file://License \
-    file://open-files-relative-to-script.patch \
-"
-
-S = "${WORKDIR}/git"
-
-do_install () {
-    install -d ${D}${bindir}
-    install -t ${D}${bindir} mkimage/*
-}
-
-BBCLASSEXTEND = "native"
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [meta-raspberrypi][PATCH V3 4/4] sdcard_image-rpi: Always install dtb files
  2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
                   ` (2 preceding siblings ...)
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 3/4] rpi-mkimage: Remove unused recipe Paul Barker
@ 2016-06-18 11:07 ` Paul Barker
  2016-07-06 22:53 ` [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
  2016-07-08 11:31 ` Andrei Gherzan
  5 siblings, 0 replies; 7+ messages in thread
From: Paul Barker @ 2016-06-18 11:07 UTC (permalink / raw)
  To: yocto

We now need dtb files when booting via u-boot.

Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 classes/sdcard_image-rpi.bbclass | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 20bd314..3b4f13f 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -103,32 +103,32 @@ IMAGE_CMD_rpi-sdimg () {
 	rm -f ${WORKDIR}/boot.img
 	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
 	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
+	if test -n "${DTS}"; then
+		# Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder
+		DT_OVERLAYS="${@split_overlays(d, 0)}"
+		DT_ROOT="${@split_overlays(d, 1)}"
+
+		# Copy board device trees to root folder
+		for DTB in ${DT_ROOT}; do
+			DTB_BASE_NAME=`basename ${DTB} .dtb`
+
+			mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
+		done
+
+		# Copy device tree overlays to dedicated folder
+		mmd -i ${WORKDIR}/boot.img overlays
+		for DTB in ${DT_OVERLAYS}; do
+			DTB_BASE_NAME=`basename ${DTB} .dtb`
+
+			mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
+		done
+	fi
 	case "${KERNEL_IMAGETYPE}" in
 	"uImage")
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_KERNELIMAGE}
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::uImage
 		;;
 	*)
-		if test -n "${DTS}"; then
-			# Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder
-			DT_OVERLAYS="${@split_overlays(d, 0)}"
-			DT_ROOT="${@split_overlays(d, 1)}"
-
-			# Copy board device trees to root folder
-			for DTB in ${DT_ROOT}; do
-				DTB_BASE_NAME=`basename ${DTB} .dtb`
-
-				mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
-			done
-
-			# Copy device tree overlays to dedicated folder
-			mmd -i ${WORKDIR}/boot.img overlays
-			for DTB in ${DT_OVERLAYS}; do
-				DTB_BASE_NAME=`basename ${DTB} .dtb`
-
-				mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtb
-			done
-		fi
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}
 		;;
 	esac
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot
  2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
                   ` (3 preceding siblings ...)
  2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 4/4] sdcard_image-rpi: Always install dtb files Paul Barker
@ 2016-07-06 22:53 ` Paul Barker
  2016-07-08 11:31 ` Andrei Gherzan
  5 siblings, 0 replies; 7+ messages in thread
From: Paul Barker @ 2016-07-06 22:53 UTC (permalink / raw)
  To: yocto

On Sat, 18 Jun 2016 12:07:02 +0100
Paul Barker <paul@paulbarker.me.uk> wrote:

> Following discussion on the Raspberry Pi tools bug tracker it was
> found that rpi-mkimage is no longer needed with recent firmware. It
> can therefore be dropped from the layer completely.
> 
> Whilst looking into this I also found that the u-boot-rpi recipe in
> meta-raspberrypi can now be replaced by direct use of the mainline
> u-boot recipe from oe-core. The 2016.03 release of u-boot supports
> the original Raspberry Pi and the Raspberry Pi 2. Configuration of
> the u-boot environment to directly boot the uImage file on the SD
> card must still be done manually - I'm going to look into making this
> work by default in the near future.
> 
> Changes for V2:
>     * Don't remove linux-raspberrypi 3.18 just yet
>     * Drop move of PV setting out of linux-raspberrypi.inc
> 
> Changes for V3:
>     * Rebase onto latest master
> 
> Paul Barker (4):
>   linux-raspberrypi: rpi-mkimage is no longer needed
>   u-boot: Use mainline u-boot recipe from oe-core
>   rpi-mkimage: Remove unused recipe
>   sdcard_image-rpi: Always install dtb files
> 
>  classes/sdcard_image-rpi.bbclass                   | 42
> +++++++++++-----------
> conf/machine/include/rpi-default-providers.inc     |  1 -
> conf/machine/raspberrypi.conf                      |  2 ++
> conf/machine/raspberrypi2.conf                     |  2 ++
> recipes-bsp/rpi-mkimage/rpi-mkimage/License        | 25
> ------------- .../open-files-relative-to-script.patch            | 17
> --------- recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb         | 22
> ------------ recipes-bsp/u-boot/u-boot-rpi_git.bb               | 29
> --------------- recipes-kernel/linux/linux-raspberrypi.inc         |
> 20 ----------- 9 files changed, 25 insertions(+), 135 deletions(-)
> delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/License delete
> mode 100644
> recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
> delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb delete
> mode 100644 recipes-bsp/u-boot/u-boot-rpi_git.bb
> 

Ping on this.

Thanks,
Paul Barker


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot
  2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
                   ` (4 preceding siblings ...)
  2016-07-06 22:53 ` [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
@ 2016-07-08 11:31 ` Andrei Gherzan
  5 siblings, 0 replies; 7+ messages in thread
From: Andrei Gherzan @ 2016-07-08 11:31 UTC (permalink / raw)
  To: Paul Barker; +Cc: yocto

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

On Sat, Jun 18, 2016 at 12:07:02PM +0100, Paul Barker wrote:
> Following discussion on the Raspberry Pi tools bug tracker it was found that
> rpi-mkimage is no longer needed with recent firmware. It can therefore be
> dropped from the layer completely.
>
> Whilst looking into this I also found that the u-boot-rpi recipe in
> meta-raspberrypi can now be replaced by direct use of the mainline u-boot recipe
> from oe-core. The 2016.03 release of u-boot supports the original Raspberry Pi
> and the Raspberry Pi 2. Configuration of the u-boot environment to directly boot
> the uImage file on the SD card must still be done manually - I'm going to look
> into making this work by default in the near future.
>
> Changes for V2:
>     * Don't remove linux-raspberrypi 3.18 just yet
>     * Drop move of PV setting out of linux-raspberrypi.inc
>
> Changes for V3:
>     * Rebase onto latest master
>
> Paul Barker (4):
>   linux-raspberrypi: rpi-mkimage is no longer needed
>   u-boot: Use mainline u-boot recipe from oe-core
>   rpi-mkimage: Remove unused recipe
>   sdcard_image-rpi: Always install dtb files
>
>  classes/sdcard_image-rpi.bbclass                   | 42 +++++++++++-----------
>  conf/machine/include/rpi-default-providers.inc     |  1 -
>  conf/machine/raspberrypi.conf                      |  2 ++
>  conf/machine/raspberrypi2.conf                     |  2 ++
>  recipes-bsp/rpi-mkimage/rpi-mkimage/License        | 25 -------------
>  .../open-files-relative-to-script.patch            | 17 ---------
>  recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb         | 22 ------------
>  recipes-bsp/u-boot/u-boot-rpi_git.bb               | 29 ---------------
>  recipes-kernel/linux/linux-raspberrypi.inc         | 20 -----------
>  9 files changed, 25 insertions(+), 135 deletions(-)
>  delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/License
>  delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage/open-files-relative-to-script.patch
>  delete mode 100644 recipes-bsp/rpi-mkimage/rpi-mkimage_git.bb
>  delete mode 100644 recipes-bsp/u-boot/u-boot-rpi_git.bb
>

Merged to master. Thank you.

--
Andrei Gherzan

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-07-08 11:31 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-18 11:07 [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 1/4] linux-raspberrypi: rpi-mkimage is no longer needed Paul Barker
2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 2/4] u-boot: Use mainline u-boot recipe from oe-core Paul Barker
2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 3/4] rpi-mkimage: Remove unused recipe Paul Barker
2016-06-18 11:07 ` [meta-raspberrypi][PATCH V3 4/4] sdcard_image-rpi: Always install dtb files Paul Barker
2016-07-06 22:53 ` [meta-raspberrypi][PATCH V3 0/4] Drop rpi-mkimage and use upstream u-boot Paul Barker
2016-07-08 11:31 ` Andrei Gherzan

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.