From d49bd07c5b54defc7cec5829d287a2bd82ae9afe Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 18 Jun 2016 12:07:04 +0100 Subject: u-boot: Use mainline u-boot recipe from oe-core 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 --- conf/machine/include/rpi-default-providers.inc | 1 - conf/machine/raspberrypi.conf | 2 ++ conf/machine/raspberrypi2.conf | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'conf/machine') 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" -- cgit v1.2.3-54-g00ecf