platform-v7a: barebox: version bump 2018.03.0 -> 2018.05.0

Bump all barebox variants, followed by oldconfig. Consistently enable
CONSOLE_ALLOW_COLOR, otherwise use default values.

Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>

6 files changed, 56 insertions, 56 deletions

diff --git a/configs/platform-v7a/patches/barebox-2018.03.0/0201-Release-pengutronix-multi_v7-20180307-1.patch b/configs/platform-v7a/patches/barebox-2018.03.0/0201-Release-pengutronix-multi_v7-20180307-1.patch
deleted file mode 100644
index 58a2d0a..0000000
--- a/configs/platform-v7a/patches/barebox-2018.03.0/0201-Release-pengutronix-multi_v7-20180307-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Wed, 7 Mar 2018 07:53:26 +0100
-Subject: [PATCH] Release pengutronix/multi_v7/20180307-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 b4f315d2672f..e15bd2c277ae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2018
- PATCHLEVEL = 03
- SUBLEVEL = 0
--EXTRAVERSION =
-+EXTRAVERSION =-20180307-1
- NAME = None
- 
- # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2018.03.0/series b/configs/platform-v7a/patches/barebox-2018.03.0/series
deleted file mode 100644
index 74ff1b4..0000000
--- a/configs/platform-v7a/patches/barebox-2018.03.0/series
+++ /dev/null
@@ -1,15 +0,0 @@
-# umpf-base: v2018.03.0
-# umpf-name: pengutronix/multi_v7
-# umpf-version: pengutronix/multi_v7/20180307-1
-# umpf-topic: v2018.03.0/customers/pengutronix/beaglebone
-# umpf-hashinfo: 564eab923b9ba35e2c79addd52762895b05130f4
-# umpf-topic-range: 610d8769ed1a620c4a048c625b540a4d8ee14ffb..564eab923b9ba35e2c79addd52762895b05130f4
-0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
-# umpf-topic: v2018.03.0/customers/pengutronix/udoo-neo
-# umpf-hashinfo: 1afa824d0652c236ef0ddeabff71a699e1d97219
-# umpf-topic-range: 564eab923b9ba35e2c79addd52762895b05130f4..ebf40cb7ee7c8a31f5e43dc438697b5aebcc30d8
-0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
-# umpf-release: pengutronix/multi_v7/20180307-1
-# umpf-topic-range: ebf40cb7ee7c8a31f5e43dc438697b5aebcc30d8..e0ce9f4c185dee6f4d4c2ff42d340d047916e884
-0201-Release-pengutronix-multi_v7-20180307-1.patch
-# umpf-end
diff --git a/configs/platform-v7a/patches/barebox-2018.03.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch b/configs/platform-v7a/patches/barebox-2018.05.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
index 4dfd47c..cfca106 100644
--- a/configs/platform-v7a/patches/barebox-2018.03.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
+++ b/configs/platform-v7a/patches/barebox-2018.05.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
@@ -8,7 +8,7 @@ Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
  1 file changed, 15 insertions(+)
 
 diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi
-index ef97d906616c..d14c6ded6a55 100644
+index 0413724e0ca1..6e58714516fd 100644
 --- a/arch/arm/dts/am335x-bone-common.dtsi
 +++ b/arch/arm/dts/am335x-bone-common.dtsi
 @@ -11,6 +11,21 @@
diff --git a/configs/platform-v7a/patches/barebox-2018.03.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch b/configs/platform-v7a/patches/barebox-2018.05.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
index df93c70..06c356b 100644
--- a/configs/platform-v7a/patches/barebox-2018.03.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
+++ b/configs/platform-v7a/patches/barebox-2018.05.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
@@ -8,16 +8,16 @@ 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        | 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 +
+ 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   | 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, 208 insertions(+)
  create mode 100644 arch/arm/boards/udoo-neo/Makefile
  create mode 100644 arch/arm/boards/udoo-neo/board.c
@@ -26,10 +26,10 @@ Forwarded: id:20170627190317.19253-1-uwe@kleine-koenig.org
  create mode 100644 arch/arm/dts/imx6sx-udoo-neo-full.dts
 
 diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
-index ca187ccb8998..88ccc1d16fbe 100644
+index 30f4c299f1a1..f70fbac8f379 100644
 --- a/arch/arm/boards/Makefile
 +++ b/arch/arm/boards/Makefile
-@@ -134,6 +134,7 @@ obj-$(CONFIG_MACH_TX51)				+= karo-tx51/
+@@ -135,6 +135,7 @@ obj-$(CONFIG_MACH_TX51)				+= karo-tx51/
  obj-$(CONFIG_MACH_TX53)				+= karo-tx53/
  obj-$(CONFIG_MACH_TX6X)				+= karo-tx6x/
  obj-$(CONFIG_MACH_UDOO)				+= udoo/
@@ -254,10 +254,10 @@ index 000000000000..e78c2685fd78
 +	imx6sx_barebox_entry(fdt);
 +}
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 0526a6f40724..4c954bb67cdb 100644
+index e60e0ea0c6be..b87e27c8c263 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -90,6 +90,7 @@ pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o
+@@ -93,6 +93,7 @@ pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o
  pbl-dtb-$(CONFIG_MACH_TX6X) += imx6q-tx6q.dtb.o
  pbl-dtb-$(CONFIG_MACH_TURRIS_OMNIA) += armada-385-turris-omnia-bb.dtb.o
  pbl-dtb-$(CONFIG_MACH_UDOO) += imx6q-udoo.dtb.o
@@ -276,10 +276,10 @@ index 000000000000..9203d40207c5
 +/{
 +};
 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
-index eb135c3f534c..b2af8d938f11 100644
+index 9052a94ea071..9ec95bb6df09 100644
 --- a/arch/arm/mach-imx/Kconfig
 +++ b/arch/arm/mach-imx/Kconfig
-@@ -367,6 +367,10 @@ config MACH_UDOO
+@@ -377,6 +377,10 @@ config MACH_UDOO
  	bool "Freescale i.MX6 UDOO Board"
  	select ARCH_IMX6
  
@@ -303,10 +303,10 @@ index 66dcc8974cfb..bd6092febca4 100644
  #endif
  
 diff --git a/images/Makefile.imx b/images/Makefile.imx
-index 5e0043f1f014..021e3a5b0f68 100644
+index 90da95d4d025..6420490811f9 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
+@@ -275,6 +275,11 @@ CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-heade
  FILE_barebox-freescale-imx6q-sabresd.img = start_imx6q_sabresd.pblx.imximg
  image-$(CONFIG_MACH_SABRESD) += barebox-freescale-imx6q-sabresd.img
  
diff --git a/configs/platform-v7a/patches/barebox-2018.05.0/0201-Release-pengutronix-multi_v7-20180515-1.patch b/configs/platform-v7a/patches/barebox-2018.05.0/0201-Release-pengutronix-multi_v7-20180515-1.patch
new file mode 100644
index 0000000..4b0c22d
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2018.05.0/0201-Release-pengutronix-multi_v7-20180515-1.patch
@@ -0,0 +1,22 @@
+From: Roland Hieber <r.hieber@pengutronix.de>
+Date: Tue, 15 May 2018 23:44:48 +0200
+Subject: [PATCH] Release pengutronix/multi_v7/20180515-1
+
+Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 88c19917394f..11e79cc339f4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2018
+ PATCHLEVEL = 05
+ SUBLEVEL = 0
+-EXTRAVERSION =
++EXTRAVERSION =-20180515-1
+ NAME = None
+ 
+ # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2018.05.0/series b/configs/platform-v7a/patches/barebox-2018.05.0/series
new file mode 100644
index 0000000..272791c
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2018.05.0/series
@@ -0,0 +1,15 @@
+# umpf-base: v2018.05.0
+# umpf-name: pengutronix/multi_v7
+# umpf-version: pengutronix/multi_v7/20180515-1
+# umpf-topic: v2018.05.0/customers/pengutronix/beaglebone
+# umpf-hashinfo: d1f50bff60c7069caad2df4ef02f672be456f141
+# umpf-topic-range: cd4320e3e86bd2ab7b4a19016ef8df6c5d69a5a5..d1f50bff60c7069caad2df4ef02f672be456f141
+0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
+# umpf-topic: v2018.05.0/customers/pengutronix/udoo-neo
+# umpf-hashinfo: 772e5039c9a147256a085c76a74cf5cb5c14ec35
+# umpf-topic-range: d1f50bff60c7069caad2df4ef02f672be456f141..183d8e8d0ccf827481923b3872144e2c10ef9fac
+0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
+# umpf-release: pengutronix/multi_v7/20180515-1
+# umpf-topic-range: 183d8e8d0ccf827481923b3872144e2c10ef9fac..734e18abc455f563837dd6ad0df6fb9378053b00
+0201-Release-pengutronix-multi_v7-20180515-1.patch
+# umpf-end