summaryrefslogtreecommitdiffstats
path: root/configs/platform-v7a/patches
diff options
context:
space:
mode:
Diffstat (limited to 'configs/platform-v7a/patches')
-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
6 files changed, 40 insertions, 40 deletions
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