projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: highbank: Add boot counter support
[oweals/u-boot.git]
/
include
/
configs
/
DB64360.h
diff --git
a/include/configs/DB64360.h
b/include/configs/DB64360.h
index ba5adda3b1294bdd6bded03174eb0464107ac735..c3f3a2415910b0c31824f8363b6f88e2f08daf2a 100644
(file)
--- a/
include/configs/DB64360.h
+++ b/
include/configs/DB64360.h
@@
-158,7
+158,6
@@
if we use PCI it has its own MAC addr */
#define CONFIG_MPSC_PORT 0
/* to change the default ethernet port, use this define (options: 0, 1, 2) */
#define CONFIG_MPSC_PORT 0
/* to change the default ethernet port, use this define (options: 0, 1, 2) */
-#define CONFIG_NET_MULTI
#define MV_ETH_DEVS 2
/* #undef CONFIG_ETHER_PORT_MII */
#define MV_ETH_DEVS 2
/* #undef CONFIG_ETHER_PORT_MII */
@@
-202,7
+201,7
@@
ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SERIAL "No. 1"
#define CONFIG_SERVERIP 10.2.1.126
#define CONFIG_SERIAL "No. 1"
#define CONFIG_SERVERIP 10.2.1.126
-#define CONFIG_ROOTPATH
/mnt/yellow_dog_mini
+#define CONFIG_ROOTPATH
"/mnt/yellow_dog_mini"
#define CONFIG_TESTDRAMDATA y
#define CONFIG_TESTDRAMDATA y
@@
-353,8
+352,7
@@
ip=${ipaddr}:${serverip}${bootargs_end}; bootm 0x400000;\0"
#define CONFIG_SYS_INIT_RAM_LOCK
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 /* unused memory region */
#define CONFIG_SYS_INIT_RAM_SIZE 0x1000
#define CONFIG_SYS_INIT_RAM_LOCK
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 /* unused memory region */
#define CONFIG_SYS_INIT_RAM_SIZE 0x1000
-#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for init data */
-#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
#define RELOCATE_INTERNAL_RAM_ADDR
#ifdef RELOCATE_INTERNAL_RAM_ADDR
#define RELOCATE_INTERNAL_RAM_ADDR
#ifdef RELOCATE_INTERNAL_RAM_ADDR