diff options
author | Rouven Czerwinski <r.czerwinski@pengutronix.de> | 2018-12-07 15:35:28 +0100 |
---|---|---|
committer | Rouven Czerwinski <r.czerwinski@pengutronix.de> | 2018-12-07 15:35:28 +0100 |
commit | 039a636d541f03769133740fbb9b400ea58cf7e9 (patch) | |
tree | 288c4c0175a8a40bb39b0d87243b6b636875b852 /configs | |
parent | 3a559a1f10f777ee61117fbb3505484e9c78e4eb (diff) | |
download | DistroKit-039a636d541f03769133740fbb9b400ea58cf7e9.tar.gz DistroKit-039a636d541f03769133740fbb9b400ea58cf7e9.tar.xz |
platform-v7a: barebox bump v2018.05.0 → v2018.12.0
Bump barebox from v2018.05.0 to v2018.12.0.
This barebox release officially supports RPI3, this will be enabled in
a later commit.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Diffstat (limited to 'configs')
16 files changed, 186 insertions, 103 deletions
diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index 6cebecd..5fc6a5d 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 2018.05.0-20180515-1 Configuration +# Barebox/arm 2018.12.0-20181207-1 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -185,6 +185,7 @@ CONFIG_OF_GPIO=y # # serial drivers # +# CONFIG_SERIAL_DEV_BUS is not set # CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y @@ -337,6 +338,15 @@ CONFIG_BUS_OMAP_GPMC=y # Filesystem support # CONFIG_FS=y +CONFIG_FS_LEGACY=y + +# +# Some selected filesystems still use the legacy FS API. +# + +# +# Consider updating them. +# # CONFIG_FS_CRAMFS is not set # CONFIG_FS_EXT4 is not set CONFIG_FS_RAMFS=y @@ -385,6 +395,7 @@ CONFIG_XYMODEM=y # CONFIG_RATP is not set # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set +# CONFIG_CRC8 is not set # # Library gui routines @@ -398,3 +409,13 @@ CONFIG_XYMODEM=y CONFIG_CRC16=y # CONFIG_DIGEST is not set # CONFIG_CRYPTO_KEYSTORE is not set + +# +# Firmware files +# +CONFIG_EXTRA_FIRMWARE_DIR="firmware" + +# +# Host Tools +# +# CONFIG_COMPILE_HOST_TOOLS is not set diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index 0c78012..1c1f0e6 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 2018.05.0-20180515-1 Configuration +# Barebox/arm 2018.12.0-20181207-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -100,6 +100,7 @@ CONFIG_BAREBOX_UPDATE=y CONFIG_MENUTREE=y CONFIG_FILE_LIST=y CONFIG_UBIFORMAT=y +CONFIG_USBGADGET_START=y CONFIG_BOOT=y # @@ -408,6 +409,7 @@ CONFIG_OF_BAREBOX_DRIVERS=y # # serial drivers # +# CONFIG_SERIAL_DEV_BUS is not set # CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y @@ -436,11 +438,13 @@ CONFIG_DRIVER_NET_CPSW=y # # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set +# CONFIG_DAVICOM_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set # CONFIG_NATIONAL_PHY is not set # CONFIG_SMSC_PHY is not set +# CONFIG_NET_DSA_MV88E6XXX is not set # # MII bus device drivers @@ -587,6 +591,7 @@ CONFIG_LED_GPIO_OF=y # CONFIG_LED_GPIO_RGB is not set # CONFIG_LED_GPIO_BICOLOR is not set CONFIG_LED_TRIGGERS=y +# CONFIG_LED_PCA955X is not set # # EEPROM support @@ -649,6 +654,15 @@ CONFIG_BUS_OMAP_GPMC=y # Filesystem support # CONFIG_FS=y +CONFIG_FS_LEGACY=y + +# +# Some selected filesystems still use the legacy FS API. +# + +# +# Consider updating them. +# CONFIG_FS_AUTOMOUNT=y # CONFIG_FS_CRAMFS is not set CONFIG_FS_EXT4=y @@ -706,6 +720,7 @@ CONFIG_IMAGE_SPARSE=y # CONFIG_RATP is not set # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set +# CONFIG_CRC8 is not set # # Library gui routines @@ -732,3 +747,13 @@ CONFIG_DIGEST_HMAC_GENERIC=y # CONFIG_DIGEST_SHA256_ARM is not set CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_KEYSTORE=y + +# +# Firmware files +# +CONFIG_EXTRA_FIRMWARE_DIR="firmware" + +# +# Host Tools +# +# CONFIG_COMPILE_HOST_TOOLS is not set diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 980b97b..b792744 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 2018.05.0-20180515-1 Configuration +# Barebox/arm 2018.12.0-20181207-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -94,13 +94,18 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_VARISCITE_MX6 is not set # CONFIG_MACH_GW_VENTANA is not set # CONFIG_MACH_CM_FX6 is not set +# CONFIG_MACH_ADVANTECH_ROM_742X is not set # CONFIG_MACH_WARP7 is not set # CONFIG_MACH_VF610_TWR is not set +# CONFIG_MACH_ZII_RDU1 is not set # CONFIG_MACH_ZII_RDU2 is not set # CONFIG_MACH_ZII_VF610_DEV is not set +# CONFIG_MACH_ZII_IMX7D_RPU2 is not set # CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set # CONFIG_MACH_FREESCALE_MX7_SABRESD is not set # CONFIG_MACH_NXP_IMX6ULL_EVK is not set +# CONFIG_MACH_NXP_IMX8MQ_EVK is not set +# CONFIG_MACH_GRINN_LITEBOARD is not set # # Board specific settings @@ -111,10 +116,7 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_IMX_IIM=y CONFIG_IMX_IIM_FUSE_BLOW=y -CONFIG_IMX_OCOTP=y -# CONFIG_IMX_OCOTP_WRITE is not set # CONFIG_HABV4 is not set -# CONFIG_ARCH_IMX_USBLOADER is not set CONFIG_ARM_ASM_UNIFIED=y CONFIG_AEABI=y CONFIG_THUMB2_BAREBOX=y @@ -147,6 +149,7 @@ CONFIG_MENUTREE=y CONFIG_FILE_LIST=y CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y CONFIG_UBIFORMAT=y +CONFIG_USBGADGET_START=y CONFIG_BOOT=y # @@ -464,6 +467,7 @@ CONFIG_OF_BAREBOX_DRIVERS=y # # serial drivers # +# CONFIG_SERIAL_DEV_BUS is not set # CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_DRIVER_SERIAL_IMX=y # CONFIG_DRIVER_SERIAL_NS16550 is not set @@ -493,11 +497,13 @@ CONFIG_DRIVER_NET_FEC_IMX=y # # CONFIG_AR8327N_PHY is not set CONFIG_AT803X_PHY=y +# CONFIG_DAVICOM_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set CONFIG_MICREL_PHY=y # CONFIG_NATIONAL_PHY is not set # CONFIG_SMSC_PHY is not set +# CONFIG_NET_DSA_MV88E6XXX is not set # # MII bus device drivers @@ -651,7 +657,9 @@ CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_OF_PROVIDER=y +CONFIG_ARCH_HAS_IMX_GPT=y CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 +CONFIG_CLOCKSOURCE_IMX_GPT=y # # MFD @@ -681,6 +689,7 @@ CONFIG_LED_GPIO_OF=y # CONFIG_LED_GPIO_RGB is not set # CONFIG_LED_GPIO_BICOLOR is not set CONFIG_LED_TRIGGERS=y +# CONFIG_LED_PCA955X is not set # # EEPROM support @@ -762,6 +771,15 @@ CONFIG_USB_NOP_XCEIV=y # Filesystem support # CONFIG_FS=y +CONFIG_FS_LEGACY=y + +# +# Some selected filesystems still use the legacy FS API. +# + +# +# Consider updating them. +# CONFIG_FS_AUTOMOUNT=y # CONFIG_FS_CRAMFS is not set CONFIG_FS_EXT4=y @@ -823,6 +841,7 @@ CONFIG_STMP_DEVICE=y # CONFIG_RATP is not set # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set +# CONFIG_CRC8 is not set # # Library gui routines @@ -854,3 +873,14 @@ CONFIG_DIGEST_HMAC_GENERIC=y # CONFIG_DIGEST_SHA1_ARM is not set # CONFIG_DIGEST_SHA256_ARM is not set CONFIG_CRYPTO_KEYSTORE=y + +# +# Firmware files +# +CONFIG_EXTRA_FIRMWARE_DIR="firmware" + +# +# Host Tools +# +# CONFIG_COMPILE_HOST_TOOLS is not set +# CONFIG_ARCH_IMX_USBLOADER is not set diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 74c52e9..7a9b560 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 2018.05.0-20180515-1 Configuration +# Barebox/arm 2018.12.0-20181207-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -54,6 +54,7 @@ CONFIG_MACH_RPI_COMMON=y # # CONFIG_MACH_RPI is not set CONFIG_MACH_RPI2=y +# CONFIG_MACH_RPI3 is not set CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff CONFIG_AEABI=y # CONFIG_THUMB2_BAREBOX is not set @@ -369,6 +370,7 @@ CONFIG_ARM_AMBA=y # # serial drivers # +# CONFIG_SERIAL_DEV_BUS is not set # CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_SERIAL_AMBA_PL011=y # CONFIG_DRIVER_SERIAL_NS16550 is not set @@ -474,6 +476,7 @@ CONFIG_GPIO_BCM283X=y # CONFIG_PINCTRL is not set CONFIG_NVMEM=y # CONFIG_NVMEM_SNVS_LPGPR is not set +# CONFIG_EEPROM_93XX46 is not set # # Bus devices @@ -499,6 +502,15 @@ CONFIG_REGULATOR_BCM283X=y # Filesystem support # CONFIG_FS=y +CONFIG_FS_LEGACY=y + +# +# Some selected filesystems still use the legacy FS API. +# + +# +# Consider updating them. +# CONFIG_FS_AUTOMOUNT=y # CONFIG_FS_CRAMFS is not set CONFIG_FS_EXT4=y @@ -551,6 +563,7 @@ CONFIG_XYMODEM=y # CONFIG_RATP is not set # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set +# CONFIG_CRC8 is not set # # Library gui routines @@ -575,3 +588,13 @@ CONFIG_DIGEST_MD5_GENERIC=y # CONFIG_DIGEST_SHA1_ARM is not set # CONFIG_DIGEST_SHA256_ARM is not set # CONFIG_CRYPTO_KEYSTORE is not set + +# +# Firmware files +# +CONFIG_EXTRA_FIRMWARE_DIR="firmware" + +# +# Host Tools +# +# CONFIG_COMPILE_HOST_TOOLS is not set diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 826d222..5abe71e 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 2018.05.0-20180515-1 Configuration +# Barebox/arm 2018.12.0-20181207-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -364,6 +364,7 @@ CONFIG_ARM_AMBA=y # # serial drivers # +# CONFIG_SERIAL_DEV_BUS is not set # CONFIG_DRIVER_SERIAL_ARM_DCC is not set CONFIG_SERIAL_AMBA_PL011=y # CONFIG_DRIVER_SERIAL_NS16550 is not set @@ -389,11 +390,13 @@ CONFIG_DRIVER_NET_SMC911X=y # # CONFIG_AR8327N_PHY is not set # CONFIG_AT803X_PHY is not set +# CONFIG_DAVICOM_PHY is not set # CONFIG_LXT_PHY is not set # CONFIG_MARVELL_PHY is not set # CONFIG_MICREL_PHY is not set # CONFIG_NATIONAL_PHY is not set # CONFIG_SMSC_PHY is not set +# CONFIG_NET_DSA_MV88E6XXX is not set # # MII bus device drivers @@ -522,6 +525,15 @@ CONFIG_STATE_DRV=y # Filesystem support # CONFIG_FS=y +CONFIG_FS_LEGACY=y + +# +# Some selected filesystems still use the legacy FS API. +# + +# +# Consider updating them. +# CONFIG_FS_AUTOMOUNT=y # CONFIG_FS_CRAMFS is not set CONFIG_FS_EXT4=y @@ -575,6 +587,7 @@ CONFIG_QSORT=y # CONFIG_RATP is not set # CONFIG_ALLOW_PRNG_FALLBACK is not set # CONFIG_CRC_CCITT is not set +# CONFIG_CRC8 is not set # # Library gui routines @@ -599,3 +612,13 @@ CONFIG_DIGEST_MD5_GENERIC=y # CONFIG_DIGEST_SHA1_ARM is not set # CONFIG_DIGEST_SHA256_ARM is not set # CONFIG_CRYPTO_KEYSTORE is not set + +# +# Firmware files +# +CONFIG_EXTRA_FIRMWARE_DIR="firmware" + +# +# Host Tools +# +# CONFIG_COMPILE_HOST_TOOLS is not set 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 diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make index e71d057..62a3483 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.05.0 -BAREBOX_AM335X_MLO_MD5 := 8286a8ea2cdd88104e5c6762d93d81db +BAREBOX_AM335X_MLO_VERSION := 2018.12.0 +BAREBOX_AM335X_MLO_MD5 := f84d7d3562055c80c3eedce0b14d4a0d 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 2c35ae1..2a38d3a 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.05.0 -BAREBOX_AM335X_MD5 := 8286a8ea2cdd88104e5c6762d93d81db +BAREBOX_AM335X_VERSION := 2018.12.0 +BAREBOX_AM335X_MD5 := f84d7d3562055c80c3eedce0b14d4a0d 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 7d7c2ce..7cda132 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.05.0 -BAREBOX_MX6_MD5 := 8286a8ea2cdd88104e5c6762d93d81db +BAREBOX_MX6_VERSION := 2018.12.0 +BAREBOX_MX6_MD5 := f84d7d3562055c80c3eedce0b14d4a0d 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 cf9fc00..c09e911 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.05.0 -BAREBOX_RPI2_MD5 := 8286a8ea2cdd88104e5c6762d93d81db +BAREBOX_RPI2_VERSION := 2018.12.0 +BAREBOX_RPI2_MD5 := f84d7d3562055c80c3eedce0b14d4a0d 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 0266cbe..afef7a9 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.05.0 -BAREBOX_VEXPRESS_MD5 := 8286a8ea2cdd88104e5c6762d93d81db +BAREBOX_VEXPRESS_VERSION := 2018.12.0 +BAREBOX_VEXPRESS_MD5 := f84d7d3562055c80c3eedce0b14d4a0d BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION) BAREBOX_VEXPRESS_SUFFIX := tar.bz2 BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION) |