On 11/30/21 14:55, Patrice CHOTARD wrote:
Hi,
While preparing and testing the next u-boot-stm32 pull request, i found an
issue with this patch during
compilation.
I got the following error:
In file included from include/config.h:4,
from include/common.h:16,
from env/common.c:10:
include/configs/stm32mp15_common.h:173:2: error: expected '}' before
'STM32MP_BOARD_EXTRA_ENV'
173 | STM32MP_BOARD_EXTRA_ENV
| ^~~~~~~~~~~~~~~~~~~~~~~
include/env_default.h:125:2: note: in expansion of macro
'CONFIG_EXTRA_ENV_SETTINGS'
125 | CONFIG_EXTRA_ENV_SETTINGS
| ^~~~~~~~~~~~~~~~~~~~~~~~~
In file included from env/common.c:32:
include/env_default.h:29:36: note: to match this '{'
29 | const char default_environment[] = {
| ^
If you have time to send a fix quickly i can wait for it before sending the
pull-request
Or i exclude these 2 patches as there are dependent :
https://patchwork.ozlabs.org/project/uboot/patch/20211113022444.231801-1-ma...@denx.de/
https://patchwork.ozlabs.org/project/uboot/patch/20211113022513.231840-1-ma...@denx.de/
I don't see this issue, on which board does this happen ?
On engicam board (stm32mp15-icore-stm32mp1-ctouch2_defconfig and
stm32mp15-icore-stm32mp1-edimm2.2_defconfig)
You will find the tag "next_bad" on STM32 custodian tree
(https://source.denx.de/u-boot/custodians/u-boot-stm.git/)
I think this should be the simplest fix, please squash it into "ARM:
stm32: Increase USB power-good delay on DHSOM":
diff --git a/include/configs/stm32mp15_common.h
b/include/configs/stm32mp15_common.h
index be22d3ea7f1..dab679f71e3 100644
--- a/include/configs/stm32mp15_common.h
+++ b/include/configs/stm32mp15_common.h
@@ -142,6 +142,10 @@
"env_check=if env info -p -d -q; then env save; fi\0" \
"boot_net_usb_start=true\0"
+#ifndef STM32MP_BOARD_EXTRA_ENV
+#define STM32MP_BOARD_EXTRA_ENV
+#endif
+
#include <config_distro_bootcmd.h>
/*
