[yocto] [meta-raspberrypi][PATCH] u-boot: drop now upstreamed patches

Thu Sep 14 14:22:00 PDT 2017

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 <gizero at gmail.com>
---
 ...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

diff --git a/recipes-bsp/u-boot/u-boot/0001-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch b/recipes-bsp/u-boot/u-boot/0001-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch
deleted file mode 100644
index ffabe89..0000000
--- a/recipes-bsp/u-boot/u-boot/0001-Revert-dm-arm-rpi-Drop-CONFIG_OF_EMBED.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 46035d84eb75d54e524d068c29a42c4f562f757a Mon Sep 17 00:00:00 2001
-From: Paul Barker <pbarker at toganlabs.com>
-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 <pbarker at toganlabs.com>
-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
-
diff --git a/recipes-bsp/u-boot/u-boot/0002-rpi-Enable-USB-keyboard-support.patch b/recipes-bsp/u-boot/u-boot/0002-rpi-Enable-USB-keyboard-support.patch
deleted file mode 100644
index 675d7d9..0000000
--- a/recipes-bsp/u-boot/u-boot/0002-rpi-Enable-USB-keyboard-support.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From e4ddccdcf2360c104de502db140a2dbb90b63cfe Mon Sep 17 00:00:00 2001
-From: Simon Glass <sjg at chromium.org>
-Date: Thu, 24 Aug 2017 19:45:31 -0600
-Subject: [PATCH 2/2] rpi: Enable USB keyboard support
-
-This is currently disabled, so USB keyboards are not detected in U_Boot.
-Enable this option to fix that.
-
-Backported to v2017.07.
-
-Signed-off-by: Simon Glass <sjg at chromium.org>
-Signed-off-by: Paul Barker <pbarker at toganlabs.com>
-Upstream-status: Backport
----
- 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 6aa0532..9851836 100644
---- a/configs/rpi_2_defconfig
-+++ b/configs/rpi_2_defconfig
-@@ -22,6 +22,7 @@ CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_STORAGE=y
- CONFIG_USB_KEYBOARD=y
-+CONFIG_DM_KEYBOARD=y
- CONFIG_DM_VIDEO=y
- CONFIG_SYS_WHITE_ON_BLACK=y
- CONFIG_CONSOLE_SCROLL_LINES=10
-diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
-index 7396925..c9bdcd7 100644
---- a/configs/rpi_3_32b_defconfig
-+++ b/configs/rpi_3_32b_defconfig
-@@ -24,6 +24,7 @@ CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_STORAGE=y
- CONFIG_USB_KEYBOARD=y
-+CONFIG_DM_KEYBOARD=y
- CONFIG_DM_VIDEO=y
- CONFIG_SYS_WHITE_ON_BLACK=y
- CONFIG_CONSOLE_SCROLL_LINES=10
-diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
-index 1b1ee67..e9c9806 100644
---- a/configs/rpi_3_defconfig
-+++ b/configs/rpi_3_defconfig
-@@ -24,6 +24,7 @@ CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_STORAGE=y
- CONFIG_USB_KEYBOARD=y
-+CONFIG_DM_KEYBOARD=y
- CONFIG_DM_VIDEO=y
- CONFIG_SYS_WHITE_ON_BLACK=y
- CONFIG_CONSOLE_SCROLL_LINES=10
-diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
-index c7cf6e0..59d8c58 100644
---- a/configs/rpi_defconfig
-+++ b/configs/rpi_defconfig
-@@ -22,6 +22,7 @@ CONFIG_USB=y
- CONFIG_DM_USB=y
- CONFIG_USB_STORAGE=y
- CONFIG_USB_KEYBOARD=y
-+CONFIG_DM_KEYBOARD=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 8d0a531..3781666 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -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"
-- 
2.7.4


