projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'u-boot-atmel/master'
[platform/kernel/u-boot.git]
/
include
/
configs
/
actux1.h
diff --git
a/include/configs/actux1.h
b/include/configs/actux1.h
index
160c10a
..
de29eb9
100644
(file)
--- a/
include/configs/actux1.h
+++ b/
include/configs/actux1.h
@@
-29,6
+29,8
@@
#define CONFIG_IXP425 1
#define CONFIG_ACTUX1 1
#define CONFIG_IXP425 1
#define CONFIG_ACTUX1 1
+#define CONFIG_MACH_TYPE 1479
+
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
@@
-103,12
+105,6
@@
115200, 230400 }
#define CONFIG_SERIAL_RTS_ACTIVE 1
115200, 230400 }
#define CONFIG_SERIAL_RTS_ACTIVE 1
-/*
- * Stack sizes
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-
/* Expansion bus settings */
#define CONFIG_SYS_EXP_CS0 0xbd113842
/* Expansion bus settings */
#define CONFIG_SYS_EXP_CS0 0xbd113842
@@
-131,8
+127,6
@@
# define CONFIG_SYS_DRAM_SIZE 0x01000000
#endif
# define CONFIG_SYS_DRAM_SIZE 0x01000000
#endif
-
-
/* FLASH organization */
#define CONFIG_SYS_TEXT_BASE 0x50000000
#ifdef CONFIG_FLASH2X2
/* FLASH organization */
#define CONFIG_SYS_TEXT_BASE 0x50000000
#ifdef CONFIG_FLASH2X2
@@
-168,7
+162,6
@@
/* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1
/* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1
-#define CONFIG_NET_MULTI 1
/* NPE0 PHY address */
#define CONFIG_PHY_ADDR 0
/* NPE1 PHY address (HW Release E only) */
/* NPE0 PHY address */
#define CONFIG_PHY_ADDR 0
/* NPE1 PHY address (HW Release E only) */