summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2017-07-02 20:04:44 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2017-07-04 15:41:06 +0200
commitc56cf4ef081af4e041bb9fd0c88356c5ef4e9966 (patch)
tree4b1fde2dc87f1eb1b61379cfd55ca3bd6ac0a412
parent6c5fcfdae6e2317bb039f3c19269b6484eb53e6d (diff)
downloadDistroKit-c56cf4ef081af4e041bb9fd0c88356c5ef4e9966.tar.gz
DistroKit-c56cf4ef081af4e041bb9fd0c88356c5ef4e9966.tar.xz
platform-v7a: barebox: version bump 2017.06.0 -> 2017.07.0
Update barebox 2017.07.0, which contains an important fix for nv and globalvars. In the previous patch stack, state was defect, as upstream has changed the oftree. This is fixed in the new patch series. Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r--configs/platform-v7a/barebox-am335x-mlo.config (renamed from configs/platform-v7a/barebox-am335x-mlo.config.2017.06.0)2
-rw-r--r--configs/platform-v7a/barebox-am335x.config (renamed from configs/platform-v7a/barebox-am335x.config.2017.06.0)2
-rw-r--r--configs/platform-v7a/barebox-mx6.config (renamed from configs/platform-v7a/barebox-mx6.config.2017.06.0)3
-rw-r--r--configs/platform-v7a/barebox-rpi2.config (renamed from configs/platform-v7a/barebox-rpi2.config.2017.06.0)2
-rw-r--r--configs/platform-v7a/barebox-vexpress.config (renamed from configs/platform-v7a/barebox-vexpress.config.2017.06.0)2
-rw-r--r--configs/platform-v7a/patches/barebox-2017.06.0/0301-Release-2017.06.0-pengutronix-multi_v7-20170614-1.patch25
-rw-r--r--configs/platform-v7a/patches/barebox-2017.06.0/series25
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0002-vexpress-device-tree-support.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0002-vexpress-device-tree-support.patch)4
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0003-vexpress-add-bootstate-node-to-the-device-tree.patch90
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0004-of-base-add-funtion-to-copy-a-device-tree-node.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0003-of-base-add-funtion-to-copy-a-device-tree-node.patch)4
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0005-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0004-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0006-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0005-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0101-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0101-beaglebone-add-state-entrie-for-mmc0-and-mmc1.patch)2
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0201-of_device_is_stdout_path-simplify.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0201-of_device_is_stdout_path-simplify.patch)6
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0202-of_device_is_stdout_path-split-off-options-and-suppo.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0202-of_device_is_stdout_path-split-off-options-and-suppo.patch)6
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0203-ARM-imx-add-support-for-Udoo-Neo-full.patch (renamed from configs/platform-v7a/patches/barebox-2017.06.0/0203-ARM-imx-add-support-for-Udoo-Neo-full.patch)26
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/0301-Release-2017.07.0-pengutronix-multi_v7-20170703-1.patch22
-rw-r--r--configs/platform-v7a/patches/barebox-2017.07.0/series26
-rw-r--r--configs/platform-v7a/rules/barebox-am335x-mlo.make6
-rw-r--r--configs/platform-v7a/rules/barebox-am335x.make6
-rw-r--r--configs/platform-v7a/rules/barebox-mx6.make6
-rw-r--r--configs/platform-v7a/rules/barebox-rpi2.make6
-rw-r--r--configs/platform-v7a/rules/barebox-vexpress.make6
24 files changed, 183 insertions, 94 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config.2017.06.0 b/configs/platform-v7a/barebox-am335x-mlo.config
index 35d5c24..0bf6513 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config.2017.06.0
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.06.0-20170613-1 Configuration
+# Barebox/arm 2017.07.0-20170614-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
diff --git a/configs/platform-v7a/barebox-am335x.config.2017.06.0 b/configs/platform-v7a/barebox-am335x.config
index b3fe5a0..f32da9b 100644
--- a/configs/platform-v7a/barebox-am335x.config.2017.06.0
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.06.0-20170613-1 Configuration
+# Barebox/arm 2017.07.0-20170614-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
diff --git a/configs/platform-v7a/barebox-mx6.config.2017.06.0 b/configs/platform-v7a/barebox-mx6.config
index cc2cd95..4362b87 100644
--- a/configs/platform-v7a/barebox-mx6.config.2017.06.0
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.06.0-20170614-1 Configuration
+# Barebox/arm 2017.07.0-20170614-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -83,6 +83,7 @@ CONFIG_MACH_SABRELITE=y
# CONFIG_MACH_FREESCALE_IMX6SX_SABRESDB is not set
# CONFIG_MACH_NITROGEN6 is not set
# CONFIG_MACH_SOLIDRUN_MICROSOM is not set
+# CONFIG_MACH_TECHNEXION_PICO_HOBBIT is not set
# CONFIG_MACH_TECHNEXION_WANDBOARD is not set
CONFIG_MACH_EMBEST_RIOTBOARD=y
# CONFIG_MACH_UDOO is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.2017.06.0 b/configs/platform-v7a/barebox-rpi2.config
index 80df303..fe36b1b 100644
--- a/configs/platform-v7a/barebox-rpi2.config.2017.06.0
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.06.0-20170613-1 Configuration
+# Barebox/arm 2017.07.0-20170614-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
diff --git a/configs/platform-v7a/barebox-vexpress.config.2017.06.0 b/configs/platform-v7a/barebox-vexpress.config
index 43b4ee5..13dff55 100644
--- a/configs/platform-v7a/barebox-vexpress.config.2017.06.0
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.06.0-20170614-1 Configuration
+# Barebox/arm 2017.07.0-20170614-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0301-Release-2017.06.0-pengutronix-multi_v7-20170614-1.patch b/configs/platform-v7a/patches/barebox-2017.06.0/0301-Release-2017.06.0-pengutronix-multi_v7-20170614-1.patch
deleted file mode 100644
index e6f74d5..0000000
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0301-Release-2017.06.0-pengutronix-multi_v7-20170614-1.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
-Date: Wed, 14 Jun 2017 22:22:27 +0200
-Subject: [PATCH] Release 2017.06.0/pengutronix/multi_v7/20170614-1
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 42948fafa33f..284a039e61db 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2017
- PATCHLEVEL = 06
- SUBLEVEL = 0
--EXTRAVERSION =
-+EXTRAVERSION =-20170614-1
- NAME = None
-
- # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/series b/configs/platform-v7a/patches/barebox-2017.06.0/series
deleted file mode 100644
index 9843d20..0000000
--- a/configs/platform-v7a/patches/barebox-2017.06.0/series
+++ /dev/null
@@ -1,25 +0,0 @@
-# umpf-base: v2017.06.0
-# umpf-name: 2017.06.0/pengutronix/multi_v7
-# umpf-version: 2017.06.0/pengutronix/multi_v7/20170614-1
-# umpf-topic: v2017.06.0/topic/vexpress
-# umpf-hashinfo: abc9e46ec6ffeae46efe678469a086dc89c83e1f
-# umpf-topic-range: 2974d53a3b3a2f56d96c56acf26501735a4e41cd..abc9e46ec6ffeae46efe678469a086dc89c83e1f
-0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch
-0002-vexpress-device-tree-support.patch
-0003-of-base-add-funtion-to-copy-a-device-tree-node.patch
-0004-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch
-0005-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch
-# umpf-topic: v2016.05.0/customers/pengutronix/beaglebone
-# umpf-hashinfo: 9cbaeb8cfaa8b5e7837725df242aacccbbc5fa53
-# umpf-topic-range: abc9e46ec6ffeae46efe678469a086dc89c83e1f..4cb671a6a6dacc8f15dc4ecd830dddca7d20bc27
-0101-beaglebone-add-state-entrie-for-mmc0-and-mmc1.patch
-# umpf-topic: v2017.06.0/customers/pengutronix/udoo-neo
-# umpf-hashinfo: 1f1ee410d983400c88b875f234709d9b280e2278
-# umpf-topic-range: 4cb671a6a6dacc8f15dc4ecd830dddca7d20bc27..d2e52d64a4ec16ce261bcebbf10503aa37fbf856
-0201-of_device_is_stdout_path-simplify.patch
-0202-of_device_is_stdout_path-split-off-options-and-suppo.patch
-0203-ARM-imx-add-support-for-Udoo-Neo-full.patch
-# umpf-release: 2017.06.0/pengutronix/multi_v7/20170614-1
-# umpf-topic-range: d2e52d64a4ec16ce261bcebbf10503aa37fbf856..715b60b1436d4e880847311415c9a31a7ba7f5b8
-0301-Release-2017.06.0-pengutronix-multi_v7-20170614-1.patch
-# umpf-end
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch
index a5fdc9c..a5fdc9c 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0002-vexpress-device-tree-support.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0002-vexpress-device-tree-support.patch
index 7f709fc..fc7ad48 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0002-vexpress-device-tree-support.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0002-vexpress-device-tree-support.patch
@@ -45,7 +45,7 @@ index f89dff939231..68ebbfab2633 100644
defaultenv_append_directory(defaultenv_vexpress);
diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
new file mode 100644
-index 000000000000..aadcb3a70377
+index 000000000000..541840ae22dc
--- /dev/null
+++ b/arch/arm/dts/vexpress-v2p-ca9.dts
@@ -0,0 +1,27 @@
@@ -57,7 +57,7 @@ index 000000000000..aadcb3a70377
+ device-path = &barebox_env;
+ };
+
-+ smb@04000000 {
++ smb@4000000 {
+ motherboard {
+ flash@0,00000000 {
+ #address-cells = <1>;
diff --git a/configs/platform-v7a/patches/barebox-2017.07.0/0003-vexpress-add-bootstate-node-to-the-device-tree.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0003-vexpress-add-bootstate-node-to-the-device-tree.patch
new file mode 100644
index 0000000..27cfa0b
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0003-vexpress-add-bootstate-node-to-the-device-tree.patch
@@ -0,0 +1,90 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 10 Sep 2016 17:54:20 +0200
+Subject: [PATCH] vexpress: add bootstate node to the device tree
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ arch/arm/dts/vexpress-v2p-ca9.dts | 63 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 63 insertions(+)
+
+diff --git a/arch/arm/dts/vexpress-v2p-ca9.dts b/arch/arm/dts/vexpress-v2p-ca9.dts
+index 541840ae22dc..d0975330f205 100644
+--- a/arch/arm/dts/vexpress-v2p-ca9.dts
++++ b/arch/arm/dts/vexpress-v2p-ca9.dts
+@@ -6,6 +6,10 @@
+ device-path = &barebox_env;
+ };
+
++ aliases {
++ state = &state;
++ };
++
+ smb@4000000 {
+ motherboard {
+ flash@0,00000000 {
+@@ -21,6 +25,65 @@
+ label = "barebox-environment";
+ reg = <0x80000 0x80000>;
+ };
++
++ state_storage: partition@100000 {
++ label = "barebox-state";
++ reg = <0x100000 0x100000>;
++ };
++ };
++ };
++ };
++
++ /* State: mutable part */
++ state: state {
++ magic = <0x4d433230>;
++ compatible = "barebox,state";
++ backend-type = "raw";
++ backend = <&state_storage>;
++ backend-stridesize = <0x40>;
++ backend-storage-type = "circular";
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ bootstate {
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ system0 { /* the node's name here must match the subnode's name in the 'bootstate' node */
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ remaining_attempts@0 {
++ reg = <0x0 0x4>;
++ type = "uint32";
++ default = <3>;
++ };
++ priority@4 {
++ reg = <0x4 0x4>;
++ type = "uint32";
++ default = <20>;
++ };
++ };
++
++ system1 { /* the node's name here must match the subnode's name in the 'bootstate' node */
++ #address-cells = <1>;
++ #size-cells = <1>;
++
++ remaining_attempts@8 {
++ reg = <0x8 0x4>;
++ type = "uint32";
++ default = <3>;
++ };
++ priority@c {
++ reg = <0xC 0x4>;
++ type = "uint32";
++ default = <20>;
++ };
++ };
++
++ last_chosen@10 {
++ reg = <0x10 0x4>;
++ type = "uint32";
+ };
+ };
+ };
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0003-of-base-add-funtion-to-copy-a-device-tree-node.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0004-of-base-add-funtion-to-copy-a-device-tree-node.patch
index 31b90c3..ae4b2b2 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0003-of-base-add-funtion-to-copy-a-device-tree-node.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0004-of-base-add-funtion-to-copy-a-device-tree-node.patch
@@ -9,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
2 files changed, 18 insertions(+)
diff --git a/drivers/of/base.c b/drivers/of/base.c
-index c9bdd91810f2..e93ba687fafc 100644
+index 33f61622ae75..9f89c7864475 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
-@@ -1963,6 +1963,22 @@ out:
+@@ -1965,6 +1965,22 @@ out:
return dn;
}
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0004-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0005-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch
index 8dc2da3..8dc2da3 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0004-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0005-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0005-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0006-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch
index 8b64d2f..8b64d2f 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0005-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0006-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0101-beaglebone-add-state-entrie-for-mmc0-and-mmc1.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0101-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
index a26a282..4dfd47c 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0101-beaglebone-add-state-entrie-for-mmc0-and-mmc1.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0101-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
@@ -1,6 +1,6 @@
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
Date: Fri, 10 Jun 2016 14:02:30 +0200
-Subject: [PATCH] beaglebone: add state entrie for mmc0 and mmc1
+Subject: [PATCH] beaglebone: add state entry for mmc0 and mmc1
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0201-of_device_is_stdout_path-simplify.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0201-of_device_is_stdout_path-simplify.patch
index 47feb45..4d36fca 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0201-of_device_is_stdout_path-simplify.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0201-of_device_is_stdout_path-simplify.patch
@@ -15,10 +15,10 @@ Forwarded: id:20170614113110.21604-1-u.kleine-koenig@pengutronix.de
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
-index e93ba687fafc..94e4c6b7b4f8 100644
+index 9f89c7864475..4241ee189cc5 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
-@@ -2016,6 +2016,9 @@ int of_device_is_stdout_path(struct device_d *dev)
+@@ -2018,6 +2018,9 @@ int of_device_is_stdout_path(struct device_d *dev)
struct device_node *dn;
const char *name;
@@ -28,7 +28,7 @@ index e93ba687fafc..94e4c6b7b4f8 100644
name = of_get_property(of_chosen, "stdout-path", NULL);
if (!name)
name = of_get_property(of_chosen, "linux,stdout-path", NULL);
-@@ -2024,13 +2027,8 @@ int of_device_is_stdout_path(struct device_d *dev)
+@@ -2026,13 +2029,8 @@ int of_device_is_stdout_path(struct device_d *dev)
return 0;
dn = of_find_node_by_path(name);
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0202-of_device_is_stdout_path-split-off-options-and-suppo.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0202-of_device_is_stdout_path-split-off-options-and-suppo.patch
index 674294d..12062a5 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0202-of_device_is_stdout_path-split-off-options-and-suppo.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0202-of_device_is_stdout_path-split-off-options-and-suppo.patch
@@ -21,10 +21,10 @@ Forwarded: id:20170614180249.12644-1-u.kleine-koenig@pengutronix.de (v2)
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/of/base.c b/drivers/of/base.c
-index 94e4c6b7b4f8..a1ae8073931d 100644
+index 4241ee189cc5..b6e90f2adb09 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
-@@ -2015,6 +2015,8 @@ int of_device_is_stdout_path(struct device_d *dev)
+@@ -2017,6 +2017,8 @@ int of_device_is_stdout_path(struct device_d *dev)
{
struct device_node *dn;
const char *name;
@@ -33,7 +33,7 @@ index 94e4c6b7b4f8..a1ae8073931d 100644
if (!dev->device_node)
return 0;
-@@ -2026,7 +2028,16 @@ int of_device_is_stdout_path(struct device_d *dev)
+@@ -2028,7 +2030,16 @@ int of_device_is_stdout_path(struct device_d *dev)
if (!name)
return 0;
diff --git a/configs/platform-v7a/patches/barebox-2017.06.0/0203-ARM-imx-add-support-for-Udoo-Neo-full.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0203-ARM-imx-add-support-for-Udoo-Neo-full.patch
index c9854a7..fc6345f 100644
--- a/configs/platform-v7a/patches/barebox-2017.06.0/0203-ARM-imx-add-support-for-Udoo-Neo-full.patch
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0203-ARM-imx-add-support-for-Udoo-Neo-full.patch
@@ -6,18 +6,19 @@ Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Forwarded: id:20170627190317.19253-1-uwe@kleine-koenig.org
---
arch/arm/boards/Makefile | 1 +
arch/arm/boards/udoo-neo/Makefile | 2 +
arch/arm/boards/udoo-neo/board.c | 27 +++++
- .../flash-header-mx6sx-udoo-neo_full.imxcfg | 125 +++++++++++++++++++++
+ .../flash-header-mx6sx-udoo-neo_full.imxcfg | 124 +++++++++++++++++++++
arch/arm/boards/udoo-neo/lowlevel.c | 39 +++++++
arch/arm/dts/Makefile | 1 +
arch/arm/dts/imx6sx-udoo-neo-full.dts | 4 +
arch/arm/mach-imx/Kconfig | 4 +
arch/arm/mach-imx/include/mach/esdctl.h | 1 +
images/Makefile.imx | 5 +
- 10 files changed, 209 insertions(+)
+ 10 files changed, 208 insertions(+)
create mode 100644 arch/arm/boards/udoo-neo/Makefile
create mode 100644 arch/arm/boards/udoo-neo/board.c
create mode 100644 arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
@@ -25,10 +26,10 @@ Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
create mode 100644 arch/arm/dts/imx6sx-udoo-neo-full.dts
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
-index 0ecfb3e4b398..98f923a134a0 100644
+index f2d4d3878524..b0e68db71da7 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
-@@ -130,6 +130,7 @@ obj-$(CONFIG_MACH_TX51) += karo-tx51/
+@@ -131,6 +131,7 @@ obj-$(CONFIG_MACH_TX51) += karo-tx51/
obj-$(CONFIG_MACH_TX53) += karo-tx53/
obj-$(CONFIG_MACH_TX6X) += karo-tx6x/
obj-$(CONFIG_MACH_UDOO) += udoo/
@@ -79,10 +80,10 @@ index 000000000000..9bf480305d70
+coredevice_initcall(imx6sx_udoneo_coredevices_init);
diff --git a/arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg b/arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
new file mode 100644
-index 000000000000..d91de992fa6a
+index 000000000000..176aff49b3ec
--- /dev/null
+++ b/arch/arm/boards/udoo-neo/flash-header-mx6sx-udoo-neo_full.imxcfg
-@@ -0,0 +1,125 @@
+@@ -0,0 +1,124 @@
+loadaddr 0x80000000
+soc imx6
+dcdofs 0x400
@@ -207,7 +208,6 @@ index 000000000000..d91de992fa6a
+wm 32 0x021b0818 0x00011117
+wm 32 0x021b001c 0x00000000
+/********************************************/
-+
diff --git a/arch/arm/boards/udoo-neo/lowlevel.c b/arch/arm/boards/udoo-neo/lowlevel.c
new file mode 100644
index 000000000000..e78c2685fd78
@@ -254,10 +254,10 @@ index 000000000000..e78c2685fd78
+ imx6sx_barebox_entry(fdt);
+}
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 2342d35a4bd1..3129a7dfbce1 100644
+index 806d38600169..ea0fa04bf41c 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
-@@ -82,6 +82,7 @@ pbl-dtb-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o
+@@ -84,6 +84,7 @@ pbl-dtb-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o
pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o
pbl-dtb-$(CONFIG_MACH_TX6X) += imx6q-tx6q.dtb.o
pbl-dtb-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o
@@ -276,15 +276,15 @@ index 000000000000..9203d40207c5
+/{
+};
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
-index 80f53ce124c1..a682030faf2e 100644
+index 6110924af642..204d0d59994e 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
-@@ -356,6 +356,10 @@ config MACH_UDOO
+@@ -362,6 +362,10 @@ config MACH_UDOO
bool "Freescale i.MX6 UDOO Board"
select ARCH_IMX6
+config MACH_UDOO_NEO
-+ bool "Freescale i.MX6 UDOO Board"
++ bool "i.MX6 UDOO Neo Board (full variant)"
+ select ARCH_IMX6SX
+
config MACH_VARISCITE_MX6
@@ -303,7 +303,7 @@ index 66dcc8974cfb..bd6092febca4 100644
#endif
diff --git a/images/Makefile.imx b/images/Makefile.imx
-index cdad2e0b8826..867ff5f6a564 100644
+index 88d3e5e339ac..b2ebd5c4bfbc 100644
--- a/images/Makefile.imx
+++ b/images/Makefile.imx
@@ -260,6 +260,11 @@ CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-heade
diff --git a/configs/platform-v7a/patches/barebox-2017.07.0/0301-Release-2017.07.0-pengutronix-multi_v7-20170703-1.patch b/configs/platform-v7a/patches/barebox-2017.07.0/0301-Release-2017.07.0-pengutronix-multi_v7-20170703-1.patch
new file mode 100644
index 0000000..1fc99c8
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/0301-Release-2017.07.0-pengutronix-multi_v7-20170703-1.patch
@@ -0,0 +1,22 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Date: Mon, 3 Jul 2017 12:12:17 +0200
+Subject: [PATCH] Release 2017.07.0/pengutronix/multi_v7/20170703-1
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 35158319a601..10d2335d4389 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2017
+ PATCHLEVEL = 07
+ SUBLEVEL = 0
+-EXTRAVERSION =
++EXTRAVERSION =-20170703-1
+ NAME = None
+
+ # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2017.07.0/series b/configs/platform-v7a/patches/barebox-2017.07.0/series
new file mode 100644
index 0000000..112cb06
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2017.07.0/series
@@ -0,0 +1,26 @@
+# umpf-base: v2017.07.0
+# umpf-name: 2017.07.0/pengutronix/multi_v7
+# umpf-version: 2017.07.0/pengutronix/multi_v7/20170703-1
+# umpf-topic: v2017.07.0/topic/vexpress
+# umpf-hashinfo: 60b579410ca5fd3420018b20d10493a7d447b3ca
+# umpf-topic-range: cd7d4469687871e483b9adda3febb11621e23ef5..60b579410ca5fd3420018b20d10493a7d447b3ca
+0001-vexpress-use-device-tree-provided-by-QEMU-if-availab.patch
+0002-vexpress-device-tree-support.patch
+0003-vexpress-add-bootstate-node-to-the-device-tree.patch
+0004-of-base-add-funtion-to-copy-a-device-tree-node.patch
+0005-commands-of_dump-don-t-use-flatten-unflatten-to-copy.patch
+0006-common-oftree-add-fixup-handler-for-virtio-mmio-devi.patch
+# umpf-topic: v2017.07.0/customers/pengutronix/beaglebone
+# umpf-hashinfo: b784a2db25aeeb3db4752eb5a72053fa3afbc1cb
+# umpf-topic-range: 60b579410ca5fd3420018b20d10493a7d447b3ca..7acfb21ed93e5208d86de6931db8cdce016ac603
+0101-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
+# umpf-topic: v2017.07.0/customers/pengutronix/udoo-neo
+# umpf-hashinfo: c2a0994f2e5e9fd4cd228bfa485b972fe26b9b86
+# umpf-topic-range: 7acfb21ed93e5208d86de6931db8cdce016ac603..8e5aaf8906410287dc5c74c98a70eaaa0ec00d42
+0201-of_device_is_stdout_path-simplify.patch
+0202-of_device_is_stdout_path-split-off-options-and-suppo.patch
+0203-ARM-imx-add-support-for-Udoo-Neo-full.patch
+# umpf-release: 2017.07.0/pengutronix/multi_v7/20170703-1
+# umpf-topic-range: 8e5aaf8906410287dc5c74c98a70eaaa0ec00d42..3b26223d62dd381a6a123f0fb34023e54f7458f9
+0301-Release-2017.07.0-pengutronix-multi_v7-20170703-1.patch
+# umpf-end
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 1e5c010..39aa33c 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -16,12 +16,12 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo
#
# Paths and names
#
-BAREBOX_AM335X_MLO_VERSION := 2017.06.0
-BAREBOX_AM335X_MLO_MD5 := 71322133e8fdcc9eb23a171cd270d841
+BAREBOX_AM335X_MLO_VERSION := 2017.07.0
+BAREBOX_AM335X_MLO_MD5 := cd14a6b9030e6257bf659106ec221e49
BAREBOX_AM335X_MLO := barebox-$(BAREBOX_AM335X_MLO_VERSION)
BAREBOX_AM335X_MLO_SUFFIX := tar.bz2
BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
-BAREBOX_AM335X_MLO_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-am335x-mlo.config.$(BAREBOX_AM335X_MLO_VERSION)
+BAREBOX_AM335X_MLO_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-am335x-mlo.config
BAREBOX_AM335X_MLO_LICENSE := GPL-2.0
BAREBOX_AM335X_MLO_URL := $(call barebox-url, BAREBOX_AM335X_MLO)
BAREBOX_AM335X_MLO_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_MLO).$(BAREBOX_AM335X_MLO_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index da24d17..e005f40 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -16,12 +16,12 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
#
# Paths and names
#
-BAREBOX_AM335X_VERSION := 2017.06.0
-BAREBOX_AM335X_MD5 := 71322133e8fdcc9eb23a171cd270d841
+BAREBOX_AM335X_VERSION := 2017.07.0
+BAREBOX_AM335X_MD5 := cd14a6b9030e6257bf659106ec221e49
BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION)
BAREBOX_AM335X_SUFFIX := tar.bz2
BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-am335x.config.$(BAREBOX_AM335X_VERSION)
+BAREBOX_AM335X_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-am335x.config
BAREBOX_AM335X_LICENSE := GPL-2.0
BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X)
BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X).$(BAREBOX_AM335X_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index afbce56..3bd47ff 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -16,12 +16,12 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
#
# Paths and names
#
-BAREBOX_MX6_VERSION := 2017.06.0
-BAREBOX_MX6_MD5 := 71322133e8fdcc9eb23a171cd270d841
+BAREBOX_MX6_VERSION := 2017.07.0
+BAREBOX_MX6_MD5 := cd14a6b9030e6257bf659106ec221e49
BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION)
BAREBOX_MX6_SUFFIX := tar.bz2
BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
-BAREBOX_MX6_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-mx6.config.$(BAREBOX_MX6_VERSION)
+BAREBOX_MX6_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-mx6.config
BAREBOX_MX6_LICENSE := GPL-2.0
BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6)
BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 0d2551b..a79b668 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -16,12 +16,12 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2
#
# Paths and names
#
-BAREBOX_RPI2_VERSION := 2017.06.0
-BAREBOX_RPI2_MD5 := 71322133e8fdcc9eb23a171cd270d841
+BAREBOX_RPI2_VERSION := 2017.07.0
+BAREBOX_RPI2_MD5 := cd14a6b9030e6257bf659106ec221e49
BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
-BAREBOX_RPI2_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-rpi2.config.$(BAREBOX_RPI2_VERSION)
+BAREBOX_RPI2_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-rpi2.config
BAREBOX_RPI2_LICENSE := GPL-2.0
BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2)
BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2).$(BAREBOX_RPI2_SUFFIX)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index f7305d4..6610080 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -16,12 +16,12 @@ PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress
#
# Paths and names
#
-BAREBOX_VEXPRESS_VERSION := 2017.06.0
-BAREBOX_VEXPRESS_MD5 := 71322133e8fdcc9eb23a171cd270d841
+BAREBOX_VEXPRESS_VERSION := 2017.07.0
+BAREBOX_VEXPRESS_MD5 := cd14a6b9030e6257bf659106ec221e49
BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
-BAREBOX_VEXPRESS_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-vexpress.config.$(BAREBOX_VEXPRESS_VERSION)
+BAREBOX_VEXPRESS_CONFIG := $(PTXDIST_PLATFORMCONFIGDIR)/barebox-vexpress.config
BAREBOX_VEXPRESS_LICENSE := GPL-2.0
BAREBOX_VEXPRESS_URL := $(call barebox-url, BAREBOX_VEXPRESS)
BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS).$(BAREBOX_VEXPRESS_SUFFIX)