Skip to content
Snippets Groups Projects
Commit dac064f5 authored by Tom Rini's avatar Tom Rini
Browse files

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

parents 28aa27b6 b765fce9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
board/freescale/m54418twr/u-boot.lds
+ 5
− 3
View file @ dac064f5
...@@ -66,9 +66,11 @@ SECTIONS ...@@ -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 = .;
......
include/configs/M54418TWR.h
+ 1
− 1
View file @ dac064f5
...@@ -350,7 +350,7 @@ ...@@ -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
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment