diff options
| author | Marek Vasut <marex@denx.de> | 2018-04-09 01:02:23 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 09:54:57 +0100 |
| commit | c1d680326cabd10d0940827e8dfdc884f67b1e9a (patch) | |
| tree | 888cf08b9920a0afad98da86fc7e87615bb60f51 | |
| parent | fb8ca4225f3e26bfc46cf6c06d55df72684c47c6 (diff) | |
| download | openembedded-core-c1d680326cabd10d0940827e8dfdc884f67b1e9a.tar.gz openembedded-core-c1d680326cabd10d0940827e8dfdc884f67b1e9a.tar.bz2 openembedded-core-c1d680326cabd10d0940827e8dfdc884f67b1e9a.zip | |
u-boot: Upgrade to 2018.03 release
This upgrades the U-Boot from 2018.01 to 2018.03 release and drops
patches accepted upstream, getting the patch count to zero.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Ross Burton <ross.burton@intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch | 19 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc (renamed from meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc) | 6 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb (renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb (renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2018.03.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2018.01.bb) | 0 |
5 files changed, 2 insertions, 23 deletions
diff --git a/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch b/meta/recipes-bsp/u-boot/files/MPC8315ERDB-enable-DHCP.patch deleted file mode 100644 index ecaa1796a4..0000000000 --- a/meta/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 <ed.bartosh@linux.intel.com> - -Index: git/configs/MPC8315ERDB_defconfig -=================================================================== ---- git.orig/configs/MPC8315ERDB_defconfig -+++ git/configs/MPC8315ERDB_defconfig -@@ -12,6 +12,7 @@ CONFIG_CMD_PCI=y - CONFIG_CMD_SATA=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_DATE=y diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc index d2073ea0c7..8ffae365a9 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.03.inc @@ -7,10 +7,8 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a" +SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890" -SRC_URI = "git://git.denx.de/u-boot.git \ - file://MPC8315ERDB-enable-DHCP.patch \ -" +SRC_URI = "git://git.denx.de/u-boot.git" S = "${WORKDIR}/git" diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb index 02887a138a..02887a138a 100644 --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.03.bb diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb index 1c008be96e..1c008be96e 100644 --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.03.bb diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.01.bb b/meta/recipes-bsp/u-boot/u-boot_2018.03.bb index 37c21dcaa3..37c21dcaa3 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2018.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2018.03.bb |