On Sun, Aug 1, 2021 at 10:46 PM Derald D. Woods woods.technical@gmail.com wrote:

This commit uses the existing DEFAULT_MMC_TI_ARGS and DEFAULT_FIT_TI_ARGS defintions to replace the 'mmc*' environment variables in the configuration. The check for the 'boot_fit' is handled like the 'am335x_*' boards with 'CONFIG_BOOTCOMMAND'.

Signed-off-by: Derald D. Woods woods.technical@gmail.com

configs/omap3_evm_defconfig | 1 + include/configs/omap3_evm.h | 45 +++++-------------------------------- 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 4d96505e36..6a6bf64526 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -10,6 +10,7 @@ CONFIG_TARGET_OMAP3_EVM=y CONFIG_SPL_SYS_MALLOC_F_LEN=0x400 CONFIG_SPL=y CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run envboot; run distro_bootcmd" CONFIG_USE_PREBOOT=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_SYS_CONSOLE_INFO_QUIET=y diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index e2e871a9cb..2ce3c867cb 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -50,9 +50,6 @@ #endif /* CONFIG_SPL_OS_BOOT */ #endif /* CONFIG_MTD_RAW_NAND */

-#define MEM_LAYOUT_ENV_SETTINGS \

•   DEFAULT_LINUX_BOOT_ENV
  

#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ "setenv mmcdev " #instance "; " \ @@ -88,8 +85,12 @@

#include <config_distro_bootcmd.h>

+#include <environment/ti/mmc.h>

#define CONFIG_EXTRA_ENV_SETTINGS \

•   MEM_LAYOUT_ENV_SETTINGS \
  

•   DEFAULT_LINUX_BOOT_ENV \
  

•   DEFAULT_MMC_TI_ARGS \
  

•   DEFAULT_FIT_TI_ARGS \
    "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
    "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
    "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
  

@@ -102,42 +103,6 @@ "bootubivol=rootfs\0" \ "bootubipart=rootfs\0" \ "optargs=\0" \

•   "mmcdev=0\0" \
  

•   "mmcpart=2\0" \
  

•   "mmcroot=/dev/mmcblk0p2 rw\0" \
  

•   "mmcrootfstype=ext4 rootwait\0" \
  

•   "mmcargs=setenv bootargs console=${console} " \
  

•           "${mtdparts} " \
  

•           "${optargs} " \
  

•           "root=${mmcroot} " \
  

•           "rootfstype=${mmcrootfstype}\0" \
  

•   "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
  

•   "ext4bootenv=ext4load mmc ${bootpart} ${loadaddr}
  

${bootdir}/${bootenv}\0" \

•   "importbootenv=echo Importing environment from mmc${mmcdev} ...; "
  

\

•           "env import -t ${loadaddr} ${filesize}\0" \
  

•   "mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \
  

•           "mmc dev ${mmcdev}; " \
  

•           "if mmc rescan; then " \
  

•                   "run loadbootenv && run importbootenv; " \
  

•                   "run ext4bootenv && run importbootenv; " \
  

•                   "if test -n $uenvcmd; then " \
  

•                           "echo Running uenvcmd ...; " \
  

•                           "run uenvcmd; " \
  

•                   "fi; " \
  

•           "fi\0" \
  

•   "loadimage=ext4load mmc ${bootpart} ${loadaddr}
  

${bootdir}/${bootfile}\0" \

•   "loaddtb=ext4load mmc ${bootpart} ${fdtaddr}
  

${bootdir}/${fdtfile}\0" \

•   "mmcboot=run mmcbootenv; " \
  

•           "if run loadimage && run loaddtb; then " \
  

•                   "echo Booting ${bootdir}/${bootfile} from mmc
  

${bootpart} ...; " \

•                   "run mmcargs; " \
  

•                   "if test ${bootfile} = uImage; then " \
  

•                           "bootm ${loadaddr} - ${fdtaddr}; " \
  

•                   "fi; " \
  

•                   "if test ${bootfile} = zImage; then " \
  

•                           "bootz ${loadaddr} - ${fdtaddr}; " \
  

•                   "fi; " \
  

•           "fi\0" \
    "nandroot=ubi0:rootfs ubi.mtd=rootfs rw noinitrd\0" \
    "nandrootfstype=ubifs rootwait\0" \
    "nandargs=setenv bootargs console=${console} " \
  

-- 2.32.0

Ping.

Is this patch in acceptable form?

Derald