From: Vagrant Cascadian Date: Tue, 5 Dec 2017 23:43:23 +0000 (+0000) Subject: omap5_distro_bootcmd X-Git-Tag: archive/raspbian/2020.07+dfsg-2+rpi1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~7 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7fbb8acd44166e8cd6f35a774a128ff13ce27e22;p=u-boot.git omap5_distro_bootcmd =================================================================== Gbp-Pq: Topic am57xx Gbp-Pq: Name omap5_distro_bootcmd --- diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index 6e4d04c13..48c1ed2d4 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y 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 716a57b37..09f91a7d7 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y 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 539164177..845d69847 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