Skip to contentSkip to conversation

u-boot: Upgrade to 2018.01 release

PATCH In review Marek Vasut 3 participants 5 messages Jan 19, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 u-boot: Upgrade to 2018.01 release

This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream.

Cc Otavio Salvador <[email protected]>
Cc Ross Burton <[email protected]>
Cc Richard Purdie <[email protected]>
---
 .../u-boot/files/10m50-update-device-tree.patch    | 28 ---------------
 .../u-boot/files/v2017.11-fw-utils-build-fix.patch | 41 ----------------------
 ...ommon_2017.11.inc => u-boot-common_2018.01.inc} |  4 +--
 ...utils_2017.11.bb => u-boot-fw-utils_2018.01.bb} |  0
 ...kimage_2017.11.bb => u-boot-mkimage_2018.01.bb} |  0
 .../{u-boot_2017.11.bb => u-boot_2018.01.bb}       |  0
 6 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch
 delete mode 100644 meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch
 rename meta/recipes-bsp/u-boot/{u-boot-common_2017.11.inc => u-boot-common_2018.01.inc} (72%)
 rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2017.11.bb => u-boot-fw-utils_2018.01.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2017.11.bb => u-boot-mkimage_2018.01.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2017.11.bb => u-boot_2018.01.bb} (100%)
meta/recipes-bsp/u-boot/files/10m50-update-device-tree.patch deleted +0 -28
deleted file mode 100644
index 841953cd10..0000000000
@@ -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 <[email protected]>
-
----
- 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
-
meta/recipes-bsp/u-boot/files/v2017.11-fw-utils-build-fix.patch deleted +0 -41

41 lines not on this page · raw message

meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc renamed from meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc +1 -3
similarity index 72%
rename from meta/recipes-bsp/u-boot/u-boot-common_2017.11.inc
rename to meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc
index 65f1228043..d2073ea0c7 100644
@@ -7,12 +7,10 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5"
+SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a"
 
 SRC_URI = "git://git.denx.de/u-boot.git \
     file://MPC8315ERDB-enable-DHCP.patch \
-    file://10m50-update-device-tree.patch \
-    file://v2017.11-fw-utils-build-fix.patch \
 "
 
 S = "${WORKDIR}/git"
meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb renamed from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2017.11.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.01.bb
meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb renamed from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2017.11.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2018.01.bb
meta/recipes-bsp/u-boot/u-boot_2018.01.bb renamed from meta/recipes-bsp/u-boot/u-boot_2017.11.bb +0 -0
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2017.11.bb
rename to meta/recipes-bsp/u-boot/u-boot_2018.01.bb
Signature · 1 line
2.15.1
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Marek Vasut

This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream.

...

Quoted 1 line
     file://MPC8315ERDB-enable-DHCP.patch \

Please send this patch for next release so we can drop it as well.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#2 lore raw
Quoted 4 lines · Otavio Salvador
Quoted 3 lines · Marek Vasut

This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream.

Quoted 8 lines
Quoted 1 line

...

Quoted 1 line
     file://MPC8315ERDB-enable-DHCP.patch \

Please send this patch for next release so we can drop it as well.

Look up the previous thread on why this patch is still here ...

Signature · 2 lines
Best regards,
Marek Vasut
#3 lore raw
Quoted 7 lines · Marek Vasut
Quoted 6 lines · Otavio Salvador
Quoted 4 lines · Marek Vasut

This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream.

Quoted 8 lines
Quoted 6 lines

...

Quoted 1 line
     file://MPC8315ERDB-enable-DHCP.patch \

Please send this patch for next release so we can drop it as well.

Look up the previous thread on why this patch is still here ...

Yes, and FWIW, I still think it's of the type that's safely merged upstream. A group of users needs additional generic functionality enabled on a board. CC the listed maintainer, and York, and I expect it would come in. Thanks!

Signature · 1 line
Tom
#4 lore raw
Quoted 13 lines · Tom Rini
Quoted 12 lines · Marek Vasut
Quoted 11 lines · Otavio Salvador
Quoted 4 lines · Marek Vasut

This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream.

...

Quoted 1 line
     file://MPC8315ERDB-enable-DHCP.patch \
Quoted 8 lines
Quoted 3 lines
Quoted 1 line

Please send this patch for next release so we can drop it as well.

Look up the previous thread on why this patch is still here ...

Yes, and FWIW, I still think it's of the type that's safely merged upstream. A group of users needs additional generic functionality enabled on a board. CC the listed maintainer, and York, and I expect it would come in. Thanks!

It didn't go too well last time and the time before, but sure, I can try again ...

Signature · 2 lines
Best regards,
Marek Vasut