diff options
author | Jan Luebbe <jlu@pengutronix.de> | 2022-09-06 12:33:26 +0200 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2022-09-06 16:11:20 +0200 |
commit | 8e21b3a4585b021e182de30f87e1159b98f8ac9e (patch) | |
tree | b7232b77b19110ecd69741326dcb8b7a3a040efa | |
parent | 9f89023433ce1650c3f0339d313e5a3fe93da138 (diff) | |
download | DistroKit-8e21b3a4585b021e182de30f87e1159b98f8ac9e.tar.gz DistroKit-8e21b3a4585b021e182de30f87e1159b98f8ac9e.tar.xz |
v7a: barebox: update diffs with enabled CONFIG_BOOTM_INITRD
It was enabled for mx6&rpi&stm32mp&vexpress, but not for am335x&at91.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Link: https://lore.pengutronix.de/20220906103328.3303545-2-jlu@pengutronix.de
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r-- | configs/platform-v7a/barebox-am335x.config | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-am335x.config.diff | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-at91.config | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-at91.config.diff | 2 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-mx6.config.diff | 3 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-rpi2.config.diff | 3 | ||||
-rw-r--r-- | configs/platform-v7a/barebox-stm32mp.config.diff | 3 | ||||
-rw-r--r-- | 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 068fd5f..254c3c2 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 17dc897..dce6ae6 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 2f00891..9232d8c 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 3e80f99..6bc2a70 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 9f596de..bbcbed7 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 3ff572b..3eb0153 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 dec198a..f032627 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 f712d6c..59e6f59 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 |