Hi Heiko, On Thu, 26 Jan 2023 at 00:46, Heiko Schocher <h...@denx.de> wrote: > > as Tom suggested get rid of CFG_EXTRA_ENV_SETTINGS and > enable CONFIG_ENV_SOURCE_FILE and use text file > > board/socrates/socrates.env > > which contains the default environment. While at it, > cleanup the default Environment. > > Signed-off-by: Heiko Schocher <h...@denx.de> > Suggested-by: Tom Rini <tr...@konsulko.com> > > --- > This patch is a follow up as requested from Tom to socrates series > posted here: > > https://lists.denx.de/pipermail/u-boot/2023-January/506030.html > > > board/socrates/socrates.env | 51 ++++++++++++++++++++++++++++++ > configs/socrates_defconfig | 5 +-- > include/configs/socrates.h | 62 ------------------------------------- > 3 files changed, 54 insertions(+), 64 deletions(-) > create mode 100644 board/socrates/socrates.env
Reviewed-by: Simon Glass <s...@chromium.org> nti below [..] > diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig > index e03c971b5e..0f4786958b 100644 > --- a/configs/socrates_defconfig > +++ b/configs/socrates_defconfig > @@ -31,9 +31,9 @@ CONFIG_BOOT_RETRY=y > CONFIG_BOOT_RETRY_TIME=120 > CONFIG_RESET_TO_RETRY=y > CONFIG_USE_BOOTCOMMAND=y > -CONFIG_BOOTCOMMAND="run boot_nor" > +CONFIG_BOOTCOMMAND="run boot_usb;run boot_nor" > CONFIG_USE_PREBOOT=y > -CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo" > +CONFIG_PREBOOT="echo;echo Welcome on the Socrates Board;echo" > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > CONFIG_BOARD_EARLY_INIT_R=y > # CONFIG_HWCONFIG is not set > @@ -70,6 +70,7 @@ > CONFIG_MTDIDS_DEFAULT="nor0=fe000000.nor_flash,nand0=socrates_nand" > > CONFIG_MTDPARTS_DEFAULT="mtdparts=fe000000.nor_flash:13312k(system1),13312k(system2),5120k(data),128k(env),128k(env-red),768k(u-boot);socrates_nand:256M(ubi-data1),-(ubi-data2)" > # CONFIG_CMD_IRQ is not set > CONFIG_OF_CONTROL=y > +CONFIG_ENV_SOURCE_FILE="socrates" This should be the default anyway, so I believe you can drop this. > CONFIG_ENV_IS_NOWHERE=y > CONFIG_ENV_IS_IN_FLASH=y > CONFIG_SYS_REDUNDAND_ENVIRONMENT=y Regards, Simon
