u-boot: drop now upstreamed patches
PATCH 1/1 u-boot: drop now upstreamed patches
oe-core now provides v2017.09 of u-boot which already merged both patches introduced by commit 94e2929f746f7e49a7870f7ea889dcbed05296c7 so we can drop them from meta-raspberrypi.
Signed-off-by Andrea Galbusera <[email protected]>
--- ...01-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch | 67 -------------------- .../0002-rpi-Enable-USB-keyboard-support.patch | 71 ---------------------- recipes-bsp/u-boot/u-boot_%.bbappend | 7 --- 3 files changed, 145 deletions(-) delete mode 100644 recipes-bsp/u-boot/u-boot/0001-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch delete mode 100644 recipes-bsp/u-boot/u-boot/0002-rpi-Enable-USB-keyboard-support.patch
recipes-bsp/u-boot/u-boot/0001-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch deleted +0 -67
@@ -1,67 +0,0 @@ -From 46035d84eb75d54e524d068c29a42c4f562f757a Mon Sep 17 00:00:00 2001 -From: Paul Barker <[email protected]> -Date: Wed, 2 Aug 2017 11:37:30 +0100 -Subject: [PATCH 1/2] Revert "dm: arm: rpi: Drop CONFIG_OF_EMBED" - -This reverts commit 25877d4e4c45451c5398aec3de50e0d5befe0e9f. - -Signed-off-by: Paul Barker <[email protected]> -Upstream-status: Pending ---- - configs/rpi_2_defconfig | 1 + - configs/rpi_3_32b_defconfig | 1 + - configs/rpi_3_defconfig | 1 + - configs/rpi_defconfig | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index 862203f..6aa0532 100644 ---- a/configs/rpi_2_defconfig -+++ b/configs/rpi_2_defconfig -@@ -13,6 +13,7 @@ CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y - # CONFIG_CMD_FPGA is not set - CONFIG_CMD_GPIO=y -+CONFIG_OF_EMBED=y - CONFIG_DM_MMC=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_BCM2835=y -diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index 95b1677..7396925 100644 ---- a/configs/rpi_3_32b_defconfig -+++ b/configs/rpi_3_32b_defconfig -@@ -14,6 +14,7 @@ CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y - # CONFIG_CMD_FPGA is not set - CONFIG_CMD_GPIO=y -+CONFIG_OF_EMBED=y - CONFIG_DM_MMC=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_BCM2835=y -diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index f91b53d..1b1ee67 100644 ---- a/configs/rpi_3_defconfig -+++ b/configs/rpi_3_defconfig -@@ -14,6 +14,7 @@ CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y - # CONFIG_CMD_FPGA is not set - CONFIG_CMD_GPIO=y -+CONFIG_OF_EMBED=y - CONFIG_DM_MMC=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_BCM2835=y -diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index e2d81ab..c7cf6e0 100644 ---- a/configs/rpi_defconfig -+++ b/configs/rpi_defconfig -@@ -13,6 +13,7 @@ CONFIG_CMD_MMC=y - CONFIG_CMD_USB=y - # CONFIG_CMD_FPGA is not set - CONFIG_CMD_GPIO=y -+CONFIG_OF_EMBED=y - CONFIG_DM_MMC=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_BCM2835=y --- -2.7.4 -
recipes-bsp/u-boot/u-boot/0002-rpi-Enable-USB-keyboard-support.patch deleted +0 -71
71 lines not on this page · raw message
recipes-bsp/u-boot/u-boot_%.bbappend +0 -7
@@ -1,8 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:" - -SRC_URI_append_rpi = " \ - file://0001-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch \ - file://0002-rpi-Enable-USB-keyboard-support.patch \ - " - RDEPENDS_${PN}_append_rpi = " rpi-u-boot-scr"
Signature · 1 line
2.7.4