From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 05 Sep 2022 15:58:02 +0200 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 1oVCbw-007Ysp-Lc for lore@lore.pengutronix.de; Mon, 05 Sep 2022 15:58:02 +0200 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 1oVCbx-0005qm-HX; Mon, 05 Sep 2022 15:58:01 +0200 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oVCbw-0005qY-5V; Mon, 05 Sep 2022 15:58:00 +0200 Received: from rsc by pty.hi.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oVCbv-00DHm9-M9; Mon, 05 Sep 2022 15:57:59 +0200 Date: Mon, 5 Sep 2022 15:57:59 +0200 From: Robert Schwebel To: Jan Luebbe Message-ID: References: <20220825104509.735383-1-jlu@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220825104509.735383-1-jlu@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain Subject: Re: [DistroKit] [PATCH 1/2] v7a: barebox: enable CONFIG_BOOTM_INITRD consistenly 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: distrokit@pengutronix.de 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 Hi Jan, this series doesn't apply any more, could you respin against next? rsc On Thu, Aug 25, 2022 at 12:45:08PM +0200, Jan Luebbe wrote: > It was enabled for mx6&rpi&stm32mp&vexpress, but not for am335x&at91. > > Signed-off-by: Jan Luebbe > --- > configs/platform-v7a/barebox-am335x.config | 2 +- > configs/platform-v7a/barebox-am335x.config.diff | 2 +- > configs/platform-v7a/barebox-at91.config | 2 +- > configs/platform-v7a/barebox-at91.config.diff | 2 +- > configs/platform-v7a/barebox-mx6.config.diff | 3 +-- > configs/platform-v7a/barebox-rpi2.config.diff | 3 +-- > configs/platform-v7a/barebox-stm32mp.config.diff | 3 +-- > configs/platform-v7a/barebox-vexpress.config.diff | 3 +-- > configs/platform-v7a/barebox.config | 2 +- > 9 files changed, 9 insertions(+), 13 deletions(-) > > diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config > index d5158225a3b1..ca11a0dc40a5 100644 > --- a/configs/platform-v7a/barebox-am335x.config > +++ b/configs/platform-v7a/barebox-am335x.config > @@ -171,7 +171,7 @@ CONFIG_ERRNO_MESSAGES=y > CONFIG_BOOTM=y > CONFIG_BOOTM_SHOW_TYPE=y > CONFIG_BOOTM_VERBOSE=y > -# CONFIG_BOOTM_INITRD is not set > +CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE=y > CONFIG_BOOTM_OFTREE_UIMAGE=y > # CONFIG_BOOTM_AIMAGE is not set > diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff > index b104b9de3213..a1b25b6bacb2 100644 > --- a/configs/platform-v7a/barebox-am335x.config.diff > +++ b/configs/platform-v7a/barebox-am335x.config.diff > @@ -1,4 +1,4 @@ > -bccbfd59ca1a1f55312818ed9031a323 > +9c16ea1d7fee27ebbd0ce983140a223d > # CONFIG_AM33XX_NET_BOOT is not set > CONFIG_ARCH_AM33XX=y > # CONFIG_ARCH_BCM283X is not set > diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config > index dde0ec8b8e39..e253ed5d97e4 100644 > --- a/configs/platform-v7a/barebox-at91.config > +++ b/configs/platform-v7a/barebox-at91.config > @@ -176,7 +176,7 @@ CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > CONFIG_BOOTM_SHOW_TYPE=y > CONFIG_BOOTM_VERBOSE=y > -# CONFIG_BOOTM_INITRD is not set > +CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE=y > CONFIG_BOOTM_OFTREE_UIMAGE=y > # CONFIG_BOOTM_AIMAGE is not set > diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff > index e7e3a813f21c..f2d44c5c2719 100644 > --- a/configs/platform-v7a/barebox-at91.config.diff > +++ b/configs/platform-v7a/barebox-at91.config.diff > @@ -1,4 +1,4 @@ > -bccbfd59ca1a1f55312818ed9031a323 > +9c16ea1d7fee27ebbd0ce983140a223d > CONFIG_ARCH_AT91=y > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_TEXT_BASE=0x23f00000 > diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff > index 93a31eeb7940..1d578c4f97bb 100644 > --- a/configs/platform-v7a/barebox-mx6.config.diff > +++ b/configs/platform-v7a/barebox-mx6.config.diff > @@ -1,4 +1,4 @@ > -bccbfd59ca1a1f55312818ed9031a323 > +9c16ea1d7fee27ebbd0ce983140a223d > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_HAS_FEC_IMX=y > CONFIG_ARCH_HAS_IMX_GPT=y > @@ -17,7 +17,6 @@ CONFIG_AT803X_PHY=y > CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB=y > CONFIG_BCH=y > # CONFIG_BMP is not set > -CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE_UIMAGE=y > # CONFIG_CACHE_L2X0 is not set > # CONFIG_CLOCKSOURCE_BCM283X is undefined > diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff > index 01d75e5ceda9..e77233fab822 100644 > --- a/configs/platform-v7a/barebox-rpi2.config.diff > +++ b/configs/platform-v7a/barebox-rpi2.config.diff > @@ -1,6 +1,5 @@ > -bccbfd59ca1a1f55312818ed9031a323 > +9c16ea1d7fee27ebbd0ce983140a223d > CONFIG_ARM_ASM_UNIFIED=y > -CONFIG_BOOTM_INITRD=y > # CONFIG_CMD_I2C is undefined > CONFIG_CMD_MIITOOL=y > # CONFIG_CMD_NVMEM is not set > diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff > index 39d7c5333749..430ab3c7782a 100644 > --- a/configs/platform-v7a/barebox-stm32mp.config.diff > +++ b/configs/platform-v7a/barebox-stm32mp.config.diff > @@ -1,4 +1,4 @@ > -bccbfd59ca1a1f55312818ed9031a323 > +9c16ea1d7fee27ebbd0ce983140a223d > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_HAS_RESET_CONTROLLER=y > CONFIG_ARCH_NR_GPIO=416 > @@ -16,7 +16,6 @@ CONFIG_ARM_USE_COMPRESSED_DTB=y > CONFIG_AT803X_PHY=y > # CONFIG_BOARD_ARM_GENERIC_DT is not set > # CONFIG_BOARD_GENERIC_DT is undefined > -CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE_UIMAGE=y > # CONFIG_BZLIB is not set > # CONFIG_CLKSRC_STM32 is not set > diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff > index 01d5633ac198..8a4584e935e3 100644 > --- a/configs/platform-v7a/barebox-vexpress.config.diff > +++ b/configs/platform-v7a/barebox-vexpress.config.diff > @@ -1,11 +1,10 @@ > -bccbfd59ca1a1f55312818ed9031a323 > +9c16ea1d7fee27ebbd0ce983140a223d > CONFIG_AMBA_SP804=y > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_VEXPRESS=y > # CONFIG_ARM_SCMI_PROTOCOL is undefined > # CONFIG_ARM_SECURE_MONITOR is undefined > # CONFIG_ARM_SMCCC is undefined > -CONFIG_BOOTM_INITRD=y > # CONFIG_CFI_BUFFER_WRITE is not set > # CONFIG_CLOCKSOURCE_BCM283X is undefined > # CONFIG_CMD_GPIO is undefined > diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config > index da56af9ace67..d7129aca964f 100644 > --- a/configs/platform-v7a/barebox.config > +++ b/configs/platform-v7a/barebox.config > @@ -161,7 +161,7 @@ CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > CONFIG_BOOTM_SHOW_TYPE=y > CONFIG_BOOTM_VERBOSE=y > -# CONFIG_BOOTM_INITRD is not set > +CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE=y > # CONFIG_BOOTM_OFTREE_UIMAGE is not set > # CONFIG_BOOTM_AIMAGE is not set > -- > 2.30.2 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |