GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Rini 2012-10-29 08:02:11 -07:00
commit dac064f58e
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
board/freescale/m54418twr/u-boot.lds
View file

@ -66,9 +66,11 @@ SECTIONS
PROVIDE (edata = .); PROVIDE (edata = .);
. = .; . = .;
__u_boot_cmd_start = .;
.u_boot_cmd : { *(.u_boot_cmd) } . = ALIGN(4);
__u_boot_cmd_end = .; .u_boot_list : {
#include <u-boot.lst>
}
. = .; . = .;
__start___ex_table = .; __start___ex_table = .;

2
include/configs/M54418TWR.h
View file

@ -350,7 +350,7 @@
#endif #endif
#if defined(CONFIG_SYS_NAND_BOOT) #if defined(CONFIG_SYS_NAND_BOOT)
#define CONFIG_SYS_NO_FLASH #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_OFFSET 0x80000
#define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SIZE 0x20000
#define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000