summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Hieber <r.hieber@pengutronix.de>2018-01-28 23:36:40 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2018-01-29 08:36:40 +0100
commite337d599ce7ce826dd3819b60b2e46ace2875840 (patch)
treed6e91b1cd1561f15011d2d9afa7b1c6ebb223e1a
parentb457b51f93f629aa8d3b7b19fdaf418fbf6cd0c6 (diff)
downloadDistroKit-e337d599ce7ce826dd3819b60b2e46ace2875840.tar.gz
DistroKit-e337d599ce7ce826dd3819b60b2e46ace2875840.tar.xz
platform-v7a: barebox: version bump 2017.11.0 -> 2018.01.0
Migrate the patches and make oldconfig without adding any new features. Note that barebox-rpi2 is still broken, but we'll bump it anyway for completeness. Tested-by: Robert Schwebel <r.schwebel@pengutronix.de> (for qemu-vexpress) Tested-by: Roland Hieber <r.hieber@pengutronix.de> (for qemu-vexpress) Signed-off-by: Roland Hieber <r.hieber@pengutronix.de>
-rw-r--r--configs/platform-v7a/barebox-am335x-mlo.config3
-rw-r--r--configs/platform-v7a/barebox-am335x.config4
-rw-r--r--configs/platform-v7a/barebox-mx6.config4
-rw-r--r--configs/platform-v7a/barebox-rpi2.config2
-rw-r--r--configs/platform-v7a/barebox-vexpress.config3
-rw-r--r--configs/platform-v7a/patches/barebox-2017.11.0/0201-Release-2017.11.0-pengutronix-multi_v7-20171113-1.patch22
-rw-r--r--configs/platform-v7a/patches/barebox-2017.11.0/series15
-rw-r--r--configs/platform-v7a/patches/barebox-2018.01.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch (renamed from configs/platform-v7a/patches/barebox-2017.11.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch)0
-rw-r--r--configs/platform-v7a/patches/barebox-2018.01.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch (renamed from configs/platform-v7a/patches/barebox-2017.11.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch)6
-rw-r--r--configs/platform-v7a/patches/barebox-2018.01.0/0201-Release-pengutronix-multi_v7-20180128-1.patch22
-rw-r--r--configs/platform-v7a/patches/barebox-2018.01.0/series15
-rw-r--r--configs/platform-v7a/rules/barebox-am335x-mlo.make4
-rw-r--r--configs/platform-v7a/rules/barebox-am335x.make4
-rw-r--r--configs/platform-v7a/rules/barebox-mx6.make4
-rw-r--r--configs/platform-v7a/rules/barebox-rpi2.make4
-rw-r--r--configs/platform-v7a/rules/barebox-vexpress.make4
16 files changed, 61 insertions, 55 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config
index 48c7e79..87514e7 100644
--- a/configs/platform-v7a/barebox-am335x-mlo.config
+++ b/configs/platform-v7a/barebox-am335x-mlo.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.11.0-20171113-1 Configuration
+# Barebox/arm 2018.01.0-20180128-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -62,6 +62,7 @@ CONFIG_MACH_AFI_GF=y
CONFIG_MACH_BEAGLEBONE=y
CONFIG_MACH_PHYTEC_SOM_AM335X=y
# CONFIG_MACH_VSCOM_BALTOS is not set
+# CONFIG_PHYTEC_SOM_AM335X_OF_AUTOENABLE is not set
CONFIG_ARM_ASM_UNIFIED=y
CONFIG_AEABI=y
CONFIG_THUMB2_BAREBOX=y
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index ef90360..601c282 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.11.0-20171113-1 Configuration
+# Barebox/arm 2018.01.0-20180128-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -319,6 +319,7 @@ CONFIG_NET_CMD_IFUP=y
CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
+# CONFIG_CMD_IP_ROUTE_GET is not set
#
# Console and Framebuffer interaction
@@ -444,6 +445,7 @@ CONFIG_DRIVER_NET_CPSW=y
# MII bus device drivers
#
# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
#
# SPI drivers
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 0782568..70bdab8 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.11.0-20171113-1 Configuration
+# Barebox/arm 2018.01.0-20180128-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -368,6 +368,7 @@ CONFIG_NET_CMD_IFUP=y
CONFIG_CMD_MIITOOL=y
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
+# CONFIG_CMD_IP_ROUTE_GET is not set
#
# Console and Framebuffer interaction
@@ -499,6 +500,7 @@ CONFIG_MICREL_PHY=y
# MII bus device drivers
#
# CONFIG_MDIO_BITBANG is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
CONFIG_NET_USB=y
CONFIG_NET_USB_ASIX=y
CONFIG_NET_USB_SMSC95XX=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 83e5fd1..3850b58 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.10.0-20171007-1 Configuration
+# Barebox/arm 2018.01.0-20180128-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 0a30b9c..8d45902 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2017.11.0-20171113-1 Configuration
+# Barebox/arm 2018.01.0-20180128-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
@@ -288,6 +288,7 @@ CONFIG_NET_CMD_IFUP=y
# CONFIG_CMD_MIITOOL is not set
CONFIG_CMD_PING=y
CONFIG_CMD_TFTP=y
+# CONFIG_CMD_IP_ROUTE_GET is not set
#
# Console and Framebuffer interaction
diff --git a/configs/platform-v7a/patches/barebox-2017.11.0/0201-Release-2017.11.0-pengutronix-multi_v7-20171113-1.patch b/configs/platform-v7a/patches/barebox-2017.11.0/0201-Release-2017.11.0-pengutronix-multi_v7-20171113-1.patch
deleted file mode 100644
index f0fea33..0000000
--- a/configs/platform-v7a/patches/barebox-2017.11.0/0201-Release-2017.11.0-pengutronix-multi_v7-20171113-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Mon, 13 Nov 2017 14:55:03 +0100
-Subject: [PATCH] Release 2017.11.0/pengutronix/multi_v7/20171113-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 e8ee515622e7..1563ef4aa405 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2017
- PATCHLEVEL = 11
- SUBLEVEL = 0
--EXTRAVERSION =
-+EXTRAVERSION =-20171113-1
- NAME = None
-
- # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2017.11.0/series b/configs/platform-v7a/patches/barebox-2017.11.0/series
deleted file mode 100644
index dcfd4aa..0000000
--- a/configs/platform-v7a/patches/barebox-2017.11.0/series
+++ /dev/null
@@ -1,15 +0,0 @@
-# umpf-base: v2017.11.0
-# umpf-name: 2017.11.0/pengutronix/multi_v7
-# umpf-version: 2017.11.0/pengutronix/multi_v7/20171113-1
-# umpf-topic: v2017.11.0/customers/pengutronix/beaglebone
-# umpf-hashinfo: cbd9e4ded858e431ffb6854377ff36272be65392
-# umpf-topic-range: 5f5decec00df364859fd375dde8c0e2c148447d1..cbd9e4ded858e431ffb6854377ff36272be65392
-0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
-# umpf-topic: v2017.11.0/customers/pengutronix/udoo-neo
-# umpf-hashinfo: dc2cecfcb78ae484ac4b79d804d3218feca79867
-# umpf-topic-range: cbd9e4ded858e431ffb6854377ff36272be65392..b99f3dca4928f97e38ceb85ee3f69b469beaa29d
-0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
-# umpf-release: 2017.11.0/pengutronix/multi_v7/20171113-1
-# umpf-topic-range: b99f3dca4928f97e38ceb85ee3f69b469beaa29d..836b26d5e8fdd7e1d20a39c96f575635acc23864
-0201-Release-2017.11.0-pengutronix-multi_v7-20171113-1.patch
-# umpf-end
diff --git a/configs/platform-v7a/patches/barebox-2017.11.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch b/configs/platform-v7a/patches/barebox-2018.01.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
index 4dfd47c..4dfd47c 100644
--- a/configs/platform-v7a/patches/barebox-2017.11.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
+++ b/configs/platform-v7a/patches/barebox-2018.01.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
diff --git a/configs/platform-v7a/patches/barebox-2017.11.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch b/configs/platform-v7a/patches/barebox-2018.01.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
index b00f641..0aa3c8a 100644
--- a/configs/platform-v7a/patches/barebox-2017.11.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
+++ b/configs/platform-v7a/patches/barebox-2018.01.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
@@ -276,10 +276,10 @@ index 000000000000..9203d40207c5
+/{
+};
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
-index 1578875e95ab..cc9d94dea56d 100644
+index eb135c3f534c..b2af8d938f11 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
-@@ -365,6 +365,10 @@ config MACH_UDOO
+@@ -367,6 +367,10 @@ config MACH_UDOO
bool "Freescale i.MX6 UDOO Board"
select ARCH_IMX6
@@ -303,7 +303,7 @@ index 66dcc8974cfb..bd6092febca4 100644
#endif
diff --git a/images/Makefile.imx b/images/Makefile.imx
-index 76e91ebd7d2e..290c9cb61e3d 100644
+index 5e0043f1f014..021e3a5b0f68 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-2018.01.0/0201-Release-pengutronix-multi_v7-20180128-1.patch b/configs/platform-v7a/patches/barebox-2018.01.0/0201-Release-pengutronix-multi_v7-20180128-1.patch
new file mode 100644
index 0000000..dfc57f5
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2018.01.0/0201-Release-pengutronix-multi_v7-20180128-1.patch
@@ -0,0 +1,22 @@
+From: Roland Hieber <r.hieber@pengutronix.de>
+Date: Sun, 28 Jan 2018 22:53:59 +0100
+Subject: [PATCH] Release pengutronix/multi_v7/20180128-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 f77a1fd722b7..49fa5c7da870 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2018
+ PATCHLEVEL = 01
+ SUBLEVEL = 0
+-EXTRAVERSION =
++EXTRAVERSION =-20180128-1
+ NAME = None
+
+ # *DOCUMENTATION*
diff --git a/configs/platform-v7a/patches/barebox-2018.01.0/series b/configs/platform-v7a/patches/barebox-2018.01.0/series
new file mode 100644
index 0000000..2536e07
--- /dev/null
+++ b/configs/platform-v7a/patches/barebox-2018.01.0/series
@@ -0,0 +1,15 @@
+# umpf-base: v2018.01.0
+# umpf-name: pengutronix/multi_v7
+# umpf-version: pengutronix/multi_v7/20180128-1
+# umpf-topic: v2018.01.0/customers/pengutronix/beaglebone
+# umpf-hashinfo: a3f8ec875bb6ebd967a41149d4285012ff96209c
+# umpf-topic-range: 1b3990c50f6137efa4c9c95d5344bdda18d92096..a3f8ec875bb6ebd967a41149d4285012ff96209c
+0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch
+# umpf-topic: v2018.01.0/customers/pengutronix/udoo-neo
+# umpf-hashinfo: 9d223aa1af85cf7815fd5dd4f56fbb6667492fe9
+# umpf-topic-range: a3f8ec875bb6ebd967a41149d4285012ff96209c..9baa03ecb6039df44814ed178a2245778667f6e7
+0101-ARM-imx-add-support-for-Udoo-Neo-full.patch
+# umpf-release: pengutronix/multi_v7/20180128-1
+# umpf-topic-range: 9baa03ecb6039df44814ed178a2245778667f6e7..369c50971b8d5eeac32452c4bb131a6b5acae00a
+0201-Release-pengutronix-multi_v7-20180128-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 fa01194..413ea15 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 := 2017.11.0
-BAREBOX_AM335X_MLO_MD5 := 81732dd9ef55e70a4a56f0d79b1dbde5
+BAREBOX_AM335X_MLO_VERSION := 2018.01.0
+BAREBOX_AM335X_MLO_MD5 := 37577d9941295d4d38b8dfa334e5d8a9
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 81029dc..f1f8ff5 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 := 2017.11.0
-BAREBOX_AM335X_MD5 := 81732dd9ef55e70a4a56f0d79b1dbde5
+BAREBOX_AM335X_VERSION := 2018.01.0
+BAREBOX_AM335X_MD5 := 37577d9941295d4d38b8dfa334e5d8a9
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 c1a0501..b490c39 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 := 2017.11.0
-BAREBOX_MX6_MD5 := 81732dd9ef55e70a4a56f0d79b1dbde5
+BAREBOX_MX6_VERSION := 2018.01.0
+BAREBOX_MX6_MD5 := 37577d9941295d4d38b8dfa334e5d8a9
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 83d3060..7dc0f61 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 := 2017.11.0
-BAREBOX_RPI2_MD5 := 81732dd9ef55e70a4a56f0d79b1dbde5
+BAREBOX_RPI2_VERSION := 2018.01.0
+BAREBOX_RPI2_MD5 := 37577d9941295d4d38b8dfa334e5d8a9
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 95b94c1..01577a5 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 := 2017.11.0
-BAREBOX_VEXPRESS_MD5 := 81732dd9ef55e70a4a56f0d79b1dbde5
+BAREBOX_VEXPRESS_VERSION := 2018.01.0
+BAREBOX_VEXPRESS_MD5 := 37577d9941295d4d38b8dfa334e5d8a9
BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)