projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8xxx: Second UART port added for MPC85xx, MPC83xx, MPC86xx processors
[oweals/u-boot.git]
/
include
/
configs
/
actux3.h
diff --git
a/include/configs/actux3.h
b/include/configs/actux3.h
index fc2d02fc39bdc58d9c767006643fba6621dc26fa..f5ee8991023d3d4b0e8b9720149efb43c2960f4b 100644
(file)
--- a/
include/configs/actux3.h
+++ b/
include/configs/actux3.h
@@
-32,7
+32,8
@@
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
-#define CFG_IXP425_CONSOLE IXP425_UART2
+#define CONFIG_IXP_SERIAL
+#define CONFIG_SYS_IXP425_CONSOLE IXP425_UART2
#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTDELAY 3
#define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */
@@
-43,9
+44,9
@@
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
#undef CONFIG_USE_IRQ
/* Size of malloc() pool */
-#define C
FG_MALLOC_LEN
(CONFIG_ENV_SIZE + 128*1024)
+#define C
ONFIG_SYS_MALLOC_LEN
(CONFIG_ENV_SIZE + 128*1024)
/* size in bytes reserved for initial data */
/* size in bytes reserved for initial data */
-#define C
FG_GBL_DATA_SIZE
128
+#define C
ONFIG_SYS_GBL_DATA_SIZE
128
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-69,30
+70,28
@@
#endif
/* Miscellaneous configurable options */
#endif
/* Miscellaneous configurable options */
-#define C
FG
_LONGHELP
-#define C
FG_PROMPT
"=> "
+#define C
ONFIG_SYS
_LONGHELP
+#define C
ONFIG_SYS_PROMPT
"=> "
/* Console I/O Buffer Size */
/* Console I/O Buffer Size */
-#define C
FG_CBSIZE
256
+#define C
ONFIG_SYS_CBSIZE
256
/* Print Buffer Size */
/* Print Buffer Size */
-#define C
FG_PBSIZE (CFG_CBSIZE+sizeof(CFG
_PROMPT)+16)
+#define C
ONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS
_PROMPT)+16)
/* max number of command args */
/* max number of command args */
-#define C
FG_MAXARGS
16
+#define C
ONFIG_SYS_MAXARGS
16
/* Boot Argument Buffer Size */
/* Boot Argument Buffer Size */
-#define C
FG_BARGSIZE CFG
_CBSIZE
+#define C
ONFIG_SYS_BARGSIZE CONFIG_SYS
_CBSIZE
-#define C
FG_MEMTEST_START
0x00400000
-#define C
FG_MEMTEST_END
0x00800000
+#define C
ONFIG_SYS_MEMTEST_START
0x00400000
+#define C
ONFIG_SYS_MEMTEST_END
0x00800000
-/* everything, incl board info, in Hz */
-#undef CFG_CLKS_IN_HZ
/* spec says 66.666 MHz, but it appears to be 33 */
/* spec says 66.666 MHz, but it appears to be 33 */
-#define C
FG_HZ
3333333
+#define C
ONFIG_SYS_HZ
3333333
/* default load address */
/* default load address */
-#define C
FG_LOAD_ADDR
0x00010000
+#define C
ONFIG_SYS_LOAD_ADDR
0x00010000
/* valid baudrates */
/* valid baudrates */
-#define C
FG_BAUDRATE_TABLE
{ 9600, 19200, 38400, 57600, \
+#define C
ONFIG_SYS_BAUDRATE_TABLE
{ 9600, 19200, 38400, 57600, \
115200, 230400 }
#define CONFIG_SERIAL_RTS_ACTIVE 1
115200, 230400 }
#define CONFIG_SERIAL_RTS_ACTIVE 1
@@
-108,46
+107,44
@@
#endif
/* Expansion bus settings */
#endif
/* Expansion bus settings */
-#define C
FG_EXP_CS0
0xbd113442
+#define C
ONFIG_SYS_EXP_CS0
0xbd113442
/* SDRAM settings */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM_1 0x00000000
/* SDRAM settings */
#define CONFIG_NR_DRAM_BANKS 1
#define PHYS_SDRAM_1 0x00000000
-#define C
FG_DRAM_BASE
0x00000000
+#define C
ONFIG_SYS_DRAM_BASE
0x00000000
/* 16MB SDRAM */
/* 16MB SDRAM */
-#define C
FG_SDR_CONFIG
0x3A
+#define C
ONFIG_SYS_SDR_CONFIG
0x3A
#define PHYS_SDRAM_1_SIZE 0x01000000
#define PHYS_SDRAM_1_SIZE 0x01000000
-#define C
FG_SDRAM_REFRESH_CNT
0x81a
-#define C
FG_SDR_MODE_CONFIG
0x1
-#define C
FG_DRAM_SIZE
0x01000000
+#define C
ONFIG_SYS_SDRAM_REFRESH_CNT
0x81a
+#define C
ONFIG_SYS_SDR_MODE_CONFIG
0x1
+#define C
ONFIG_SYS_DRAM_SIZE
0x01000000
/* FLASH organization */
/* FLASH organization */
-#define C
FG_MAX_FLASH_BANKS
1
+#define C
ONFIG_SYS_MAX_FLASH_BANKS
1
/* max number of sectors on one chip */
/* max number of sectors on one chip */
-#define C
FG_MAX_FLASH_SECT
140
+#define C
ONFIG_SYS_MAX_FLASH_SECT
140
#define PHYS_FLASH_1 0x50000000
#define PHYS_FLASH_1 0x50000000
-#define C
FG_FLASH_BANKS_LIST
{ PHYS_FLASH_1 }
+#define C
ONFIG_SYS_FLASH_BANKS_LIST
{ PHYS_FLASH_1 }
-#define C
FG_FLASH_BASE
PHYS_FLASH_1
-#define C
FG_MONITOR_BASE
PHYS_FLASH_1
-#define C
FG_MONITOR_LEN
(256 << 10)
+#define C
ONFIG_SYS_FLASH_BASE
PHYS_FLASH_1
+#define C
ONFIG_SYS_MONITOR_BASE
PHYS_FLASH_1
+#define C
ONFIG_SYS_MONITOR_LEN
(256 << 10)
/* Use common CFI driver */
/* Use common CFI driver */
-#define C
FG
_FLASH_CFI
+#define C
ONFIG_SYS
_FLASH_CFI
#define CONFIG_FLASH_CFI_DRIVER
/* no byte writes on IXP4xx */
#define CONFIG_FLASH_CFI_DRIVER
/* no byte writes on IXP4xx */
-#define C
FG_FLASH_CFI_WIDTH
FLASH_CFI_16BIT
+#define C
ONFIG_SYS_FLASH_CFI_WIDTH
FLASH_CFI_16BIT
/* print 'E' for empty sector on flinfo */
/* print 'E' for empty sector on flinfo */
-#define C
FG
_FLASH_EMPTY_INFO
+#define C
ONFIG_SYS
_FLASH_EMPTY_INFO
/* Ethernet */
/* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1
/* Ethernet */
/* include IXP4xx NPE support */
#define CONFIG_IXP4XX_NPE 1
-/* use separate flash sector with ucode images */
-#define CONFIG_IXP4XX_NPE_EXT_UCODE_BASE 0x50040000
#define CONFIG_NET_MULTI 1
/* NPE0 PHY address */
#define CONFIG_NET_MULTI 1
/* NPE0 PHY address */
@@
-155,7
+152,7
@@
/* MII PHY management */
#define CONFIG_MII 1
/* Number of ethernet rx buffers & descriptors */
/* MII PHY management */
#define CONFIG_MII 1
/* Number of ethernet rx buffers & descriptors */
-#define C
FG_RX_ETH_BUFFER
16
+#define C
ONFIG_SYS_RX_ETH_BUFFER
16
#define CONFIG_RESET_PHY_R 1
/* ethernet switch connected to MII port */
#define CONFIG_MII_ETHSWITCH 1
#define CONFIG_RESET_PHY_R 1
/* ethernet switch connected to MII port */
#define CONFIG_MII_ETHSWITCH 1
@@
-173,7
+170,7
@@
#define CONFIG_BOOTP_HOSTNAME
/* Cache Configuration */
#define CONFIG_BOOTP_HOSTNAME
/* Cache Configuration */
-#define C
FG_CACHELINE_SIZE
32
+#define C
ONFIG_SYS_CACHELINE_SIZE
32
/*
* environment organization:
/*
* environment organization:
@@
-182,9
+179,10
@@
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000)
#define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SIZE 0x2000
#define CONFIG_ENV_ADDR (PHYS_FLASH_1 + 0x4000)
-#define C
FG_USE_PPCENV
1
+#define C
ONFIG_SYS_USE_PPCENV
1
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CONFIG_EXTRA_ENV_SETTINGS \
+ "npe_ucode=50040000\0" \
"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
"kerneladdr=50050000\0" \
"rootaddr=50170000\0" \
"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
"kerneladdr=50050000\0" \
"rootaddr=50170000\0" \