summaryrefslogtreecommitdiff
path: root/include/configs/am65x_evm.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-07-13 17:11:39 +0300
committerLokesh Vutla <lokeshvutla@ti.com>2021-07-15 15:26:04 +0300
commitbde6ac549053a4a983ddb7306a4ea0245a2b4ea9 (patch)
tree14814b8ffe6e912aed2c5e521faa5584ea111235 /include/configs/am65x_evm.h
parent52306258548f131530abc34de858a55bf0895e0a (diff)
downloadu-boot-bde6ac549053a4a983ddb7306a4ea0245a2b4ea9.tar.xz
configs: am65x_evm: Switch envboot out for distro_bootcmd
Swap out the TI-centric "envboot" logic for the generic distro_bootcmd logic for the bootcmd we run before trying to do something more complex involving additional firmware, etc. Cc: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Link: https://lore.kernel.org/r/20210713141139.15183-1-trini@konsulko.com
Diffstat (limited to 'include/configs/am65x_evm.h')
-rw-r--r--include/configs/am65x_evm.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h
index 8c50fe9d11..d4514a0dba 100644
--- a/include/configs/am65x_evm.h
+++ b/include/configs/am65x_evm.h
@@ -10,7 +10,6 @@
#define __CONFIG_AM654_EVM_H
#include <linux/sizes.h>
-#include <config_distro_bootcmd.h>
#include <environment/ti/mmc.h>
#include <environment/ti/k3_rproc.h>
#include <environment/ti/k3_dfu.h>
@@ -126,6 +125,16 @@
DFU_ALT_INFO_EMMC \
DFU_ALT_INFO_OSPI
+#ifdef CONFIG_TARGET_AM654_A53_EVM
+#define BOOT_TARGET_DEVICES(func) \
+ func(MMC, mmc, 1) \
+ func(MMC, mmc, 0)
+
+#include <config_distro_bootcmd.h>
+#else
+#define BOOTENV
+#endif
+
/* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
@@ -136,7 +145,8 @@
EXTRA_ENV_AM65X_BOARD_SETTINGS_MTD \
EXTRA_ENV_AM65X_BOARD_SETTINGS_UBI \
EXTRA_ENV_RPROC_SETTINGS \
- EXTRA_ENV_DFUARGS
+ EXTRA_ENV_DFUARGS \
+ BOOTENV
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1