Merge branch 'master' of git://git.denx.de/u-boot-coldfire
This commit is contained in:
@@ -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 = .;
|
||||||
|
@@ -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
|
||||||
|
Reference in New Issue
Block a user