projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
[oweals/u-boot.git]
/
include
/
configs
/
r7780mp.h
diff --git
a/include/configs/r7780mp.h
b/include/configs/r7780mp.h
index 802416f3e00eedab2ce0665df01624cf2a960493..b0655c32330098d4064774b8768c289da1725996 100644
(file)
--- a/
include/configs/r7780mp.h
+++ b/
include/configs/r7780mp.h
@@
-60,6
+60,7
@@
/* check for keypress on bootdelay==0 */
/*#define CONFIG_ZERO_BOOTDELAY_CHECK*/
/* check for keypress on bootdelay==0 */
/*#define CONFIG_ZERO_BOOTDELAY_CHECK*/
+#define CONFIG_SYS_TEXT_BASE 0x0FFC0000
#define CONFIG_SYS_SDRAM_BASE (0x08000000)
#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024)
#define CONFIG_SYS_SDRAM_BASE (0x08000000)
#define CONFIG_SYS_SDRAM_SIZE (128 * 1024 * 1024)
@@
-100,7
+101,6
@@
/* Size of DRAM reserved for malloc() use */
#define CONFIG_SYS_MALLOC_LEN (1204 * 1024)
/* Size of DRAM reserved for malloc() use */
#define CONFIG_SYS_MALLOC_LEN (1204 * 1024)
-/* size in bytes reserved for initial data */
#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
#define CONFIG_SYS_RX_ETH_BUFFER (8)
#define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
#define CONFIG_SYS_RX_ETH_BUFFER (8)
@@
-150,7
+150,6
@@
#if defined(CONFIG_CMD_NET)
/*
#if defined(CONFIG_CMD_NET)
/*
-#define CONFIG_NET_MULTI
#define CONFIG_RTL8169
*/
/* AX88796L Support(NE2000 base chip) */
#define CONFIG_RTL8169
*/
/* AX88796L Support(NE2000 base chip) */