From 7a358fc25fec032d4dde7f8393ccc434e093dba8 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 15 Feb 2019 11:21:15 +0100 Subject: [PATCH] u-boot: remove unnecessary patches for Digi platforms Signed-off-by: Arturo Buzarra --- .../files/10m50-update-device-tree.patch | 28 ------------------- .../files/MPC8315ERDB-enable-DHCP.patch | 19 ------------- .../u-boot/u-boot-common_2017.09.inc | 2 -- 3 files changed, 49 deletions(-) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/files/10m50-update-device-tree.patch delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch diff --git a/meta-digi-arm/recipes-bsp/u-boot/files/10m50-update-device-tree.patch b/meta-digi-arm/recipes-bsp/u-boot/files/10m50-update-device-tree.patch deleted file mode 100644 index 841953cd1..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/files/10m50-update-device-tree.patch +++ /dev/null @@ -1,28 +0,0 @@ -Nios II for MAX10 10m50 board requires update to -its device tree to enable CPU driver during -u-boot pre-relocation. This patch tag the CPU -with dm-pre-reloc flag. - -Upstream-Status: Submitted - -Signed-off-by: Gan, Yau Wai - ---- - arch/nios2/dts/10m50_devboard.dts | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts -index 05eac30..461ae68 100644 ---- a/arch/nios2/dts/10m50_devboard.dts -+++ b/arch/nios2/dts/10m50_devboard.dts -@@ -19,6 +19,7 @@ - #size-cells = <0>; - - cpu: cpu@0 { -+ u-boot,dm-pre-reloc; - device_type = "cpu"; - compatible = "altr,nios2-1.1"; - reg = <0x00000000>; --- -2.7.4 - diff --git a/meta-digi-arm/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/meta-digi-arm/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch deleted file mode 100644 index cea52b79e..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enabled dhcp client functionality for Yocto reference -hardware MPC8315E-RDB. - -Upstream-Status: Pending - -Signed-off-by: Ed Bartosh - -diff --git a/configs/MPC8315ERDB_defconfig b/configs/MPC8315ERDB_defconfig -index 4e2b705..b02ab1f 100644 ---- a/configs/MPC8315ERDB_defconfig -+++ b/configs/MPC8315ERDB_defconfig -@@ -9,6 +9,7 @@ CONFIG_HUSH_PARSER=y - CONFIG_CMD_I2C=y - CONFIG_CMD_USB=y - # CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_DHCP=y - CONFIG_CMD_MII=y - CONFIG_CMD_PING=y - CONFIG_CMD_EXT2=y diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-common_2017.09.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-common_2017.09.inc index 02e51242c..390e7a965 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-common_2017.09.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-common_2017.09.inc @@ -10,8 +10,6 @@ PE = "1" SRCREV = "c98ac3487e413c71e5d36322ef3324b21c6f60f9" SRC_URI = "git://git.denx.de/u-boot.git \ - file://MPC8315ERDB-enable-DHCP.patch \ - file://10m50-update-device-tree.patch \ " S = "${WORKDIR}/git"