diff options
| author | Vagrant Cascadian <vagrant@debian.org> | 2014-10-01 13:28:18 -0700 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2014-10-27 21:41:05 -0500 |
| commit | 455018f78aa4d96378c804f2883e86b5f986e7cb (patch) | |
| tree | e625e45b702d0903502eff1fdb56cfa0414a9397 | |
| parent | e35f16a3b1d651e2ce0b07ec67572f55fafff092 (diff) | |
| download | u-boot-455018f78aa4d96378c804f2883e86b5f986e7cb.tar.gz u-boot-455018f78aa4d96378c804f2883e86b5f986e7cb.tar.xz u-boot-455018f78aa4d96378c804f2883e86b5f986e7cb.zip | |
Switch am335x_evm.h to use config_distro_defaults and config_distro_bootcmd. Add scriptaddr to DEFAULT_LINUX_BOOT_ENV, as scriptaddr is used for boot scripts in config_distro_defaults.
| -rw-r--r-- | include/configs/am335x_evm.h | 26 | ||||
| -rw-r--r-- | include/configs/ti_armv7_common.h | 1 |
2 files changed, 18 insertions, 9 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 476430ddd0..4af8dc4aa2 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -18,6 +18,21 @@ #include <configs/ti_am335x_common.h> +#include <config_distro_defaults.h> + +#define BOOTENV_BOOT_PARTITIONS "1 2" + +#define BOOTENV_INIT_COMMAND "run findfdt ;" +#ifdef CONFIG_NAND +#define BOOTENV_POST_COMMAND "run nandboot ;" +#endif + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) + +#include <config_distro_bootcmd.h> + #ifndef CONFIG_SPL_BUILD # define CONFIG_FIT # define CONFIG_TIMESTAMP @@ -185,17 +200,10 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ NANDARGS \ - DFUARGS + DFUARGS \ + BOOTENV #endif -#define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ - "run mmcboot;" \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ - "run mmcboot;" \ - "run nandboot;" - /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 85171dbb4c..f405fea576 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -54,6 +54,7 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ + "scriptaddr=0x82000000\0" \ "fdtaddr=0x88000000\0" \ "fdt_addr_r=0x88000000\0" \ "rdaddr=0x88080000\0" \ |