From f0e2287af9d0efc7952839b8df2cdf732a9e75a5 Mon Sep 17 00:00:00 2001 From: Trevor Woerner Date: Mon, 30 Apr 2018 17:06:09 -0400 Subject: [PATCH] bootloader: set to upstream u-boot for rk3288 The upstream u-boot bootloader seems to work fine for both the tinker-rk3288 and the firefly-rk3288, so switch to it by default for rk3288 boards. Signed-off-by: Trevor Woerner --- conf/machine/include/rk3288.inc | 2 +- recipes-bsp/u-boot/u-boot_%.bbappend | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/u-boot/u-boot_%.bbappend diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index 4dd0250..0528e8a 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -9,7 +9,7 @@ require conf/machine/include/rockchip-defaults.inc SERIAL_CONSOLES = "115200;ttyS2" -PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-rockchip" +PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot" SPL_BINARY ?= "u-boot-spl-dtb.bin" IMAGE_FSTYPES = "rockchip-gpt-img" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend new file mode 100644 index 0000000..fa0a681 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -0,0 +1,6 @@ +do_compile_append_rk3288 () { + # copy to default search path + if [ ${SPL_BINARY} ]; then + cp ${B}/spl/${SPL_BINARY} ${B}/ + fi +}