* [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines
@ 2024-07-11 11:01 Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 2/4] v7a: barebox: don't activate first console Ahmad Fatoum
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2024-07-11 11:01 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
All barebox defconfigs that enable generic SHA1 support also enable
ARM-optimized SHA256 support. Enable ARM-optimized SHA1 as well for
improved performance.
It would be nice if we could disable generic SHA1 now, but that's not
possible yet, because generic SHA1 support is selected by
CONFIG_CMD_SHA1SUM, which we enable.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
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 | 2 +-
configs/platform-v7a/barebox-mx6.config.diff | 2 +-
configs/platform-v7a/barebox-rpi2.config | 2 +-
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config | 2 +-
configs/platform-v7a/barebox-stm32mp.config.diff | 2 +-
configs/platform-v7a/barebox-vexpress.config | 2 +-
configs/platform-v7a/barebox-vexpress.config.diff | 2 +-
configs/platform-v7a/barebox.config | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
index aeaf1192bdbb..61c17f70896d 100644
--- a/configs/platform-v7a/barebox-am335x.config
+++ b/configs/platform-v7a/barebox-am335x.config
@@ -1038,7 +1038,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
CONFIG_CRYPTO_KEYSTORE=y
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index 8c6e7959fedf..f1d46b41cf9a 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-dcf5e1fcb2504dfaa2c1441bc71bbdd2
+e68dcd40a22e40e08bfbabe8f90da935
# 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 dec985bc8a9e..c3aeee7125fe 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -1042,7 +1042,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 9ebfb4771860..2aca21897016 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-dcf5e1fcb2504dfaa2c1441bc71bbdd2
+e68dcd40a22e40e08bfbabe8f90da935
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
index 945b4a903463..2a144c674e0a 100644
--- a/configs/platform-v7a/barebox-mx6.config
+++ b/configs/platform-v7a/barebox-mx6.config
@@ -1226,7 +1226,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
CONFIG_CRYPTO_KEYSTORE=y
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index af14a2eed749..291a35edc4b9 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-dcf5e1fcb2504dfaa2c1441bc71bbdd2
+e68dcd40a22e40e08bfbabe8f90da935
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index b00b8f7b29a5..63035910c2a3 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -1008,7 +1008,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index 82fa555afacc..b2b34df1d863 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-dcf5e1fcb2504dfaa2c1441bc71bbdd2
+e68dcd40a22e40e08bfbabe8f90da935
CONFIG_ARM_ASM_UNIFIED=y
# CONFIG_CMD_NVMEM is not set
CONFIG_DRIVER_NET_BCMGENET=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 898d8ed979c3..afba652187a9 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -990,7 +990,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
CONFIG_DIGEST_HMAC_GENERIC=y
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 1d31bc529248..be07a2a27b1f 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-dcf5e1fcb2504dfaa2c1441bc71bbdd2
+e68dcd40a22e40e08bfbabe8f90da935
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index 2c45042c62b7..ac4bff2d9a9d 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -949,7 +949,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index a5f70ff8f594..103a9e77df62 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-dcf5e1fcb2504dfaa2c1441bc71bbdd2
+e68dcd40a22e40e08bfbabe8f90da935
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index e678fff7e57b..a562d8e8bf73 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -1002,7 +1002,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
# CONFIG_DIGEST_SHA384_GENERIC is not set
# CONFIG_DIGEST_SHA512_GENERIC is not set
# CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
+CONFIG_DIGEST_SHA1_ARM=y
CONFIG_DIGEST_SHA256_ARM=y
# CONFIG_CRYPTO_KEYSTORE is not set
# end of Crypto support
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [DistroKit] [PATCH 2/4] v7a: barebox: don't activate first console
2024-07-11 11:01 [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Ahmad Fatoum
@ 2024-07-11 11:01 ` Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 3/4] v7a: barebox: don't use root=PARTUUID= when booting from SD/eMMC Ahmad Fatoum
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2024-07-11 11:01 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
Activating the first console unconditionally is a bad idea as it's
probe order dependent which console is registered first.
It seems like all systems we support with platform-v7a describe their
default console with /chosen/stdout-path, so let's select
CONFIG_CONSOLE_ACTIVATE_NONE instead, which instructs barebox to not
activate a specific console unconditionally and instead activate
depending on explicit configuration (like /chosen/stdout-path).
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/platform-v7a/barebox-am335x.config.diff | 4 +---
configs/platform-v7a/barebox-at91.config | 4 ++--
configs/platform-v7a/barebox-at91.config.diff | 2 +-
configs/platform-v7a/barebox-mx6.config.diff | 4 +---
configs/platform-v7a/barebox-rpi2.config | 4 ++--
configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
configs/platform-v7a/barebox-stm32mp.config.diff | 4 +---
configs/platform-v7a/barebox-vexpress.config | 4 ++--
configs/platform-v7a/barebox-vexpress.config.diff | 4 +---
configs/platform-v7a/barebox.config | 4 ++--
10 files changed, 14 insertions(+), 22 deletions(-)
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
index f1d46b41cf9a..10c4775dfaba 100644
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ b/configs/platform-v7a/barebox-am335x.config.diff
@@ -1,4 +1,4 @@
-e68dcd40a22e40e08bfbabe8f90da935
+1cd68f01fa4cd1e3cbe5a47a02cbbb93
# CONFIG_AM33XX_NET_BOOT is not set
CONFIG_ARCH_AM33XX=y
# CONFIG_ARCH_BCM283X is not set
@@ -27,8 +27,6 @@ CONFIG_CMD_NAND=y
# CONFIG_COMMON_CLK is not set
# CONFIG_COMMON_CLK_GPIO is undefined
# CONFIG_COMMON_CLK_OF_PROVIDER is undefined
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CRYPTO_KEYSTORE=y
CONFIG_DEBUG_OMAP_UART_PORT=1
CONFIG_DIGEST_HMAC_GENERIC=y
diff --git a/configs/platform-v7a/barebox-at91.config b/configs/platform-v7a/barebox-at91.config
index c3aeee7125fe..d3c50caa44a0 100644
--- a/configs/platform-v7a/barebox-at91.config
+++ b/configs/platform-v7a/barebox-at91.config
@@ -195,9 +195,9 @@ CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
# CONFIG_CONSOLE_NONE is not set
-CONFIG_CONSOLE_ACTIVATE_FIRST=y
+# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_CONSOLE_DISABLE_INPUT is not set
CONFIG_PBL_CONSOLE=y
diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
index 2aca21897016..9ee1b4d98aef 100644
--- a/configs/platform-v7a/barebox-at91.config.diff
+++ b/configs/platform-v7a/barebox-at91.config.diff
@@ -1,4 +1,4 @@
-e68dcd40a22e40e08bfbabe8f90da935
+1cd68f01fa4cd1e3cbe5a47a02cbbb93
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
index 291a35edc4b9..6b60d63a5828 100644
--- a/configs/platform-v7a/barebox-mx6.config.diff
+++ b/configs/platform-v7a/barebox-mx6.config.diff
@@ -1,4 +1,4 @@
-e68dcd40a22e40e08bfbabe8f90da935
+1cd68f01fa4cd1e3cbe5a47a02cbbb93
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_FEC_IMX=y
CONFIG_ARCH_HAS_IMX_GPT=y
@@ -35,8 +35,6 @@ CONFIG_CMD_NAND=y
CONFIG_CMD_SPLASH=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFORMAT=y
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
# CONFIG_CRYPTO_DEV_FSL_CAAM is not set
CONFIG_CRYPTO_KEYSTORE=y
CONFIG_DEBUG_IMX_UART_PORT=1
diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
index 63035910c2a3..cb6ac777ca92 100644
--- a/configs/platform-v7a/barebox-rpi2.config
+++ b/configs/platform-v7a/barebox-rpi2.config
@@ -180,9 +180,9 @@ CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
# CONFIG_CONSOLE_NONE is not set
-CONFIG_CONSOLE_ACTIVATE_FIRST=y
+# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_CONSOLE_DISABLE_INPUT is not set
# CONFIG_PBL_CONSOLE is not set
diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
index b2b34df1d863..bd7044318525 100644
--- a/configs/platform-v7a/barebox-rpi2.config.diff
+++ b/configs/platform-v7a/barebox-rpi2.config.diff
@@ -1,4 +1,4 @@
-e68dcd40a22e40e08bfbabe8f90da935
+1cd68f01fa4cd1e3cbe5a47a02cbbb93
CONFIG_ARM_ASM_UNIFIED=y
# CONFIG_CMD_NVMEM is not set
CONFIG_DRIVER_NET_BCMGENET=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index be07a2a27b1f..6c285c6793bc 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -1,4 +1,4 @@
-e68dcd40a22e40e08bfbabe8f90da935
+1cd68f01fa4cd1e3cbe5a47a02cbbb93
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_HAS_RESET_CONTROLLER=y
CONFIG_ARCH_NR_GPIO=416
@@ -41,8 +41,6 @@ CONFIG_COMMON_CLK_SCMI=y
CONFIG_COMMON_CLK_STM32MP135=y
CONFIG_COMMON_CLK_STM32MP157=y
CONFIG_COMPILE_LOGLEVEL=6
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CRC8=y
# CONFIG_DEBUG_PBL is not set
CONFIG_DEFAULT_LOGLEVEL=7
diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
index ac4bff2d9a9d..ee0229f5c862 100644
--- a/configs/platform-v7a/barebox-vexpress.config
+++ b/configs/platform-v7a/barebox-vexpress.config
@@ -164,8 +164,8 @@ CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
# CONFIG_CONSOLE_NONE is not set
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
-CONFIG_CONSOLE_ACTIVATE_ALL=y
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+# CONFIG_CONSOLE_ACTIVATE_ALL is not set
+CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_CONSOLE_DISABLE_INPUT is not set
CONFIG_PBL_CONSOLE=y
diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
index 103a9e77df62..788a820066f5 100644
--- a/configs/platform-v7a/barebox-vexpress.config.diff
+++ b/configs/platform-v7a/barebox-vexpress.config.diff
@@ -1,4 +1,4 @@
-e68dcd40a22e40e08bfbabe8f90da935
+1cd68f01fa4cd1e3cbe5a47a02cbbb93
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
@@ -9,8 +9,6 @@ CONFIG_ARCH_VEXPRESS=y
# CONFIG_CLOCKSOURCE_BCM283X is undefined
# CONFIG_CMD_GPIO is undefined
# CONFIG_CMD_SMC is undefined
-CONFIG_CONSOLE_ACTIVATE_ALL=y
-# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_DEBUG_PBL is not set
CONFIG_DRIVER_CFI=y
CONFIG_DRIVER_CFI_AMD=y
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
index a562d8e8bf73..54ca5d8da610 100644
--- a/configs/platform-v7a/barebox.config
+++ b/configs/platform-v7a/barebox.config
@@ -179,9 +179,9 @@ CONFIG_IMD=y
CONFIG_CONSOLE_FULL=y
# CONFIG_CONSOLE_SIMPLE is not set
# CONFIG_CONSOLE_NONE is not set
-CONFIG_CONSOLE_ACTIVATE_FIRST=y
+# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
-# CONFIG_CONSOLE_ACTIVATE_NONE is not set
+CONFIG_CONSOLE_ACTIVATE_NONE=y
CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_CONSOLE_DISABLE_INPUT is not set
# CONFIG_PBL_CONSOLE is not set
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [DistroKit] [PATCH 3/4] v7a: barebox: don't use root=PARTUUID= when booting from SD/eMMC
2024-07-11 11:01 [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 2/4] v7a: barebox: don't activate first console Ahmad Fatoum
@ 2024-07-11 11:01 ` Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 4/4] v7a: barebox: am335x-mlo: document some unusual kconfig options Ahmad Fatoum
2024-07-12 14:30 ` [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Robert Schwebel
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2024-07-11 11:01 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
The stm32mp images may be written to both SD and eMMC, so it's important
that barebox identifies the boot medium uses for root= unambiguously and
not via PARTUUID= which may be equal if the exact same image is written
to both SD and eMMC
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/platform-v7a/barebox-stm32mp.config | 2 +-
configs/platform-v7a/barebox-stm32mp.config.diff | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index afba652187a9..0de53381925b 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -171,7 +171,7 @@ CONFIG_BOOTM_FITIMAGE=y
# CONFIG_BOOTM_FITIMAGE_SIGNATURE is not set
CONFIG_BLSPEC=y
CONFIG_FLEXIBLE_BOOTARGS=y
-# CONFIG_MMCBLKDEV_ROOTARG is not set
+CONFIG_MMCBLKDEV_ROOTARG=y
CONFIG_BAREBOX_UPDATE=y
CONFIG_SYSTEM_PARTITIONS=y
CONFIG_IMD=y
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 6c285c6793bc..23f80f70d3ee 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -99,7 +99,6 @@ CONFIG_MFD_STM32_TIMERS=y
CONFIG_MFD_STPMIC1=y
CONFIG_MFD_SYSCON=y
CONFIG_MICREL_PHY=y
-# CONFIG_MMCBLKDEV_ROOTARG is not set
# CONFIG_MTD is not set
# CONFIG_MTD_CONCAT is undefined
# CONFIG_MTD_DATAFLASH is undefined
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [DistroKit] [PATCH 4/4] v7a: barebox: am335x-mlo: document some unusual kconfig options
2024-07-11 11:01 [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 2/4] v7a: barebox: don't activate first console Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 3/4] v7a: barebox: don't use root=PARTUUID= when booting from SD/eMMC Ahmad Fatoum
@ 2024-07-11 11:01 ` Ahmad Fatoum
2024-07-12 14:30 ` [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Robert Schwebel
3 siblings, 0 replies; 5+ messages in thread
From: Ahmad Fatoum @ 2024-07-11 11:01 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
While we generally prefer ARM-optimized string/memory routines and
support of GPT in barebox, the MLO configuration is special:
It's size constrained by having to run from on-chip SRAM and it need
only worry about loading barebox from the same partition the MLO came
from.
Therefore leave the configuration as-is, but explain the choices made.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/bsp.ref | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/configs/bsp.ref b/configs/bsp.ref
index b7077411c2dd..5b5b4a763b15 100644
--- a/configs/bsp.ref
+++ b/configs/bsp.ref
@@ -45,6 +45,32 @@ optee_disabled_features:
- CFG_ENABLE_EMBEDDED_TESTS
- CFG_TEE_CORE_TA_TRACE
+barebox_arm_optimized_string_functions:
+ description: |
+ The use of assembler optimized memcpy / memset functions improves
+ throughput at the cost of an increase in binary size.
+ The am335x-mlo configuration is very size constrained, because it
+ needs to fit into on-chip SRAM to be able to set up DRAM and thus
+ we use the smaller C implementation instead.
+ variants:
+ - condition: kconfig.BareboxConfig()['ARCH_OMAP'] and kconfig.BareboxConfig()['SHELL_NONE']
+ value: False
+ - value: True
+
+barebox_gpt_support:
+ description: |
+ The am335x boot ROM expects SD/MMC media to be formatted as MBR
+ and loads the first stage bootloader from the BOOT.BIN file from the
+ first vfat partition. As the MLO
+
+ As the am335x-mlo configuration's only function is to chainload
+ barebox, we only need GPT support later on in the second stage
+ barebox-am335x configuration.
+ variants:
+ - condition: kconfig.BareboxConfig()['ARCH_OMAP'] and kconfig.BareboxConfig()['SHELL_NONE']
+ value: False
+ - value: True
+
rootfs_unused_libraries:
description: |
- libatomic is needed on mips and rpi1 by libcrypto, but for simplicity ship it on all platforms
--
2.39.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines
2024-07-11 11:01 [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Ahmad Fatoum
` (2 preceding siblings ...)
2024-07-11 11:01 ` [DistroKit] [PATCH 4/4] v7a: barebox: am335x-mlo: document some unusual kconfig options Ahmad Fatoum
@ 2024-07-12 14:30 ` Robert Schwebel
3 siblings, 0 replies; 5+ messages in thread
From: Robert Schwebel @ 2024-07-12 14:30 UTC (permalink / raw)
To: Ahmad Fatoum; +Cc: distrokit
series applied to next
On Thu, Jul 11, 2024 at 01:01:40PM +0200, Ahmad Fatoum wrote:
> All barebox defconfigs that enable generic SHA1 support also enable
> ARM-optimized SHA256 support. Enable ARM-optimized SHA1 as well for
> improved performance.
>
> It would be nice if we could disable generic SHA1 now, but that's not
> possible yet, because generic SHA1 support is selected by
> CONFIG_CMD_SHA1SUM, which we enable.
>
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
> 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 | 2 +-
> configs/platform-v7a/barebox-mx6.config.diff | 2 +-
> configs/platform-v7a/barebox-rpi2.config | 2 +-
> configs/platform-v7a/barebox-rpi2.config.diff | 2 +-
> configs/platform-v7a/barebox-stm32mp.config | 2 +-
> configs/platform-v7a/barebox-stm32mp.config.diff | 2 +-
> configs/platform-v7a/barebox-vexpress.config | 2 +-
> configs/platform-v7a/barebox-vexpress.config.diff | 2 +-
> configs/platform-v7a/barebox.config | 2 +-
> 13 files changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox-am335x.config
> index aeaf1192bdbb..61c17f70896d 100644
> --- a/configs/platform-v7a/barebox-am335x.config
> +++ b/configs/platform-v7a/barebox-am335x.config
> @@ -1038,7 +1038,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> CONFIG_DIGEST_HMAC_GENERIC=y
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> CONFIG_CRYPTO_KEYSTORE=y
> # end of Crypto support
> diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
> index 8c6e7959fedf..f1d46b41cf9a 100644
> --- a/configs/platform-v7a/barebox-am335x.config.diff
> +++ b/configs/platform-v7a/barebox-am335x.config.diff
> @@ -1,4 +1,4 @@
> -dcf5e1fcb2504dfaa2c1441bc71bbdd2
> +e68dcd40a22e40e08bfbabe8f90da935
> # 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 dec985bc8a9e..c3aeee7125fe 100644
> --- a/configs/platform-v7a/barebox-at91.config
> +++ b/configs/platform-v7a/barebox-at91.config
> @@ -1042,7 +1042,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> # CONFIG_DIGEST_HMAC_GENERIC is not set
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> # CONFIG_CRYPTO_KEYSTORE is not set
> # end of Crypto support
> diff --git a/configs/platform-v7a/barebox-at91.config.diff b/configs/platform-v7a/barebox-at91.config.diff
> index 9ebfb4771860..2aca21897016 100644
> --- a/configs/platform-v7a/barebox-at91.config.diff
> +++ b/configs/platform-v7a/barebox-at91.config.diff
> @@ -1,4 +1,4 @@
> -dcf5e1fcb2504dfaa2c1441bc71bbdd2
> +e68dcd40a22e40e08bfbabe8f90da935
> CONFIG_ARCH_AT91=y
> # CONFIG_ARCH_BCM283X is not set
> # CONFIG_ARCH_IMX is undefined
> diff --git a/configs/platform-v7a/barebox-mx6.config b/configs/platform-v7a/barebox-mx6.config
> index 945b4a903463..2a144c674e0a 100644
> --- a/configs/platform-v7a/barebox-mx6.config
> +++ b/configs/platform-v7a/barebox-mx6.config
> @@ -1226,7 +1226,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> CONFIG_DIGEST_HMAC_GENERIC=y
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> CONFIG_CRYPTO_KEYSTORE=y
> # end of Crypto support
> diff --git a/configs/platform-v7a/barebox-mx6.config.diff b/configs/platform-v7a/barebox-mx6.config.diff
> index af14a2eed749..291a35edc4b9 100644
> --- a/configs/platform-v7a/barebox-mx6.config.diff
> +++ b/configs/platform-v7a/barebox-mx6.config.diff
> @@ -1,4 +1,4 @@
> -dcf5e1fcb2504dfaa2c1441bc71bbdd2
> +e68dcd40a22e40e08bfbabe8f90da935
> # CONFIG_ARCH_BCM283X is not set
> CONFIG_ARCH_HAS_FEC_IMX=y
> CONFIG_ARCH_HAS_IMX_GPT=y
> diff --git a/configs/platform-v7a/barebox-rpi2.config b/configs/platform-v7a/barebox-rpi2.config
> index b00b8f7b29a5..63035910c2a3 100644
> --- a/configs/platform-v7a/barebox-rpi2.config
> +++ b/configs/platform-v7a/barebox-rpi2.config
> @@ -1008,7 +1008,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> # CONFIG_DIGEST_HMAC_GENERIC is not set
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> # CONFIG_CRYPTO_KEYSTORE is not set
> # end of Crypto support
> diff --git a/configs/platform-v7a/barebox-rpi2.config.diff b/configs/platform-v7a/barebox-rpi2.config.diff
> index 82fa555afacc..b2b34df1d863 100644
> --- a/configs/platform-v7a/barebox-rpi2.config.diff
> +++ b/configs/platform-v7a/barebox-rpi2.config.diff
> @@ -1,4 +1,4 @@
> -dcf5e1fcb2504dfaa2c1441bc71bbdd2
> +e68dcd40a22e40e08bfbabe8f90da935
> CONFIG_ARM_ASM_UNIFIED=y
> # CONFIG_CMD_NVMEM is not set
> CONFIG_DRIVER_NET_BCMGENET=y
> diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
> index 898d8ed979c3..afba652187a9 100644
> --- a/configs/platform-v7a/barebox-stm32mp.config
> +++ b/configs/platform-v7a/barebox-stm32mp.config
> @@ -990,7 +990,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> CONFIG_DIGEST_HMAC_GENERIC=y
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> # CONFIG_CRYPTO_KEYSTORE is not set
> # end of Crypto support
> diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
> index 1d31bc529248..be07a2a27b1f 100644
> --- a/configs/platform-v7a/barebox-stm32mp.config.diff
> +++ b/configs/platform-v7a/barebox-stm32mp.config.diff
> @@ -1,4 +1,4 @@
> -dcf5e1fcb2504dfaa2c1441bc71bbdd2
> +e68dcd40a22e40e08bfbabe8f90da935
> # CONFIG_ARCH_BCM283X is not set
> CONFIG_ARCH_HAS_RESET_CONTROLLER=y
> CONFIG_ARCH_NR_GPIO=416
> diff --git a/configs/platform-v7a/barebox-vexpress.config b/configs/platform-v7a/barebox-vexpress.config
> index 2c45042c62b7..ac4bff2d9a9d 100644
> --- a/configs/platform-v7a/barebox-vexpress.config
> +++ b/configs/platform-v7a/barebox-vexpress.config
> @@ -949,7 +949,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> # CONFIG_DIGEST_HMAC_GENERIC is not set
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> # CONFIG_CRYPTO_KEYSTORE is not set
> # end of Crypto support
> diff --git a/configs/platform-v7a/barebox-vexpress.config.diff b/configs/platform-v7a/barebox-vexpress.config.diff
> index a5f70ff8f594..103a9e77df62 100644
> --- a/configs/platform-v7a/barebox-vexpress.config.diff
> +++ b/configs/platform-v7a/barebox-vexpress.config.diff
> @@ -1,4 +1,4 @@
> -dcf5e1fcb2504dfaa2c1441bc71bbdd2
> +e68dcd40a22e40e08bfbabe8f90da935
> CONFIG_AMBA_SP804=y
> # CONFIG_ARCH_BCM283X is not set
> CONFIG_ARCH_VEXPRESS=y
> diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox.config
> index e678fff7e57b..a562d8e8bf73 100644
> --- a/configs/platform-v7a/barebox.config
> +++ b/configs/platform-v7a/barebox.config
> @@ -1002,7 +1002,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y
> # CONFIG_DIGEST_SHA384_GENERIC is not set
> # CONFIG_DIGEST_SHA512_GENERIC is not set
> # CONFIG_DIGEST_HMAC_GENERIC is not set
> -# CONFIG_DIGEST_SHA1_ARM is not set
> +CONFIG_DIGEST_SHA1_ARM=y
> CONFIG_DIGEST_SHA256_ARM=y
> # CONFIG_CRYPTO_KEYSTORE is not set
> # end of Crypto support
> --
> 2.39.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 |
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-07-12 14:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-11 11:01 [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 2/4] v7a: barebox: don't activate first console Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 3/4] v7a: barebox: don't use root=PARTUUID= when booting from SD/eMMC Ahmad Fatoum
2024-07-11 11:01 ` [DistroKit] [PATCH 4/4] v7a: barebox: am335x-mlo: document some unusual kconfig options Ahmad Fatoum
2024-07-12 14:30 ` [DistroKit] [PATCH 1/4] v7a: barebox: enable ARM accelerated SHA1 routines Robert Schwebel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox