From f8abcaeb9a67e51c2f243ea1e14d9367d20fcad6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 9 Oct 2017 23:14:03 +0100 Subject: [PATCH] omap5_distro_bootcmd =================================================================== Gbp-Pq: Topic am57xx Gbp-Pq: Name omap5_distro_bootcmd --- configs/am57xx_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + include/configs/ti_omap5_common.h | 16 ++++++++++++++++ 3 files changed, 18 insertions(+) diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 3d455eb7d..98fc1daed 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ARMV7_LPAE=y CONFIG_DEFAULT_DEVICE_TREE="am572x-idk" +CONFIG_DISTRO_DEFAULTS=y CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_BOOTARGS=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index e4bb29927..20eed9858 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -10,6 +10,7 @@ CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ARMV7_LPAE=y CONFIG_DEFAULT_DEVICE_TREE="dra7-evm" +CONFIG_DISTRO_DEFAULTS=y CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y CONFIG_USE_BOOTARGS=y diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index 73c1d8f66..89eee6ac3 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -58,6 +58,21 @@ #include #include +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#ifdef CONFIG_BOOTCOMMAND +#undef CONFIG_BOOTCOMMAND +#endif +#define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ + "run distro_bootcmd" + +#include + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ @@ -67,6 +82,7 @@ DEFAULT_FDT_TI_ARGS \ DFUARGS \ NETARGS \ + BOOTENV \ /* * SPL related defines. The Public RAM memory map the ROM defines the -- 2.30.2