diff options
| author | Tom Rini <trini@ti.com> | 2012-10-29 08:02:11 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-29 08:02:11 -0700 |
| commit | dac064f58e4f016f3d7342afb60570c2bd3b95b6 (patch) | |
| tree | 7955ea4d2bc15b8eb5e81af7a8d05cd51e25d516 | |
| parent | 28aa27b608bddf20a655e10c09412f93d2f83a5a (diff) | |
| parent | b765fce95c58b5a7da44b89eb754e66880ecd7f1 (diff) | |
| download | u-boot-imx-dac064f58e4f016f3d7342afb60570c2bd3b95b6.zip u-boot-imx-dac064f58e4f016f3d7342afb60570c2bd3b95b6.tar.gz u-boot-imx-dac064f58e4f016f3d7342afb60570c2bd3b95b6.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
| -rw-r--r-- | board/freescale/m54418twr/u-boot.lds | 8 | ||||
| -rw-r--r-- | include/configs/M54418TWR.h | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/m54418twr/u-boot.lds b/board/freescale/m54418twr/u-boot.lds index f341449..36a4c26 100644 --- a/board/freescale/m54418twr/u-boot.lds +++ b/board/freescale/m54418twr/u-boot.lds @@ -66,9 +66,11 @@ SECTIONS PROVIDE (edata = .); . = .; - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; + + . = ALIGN(4); + .u_boot_list : { + #include <u-boot.lst> + } . = .; __start___ex_table = .; diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index 6c96111..3be2f8e 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -350,7 +350,7 @@ #endif #if defined(CONFIG_SYS_NAND_BOOT) #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_OFFSET 0x80000 #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 |