[DistroKit] [PATCH 1/3] v7a: barebox: stm32mp: enable barebox-state support

[DistroKit] [PATCH 1/3] v7a: barebox: stm32mp: enable barebox-state support

[Ahmad Fatoum]

The barebox images for all v7a boards (e.g. rpi3, bbb) have this already
enabled. For symmetry with them and because internal CI checks for
it, enable state support.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/barebox-stm32mp.config      | 6 +++++-
 configs/platform-v7a/barebox-stm32mp.config.diff | 5 -----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 35069621059e..1a346805fd8c 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -189,7 +189,9 @@ CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
 # CONFIG_BAREBOXENV_TARGET is not set
 # CONFIG_BAREBOXCRC32_TARGET is not set
 CONFIG_POLLER=y
-# CONFIG_STATE is not set
+CONFIG_STATE=y
+# CONFIG_STATE_CRYPTO is not set
+# CONFIG_STATE_BACKWARD_COMPATIBLE is not set
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 
@@ -388,6 +390,7 @@ CONFIG_CMD_OF_PROPERTY=y
 # CONFIG_CMD_OF_OVERLAY is not set
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
+CONFIG_CMD_STATE=y
 # CONFIG_CMD_DHRYSTONE is not set
 # CONFIG_CMD_SPD_DECODE is not set
 # CONFIG_CMD_SEED is not set
@@ -561,6 +564,7 @@ CONFIG_MFD_STPMIC1=y
 #
 # CONFIG_JTAG is not set
 # CONFIG_SRAM is not set
+CONFIG_STATE_DRV=y
 CONFIG_DEV_MEM=y
 # CONFIG_UBOOTVAR is not set
 # end of Misc devices
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index a10ca6f9d278..3e5fc93e30eb 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -28,7 +28,6 @@ CONFIG_CMD_OF_DIFF=y
 CONFIG_CMD_POWEROFF=y
 # CONFIG_CMD_SHA1SUM is not set
 # CONFIG_CMD_SPI is undefined
-# CONFIG_CMD_STATE is undefined
 # CONFIG_CMD_USB is undefined
 # CONFIG_CMD_USBGADGET is undefined
 CONFIG_COMMON_CLK_OF_PROVIDER=y
@@ -121,10 +120,6 @@ CONFIG_RESET_STM32=y
 # CONFIG_SHA1 is undefined
 # CONFIG_SPI is not set
 # CONFIG_SPI_MEM is undefined
-# CONFIG_STATE is not set
-# CONFIG_STATE_BACKWARD_COMPATIBLE is undefined
-# CONFIG_STATE_CRYPTO is undefined
-# CONFIG_STATE_DRV is undefined
 CONFIG_STM32_BSEC=y
 CONFIG_STM32_IWDG_WATCHDOG=y
 CONFIG_STM32_REMOTEPROC=y
-- 
2.27.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 2/3] v7a: barebox: stm32mp: enable sha1sum command

[Ahmad Fatoum]

The barebox images for all v7a boards (e.g. rpi3, bbb) have this already
enabled. For symmetry with them and because internal CI checks for
it, enable the command.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 configs/platform-v7a/barebox-stm32mp.config      | 6 ++++--
 configs/platform-v7a/barebox-stm32mp.config.diff | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 1a346805fd8c..027b9d6e2c43 100644
--- a/configs/platform-v7a/barebox-stm32mp.config
+++ b/configs/platform-v7a/barebox-stm32mp.config
@@ -194,6 +194,7 @@ CONFIG_STATE=y
 # CONFIG_STATE_BACKWARD_COMPATIBLE is not set
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
+# CONFIG_MACHINE_ID is not set
 
 #
 # OP-TEE loading
@@ -297,7 +298,7 @@ CONFIG_CMD_PWD=y
 CONFIG_CMD_READLINK=y
 CONFIG_CMD_RM=y
 CONFIG_CMD_RMDIR=y
-# CONFIG_CMD_SHA1SUM is not set
+CONFIG_CMD_SHA1SUM=y
 # CONFIG_CMD_SHA224SUM is not set
 # CONFIG_CMD_SHA256SUM is not set
 # CONFIG_CMD_SHA384SUM is not set
@@ -767,9 +768,10 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
 CONFIG_CRC32=y
 CONFIG_DIGEST=y
 CONFIG_MD5=y
+CONFIG_SHA1=y
 # CONFIG_DIGEST_CRC32_GENERIC is not set
 CONFIG_DIGEST_MD5_GENERIC=y
-# CONFIG_DIGEST_SHA1_GENERIC is not set
+CONFIG_DIGEST_SHA1_GENERIC=y
 # CONFIG_DIGEST_SHA224_GENERIC is not set
 # CONFIG_DIGEST_SHA256_GENERIC is not set
 # CONFIG_DIGEST_SHA384_GENERIC is not set
diff --git a/configs/platform-v7a/barebox-stm32mp.config.diff b/configs/platform-v7a/barebox-stm32mp.config.diff
index 3e5fc93e30eb..81d1af5eb14d 100644
--- a/configs/platform-v7a/barebox-stm32mp.config.diff
+++ b/configs/platform-v7a/barebox-stm32mp.config.diff
@@ -26,7 +26,6 @@ CONFIG_CMD_MENU_MANAGEMENT=y
 CONFIG_CMD_MIITOOL=y
 CONFIG_CMD_OF_DIFF=y
 CONFIG_CMD_POWEROFF=y
-# CONFIG_CMD_SHA1SUM is not set
 # CONFIG_CMD_SPI is undefined
 # CONFIG_CMD_USB is undefined
 # CONFIG_CMD_USBGADGET is undefined
@@ -38,7 +37,6 @@ CONFIG_CRC8=y
 # CONFIG_DEFAULT_COMPRESSION_BZIP2 is undefined
 # CONFIG_DEFAULT_COMPRESSION_XZ is undefined
 CONFIG_DEFAULT_LOGLEVEL=7
-# CONFIG_DIGEST_SHA1_GENERIC is not set
 # CONFIG_DRIVER_CFI is undefined
 CONFIG_DRIVER_NET_DESIGNWARE_EQOS=y
 CONFIG_DRIVER_NET_DESIGNWARE_STM32=y
@@ -62,7 +60,6 @@ CONFIG_I2C_STM32=y
 # CONFIG_KEYBOARD_USB is undefined
 # CONFIG_LED_TRIGGERS is not set
 # CONFIG_LIBFDT is undefined
-# CONFIG_MACHINE_ID is undefined
 CONFIG_MACH_LXA_MC1=y
 # CONFIG_MACH_RPI2 is undefined
 # CONFIG_MACH_RPI3 is undefined
@@ -117,7 +114,6 @@ CONFIG_REMOTEPROC=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_IMX7 is not set
 CONFIG_RESET_STM32=y
-# CONFIG_SHA1 is undefined
 # CONFIG_SPI is not set
 # CONFIG_SPI_MEM is undefined
 CONFIG_STM32_BSEC=y
-- 
2.27.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

[DistroKit] [PATCH 3/3] v7a: lxa-mc1: migrate loglevel to barebox environment variable

[Ahmad Fatoum]

The MC-1 is the only supported board that configures loglevel via
bootspec and not via barebox environment. For symmetry and because
internal CI checks for it, migrate the loglevel to the environment.

This also affects the stm32mp157c-dk2 target, which is fine. No one
minds shorter boot times.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 .../barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel       | 1 +
 configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel

diff --git a/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
new file mode 100644
index 000000000000..705752ca416d
--- /dev/null
+++ b/configs/platform-v7a/barebox-stm32mp-defaultenv/nv/linux.bootargs.loglevel
@@ -0,0 +1 @@
+loglevel=5 systemd.log_level=warning systemd.show_status=auto
diff --git a/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf b/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
index e0f418c95398..5718be4d1710 100644
--- a/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
@@ -1,6 +1,6 @@
 title		PTXdist - Pengutronix-DistroKit
 version		5.5
-options		rootwait rw loglevel=5 systemd.log_level=warning systemd.show_status=auto
+options		rootwait rw
 linux		/boot/zImage
 devicetree	/boot/stm32mp157c-lxa-mc1.dtb
 linux-appendroot true
-- 
2.27.0


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de

Re: [DistroKit] [PATCH 1/3] v7a: barebox: stm32mp: enable barebox-state support

[Robert Schwebel]

Applied series to next.

rsc
-- 
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    |

_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de