diff options
Diffstat (limited to 'configs/platform-v7a/patches')
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2018.05.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch | 35 | ||||
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2018.05.0/0201-Release-pengutronix-multi_v7-20180515-1.patch | 22 | ||||
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2018.05.0/series | 15 | ||||
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch (renamed from configs/platform-v7a/patches/barebox-2018.05.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch) | 26 | ||||
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch | 22 | ||||
| -rw-r--r-- | configs/platform-v7a/patches/barebox-2018.12.0/series | 11 |
6 files changed, 46 insertions, 85 deletions
diff --git a/configs/platform-v7a/patches/barebox-2018.05.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 deleted file mode 100644 index cfca106..0000000 --- a/configs/platform-v7a/patches/barebox-2018.05.0/0001-beaglebone-add-state-entry-for-mmc0-and-mmc1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Michael Grzeschik <m.grzeschik@pengutronix.de> -Date: Fri, 10 Jun 2016 14:02:30 +0200 -Subject: [PATCH] beaglebone: add state entry for mmc0 and mmc1 - -Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> ---- - arch/arm/dts/am335x-bone-common.dtsi | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi -index 0413724e0ca1..6e58714516fd 100644 ---- a/arch/arm/dts/am335x-bone-common.dtsi -+++ b/arch/arm/dts/am335x-bone-common.dtsi -@@ -11,6 +11,21 @@ - linux,stdout-path = &uart0; - }; - -+ bootstate: bootstate { -+ compatible = "barebox,bootstate"; -+ backend-type = "nv"; -+ -+ system0 { -+ default_attempts = <3>; -+ boot = "mmc0"; -+ }; -+ -+ system1 { -+ default_attempts = <3>; -+ boot = "mmc1"; -+ }; -+ }; -+ - cpus { - cpu@0 { - cpu0-supply = <&dcdc2_reg>; 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 deleted file mode 100644 index 4b0c22d..0000000 --- a/configs/platform-v7a/patches/barebox-2018.05.0/0201-Release-pengutronix-multi_v7-20180515-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 272791c..0000000 --- a/configs/platform-v7a/patches/barebox-2018.05.0/series +++ /dev/null @@ -1,15 +0,0 @@ -# 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/patches/barebox-2018.05.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch index 06c356b..885dd61 100644 --- a/configs/platform-v7a/patches/barebox-2018.05.0/0101-ARM-imx-add-support-for-Udoo-Neo-full.patch +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0001-ARM-imx-add-support-for-Udoo-Neo-full.patch @@ -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 30f4c299f1a1..f70fbac8f379 100644 +index 3bf176b14dc2..953a6eec12e4 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile -@@ -135,6 +135,7 @@ obj-$(CONFIG_MACH_TX51) += karo-tx51/ +@@ -139,6 +139,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 e60e0ea0c6be..b87e27c8c263 100644 +index 503d9b18f9c1..eadffc7b7c44 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -93,6 +93,7 @@ pbl-dtb-$(CONFIG_MACH_TX6X) += imx6dl-tx6u.dtb.o +@@ -98,6 +98,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 9052a94ea071..9ec95bb6df09 100644 +index edfc85113880..6f86175b24e9 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig -@@ -377,6 +377,10 @@ config MACH_UDOO +@@ -392,6 +392,10 @@ config MACH_UDOO bool "Freescale i.MX6 UDOO Board" select ARCH_IMX6 @@ -291,22 +291,22 @@ index 9052a94ea071..9ec95bb6df09 100644 bool "Variscite i.MX6 Quad SOM" select ARCH_IMX6 diff --git a/arch/arm/mach-imx/include/mach/esdctl.h b/arch/arm/mach-imx/include/mach/esdctl.h -index 66dcc8974cfb..bd6092febca4 100644 +index bc6c7339535e..18c4a2836007 100644 --- a/arch/arm/mach-imx/include/mach/esdctl.h +++ b/arch/arm/mach-imx/include/mach/esdctl.h -@@ -137,6 +137,7 @@ void __noreturn imx51_barebox_entry(void *boarddata); - void __noreturn imx53_barebox_entry(void *boarddata); - void __noreturn imx6q_barebox_entry(void *boarddata); - void __noreturn imx6ul_barebox_entry(void *boarddata); +@@ -141,6 +141,7 @@ void __noreturn imx6ul_barebox_entry(void *boarddata); + void __noreturn vf610_barebox_entry(void *boarddata); + void __noreturn imx8mq_barebox_entry(void *boarddata); + void __noreturn imx7d_barebox_entry(void *boarddata); +#define imx6sx_barebox_entry(boarddata) imx6ul_barebox_entry(boarddata) void imx_esdctl_disable(void); #endif diff --git a/images/Makefile.imx b/images/Makefile.imx -index 90da95d4d025..6420490811f9 100644 +index 9b5cd577d285..257561464504 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx -@@ -275,6 +275,11 @@ CFG_start_imx6q_sabresd.pblx.imximg = $(board)/freescale-mx6-sabresd/flash-heade +@@ -271,6 +271,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.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch b/configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch new file mode 100644 index 0000000..836a7ff --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch @@ -0,0 +1,22 @@ +From: Rouven Czerwinski <r.czerwinski@pengutronix.de> +Date: Fri, 7 Dec 2018 15:18:01 +0100 +Subject: [PATCH] Release 2018.12.0/customers/pengutronix/multiv7/20181207-1 + +Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de> +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 1ce50d025e47..84de26cbb028 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2018 + PATCHLEVEL = 12 + SUBLEVEL = 0 +-EXTRAVERSION = ++EXTRAVERSION =-20181207-1 + NAME = None + + # *DOCUMENTATION* diff --git a/configs/platform-v7a/patches/barebox-2018.12.0/series b/configs/platform-v7a/patches/barebox-2018.12.0/series new file mode 100644 index 0000000..776d279 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2018.12.0/series @@ -0,0 +1,11 @@ +# umpf-base: v2018.12.0 +# umpf-name: 2018.12.0/customers/pengutronix/multiv7 +# umpf-version: 2018.12.0/customers/pengutronix/multiv7/20181207-1 +# umpf-topic: v2018.11.0/customers/pengutronix/udoo-neo +# umpf-hashinfo: c5f2e150d7e8d5439458df1a2cab71b25fc36e19 +# umpf-topic-range: 0b5361a328632e64c14a54306119093a0c7fecdf..91bbdb966ae2431a0fa298d5976e9435312f555a +0001-ARM-imx-add-support-for-Udoo-Neo-full.patch +# umpf-release: 2018.12.0/customers/pengutronix/multiv7/20181207-1 +# umpf-topic-range: 91bbdb966ae2431a0fa298d5976e9435312f555a..aaff0754c24c6911d3ba72f96d37fedf8007d3e6 +0101-Release-2018.12.0-customers-pengutronix-multiv7-2018.patch +# umpf-end |