From bfa90d0cf6b219fd2d5e86d4dbf096fa6ff135f3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 6 Sep 2019 11:40:02 +0000 Subject: [PATCH] u-boot-fw-utils: apply the same rpi4 patches as for u-boot recipe * otherwise u-boot-fw-utils build for rpi4 fails with: scripts/kconfig/conf --defconfig=arch/../configs/rpi_4_defconfig Kconfig *** *** Can't find default configuration "arch/../configs/rpi_4_defconfig"! *** scripts/kconfig/Makefile:128: recipe for target 'rpi_4_defconfig' failed * cannot include/require u-boot_2019.07.bbappend directly in u-boot-fw-utils_2019.07.bbappend, because then it fails with: "u-boot_2019.01.bbappend: not a BitBake file" Signed-off-by: Martin Jansa --- .../u-boot/u-boot-fw-utils_2019.01.bbappend | 2 ++ recipes-bsp/u-boot/u-boot-rpi4-2019.01.inc | 13 +++++++++++++ recipes-bsp/u-boot/u-boot_2019.01.bbappend | 15 ++------------- 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bbappend create mode 100644 recipes-bsp/u-boot/u-boot-rpi4-2019.01.inc diff --git a/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bbappend b/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bbappend new file mode 100644 index 0000000..3daf157 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-fw-utils_2019.01.bbappend @@ -0,0 +1,2 @@ +# Apply the same patches for rpi4 as u-boot recipe +require u-boot-rpi4-${PV}.inc diff --git a/recipes-bsp/u-boot/u-boot-rpi4-2019.01.inc b/recipes-bsp/u-boot/u-boot-rpi4-2019.01.inc new file mode 100644 index 0000000..e06ebfc --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-rpi4-2019.01.inc @@ -0,0 +1,13 @@ +FILESEXTRAPATHS_prepend_raspberrypi4 := "${THISDIR}/u-boot-2019.01:" +UBOOT_RPI4_SUPPORT_PATCHES = " \ + file://0001-Fix-compilation-error-if-CONFIG_USB-is-disabled.patch \ + file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \ + file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \ + file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \ + file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \ + file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \ + file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \ + file://0007-rpi-Add-memory-map-for-bcm2838.patch \ +" + +SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}" diff --git a/recipes-bsp/u-boot/u-boot_2019.01.bbappend b/recipes-bsp/u-boot/u-boot_2019.01.bbappend index b11dfc2..3daf157 100644 --- a/recipes-bsp/u-boot/u-boot_2019.01.bbappend +++ b/recipes-bsp/u-boot/u-boot_2019.01.bbappend @@ -1,13 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" -UBOOT_RPI4_SUPPORT_PATCHES = " \ - file://0001-Fix-compilation-error-if-CONFIG_USB-is-disabled.patch \ - file://0001-configs-rpi4-Add-defconfigs-for-rpi4-32-64.patch \ - file://0002-ARM-bcm283x-Add-BCM283x_BASE-define.patch \ - file://0003-arm-mach-bcm283x-Define-configs-for-RaspberryPi-4.patch \ - file://0004-rpi-Add-entry-for-Raspberry-Pi-4-model-B.patch \ - file://0005-arm-bcm283x-Include-definition-for-additional-emmc-c.patch \ - file://0006-mmc-bcm2835_sdhci-Add-support-for-bcm2711-device.patch \ - file://0007-rpi-Add-memory-map-for-bcm2838.patch \ -" - -SRC_URI_append_raspberrypi4 = "${UBOOT_RPI4_SUPPORT_PATCHES}" +# Apply the same patches for rpi4 as u-boot recipe +require u-boot-rpi4-${PV}.inc