From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 06 Sep 2022 12:33:37 +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 1oVVtf-008Vpf-9a for lore@lore.pengutronix.de; Tue, 06 Sep 2022 12:33:37 +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 1oVVtf-0005g9-Kd; Tue, 06 Sep 2022 12:33:35 +0200 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 1oVVtb-0005eo-W7; Tue, 06 Sep 2022 12:33:32 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oVVtZ-004EUP-D8; Tue, 06 Sep 2022 12:33:31 +0200 Received: from jlu by dude03.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oVVta-00DrPo-AI; Tue, 06 Sep 2022 12:33:30 +0200 From: Jan Luebbe To: distrokit@pengutronix.de Date: Tue, 6 Sep 2022 12:33:26 +0200 Message-Id: <20220906103328.3303545-2-jlu@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220906103328.3303545-1-jlu@pengutronix.de> References: <20220906103328.3303545-1-jlu@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [DistroKit] [PATCH 2/4] v7a: barebox: update diffs with enabled CONFIG_BOOTM_INITRD 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: Jan Luebbe 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 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 +-- 8 files changed, 8 insertions(+), 12 deletions(-) diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config index 068fd5fe1679..254c3c2d711b 100644 --- a/configs/platform-v7a/barebox-am335x.config +++ b/configs/platform-v7a/barebox-am335x.config @@ -172,7 +172,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 17dc8972da5d..dce6ae6807bd 100644 --- a/configs/platform-v7a/barebox-am335x.config.diff +++ b/configs/platform-v7a/barebox-am335x.config.diff @@ -1,4 +1,4 @@ -c2cbf48a6de666e3854240d3b1769aee +c8538bf2b18f8c8376aa6ee6e77cd76e # 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 2f00891a8cfa..9232d8ca75ed 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 3e80f997e9aa..6bc2a70348bd 100644 --- a/configs/platform-v7a/barebox-at91.config.diff +++ b/configs/platform-v7a/barebox-at91.config.diff @@ -1,4 +1,4 @@ -c2cbf48a6de666e3854240d3b1769aee +c8538bf2b18f8c8376aa6ee6e77cd76e 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 9f596de59486..bbcbed7c78bf 100644 --- a/configs/platform-v7a/barebox-mx6.config.diff +++ b/configs/platform-v7a/barebox-mx6.config.diff @@ -1,4 +1,4 @@ -c2cbf48a6de666e3854240d3b1769aee +c8538bf2b18f8c8376aa6ee6e77cd76e # 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 3ff572b319e5..3eb015312c87 100644 --- a/configs/platform-v7a/barebox-rpi2.config.diff +++ b/configs/platform-v7a/barebox-rpi2.config.diff @@ -1,6 +1,5 @@ -c2cbf48a6de666e3854240d3b1769aee +c8538bf2b18f8c8376aa6ee6e77cd76e 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 dec198abd3b0..f03262722b06 100644 --- a/configs/platform-v7a/barebox-stm32mp.config.diff +++ b/configs/platform-v7a/barebox-stm32mp.config.diff @@ -1,4 +1,4 @@ -c2cbf48a6de666e3854240d3b1769aee +c8538bf2b18f8c8376aa6ee6e77cd76e # 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 f712d6c8ca13..59e6f598ea29 100644 --- a/configs/platform-v7a/barebox-vexpress.config.diff +++ b/configs/platform-v7a/barebox-vexpress.config.diff @@ -1,11 +1,10 @@ -c2cbf48a6de666e3854240d3b1769aee +c8538bf2b18f8c8376aa6ee6e77cd76e 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 -- 2.30.2