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
/
AP1000.h
diff --git
a/include/configs/AP1000.h
b/include/configs/AP1000.h
index ffaab796186b4ac939a0e177e94da39f83afc098..09cfef6575cbb4e96edeff1fca88791b87093e33 100644
(file)
--- a/
include/configs/AP1000.h
+++ b/
include/configs/AP1000.h
@@
-33,12
+33,12
@@
* run from RAM instead of Flash.
*/
#define CONFIG_SYS_TEXT_BASE 0x08000000
* run from RAM instead of Flash.
*/
#define CONFIG_SYS_TEXT_BASE 0x08000000
+#define CONFIG_SYS_LDSCRIPT "board/amirix/ap1000/u-boot.lds"
#define CONFIG_PCI 1
#define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */
#define CONFIG_SYS_PROMPT "0> "
#define CONFIG_PCI 1
#define CONFIG_SYS_HUSH_PARSER 1 /* use "hush" command parser */
#define CONFIG_SYS_PROMPT "0> "
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_COMMAND_EDIT 1
#define CONFIG_COMPLETE_ADDRESSES 1
#define CONFIG_COMMAND_EDIT 1
#define CONFIG_COMPLETE_ADDRESSES 1
@@
-238,7
+238,6
@@
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#define CONFIG_SYS_JFFS2_FIRST_SECTOR 1
#define CONFIG_SYS_JFFS2_NUM_BANKS 1
#define CONFIG_SYS_JFFS2_FIRST_SECTOR 1
-#define CONFIG_NET_MULTI
#define CONFIG_E1000
#define CONFIG_SYS_ETH_DEV_FN 0x0800
#define CONFIG_E1000
#define CONFIG_SYS_ETH_DEV_FN 0x0800