From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 07 Mar 2023 12:45:57 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pZVlU-00CFqk-1X for lore@lore.pengutronix.de; Tue, 07 Mar 2023 12:45:57 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1pZVlT-0004m8-Rq; Tue, 07 Mar 2023 12:45:55 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pZVlJ-0004ll-Kh; Tue, 07 Mar 2023 12:45:45 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pZVlI-002TCo-Vi; Tue, 07 Mar 2023 12:45:44 +0100 Received: from afa by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pZVlI-00DL4q-72; Tue, 07 Mar 2023 12:45:44 +0100 From: Ahmad Fatoum To: distrokit@pengutronix.de Date: Tue, 7 Mar 2023 12:45:41 +0100 Message-Id: <20230307114541.3179101-1-a.fatoum@pengutronix.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [DistroKit] =?utf-8?q?=5BPATCH=5D_v7a=3A_barebox=3A_version_bump?= =?utf-8?b?IHYyMDIyLjA5LjAg4oaSIHYyMDIzLjAyLjE=?= X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ahmad Fatoum Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Our patches for optionally working around flaky SD-Card detect are now upstream, so let's update to the newest release and drop them from our side. Config is what resulted from oldconfig with the exception of: - CONFIG_DRIVER_NET_BCMGENET, which is now enabled to give resulting barebox-raspberry-pi.img Ethernet support when running on the rpi 4-b. - CONFIG_CMD_FCB, which adds a useful fcb command for debugging boot from NAND on i.MX SoCs. Signed-off-by: Ahmad Fatoum --- .../platform-v7a/barebox-am335x-mlo.config | 5 +- configs/platform-v7a/barebox-am335x.config | 10 ++- .../platform-v7a/barebox-am335x.config.diff | 2 +- configs/platform-v7a/barebox-at91.config | 14 +++- configs/platform-v7a/barebox-at91.config.diff | 6 +- configs/platform-v7a/barebox-mx6.config | 13 +++- configs/platform-v7a/barebox-mx6.config.diff | 5 +- configs/platform-v7a/barebox-rpi2.config | 10 ++- configs/platform-v7a/barebox-rpi2.config.diff | 3 +- configs/platform-v7a/barebox-stm32mp.config | 13 +++- .../platform-v7a/barebox-stm32mp.config.diff | 5 +- configs/platform-v7a/barebox-vexpress.config | 10 ++- .../platform-v7a/barebox-vexpress.config.diff | 4 +- configs/platform-v7a/barebox.config | 10 ++- ...-upon-broken-cd-device-tree-property.patch | 60 ----------------- ...-core-add-broken_cd-device-parameter.patch | 46 ------------- ...broken-cd-information-into-kernel-DT.patch | 67 ------------------- .../patches/barebox-2022.09.0/series | 3 - configs/platform-v7a/platformconfig | 4 +- 19 files changed, 90 insertions(+), 200 deletions(-) delete mode 100644 configs/platform-v7a/patches/barebox-2022.09.0/0001-mci-core-act-upon-broken-cd-device-tree-property.patch delete mode 100644 configs/platform-v7a/patches/barebox-2022.09.0/0002-mci-core-add-broken_cd-device-parameter.patch delete mode 100644 configs/platform-v7a/patches/barebox-2022.09.0/0003-mci-core-fixup-broken-cd-information-into-kernel-DT.patch delete mode 100644 configs/platform-v7a/patches/barebox-2022.09.0/series diff --git a/configs/platform-v7a/barebox-am335x-mlo.config b/configs/platform-v7a/barebox-am335x-mlo.config index c296fefaa7a1..010b1b9d32cd 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 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_USE_COMPRESSED_DTB=y @@ -88,7 +88,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_FILETYPE=y @@ -369,6 +369,7 @@ CONFIG_GPIOLIB=y CONFIG_GPIO_OMAP=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index 6f54bea19aa7..647d7162297c 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 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -93,7 +93,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -340,6 +340,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -447,6 +448,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -494,6 +496,7 @@ CONFIG_PHYLIB=y # # Network drivers # +# CONFIG_DRIVER_NET_BCMGENET is not set CONFIG_DRIVER_NET_CPSW=y # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set # CONFIG_DRIVER_NET_ENC28J60 is not set @@ -689,6 +692,7 @@ CONFIG_CLOCKSOURCE_TI_DM=y # CONFIG_MFD_RN568PMIC is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -755,6 +759,7 @@ CONFIG_GPIO_OMAP=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set @@ -857,6 +862,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff index 936bb661ecba..20ab6803c846 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -44749ac3167836cbc7b473f78c4e9fea +68457081af06bd8377bc38ef02c7d415 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined # CONFIG_AM33XX_NET_BOOT is not set diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config index a0130d2ba249..78e8e8523d55 100644 --- a/configs/platform-v7a/barebox-at91.config +++ b/configs/platform-v7a/barebox-at91.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -61,6 +61,7 @@ CONFIG_AT91_MCI_PBL=y CONFIG_AT91SAM9_SMC=y CONFIG_HAVE_AT91SAM9_RST=y CONFIG_SOC_SAMA5=y +CONFIG_SOC_SAMA5_MULTI=y CONFIG_SOC_SAMA5D2=y CONFIG_ARCH_TEXT_BASE=0x23f00000 @@ -75,6 +76,7 @@ CONFIG_AT91_MULTI_BOARDS=y # CONFIG_MACH_SAMA5D3_XPLAINED is not set CONFIG_MACH_SAMA5D27_SOM1=y CONFIG_MACH_SAMA5D27_GIANTBOARD=y +# CONFIG_MACH_SAMA5D4_WIFX is not set # # AT91 Board Options @@ -100,7 +102,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -237,6 +239,7 @@ CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_LL is not set CONFIG_DEBUG_AT91_UART_BASE=0xf8020000 # CONFIG_DEBUG_INITCALLS is not set +# CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set @@ -339,6 +342,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -441,6 +445,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -488,6 +493,7 @@ CONFIG_PHYLIB=y # # Network drivers # +# CONFIG_DRIVER_NET_BCMGENET is not set # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set @@ -651,6 +657,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_RN568PMIC is not set CONFIG_MFD_ATMEL_FLEXCOM=y # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -713,6 +720,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set @@ -763,6 +771,7 @@ CONFIG_REGULATOR_FIXED=y # # Memory controller drivers # +# CONFIG_ATMEL_EBI is not set # end of Memory controller drivers # @@ -812,6 +821,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff index c6e0f20b64bb..a08422ffe318 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -44749ac3167836cbc7b473f78c4e9fea +68457081af06bd8377bc38ef02c7d415 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined CONFIG_ARCH_AT91=y @@ -11,6 +11,7 @@ CONFIG_ARCH_TEXT_BASE=0x23f00000 CONFIG_AT91SAM9_SMC=y CONFIG_AT91_MCI_PBL=y CONFIG_AT91_MULTI_BOARDS=y +# CONFIG_ATMEL_EBI is not set # CONFIG_BOARD_ARM_GENERIC_DT is not set # CONFIG_BOARD_GENERIC_DT is undefined CONFIG_BOOTM_OFTREE_UIMAGE=y @@ -28,6 +29,7 @@ CONFIG_COMPILE_LOGLEVEL=6 # CONFIG_CPU_SUPPORTS_32BIT_KERNEL is undefined # CONFIG_CPU_SUPPORTS_64BIT_KERNEL is undefined CONFIG_DEBUG_AT91_UART_BASE=0xf8020000 +# CONFIG_DEBUG_PBL is not set CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DRIVER_NET_ARC_EMAC is undefined CONFIG_DRIVER_NET_MACB=y @@ -75,6 +77,7 @@ CONFIG_IMD_TARGET=y CONFIG_MACH_SAMA5D27_GIANTBOARD=y CONFIG_MACH_SAMA5D27_SOM1=y # CONFIG_MACH_SAMA5D3_XPLAINED is not set +# CONFIG_MACH_SAMA5D4_WIFX is not set # CONFIG_MACH_SKOV_ARM9CPU is not set CONFIG_MCI_ATMEL=y CONFIG_MCI_ATMEL_SDHCI=y @@ -106,6 +109,7 @@ CONFIG_REGULATOR_FIXED=y # CONFIG_SERIAL_AMBA_PL011 is undefined CONFIG_SOC_SAMA5=y CONFIG_SOC_SAMA5D2=y +CONFIG_SOC_SAMA5_MULTI=y CONFIG_SPI_ATMEL_QUADSPI=y # CONFIG_SPI_CADENCE_QUADSPI is not set CONFIG_SPI_MEM=y diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config index d62cd2bf8ab1..f6a1003d1570 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 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -77,6 +77,7 @@ CONFIG_IMX_MULTI_BOARDS=y # CONFIG_MACH_PHYTEC_SOM_IMX6 is not set # CONFIG_MACH_PROTONIC_IMX6 is not set # CONFIG_MACH_PROTONIC_IMX8M is not set +# CONFIG_MACH_INNOCOMM_WB15 is not set # CONFIG_MACH_KONTRON_SAMX6I is not set # CONFIG_MACH_DFI_FS700_M60 is not set # CONFIG_MACH_GUF_SANTARO is not set @@ -119,6 +120,7 @@ CONFIG_MACH_UDOO_NEO=y # CONFIG_MACH_NXP_IMX8MP_EVK is not set # CONFIG_MACH_NXP_IMX8MQ_EVK is not set # CONFIG_MACH_PHYTEC_SOM_IMX8MQ is not set +# CONFIG_MACH_TQ_MBA8MPXL is not set # CONFIG_MACH_GRINN_LITEBOARD is not set # CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set # CONFIG_MACH_WEBASTO_CCBV2 is not set @@ -161,7 +163,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -358,6 +360,7 @@ CONFIG_CMD_MMC_EXTCSD=y # CONFIG_CMD_POLLER is not set CONFIG_CMD_BTHREAD=y # CONFIG_CMD_SLICE is not set +CONFIG_CMD_FCB=y # end of Information # @@ -414,6 +417,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -524,6 +528,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -573,6 +578,7 @@ CONFIG_PHYLIB=y # # Network drivers # +# CONFIG_DRIVER_NET_BCMGENET is not set # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set # CONFIG_DRIVER_NET_ENC28J60 is not set CONFIG_DRIVER_NET_FEC_IMX=y @@ -808,6 +814,7 @@ CONFIG_MFD_SYSCON=y # CONFIG_MFD_RN568PMIC is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -879,6 +886,7 @@ CONFIG_GPIO_IMX=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set @@ -998,6 +1006,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff index 9efdf8c30380..0ff150f6ebbc 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -44749ac3167836cbc7b473f78c4e9fea +68457081af06bd8377bc38ef02c7d415 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined # CONFIG_ARCH_BCM283X is not set @@ -26,6 +26,7 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y # CONFIG_CLOCKSOURCE_BCM283X is undefined CONFIG_CLOCKSOURCE_IMX_GPT=y # CONFIG_CMD_FBTEST is not set +CONFIG_CMD_FCB=y # CONFIG_CMD_KEYSTORE is not set CONFIG_CMD_MMC_EXTCSD=y CONFIG_CMD_NAND=y @@ -120,6 +121,7 @@ CONFIG_MACH_EMBEST_RIOTBOARD=y # CONFIG_MACH_GUF_SANTARO is not set # CONFIG_MACH_GUF_VINCELL is not set # CONFIG_MACH_GW_VENTANA is not set +# CONFIG_MACH_INNOCOMM_WB15 is not set # CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set # CONFIG_MACH_KINDLE_MX50 is not set # CONFIG_MACH_KONTRON_SAMX6I is not set @@ -156,6 +158,7 @@ CONFIG_MACH_SABRELITE=y # CONFIG_MACH_TQMA53 is not set # CONFIG_MACH_TQMA6UL is not set # CONFIG_MACH_TQMA6X is not set +# CONFIG_MACH_TQ_MBA8MPXL is not set # CONFIG_MACH_TX25 is not set # CONFIG_MACH_TX53 is not set # CONFIG_MACH_TX6X is not set diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config index 4788ff19a692..96b416fe414a 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 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -92,7 +92,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -329,6 +329,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -433,6 +434,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -481,6 +483,7 @@ CONFIG_PHYLIB=y # Network drivers # # CONFIG_DRIVER_NET_ARC_EMAC is not set +CONFIG_DRIVER_NET_BCMGENET=y # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set @@ -656,6 +659,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # CONFIG_MFD_RN568PMIC is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -721,6 +725,7 @@ CONFIG_GPIO_RASPBERRYPI_EXP=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set @@ -826,6 +831,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff index 534b657b7448..852c2717059c 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,7 +1,8 @@ -44749ac3167836cbc7b473f78c4e9fea +68457081af06bd8377bc38ef02c7d415 CONFIG_ARM_ASM_UNIFIED=y # CONFIG_CMD_NVMEM is not set # CONFIG_CMD_USBGADGET is undefined +CONFIG_DRIVER_NET_BCMGENET=y CONFIG_DRIVER_SERIAL_NS16550=y # CONFIG_EEPROM_93XX46 is not set # CONFIG_FASTBOOT_BASE is undefined diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config index cf2348ee1105..8a6f6d9474d2 100644 --- a/configs/platform-v7a/barebox-stm32mp.config +++ b/configs/platform-v7a/barebox-stm32mp.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Barebox/arm 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -84,7 +84,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -230,6 +230,7 @@ CONFIG_COMPILE_LOGLEVEL=6 CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_INITCALLS is not set +# CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set @@ -331,6 +332,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -434,6 +436,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -453,6 +456,8 @@ CONFIG_NET_DHCP=y # # Drivers # +CONFIG_REGMAP_FORMATTED=y +CONFIG_REGMAP_I2C=y CONFIG_OFTREE=y CONFIG_OFTREE_MEM_GENERIC=y CONFIG_DTC=y @@ -482,6 +487,7 @@ CONFIG_PHYLIB=y # # Network drivers # +# CONFIG_DRIVER_NET_BCMGENET is not set # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y CONFIG_DRIVER_NET_DESIGNWARE_STM32=y @@ -635,6 +641,7 @@ CONFIG_MFD_STPMIC1=y CONFIG_MFD_STM32_TIMERS=y # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -700,6 +707,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set @@ -814,6 +822,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff index 60037f88a95a..42950765f911 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -44749ac3167836cbc7b473f78c4e9fea +68457081af06bd8377bc38ef02c7d415 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined # CONFIG_ARCH_BCM283X is not set @@ -36,6 +36,7 @@ CONFIG_CONSOLE_ACTIVATE_NONE=y # CONFIG_CPU_SUPPORTS_32BIT_KERNEL is undefined # CONFIG_CPU_SUPPORTS_64BIT_KERNEL is undefined CONFIG_CRC8=y +# CONFIG_DEBUG_PBL is not set CONFIG_DEFAULT_LOGLEVEL=7 # CONFIG_DRIVER_CFI is undefined # CONFIG_DRIVER_NET_ARC_EMAC is undefined @@ -124,6 +125,8 @@ CONFIG_PRINTF_UUID=y CONFIG_PROMPT="barebox:" CONFIG_PWM=y CONFIG_PWM_STM32=y +CONFIG_REGMAP_FORMATTED=y +CONFIG_REGMAP_I2C=y # CONFIG_REGULATOR_ANATOP is not set # CONFIG_REGULATOR_BCM283X is undefined CONFIG_REGULATOR_FIXED=y diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config index 9503d59b04af..80d446ceccd1 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 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -72,7 +72,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y CONFIG_FILETYPE=y @@ -216,6 +216,7 @@ CONFIG_COMPILE_LOGLEVEL=7 CONFIG_DEFAULT_LOGLEVEL=6 # CONFIG_DEBUG_LL is not set # CONFIG_DEBUG_INITCALLS is not set +# CONFIG_DEBUG_PBL is not set # CONFIG_DEBUG_PROBES is not set # CONFIG_PBL_BREAK is not set # CONFIG_PRINTF_FULL is not set @@ -316,6 +317,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -419,6 +421,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -465,6 +468,7 @@ CONFIG_PHYLIB=y # # Network drivers # +# CONFIG_DRIVER_NET_BCMGENET is not set # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set @@ -648,6 +652,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # CONFIG_MFD_RN568PMIC is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -779,6 +784,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff index c9c2cc471980..abbea1a621ce 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,4 +1,4 @@ -44749ac3167836cbc7b473f78c4e9fea +68457081af06bd8377bc38ef02c7d415 # CONFIG_32BIT is undefined # CONFIG_64BIT is undefined CONFIG_AMBA_SP804=y @@ -16,6 +16,7 @@ CONFIG_CONSOLE_ACTIVATE_ALL=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set # CONFIG_CPU_SUPPORTS_32BIT_KERNEL is undefined # CONFIG_CPU_SUPPORTS_64BIT_KERNEL is undefined +# CONFIG_DEBUG_PBL is not set CONFIG_DRIVER_CFI=y CONFIG_DRIVER_CFI_AMD=y CONFIG_DRIVER_CFI_BANK_WIDTH_1=y @@ -33,6 +34,7 @@ CONFIG_DRIVER_NET_SMC911X=y # CONFIG_GPIO_74XX_MMIO is undefined # CONFIG_GPIO_DESIGNWARE is undefined # CONFIG_GPIO_GENERIC_PLATFORM is undefined +# CONFIG_GPIO_LATCH is undefined # CONFIG_GPIO_PCA953X is undefined # CONFIG_GPIO_PCF857X is undefined # CONFIG_GPIO_PL061 is undefined diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config index e0ea31877300..2e1d844e9512 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 2022.09.0 Configuration +# Barebox/arm 2023.02.1 Configuration # CONFIG_ARM=y CONFIG_ARM_LINUX=y @@ -91,7 +91,7 @@ CONFIG_HAS_KALLSYMS=y CONFIG_HAS_MODULES=y CONFIG_HAS_CACHE=y CONFIG_HAS_DMA=y -CONFIG_HAS_ARCH_SJLJ=y +CONFIG_ARCH_HAS_SJLJ=y CONFIG_GENERIC_GPIO=y CONFIG_BLOCK=y CONFIG_BLOCK_WRITE=y @@ -337,6 +337,7 @@ CONFIG_CMD_DIRNAME=y CONFIG_CMD_FILETYPE=y CONFIG_CMD_LN=y CONFIG_CMD_LS=y +# CONFIG_CMD_STAT is not set CONFIG_CMD_MD5SUM=y CONFIG_CMD_MKDIR=y CONFIG_CMD_PWD=y @@ -442,6 +443,7 @@ CONFIG_CMD_OF_FIXUP_STATUS=y CONFIG_CMD_OF_OVERLAY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +# CONFIG_CMD_UPTIME is not set CONFIG_CMD_STATE=y # CONFIG_CMD_DHRYSTONE is not set # CONFIG_CMD_SPD_DECODE is not set @@ -490,6 +492,7 @@ CONFIG_PHYLIB=y # Network drivers # # CONFIG_DRIVER_NET_ARC_EMAC is not set +# CONFIG_DRIVER_NET_BCMGENET is not set # CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set # CONFIG_DRIVER_NET_ENC28J60 is not set # CONFIG_DRIVER_NET_FSL_FMAN is not set @@ -673,6 +676,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y # CONFIG_MFD_RN568PMIC is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set # CONFIG_MFD_RK808 is not set +# CONFIG_MFD_AXP20X_I2C is not set # end of Multifunction device drivers # @@ -738,6 +742,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_DESIGNWARE is not set # CONFIG_GPIO_SX150X is not set # CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_LATCH is not set # end of GPIO # CONFIG_W1 is not set @@ -837,6 +842,7 @@ CONFIG_FS_EXT4=y CONFIG_FS_RAMFS=y CONFIG_FS_DEVFS=y CONFIG_FS_TFTP=y +CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128 CONFIG_FS_NFS=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/0001-mci-core-act-upon-broken-cd-device-tree-property.patch b/configs/platform-v7a/patches/barebox-2022.09.0/0001-mci-core-act-upon-broken-cd-device-tree-property.patch deleted file mode 100644 index 7360637bdbfc..000000000000 --- a/configs/platform-v7a/patches/barebox-2022.09.0/0001-mci-core-act-upon-broken-cd-device-tree-property.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 1d41bcf91e00a2e590497c266d5171232f30428c Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum -Date: Tue, 6 Sep 2022 20:10:14 +0200 -Subject: [PATCH 1/3] mci: core: act upon broken-cd device tree property - -We didn't care much for broken-cd so far, still we have some drivers -implementing the card_present callback, which we should ignore when -card-detect is marked broken. - -Signed-off-by: Ahmad Fatoum ---- - drivers/mci/mci-core.c | 12 ++++++++---- - include/mci.h | 1 + - 2 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c -index b8f71e15986e..5b1aa8dbed87 100644 ---- a/drivers/mci/mci-core.c -+++ b/drivers/mci/mci-core.c -@@ -1750,10 +1750,13 @@ static int mci_card_probe(struct mci *mci) - int i, rc, disknum, ret; - bool has_bootpart = false; - -- if (host->card_present && !host->card_present(host) && -- !host->non_removable) { -- dev_err(&mci->dev, "no card inserted\n"); -- return -ENODEV; -+ if (host->card_present && !host->card_present(host) && !host->non_removable) { -+ if (!host->broken_cd) { -+ dev_err(&mci->dev, "no card inserted\n"); -+ return -ENODEV; -+ } -+ -+ dev_info(&mci->dev, "no card inserted (ignoring)\n"); - } - - ret = regulator_enable(host->supply); -@@ -2033,6 +2036,7 @@ void mci_of_parse_node(struct mci_host *host, - } - } - -+ host->broken_cd = of_property_read_bool(np, "broken-cd"); - host->non_removable = of_property_read_bool(np, "non-removable"); - host->no_sd = of_property_read_bool(np, "no-sd"); - host->disable_wp = of_property_read_bool(np, "disable-wp"); -diff --git a/include/mci.h b/include/mci.h -index 2098b4fbf084..d949310fac30 100644 ---- a/include/mci.h -+++ b/include/mci.h -@@ -404,6 +404,7 @@ struct mci_host { - unsigned max_req_size; - unsigned dsr_val; /**< optional dsr value */ - int use_dsr; /**< optional dsr usage flag */ -+ int broken_cd; /**< card detect is broken */ - bool non_removable; /**< device is non removable */ - bool no_sd; /**< do not send SD commands during initialization */ - bool disable_wp; /**< ignore write-protect detection logic */ --- -2.30.2 - diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/0002-mci-core-add-broken_cd-device-parameter.patch b/configs/platform-v7a/patches/barebox-2022.09.0/0002-mci-core-add-broken_cd-device-parameter.patch deleted file mode 100644 index b14c1602747d..000000000000 --- a/configs/platform-v7a/patches/barebox-2022.09.0/0002-mci-core-add-broken_cd-device-parameter.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8d66a16dfd6b5c7e0d39e90954af32667e480074 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum -Date: Tue, 6 Sep 2022 20:10:37 +0200 -Subject: [PATCH 2/3] mci: core: add broken_cd device parameter - -Sometimes a broken card-detect is not a general issue affecting all -boards, but only a given board. Allow setting broken_cd for such boards -via a device parameter. - -Signed-off-by: Ahmad Fatoum ---- - drivers/mci/mci-core.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c -index 5b1aa8dbed87..5101ac1d8298 100644 ---- a/drivers/mci/mci-core.c -+++ b/drivers/mci/mci-core.c -@@ -1919,7 +1919,7 @@ int mci_register(struct mci_host *host) - { - struct mci *mci; - struct device_d *hw_dev; -- struct param_d *param_probe; -+ struct param_d *param_probe, *param_broken_cd; - int ret; - - mci = xzalloc(sizeof(*mci)); -@@ -1963,6 +1963,15 @@ int mci_register(struct mci_host *host) - goto err_unregister; - } - -+ param_broken_cd = dev_add_param_bool(&mci->dev, "broken_cd", -+ NULL, NULL, &host->broken_cd, mci); -+ -+ if (IS_ERR(param_broken_cd) && PTR_ERR(param_broken_cd) != -ENOSYS) { -+ ret = PTR_ERR(param_broken_cd); -+ dev_dbg(&mci->dev, "Failed to add 'broken_cd' parameter to the MCI device\n"); -+ goto err_unregister; -+ } -+ - if (IS_ENABLED(CONFIG_MCI_INFO)) - mci->dev.info = mci_info; - --- -2.30.2 - diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/0003-mci-core-fixup-broken-cd-information-into-kernel-DT.patch b/configs/platform-v7a/patches/barebox-2022.09.0/0003-mci-core-fixup-broken-cd-information-into-kernel-DT.patch deleted file mode 100644 index 8f2c7767d0d9..000000000000 --- a/configs/platform-v7a/patches/barebox-2022.09.0/0003-mci-core-fixup-broken-cd-information-into-kernel-DT.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 16931f8ef3bc2a5ecce5ae77c33e2b5611ac8d98 Mon Sep 17 00:00:00 2001 -From: Ahmad Fatoum -Date: Mon, 25 Jul 2022 13:58:56 +0200 -Subject: [PATCH 3/3] mci: core: fixup broken-cd information into kernel DT - -In remote labs co-located with other hardware, we've observed card -detect levers of different boards to sporadically fail to detect -the card, e.g. because the cable on the usbsdmux was yanked around -by accident. When this happens, barebox usually boots up normally as -the card detect is ignored and then Linux waits indefinitely for -the card-detect to turn active. We already maintain a broken_cd flag -for each card. Use this to fixup the kernel DT appropriately. - -Signed-off-by: Ahmad Fatoum ---- - drivers/mci/mci-core.c | 28 ++++++++++++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c -index 5101ac1d8298..92dbdaf469fd 100644 ---- a/drivers/mci/mci-core.c -+++ b/drivers/mci/mci-core.c -@@ -1739,6 +1739,31 @@ static int mci_register_partition(struct mci_part *part) - return 0; - } - -+static int of_broken_cd_fixup(struct device_node *root, void *ctx) -+{ -+ struct mci_host *host = ctx; -+ struct device_d *hw_dev = host->hw_dev; -+ struct device_node *np; -+ char *name; -+ -+ if (!host->broken_cd) -+ return 0; -+ -+ name = of_get_reproducible_name(hw_dev->device_node); -+ np = of_find_node_by_reproducible_name(root, name); -+ free(name); -+ if (!np) { -+ dev_warn(hw_dev, "Cannot find nodepath %s, cannot fixup\n", -+ hw_dev->device_node->full_name); -+ return -EINVAL; -+ } -+ -+ of_property_write_bool(np, "cd-gpios", false); -+ of_property_write_bool(np, "broken-cd", true); -+ -+ return 0; -+} -+ - /** - * Probe an MCI card at the given host interface - * @param mci MCI device instance -@@ -1979,6 +2004,9 @@ int mci_register(struct mci_host *host) - if (IS_ENABLED(CONFIG_MCI_STARTUP)) - mci_card_probe(mci); - -+ if (!host->no_sd && dev_of_node(host->hw_dev)) -+ of_register_fixup(of_broken_cd_fixup, host); -+ - list_add_tail(&mci->list, &mci_list); - - return 0; --- -2.30.2 - diff --git a/configs/platform-v7a/patches/barebox-2022.09.0/series b/configs/platform-v7a/patches/barebox-2022.09.0/series deleted file mode 100644 index 26c8a02e7caa..000000000000 --- a/configs/platform-v7a/patches/barebox-2022.09.0/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-mci-core-act-upon-broken-cd-device-tree-property.patch -0002-mci-core-add-broken_cd-device-parameter.patch -0003-mci-core-fixup-broken-cd-information-into-kernel-DT.patch diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 3c7a632960f1..cd6c2118dcac 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -180,8 +180,8 @@ PTXCONF_CONSOLE_SPEED="115200" # PTXCONF_AT91BOOTSTRAP2 is not set PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2022.09.0" -PTXCONF_BAREBOX_COMMON_MD5="f0be6e1a15b5a75c25a41e8c23dc7b95" +PTXCONF_BAREBOX_COMMON_VERSION="2023.02.1" +PTXCONF_BAREBOX_COMMON_MD5="348dcab39489a46506a3c205a0da87a9" PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AM335X_MLO=y PTXCONF_BAREBOX_AM335X=y -- 2.30.2