From: Roland Hieber <r.hieber@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <r.hieber@pengutronix.de>
Subject: [DistroKit] [PATCH] platform-v7a: barebox: version bump 2018.03.0 -> 2018.05.0
Date: Wed, 16 May 2018 00:15:15 +0200 [thread overview]
Message-ID: <20180515221515.15394-1-r.hieber@pengutronix.de> (raw)
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>
---
.../platform-v7a/barebox-am335x-mlo.config | 8 +++--
configs/platform-v7a/barebox-am335x.config | 11 ++++--
configs/platform-v7a/barebox-mx6.config | 13 +++++--
configs/platform-v7a/barebox-rpi2.config | 8 +++--
configs/platform-v7a/barebox-vexpress.config | 8 +++--
...ease-pengutronix-multi_v7-20180307-1.patch | 22 ------------
.../patches/barebox-2018.03.0/series | 15 --------
...ne-add-state-entry-for-mmc0-and-mmc1.patch | 2 +-
...RM-imx-add-support-for-Udoo-Neo-full.patch | 36 +++++++++----------
...ease-pengutronix-multi_v7-20180515-1.patch | 22 ++++++++++++
.../patches/barebox-2018.05.0/series | 15 ++++++++
.../rules/barebox-am335x-mlo.make | 4 +--
.../platform-v7a/rules/barebox-am335x.make | 4 +--
configs/platform-v7a/rules/barebox-mx6.make | 4 +--
configs/platform-v7a/rules/barebox-rpi2.make | 4 +--
.../platform-v7a/rules/barebox-vexpress.make | 4 +--
16 files changed, 99 insertions(+), 81 deletions(-)
delete mode 100644 configs/platform-v7a/patches/barebox-2018.03.0/0201-Release-pengutronix-multi_v7-20180307-1.patch
delete mode 100644 configs/platform-v7a/patches/barebox-2018.03.0/series
rename configs/platform-v7a/patches/{barebox-2018.03.0 => barebox-2018.05.0}/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch (95%)
rename configs/platform-v7a/patches/{barebox-2018.03.0 => barebox-2018.05.0}/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch (90%)
create mode 100644 configs/platform-v7a/patches/barebox-2018.05.0/0201-Release-pengutronix-multi_v7-20180515-1.patch
create mode 100644 configs/platform-v7a/patches/barebox-2018.05.0/series
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 3e7f4dd..6cebecd 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,9 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.03.0-20180307-1 Configuration
+# Barebox/arm 2018.05.0-20180515-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
+CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -111,8 +112,6 @@ CONFIG_IMAGE_COMPRESSION_LZO=y
# CONFIG_IMAGE_COMPRESSION_NONE is not set
CONFIG_MMU=y
CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_PBLX_SIZE=0xffffffff
@@ -145,6 +144,7 @@ CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
CONFIG_CONSOLE_ACTIVATE_NONE=y
+CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
@@ -382,7 +382,9 @@ CONFIG_UNCOMPRESS=y
# CONFIG_PROCESS_ESCAPE_SEQUENCE is not set
CONFIG_LZO_DECOMPRESS=y
CONFIG_XYMODEM=y
+# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
+# CONFIG_CRC_CCITT is not set
#
# Library gui routines
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index 7f85317..0e4d50f 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -1,10 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.03.0-20180307-1 Configuration
+# Barebox/arm 2018.05.0-20180515-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
+CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -129,8 +130,6 @@ CONFIG_IMAGE_COMPRESSION_LZO=y
# CONFIG_IMAGE_COMPRESSION_NONE is not set
CONFIG_MMU=y
CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_PBLX_SIZE=0xffffffff
@@ -168,6 +167,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_AIMAGE is not set
CONFIG_BOOTM_FITIMAGE=y
CONFIG_BOOTM_FITIMAGE_SIGNATURE=y
+CONFIG_BOOTM_FITIMAGE_PUBKEY="../fit/pubkey.dtsi"
# CONFIG_BOOTM_FORCE_SIGNED_IMAGES is not set
CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
@@ -179,6 +179,7 @@ CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
CONFIG_CONSOLE_ACTIVATE_NONE=y
+CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
@@ -534,6 +535,8 @@ CONFIG_USB_GADGET_AUTOSTART=y
# CONFIG_USB_GADGET_DFU is not set
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
+CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
+# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
CONFIG_USB_MUSB=y
CONFIG_USB_MUSB_DSPS=y
CONFIG_USB_MUSB_AM335X=y
@@ -700,7 +703,9 @@ CONFIG_QSORT=y
CONFIG_LIBSCAN=y
CONFIG_LIBUBIGEN=y
CONFIG_IMAGE_SPARSE=y
+# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
+# CONFIG_CRC_CCITT is not set
#
# Library gui routines
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 1d646f5..65ce26d 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1,9 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.03.0-20180307-1 Configuration
+# Barebox/arm 2018.05.0-20180515-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
+CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -70,7 +71,9 @@ CONFIG_IMX_MULTI_BOARDS=y
# CONFIG_MACH_GUF_VINCELL is not set
# CONFIG_MACH_TQMA53 is not set
# CONFIG_MACH_FREESCALE_MX53_VMX53 is not set
+# CONFIG_MACH_TX53 is not set
# CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
+# CONFIG_MACH_KONTRON_SAMX6I is not set
# CONFIG_MACH_DFI_FS700_M60 is not set
# CONFIG_MACH_GUF_SANTARO is not set
# CONFIG_MACH_REALQ7 is not set
@@ -174,8 +177,6 @@ CONFIG_IMAGE_COMPRESSION_LZO=y
# CONFIG_IMAGE_COMPRESSION_NONE is not set
CONFIG_MMU=y
CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_PBLX_SIZE=0xffffffff
@@ -223,6 +224,7 @@ CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
CONFIG_CONSOLE_ACTIVATE_NONE=y
+CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
@@ -609,6 +611,8 @@ CONFIG_USB_GADGET_AUTOSTART=y
CONFIG_USB_GADGET_DFU=y
CONFIG_USB_GADGET_SERIAL=y
CONFIG_USB_GADGET_FASTBOOT=y
+CONFIG_USB_GADGET_FASTBOOT_SPARSE=y
+# CONFIG_USB_GADGET_FASTBOOT_BUF is not set
# CONFIG_USB_MUSB is not set
CONFIG_VIDEO=y
# CONFIG_FRAMEBUFFER_CONSOLE is not set
@@ -694,6 +698,7 @@ CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_USB is not set
CONFIG_WATCHDOG_IMX_RESET_SOURCE=y
CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_POLLER is not set
# CONFIG_WATCHDOG_DW is not set
CONFIG_WATCHDOG_IMX=y
CONFIG_PWM=y
@@ -815,7 +820,9 @@ CONFIG_LIBSCAN=y
CONFIG_LIBUBIGEN=y
CONFIG_IMAGE_SPARSE=y
CONFIG_STMP_DEVICE=y
+# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
+# CONFIG_CRC_CCITT is not set
#
# Library gui routines
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 7b3f1db..6e673bd 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1,9 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.03.0-20180307-1 Configuration
+# Barebox/arm 2018.05.0-20180515-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
+CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -110,8 +111,6 @@ CONFIG_IMAGE_COMPRESSION_LZO=y
# CONFIG_IMAGE_COMPRESSION_NONE is not set
CONFIG_MMU=y
CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x04000000
CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_PBLX_SIZE=0xffffffff
@@ -163,6 +162,7 @@ CONFIG_CONSOLE_FULL=y
CONFIG_CONSOLE_ACTIVATE_FIRST=y
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
@@ -548,7 +548,9 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
CONFIG_XYMODEM=y
+# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
+# CONFIG_CRC_CCITT is not set
#
# Library gui routines
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index d69bbc5..cee2bb3 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -1,9 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2018.03.0-20180307-1 Configuration
+# Barebox/arm 2018.05.0-20180515-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
+CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -104,8 +105,6 @@ CONFIG_IMAGE_COMPRESSION_LZO=y
# CONFIG_IMAGE_COMPRESSION_NONE is not set
CONFIG_MMU=y
CONFIG_MMU_EARLY=y
-CONFIG_HAVE_CONFIGURABLE_TEXT_BASE=y
-CONFIG_TEXT_BASE=0x0
CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_PBLX_SIZE=0xffffffff
@@ -153,6 +152,7 @@ CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
CONFIG_CONSOLE_ACTIVATE_ALL=y
# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
@@ -572,7 +572,9 @@ CONFIG_PROCESS_ESCAPE_SEQUENCE=y
# CONFIG_LZO_DECOMPRESS is not set
CONFIG_FNMATCH=y
CONFIG_QSORT=y
+# CONFIG_RATP is not set
# CONFIG_ALLOW_PRNG_FALLBACK is not set
+# CONFIG_CRC_CCITT is not set
#
# Library gui routines
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
similarity index 95%
rename from configs/platform-v7a/patches/barebox-2018.03.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
rename to 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
similarity index 90%
rename from configs/platform-v7a/patches/barebox-2018.03.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
rename to 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
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 0cc5ec4..9bfb623 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo
#
# Paths and names
#
-BAREBOX_AM335X_MLO_VERSION := 2018.03.0
-BAREBOX_AM335X_MLO_MD5 := 5a7692364684ad681c6a3c7a46e5000e
+BAREBOX_AM335X_MLO_VERSION := 2018.05.0
+BAREBOX_AM335X_MLO_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
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)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index ff56102..e358ac6 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
#
# Paths and names
#
-BAREBOX_AM335X_VERSION := 2018.03.0
-BAREBOX_AM335X_MD5 := 5a7692364684ad681c6a3c7a46e5000e
+BAREBOX_AM335X_VERSION := 2018.05.0
+BAREBOX_AM335X_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION)
BAREBOX_AM335X_SUFFIX := tar.bz2
BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index a8b4a7e..7103ed4 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
#
# Paths and names
#
-BAREBOX_MX6_VERSION := 2018.03.0
-BAREBOX_MX6_MD5 := 5a7692364684ad681c6a3c7a46e5000e
+BAREBOX_MX6_VERSION := 2018.05.0
+BAREBOX_MX6_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION)
BAREBOX_MX6_SUFFIX := tar.bz2
BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index 6361cf1..ba16511 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2
#
# Paths and names
#
-BAREBOX_RPI2_VERSION := 2018.03.0
-BAREBOX_RPI2_MD5 := 5a7692364684ad681c6a3c7a46e5000e
+BAREBOX_RPI2_VERSION := 2018.05.0
+BAREBOX_RPI2_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index 9eeaeab..8dea4da 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress
#
# Paths and names
#
-BAREBOX_VEXPRESS_VERSION := 2018.03.0
-BAREBOX_VEXPRESS_MD5 := 5a7692364684ad681c6a3c7a46e5000e
+BAREBOX_VEXPRESS_VERSION := 2018.05.0
+BAREBOX_VEXPRESS_MD5 := 8286a8ea2cdd88104e5c6762d93d81db
BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
--
2.17.0
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next reply other threads:[~2018-05-15 22:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-15 22:15 Roland Hieber [this message]
2018-05-16 16:26 ` Robert Schwebel
2018-05-16 16:27 ` Robert Schwebel
2018-05-18 9:26 ` Roland Hieber
2018-05-18 14:29 ` Robert Schwebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180515221515.15394-1-r.hieber@pengutronix.de \
--to=r.hieber@pengutronix.de \
--cc=distrokit@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox