diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2014-10-27 21:27:31 -0500 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2014-10-27 21:41:06 -0500 |
| commit | 7624d0d511378fc8149703050aec2d78ce4217e1 (patch) | |
| tree | 388f2ff6afa2b1c834884ed6fc226a6518f7d48a | |
| parent | fb3ce7db4e100e9a051aaa19b96d33d67f02d1f2 (diff) | |
| download | u-boot-7624d0d511378fc8149703050aec2d78ce4217e1.tar.gz u-boot-7624d0d511378fc8149703050aec2d78ce4217e1.tar.xz u-boot-7624d0d511378fc8149703050aec2d78ce4217e1.zip | |
Switch omap4 boards to use config_distro_defaults and config_distro_bootcmd.
Add pxefile_addr_r to DEFAULT_LINUX_BOOT_ENV, as pxefile_addr_r is used
to store the pxe boot configuation file in config_distro_defaults.
adjust adress of scriptaddr to be unique
| -rw-r--r-- | include/configs/ti_armv7_common.h | 3 | ||||
| -rw-r--r-- | include/configs/ti_omap4_common.h | 40 |
2 files changed, 19 insertions, 24 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index f405fea576..fa8bc1f38d 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -54,7 +54,8 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ - "scriptaddr=0x82000000\0" \ + "pxefile_addr_r=0x87F00000\0" \ + "scriptaddr=0x87E00000\0" \ "fdtaddr=0x88000000\0" \ "fdt_addr_r=0x88000000\0" \ "rdaddr=0x88080000\0" \ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index b0f199e3f4..c10d2c81ae 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -82,6 +82,19 @@ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS + +#ifndef CONFIG_SPL_BUILD +#include <config_distro_defaults.h> +#include <config_distro_bootcmd.h> + +#define BOOTENV_INIT_COMMAND "run findfdt ;" + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + /* * Environment setup */ @@ -129,30 +142,11 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + BOOTENV -#define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadbootenv; then " \ - "run importbootenv; " \ - "fi;" \ - "if test -n ${uenvcmd}; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "fi;" \ - "if run loadimage; then " \ - "run loadfdt;" \ - "run mmcboot; " \ - "fi; " \ - "if run loaduimage; then " \ - "run uimageboot;" \ - "fi; " \ - "fi" +#else +#define BOOT_TARGET_DEVICES +#endif /* * Defines for SPL |