summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-06-03 16:16:51 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2020-06-03 18:15:03 +0200
commit6fe6cd777dc21ef7f3ff0051bf639fcfd38a0a81 (patch)
treec6629346c169db6b726651bad35fcc1ce513b760
parente266c3734cde2ef818a2b12795b2acfbe6b2f2a5 (diff)
downloadDistroKit-6fe6cd777dc21ef7f3ff0051bf639fcfd38a0a81.tar.gz
DistroKit-6fe6cd777dc21ef7f3ff0051bf639fcfd38a0a81.tar.xz
v7a: barebox: stm32mp: enable barebox-state support
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>
-rw-r--r--configs/platform-v7a/barebox-stm32mp.config6
-rw-r--r--configs/platform-v7a/barebox-stm32mp.config.diff5
2 files changed, 5 insertions, 6 deletions
diff --git a/configs/platform-v7a/barebox-stm32mp.config b/configs/platform-v7a/barebox-stm32mp.config
index 3506962..1a34680 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 a10ca6f..3e5fc93 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