From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Ahmad Fatoum Date: Tue, 14 Jan 2020 17:00:23 +0100 Message-Id: <20200114160023.11470-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH] platform-v7a: barebox: version bump 2019.12.0 -> 2020.01.0 List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Ahmad Fatoum barebox v2020.01.0 has just been released. Rebase the patch stack, oldconfig the configs and use it. Signed-off-by: Ahmad Fatoum --- .../platform-v7a/barebox-am335x-mlo.config | 6 ++--- configs/platform-v7a/barebox-am335x.config | 6 ++--- .../platform-v7a/barebox-am335x.config.diff | 5 ++++- configs/platform-v7a/barebox-mx6.config | 6 +++-- configs/platform-v7a/barebox-mx6.config.diff | 5 ++++- configs/platform-v7a/barebox-rpi2.config | 6 +++-- configs/platform-v7a/barebox-rpi2.config.diff | 3 ++- configs/platform-v7a/barebox-vexpress.config | 4 ++-- .../platform-v7a/barebox-vexpress.config.diff | 3 ++- configs/platform-v7a/barebox.config | 5 +++-- ...0-customers-pengutronix-distrokit-v7.patch | 22 ------------------- ...arn-when-firmware-doesn-t-pass-a-dtb.patch | 0 .../0002-usb-Make-timeout-unit-clear.patch | 2 +- .../0003-of-Add-of_bus_n_xxx_cells.patch | 6 ++--- .../0004-device-Introduce-dma_offset.patch | 6 ++--- ...-of-Read-dma_offset-from-device-tree.patch | 0 .../0006-usb-Add-usbroothubdes.h.patch | 0 ...unction-to-get-regulator-by-its-name.patch | 0 ...able-USB-Power-domain-during-startup.patch | 0 ...rror-code-from-usb_set_configuration.patch | 0 .../0010-usb-Add-dwc2-host-driver.patch | 0 ...835-mbox-Remove-response-valid-check.patch | 0 ...gpio-Add-raspberrypi-exp-gpio-driver.patch | 0 ...m2835-mbox-use-pr_-to-print-messages.patch | 0 ...fig-Enable-raspberry-GPIO-exp-driver.patch | 0 ...ailbox-Use-non-interruptible-timeout.patch | 0 ...M-rpi_defconfig-Enable-more-features.patch | 0 ...0-customers-pengutronix-distrokit-v7.patch | 22 +++++++++++++++++++ .../series | 18 +++++++-------- configs/platform-v7a/platformconfig | 4 ++-- 30 files changed, 70 insertions(+), 59 deletions(-) delete mode 100644 configs/platform-v7a/patches/barebox-2019.12.0/0101-Release-2019.12.0-customers-pengutronix-distrokit-v7.patch rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0002-usb-Make-timeout-unit-clear.patch (98%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0003-of-Add-of_bus_n_xxx_cells.patch (95%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0004-device-Introduce-dma_offset.patch (96%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0005-of-Read-dma_offset-from-device-tree.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0006-usb-Add-usbroothubdes.h.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0007-regulator-add-function-to-get-regulator-by-its-name.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0008-rpi-Enable-USB-Power-domain-during-startup.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0009-usb-Forward-error-code-from-usb_set_configuration.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0010-usb-Add-dwc2-host-driver.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0011-ARM-bcm2835-mbox-Remove-response-valid-check.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0012-gpio-Add-raspberrypi-exp-gpio-driver.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0013-ARM-bcm2835-mbox-use-pr_-to-print-messages.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0014-ARM-rpi_defconfig-Enable-raspberry-GPIO-exp-driver.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0015-ARM-rpi-mailbox-Use-non-interruptible-timeout.patch (100%) rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/0016-ARM-rpi_defconfig-Enable-more-features.patch (100%) create mode 100644 configs/platform-v7a/patches/barebox-2020.01.0/0101-Release-2020.01.0-customers-pengutronix-distrokit-v7.patch rename configs/platform-v7a/patches/{barebox-2019.12.0 => barebox-2020.01.0}/series (57%) diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index ac33598493b8..a74cec240ab4 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 2019.12.0-20200108-1 Configuration +# Barebox/arm 2020.01.0-20200114-1 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -155,7 +155,6 @@ CONFIG_CONSOLE_FULL=y 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 CONFIG_PARTITION_DISK=y CONFIG_PARTITION_DISK_DOS=y @@ -289,13 +288,13 @@ CONFIG_MCI=y # # CONFIG_MCI_DW is not set CONFIG_MCI_OMAP_HSMMC=y +# CONFIG_MCI_ARASAN is not set # CONFIG_MCI_SPI is not set # # Clocksource # CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 -CONFIG_CLOCKSOURCE_ARMV8_TIMER=y # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set CONFIG_CLOCKSOURCE_TI_DM=y # end of Clocksource @@ -465,7 +464,6 @@ CONFIG_UNCOMPRESS=y # CONFIG_BASE64 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 # CONFIG_CRC8 is not set diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index ed52e1c2107e..315ef85e0088 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 2019.12.0-20200108-1 Configuration +# Barebox/arm 2020.01.0-20200114-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -459,7 +459,6 @@ CONFIG_PHYLIB=y # CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set CONFIG_DRIVER_NET_CPSW=y # CONFIG_DRIVER_NET_DESIGNWARE is not set -# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set # CONFIG_DRIVER_NET_KS8851_MLL is not set @@ -582,6 +581,7 @@ CONFIG_USB_EHCI=y # CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_XHCI is not set # CONFIG_USB_ULPI is not set +CONFIG_USB_OTGDEV=y CONFIG_USB_STORAGE=y # @@ -621,13 +621,13 @@ CONFIG_MCI_WRITE=y # CONFIG_MCI_DW is not set CONFIG_MCI_OMAP_HSMMC=y # CONFIG_MCI_MMCI is not set +# CONFIG_MCI_ARASAN is not set # CONFIG_MCI_SPI is not set # # Clocksource # CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 -CONFIG_CLOCKSOURCE_ARMV8_TIMER=y # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set CONFIG_CLOCKSOURCE_TI_DM=y # end of Clocksource diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index e2c18234e0a5..72119af79acb 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -f04efdb7bd2dd288fed0cb3cb5c307cd +4f96ad8958c2f43745e94a3d9bdb97bf # CONFIG_AM33XX_NET_BOOT is not set CONFIG_ARCH_AM33XX=y # CONFIG_ARCH_BCM283X is not set @@ -24,6 +24,7 @@ CONFIG_CMD_MIITOOL=y CONFIG_CMD_NAND=y # CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set +# CONFIG_CMD_SMC is undefined # CONFIG_COMMON_CLK is undefined # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y @@ -32,6 +33,7 @@ CONFIG_DEBUG_OMAP_UART_PORT=1 CONFIG_DIGEST_HMAC=y CONFIG_DIGEST_HMAC_GENERIC=y CONFIG_DRIVER_NET_CPSW=y +# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is undefined CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS=y # CONFIG_DRIVER_SPI_FSL_QUADSPI is not set @@ -107,5 +109,6 @@ CONFIG_USB_MUSB_AM335X=y CONFIG_USB_MUSB_DSPS=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_HOST=y +CONFIG_USB_OTGDEV=y # CONFIG_WATCHDOG_BCM2835 is undefined CONFIG_WATCHDOG_OMAP=y diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index 4bf336fabea0..132cbb82a02d 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 2019.12.0-20200108-1 Configuration +# Barebox/arm 2020.01.0-20200114-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -668,6 +668,7 @@ CONFIG_USB_EHCI=y # CONFIG_USB_DWC2_HOST is not set # CONFIG_USB_XHCI is not set CONFIG_USB_ULPI=y +CONFIG_USB_OTGDEV=y CONFIG_USB_STORAGE=y # @@ -704,6 +705,7 @@ CONFIG_DRIVER_VIDEO_SIMPLEFB=y # # CONFIG_DRIVER_VIDEO_MTL017 is not set # CONFIG_DRIVER_VIDEO_SIMPLE_PANEL is not set +CONFIG_MCI_SDHCI=y CONFIG_MCI=y # @@ -721,6 +723,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_IMX_ESDHC=y # CONFIG_MCI_IMX_ESDHC_PIO is not set # CONFIG_MCI_MMCI is not set +# CONFIG_MCI_ARASAN is not set # CONFIG_MCI_SPI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -732,7 +735,6 @@ CONFIG_COMMON_CLK_OF_PROVIDER=y # CONFIG_ARCH_HAS_IMX_GPT=y CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 -CONFIG_CLOCKSOURCE_ARMV8_TIMER=y CONFIG_CLOCKSOURCE_IMX_GPT=y # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set # end of Clocksource diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 5c66e2522a0f..c89c64660f60 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -f04efdb7bd2dd288fed0cb3cb5c307cd +4f96ad8958c2f43745e94a3d9bdb97bf # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_HAS_FEC_IMX=y CONFIG_ARCH_HAS_IMX_GPT=y @@ -28,6 +28,7 @@ CONFIG_CMD_MMC_EXTCSD=y CONFIG_CMD_NAND=y CONFIG_CMD_NANDTEST=y # CONFIG_CMD_NAND_BITFLIP is not set +# CONFIG_CMD_SMC is undefined CONFIG_CMD_SPLASH=y CONFIG_CMD_UBI=y CONFIG_CMD_UBIFORMAT=y @@ -151,6 +152,7 @@ CONFIG_MCI_IMX_ESDHC=y # CONFIG_MCI_IMX_ESDHC_PIO is not set # CONFIG_MCI_MMCI is not set CONFIG_MCI_MMC_BOOT_PARTITIONS=y +CONFIG_MCI_SDHCI=y # CONFIG_MCI_STARTUP is not set CONFIG_MFD_SYSCON=y CONFIG_MICREL_PHY=y @@ -219,6 +221,7 @@ CONFIG_USB_GADGET_FASTBOOT_SPARSE=y CONFIG_USB_IMX_CHIPIDEA=y CONFIG_USB_IMX_PHY=y CONFIG_USB_NOP_XCEIV=y +CONFIG_USB_OTGDEV=y CONFIG_USB_ULPI=y CONFIG_VIDEO=y CONFIG_VIDEO_VPL=y diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 400cd3deb633..911a35b4f2df 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 2019.12.0-20200108-1 Configuration +# Barebox/arm 2020.01.0-20200114-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -370,6 +370,7 @@ CONFIG_CMD_FLASH=y CONFIG_CMD_GPIO=y CONFIG_CMD_LED=y # CONFIG_CMD_POWEROFF is not set +# CONFIG_CMD_SMC is not set CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_USB=y @@ -541,6 +542,7 @@ CONFIG_USB_STORAGE=y # CONFIG_USB_GADGET is not set # CONFIG_USB_MUSB is not set # CONFIG_VIDEO is not set +CONFIG_MCI_SDHCI=y CONFIG_MCI=y # @@ -558,6 +560,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y CONFIG_MCI_BCM283X=y CONFIG_MCI_BCM283X_SDHOST=y # CONFIG_MCI_MMCI is not set +# CONFIG_MCI_ARASAN is not set # CONFIG_MCI_SPI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -568,7 +571,6 @@ CONFIG_COMMON_CLK=y # CONFIG_CLOCKSOURCE_BCM283X=y CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 -CONFIG_CLOCKSOURCE_ARMV8_TIMER=y # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set # end of Clocksource diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 84cfd0d2213f..7d5cf3533471 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,4 +1,4 @@ -f04efdb7bd2dd288fed0cb3cb5c307cd +4f96ad8958c2f43745e94a3d9bdb97bf CONFIG_ARM_ASM_UNIFIED=y CONFIG_BOOTM_INITRD=y # CONFIG_CMD_I2C is undefined @@ -27,6 +27,7 @@ CONFIG_MCI_BCM283X=y CONFIG_MCI_BCM283X_SDHOST=y # CONFIG_MCI_MMCI is not set CONFIG_MCI_MMC_BOOT_PARTITIONS=y +CONFIG_MCI_SDHCI=y # CONFIG_MCI_STARTUP is not set # CONFIG_MFD_ACT8846 is undefined # CONFIG_MFD_DA9053 is undefined diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 66f98b4967cf..2c8577078ba9 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 2019.12.0-20200108-1 Configuration +# Barebox/arm 2020.01.0-20200114-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -569,6 +569,7 @@ CONFIG_MCI_WRITE=y # # CONFIG_MCI_DW is not set CONFIG_MCI_MMCI=y +# CONFIG_MCI_ARASAN is not set # CONFIG_MCI_SPI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -580,7 +581,6 @@ CONFIG_COMMON_CLK_OF_PROVIDER=y # CONFIG_AMBA_SP804=y CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 -CONFIG_CLOCKSOURCE_ARMV8_TIMER=y # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set # end of Clocksource diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index 294201d7b755..faf128078a90 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -f04efdb7bd2dd288fed0cb3cb5c307cd +4f96ad8958c2f43745e94a3d9bdb97bf CONFIG_AMBA_SP804=y # CONFIG_ARCH_BCM283X is not set CONFIG_ARCH_VEXPRESS=y @@ -8,6 +8,7 @@ CONFIG_BOOTM_INITRD=y # CONFIG_CFI_BUFFER_WRITE is not set # CONFIG_CLOCKSOURCE_BCM283X is undefined # CONFIG_CMD_GPIO is undefined +# CONFIG_CMD_SMC is undefined CONFIG_COMMON_CLK_OF_PROVIDER=y CONFIG_CONSOLE_ACTIVATE_ALL=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index ea81861ffde6..f9f505116916 100644 --- a/configs/platform-v7a/barebox.config +++ b/configs/platform-v7a/barebox.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2019.12.0-20200108-1 Configuration +# Barebox/arm 2020.01.0-20200114-1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -372,6 +372,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_LED=y # CONFIG_CMD_POWEROFF is not set +# CONFIG_CMD_SMC is not set CONFIG_CMD_SPI=y CONFIG_CMD_LED_TRIGGER=y CONFIG_CMD_USB=y @@ -583,6 +584,7 @@ CONFIG_MCI_WRITE=y # CONFIG_MCI_BCM283X is not set # CONFIG_MCI_BCM283X_SDHOST is not set CONFIG_MCI_MMCI=y +# CONFIG_MCI_ARASAN is not set # CONFIG_MCI_SPI is not set CONFIG_HAVE_CLK=y CONFIG_CLKDEV_LOOKUP=y @@ -593,7 +595,6 @@ CONFIG_COMMON_CLK=y # CONFIG_CLOCKSOURCE_BCM283X=y CONFIG_CLOCKSOURCE_DUMMY_RATE=1000 -CONFIG_CLOCKSOURCE_ARMV8_TIMER=y # CONFIG_CLOCKSOURCE_DW_APB_TIMER is not set # end of Clocksource diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0101-Release-2019.12.0-customers-pengutronix-distrokit-v7.patch b/configs/platform-v7a/patches/barebox-2019.12.0/0101-Release-2019.12.0-customers-pengutronix-distrokit-v7.patch deleted file mode 100644 index 94e09d05a5b2..000000000000 --- a/configs/platform-v7a/patches/barebox-2019.12.0/0101-Release-2019.12.0-customers-pengutronix-distrokit-v7.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Sascha Hauer -Date: Wed, 8 Jan 2020 11:15:45 +0100 -Subject: [PATCH] Release - 2019.12.0/customers/pengutronix/distrokit-v7a/20200108-1 - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 600ca36a311c..96890b4c13f6 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,7 +1,7 @@ - VERSION = 2019 - PATCHLEVEL = 12 - SUBLEVEL = 0 --EXTRAVERSION = -+EXTRAVERSION =-20200108-1 - NAME = None - - # *DOCUMENTATION* diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0002-usb-Make-timeout-unit-clear.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch similarity index 98% rename from configs/platform-v7a/patches/barebox-2019.12.0/0002-usb-Make-timeout-unit-clear.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch index 9fab21f11ffb..521c8a1b891c 100644 --- a/configs/platform-v7a/patches/barebox-2019.12.0/0002-usb-Make-timeout-unit-clear.patch +++ b/configs/platform-v7a/patches/barebox-2020.01.0/0002-usb-Make-timeout-unit-clear.patch @@ -52,7 +52,7 @@ index d29cd1328bbb..ad3bacf23655 100644 usb_host_release(host); diff --git a/include/usb/usb.h b/include/usb/usb.h -index 0045608d6446..a9714ec28992 100644 +index d39de71aff95..95dedfd5b739 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -140,9 +140,9 @@ struct usb_host { diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0003-of-Add-of_bus_n_xxx_cells.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0003-of-Add-of_bus_n_xxx_cells.patch similarity index 95% rename from configs/platform-v7a/patches/barebox-2019.12.0/0003-of-Add-of_bus_n_xxx_cells.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0003-of-Add-of_bus_n_xxx_cells.patch index 8bc59264806e..6bab0bfd8382 100644 --- a/configs/platform-v7a/patches/barebox-2019.12.0/0003-of-Add-of_bus_n_xxx_cells.patch +++ b/configs/platform-v7a/patches/barebox-2020.01.0/0003-of-Add-of_bus_n_xxx_cells.patch @@ -11,7 +11,7 @@ Signed-off-by: Sascha Hauer 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c -index 98ef5fc0d421..e1d3707d01ee 100644 +index 80ceeab13b34..9ede05227444 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -78,36 +78,46 @@ static struct device_node *of_aliases; @@ -80,7 +80,7 @@ index 98ef5fc0d421..e1d3707d01ee 100644 struct property *of_find_property(const struct device_node *np, diff --git a/include/of.h b/include/of.h -index 98ddf795cbb4..fb49f40c12a0 100644 +index f63a3efe13e9..67601ce80cad 100644 --- a/include/of.h +++ b/include/of.h @@ -113,7 +113,9 @@ struct device_node *of_unflatten_dtb_const(const void *infdt); @@ -93,7 +93,7 @@ index 98ddf795cbb4..fb49f40c12a0 100644 extern int of_n_size_cells(struct device_node *np); extern struct property *of_find_property(const struct device_node *np, -@@ -330,11 +332,21 @@ static inline struct device_d *of_platform_device_create(struct device_node *np, +@@ -328,11 +330,21 @@ static inline struct device_d *of_platform_device_create(struct device_node *np, return NULL; } diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0004-device-Introduce-dma_offset.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0004-device-Introduce-dma_offset.patch similarity index 96% rename from configs/platform-v7a/patches/barebox-2019.12.0/0004-device-Introduce-dma_offset.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0004-device-Introduce-dma_offset.patch index d4d850aed2d8..99ed357ed6a9 100644 --- a/configs/platform-v7a/patches/barebox-2019.12.0/0004-device-Introduce-dma_offset.patch +++ b/configs/platform-v7a/patches/barebox-2020.01.0/0004-device-Introduce-dma_offset.patch @@ -97,10 +97,10 @@ index 158b130b5765..1f97c28ec657 100644 __dma_inv_range(address, address + size); if (outer_cache.inv_range) diff --git a/arch/arm/cpu/mmu_64.c b/arch/arm/cpu/mmu_64.c -index b45a69661e22..1851fdd1a70a 100644 +index f7a13014aff3..98cd4c754edb 100644 --- a/arch/arm/cpu/mmu_64.c +++ b/arch/arm/cpu/mmu_64.c -@@ -244,6 +244,10 @@ void dma_flush_range(void *ptr, size_t size) +@@ -245,6 +245,10 @@ void dma_flush_range(void *ptr, size_t size) void dma_sync_single_for_device(dma_addr_t address, size_t size, enum dma_data_direction dir) { @@ -112,7 +112,7 @@ index b45a69661e22..1851fdd1a70a 100644 v8_inv_dcache_range(address, address + size - 1); else diff --git a/include/driver.h b/include/driver.h -index 300603fa3277..5ea3a862f2f0 100644 +index ad59ce90c3a3..74be1b3e8e41 100644 --- a/include/driver.h +++ b/include/driver.h @@ -93,6 +93,8 @@ struct device_d { diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0005-of-Read-dma_offset-from-device-tree.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0005-of-Read-dma_offset-from-device-tree.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0005-of-Read-dma_offset-from-device-tree.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0005-of-Read-dma_offset-from-device-tree.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0006-usb-Add-usbroothubdes.h.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0006-usb-Add-usbroothubdes.h.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0006-usb-Add-usbroothubdes.h.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0006-usb-Add-usbroothubdes.h.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0007-regulator-add-function-to-get-regulator-by-its-name.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0007-regulator-add-function-to-get-regulator-by-its-name.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0007-regulator-add-function-to-get-regulator-by-its-name.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0007-regulator-add-function-to-get-regulator-by-its-name.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0008-rpi-Enable-USB-Power-domain-during-startup.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0008-rpi-Enable-USB-Power-domain-during-startup.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0008-rpi-Enable-USB-Power-domain-during-startup.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0008-rpi-Enable-USB-Power-domain-during-startup.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0009-usb-Forward-error-code-from-usb_set_configuration.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0009-usb-Forward-error-code-from-usb_set_configuration.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0009-usb-Forward-error-code-from-usb_set_configuration.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0009-usb-Forward-error-code-from-usb_set_configuration.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0010-usb-Add-dwc2-host-driver.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0010-usb-Add-dwc2-host-driver.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0010-usb-Add-dwc2-host-driver.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0010-usb-Add-dwc2-host-driver.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0011-ARM-bcm2835-mbox-Remove-response-valid-check.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0011-ARM-bcm2835-mbox-Remove-response-valid-check.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0011-ARM-bcm2835-mbox-Remove-response-valid-check.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0011-ARM-bcm2835-mbox-Remove-response-valid-check.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0012-gpio-Add-raspberrypi-exp-gpio-driver.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0012-gpio-Add-raspberrypi-exp-gpio-driver.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0012-gpio-Add-raspberrypi-exp-gpio-driver.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0012-gpio-Add-raspberrypi-exp-gpio-driver.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0013-ARM-bcm2835-mbox-use-pr_-to-print-messages.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0013-ARM-bcm2835-mbox-use-pr_-to-print-messages.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0013-ARM-bcm2835-mbox-use-pr_-to-print-messages.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0013-ARM-bcm2835-mbox-use-pr_-to-print-messages.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0014-ARM-rpi_defconfig-Enable-raspberry-GPIO-exp-driver.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0014-ARM-rpi_defconfig-Enable-raspberry-GPIO-exp-driver.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0014-ARM-rpi_defconfig-Enable-raspberry-GPIO-exp-driver.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0014-ARM-rpi_defconfig-Enable-raspberry-GPIO-exp-driver.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0015-ARM-rpi-mailbox-Use-non-interruptible-timeout.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0015-ARM-rpi-mailbox-Use-non-interruptible-timeout.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0015-ARM-rpi-mailbox-Use-non-interruptible-timeout.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0015-ARM-rpi-mailbox-Use-non-interruptible-timeout.patch diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/0016-ARM-rpi_defconfig-Enable-more-features.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0016-ARM-rpi_defconfig-Enable-more-features.patch similarity index 100% rename from configs/platform-v7a/patches/barebox-2019.12.0/0016-ARM-rpi_defconfig-Enable-more-features.patch rename to configs/platform-v7a/patches/barebox-2020.01.0/0016-ARM-rpi_defconfig-Enable-more-features.patch diff --git a/configs/platform-v7a/patches/barebox-2020.01.0/0101-Release-2020.01.0-customers-pengutronix-distrokit-v7.patch b/configs/platform-v7a/patches/barebox-2020.01.0/0101-Release-2020.01.0-customers-pengutronix-distrokit-v7.patch new file mode 100644 index 000000000000..1ab7b1bcdea2 --- /dev/null +++ b/configs/platform-v7a/patches/barebox-2020.01.0/0101-Release-2020.01.0-customers-pengutronix-distrokit-v7.patch @@ -0,0 +1,22 @@ +From: Ahmad Fatoum +Date: Tue, 14 Jan 2020 16:03:27 +0100 +Subject: [PATCH] Release + 2020.01.0/customers/pengutronix/distrokit-v7a/20200114-1 + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index e08849718932..86632eaaa2c9 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2020 + PATCHLEVEL = 01 + SUBLEVEL = 0 +-EXTRAVERSION = ++EXTRAVERSION =-20200114-1 + NAME = None + + # *DOCUMENTATION* diff --git a/configs/platform-v7a/patches/barebox-2019.12.0/series b/configs/platform-v7a/patches/barebox-2020.01.0/series similarity index 57% rename from configs/platform-v7a/patches/barebox-2019.12.0/series rename to configs/platform-v7a/patches/barebox-2020.01.0/series index f5bb5c563d22..3f553769cfec 100644 --- a/configs/platform-v7a/patches/barebox-2019.12.0/series +++ b/configs/platform-v7a/patches/barebox-2020.01.0/series @@ -1,9 +1,9 @@ -# umpf-base: v2019.12.0 -# umpf-name: 2019.12.0/customers/pengutronix/distrokit-v7a -# umpf-version: 2019.12.0/customers/pengutronix/distrokit-v7a/20200108-1 -# umpf-topic: v2019.12.0/topic/raspberrypi -# umpf-hashinfo: 3315e55b033d80c15865e0b936894ed773ce391c -# umpf-topic-range: 48b57af0ab888bf88607d0e55ad3e79d13cc0a31..adbebd694167ede6aeb2a298918b24040c0ded97 +# umpf-base: v2020.01.0 +# umpf-name: 2020.01.0/customers/pengutronix/distrokit-v7a +# umpf-version: 2020.01.0/customers/pengutronix/distrokit-v7a/20200114-1 +# umpf-topic: v2020.01.0/topic/raspberrypi +# umpf-hashinfo: 8f5d62e51d27c625e7ae4a9111c958d9b9943bad +# umpf-topic-range: 4cce60b7fe2798e81b04c5d9ad79dc9b443635a8..9e25fbceb1b17c750bba9b363d213667d52800c5 0001-ARM-rpi-Do-not-warn-when-firmware-doesn-t-pass-a-dtb.patch 0002-usb-Make-timeout-unit-clear.patch 0003-of-Add-of_bus_n_xxx_cells.patch @@ -20,7 +20,7 @@ 0014-ARM-rpi_defconfig-Enable-raspberry-GPIO-exp-driver.patch 0015-ARM-rpi-mailbox-Use-non-interruptible-timeout.patch 0016-ARM-rpi_defconfig-Enable-more-features.patch -# umpf-release: 2019.12.0/customers/pengutronix/distrokit-v7a/20200108-1 -# umpf-topic-range: adbebd694167ede6aeb2a298918b24040c0ded97..0cc90c348816c16cded33c2ed48e918c9f69d8cd -0101-Release-2019.12.0-customers-pengutronix-distrokit-v7.patch +# umpf-release: 2020.01.0/customers/pengutronix/distrokit-v7a/20200114-1 +# umpf-topic-range: 9e25fbceb1b17c750bba9b363d213667d52800c5..7591731bd2a9906edd2ad92fa76c29887f2ef6d9 +0101-Release-2020.01.0-customers-pengutronix-distrokit-v7.patch # umpf-end diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 8800aab86803..246e763fae55 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -166,8 +166,8 @@ PTXCONF_CONSOLE_SPEED="115200" # PTXCONF_AT91BOOTSTRAP2 is not set PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2019.12.0" -PTXCONF_BAREBOX_COMMON_MD5="2d25158ccffaa843c9e4943bbe820ce2" +PTXCONF_BAREBOX_COMMON_VERSION="2020.01.0" +PTXCONF_BAREBOX_COMMON_MD5="05038e0b61b68ce40e038295b809c548" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y -- 2.25.0 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de