1
0
Fork 0

Merge branch 'master' of git://git.denx.de/u-boot-coldfire

utp
Tom Rini 2012-10-29 08:02:11 -07:00
commit dac064f58e
2 changed files with 6 additions and 4 deletions

View File

@ -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 = .;

View File

@ -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