From d2015ceee06531c61fb59f16d8fd23e31b9e68e7 Mon Sep 17 00:00:00 2001 From: Jonathan Haigh Date: Tue, 8 May 2018 14:17:06 +0100 Subject: [PATCH] u-boot: Remove upstreamed U-Boot rpi0w defconfig patch [Issue #239] -- https://github.com/agherzan/meta-raspberrypi/issues/239 The patch 0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch has been applied to the upstream U-Boot repo and is now in the release that openembedded-core uses so remove it from meta-raspberrypi's U-Boot bbappend. Signed-off-by: Jonathan Haigh --- ...0_w-Add-configs-consistent-with-RpI3.patch | 41 ------------------- recipes-bsp/u-boot/u-boot_%.bbappend | 6 --- 2 files changed, 47 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch diff --git a/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch b/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch deleted file mode 100644 index e98fd85..0000000 --- a/recipes-bsp/u-boot/u-boot/0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 5d113dc0130ea2ea9faaa000fba9c737266b9747 Mon Sep 17 00:00:00 2001 -From: Drew Moseley -Date: Fri, 9 Feb 2018 18:10:09 -0500 -Subject: [PATCH] rpi_0_w: Add configs consistent with RpI3 - -Upstream-Status: Accepted [https://patchwork.ozlabs.org/patch/856572/] - -Signed-off-by: Drew Moseley ---- - configs/rpi_0_w_defconfig | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index 9a6d24b..1248294 100644 ---- a/configs/rpi_0_w_defconfig -+++ b/configs/rpi_0_w_defconfig -@@ -12,14 +12,21 @@ CONFIG_SYS_PROMPT="U-Boot> " - CONFIG_CMD_GPIO=y - CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y -+CONFIG_OF_EMBED=y -+CONFIG_ENV_FAT_INTERFACE="mmc" -+CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" -+CONFIG_DM_KEYBOARD=y - CONFIG_DM_MMC=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_BCM2835=y - CONFIG_DM_ETH=y - CONFIG_USB=y - CONFIG_DM_USB=y -+CONFIG_USB_DWC2=y - CONFIG_USB_STORAGE=y - CONFIG_USB_KEYBOARD=y -+CONFIG_USB_HOST_ETHER=y -+CONFIG_USB_ETHER_SMSC95XX=y - CONFIG_DM_VIDEO=y - CONFIG_SYS_WHITE_ON_BLACK=y - CONFIG_CONSOLE_SCROLL_LINES=10 --- -2.7.4 - diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 7d4a49e..95015f4 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,7 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:" - -SRC_URI_append_rpi = " \ - file://0002-rpi_0_w-Add-configs-consistent-with-RpI3.patch \ -" - DEPENDS_append_rpi = " rpi-u-boot-scr"