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
33a7494
..
de29eb9
100644
(file)
--- a/
include/configs/actux1.h
+++ b/
include/configs/actux1.h
@@
-26,35
+26,29
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-/* 1: modified board with 32MB DRAM */
-#define CONFIG_ACTUX1_32MB 0
-/* 1: 2*2MB FLASH (standard) */
-#define CONFIG_ACTUX1_FLASH2X2 1
-/* 1: 1*8MB FLASH (upgraded boards) */
-#define CONFIG_ACTUX1_FLASH1X8 0
-
#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
-#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 */
+#define CONFIG_BOARD_EARLY_INIT_F 1
+#define CONFIG_SYS_LDSCRIPT "board/actux1/u-boot.lds"
/***************************************************************
* U-boot generic defines start here.
***************************************************************/
/***************************************************************
* U-boot generic defines start here.
***************************************************************/
-#undef CONFIG_USE_IRQ
-
/*
* Size of malloc() pool
*/
/*
* Size of malloc() pool
*/
-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
-/* size in bytes reserved for initial data */
-#define CFG_GBL_DATA_SIZE 128
+#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* allow to overwrite serial and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-63,8
+57,13
@@
#include <config_cmd_default.h>
#define CONFIG_CMD_ELF
#include <config_cmd_default.h>
#define CONFIG_CMD_ELF
-#undef CONFIG_CMD_PCI
-#undef CONFIG_PCI
+#ifdef CONFIG_PCI
+#define CONFIG_CMD_PCI
+#define CONFIG_PCI_PNP
+#define CONFIG_IXP_PCI
+#define CONFIG_PCI_SCAN_SHOW
+#define CONFIG_CMD_PCI_ENUM
+#endif
#define CONFIG_BOOTCOMMAND "run boot_flash"
/* enable passing of ATAGs */
#define CONFIG_BOOTCOMMAND "run boot_flash"
/* enable passing of ATAGs */
@@
-80,109
+79,101
@@
#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 */
-#define CFG_HZ 3333333
+/* timer clock - 2* OSC_IN system clock */
+#define CONFIG_IXP425_TIMER_CLK 66666666
+#define CONFIG_SYS_HZ 1000
/* 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
-/*
- * Stack sizes
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE (128*1024) /* regular stack */
-#ifdef CONFIG_USE_IRQ
-# define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
-# define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
-#endif
-
/* Expansion bus settings */
/* Expansion bus settings */
-#define C
FG_EXP_CS0
0xbd113842
+#define C
ONFIG_SYS_EXP_CS0
0xbd113842
/* 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_S
DRAM_BASE 0x00000000
-#if
CONFIG_ACTUX1
_32MB
-# define C
FG_SDR_CONFIG
0x18
+#if
def CONFIG_RAM
_32MB
+# define C
ONFIG_SYS_SDR_CONFIG
0x18
# define PHYS_SDRAM_1_SIZE 0x02000000
# define PHYS_SDRAM_1_SIZE 0x02000000
-# define C
FG_SDRAM_REFRESH_CNT
0x81a
-# define C
FG_SDR_MODE_CONFIG
0x1
-# define C
FG_DRAM_SIZE
0x02000000
+# define C
ONFIG_SYS_SDRAM_REFRESH_CNT
0x81a
+# define C
ONFIG_SYS_SDR_MODE_CONFIG
0x1
+# define C
ONFIG_SYS_DRAM_SIZE
0x02000000
#else /* 16MB SDRAM */
#else /* 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
#endif
/* FLASH organization */
#endif
/* FLASH organization */
-#if CONFIG_ACTUX1_FLASH2X2
-# define CFG_MAX_FLASH_BANKS 2
+#define CONFIG_SYS_TEXT_BASE 0x50000000
+#ifdef CONFIG_FLASH2X2
+# define CONFIG_SYS_MAX_FLASH_BANKS 2
/* max number of sectors on one chip */
/* max number of sectors on one chip */
-# define C
FG_MAX_FLASH_SECT
40
+# define C
ONFIG_SYS_MAX_FLASH_SECT
40
# define PHYS_FLASH_1 0x50000000
# define PHYS_FLASH_2 0x50200000
# define PHYS_FLASH_1 0x50000000
# define PHYS_FLASH_2 0x50200000
-# define C
FG_FLASH_BANKS_LIST
{ PHYS_FLASH_1, PHYS_FLASH_2 }
+# define C
ONFIG_SYS_FLASH_BANKS_LIST
{ PHYS_FLASH_1, PHYS_FLASH_2 }
#endif
#endif
-#if
CONFIG_ACTUX1
_FLASH1X8
-# define C
FG_MAX_FLASH_BANKS
1
+#if
def CONFIG
_FLASH1X8
+# 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 }
#endif
#endif
-#define CFG_FLASH_BASE PHYS_FLASH_1
-#define CFG_MONITOR_BASE PHYS_FLASH_1
-#define CFG_MONITOR_LEN (256 << 10)
+#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1
+#define CONFIG_SYS_MONITOR_BASE PHYS_FLASH_1
+#define CONFIG_SYS_MONITOR_LEN (256 << 10)
+#define CONFIG_BOARD_SIZE_LIMIT 262144
/* 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_PHY_ADDR 0
/* NPE0 PHY address */
#define CONFIG_PHY_ADDR 0
+/* NPE1 PHY address (HW Release E only) */
+#define CONFIG_PHY1_ADDR 1
/* 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
#define CONFIG_RESET_PHY_R 1
+#define CONFIG_HAS_ETH1 1
+
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_NET
#define CONFIG_CMD_MII
#define CONFIG_CMD_DHCP
#define CONFIG_CMD_NET
#define CONFIG_CMD_MII
@@
-196,27
+187,30
@@
#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:
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
/*
* environment organization:
* one flash sector, embedded in uboot area (bottom bootblock flash)
*/
-#define C
FG_ENV_IS_IN_FLASH
1
-#define C
FG_ENV_SIZE
0x2000
-#define C
FG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
-#define C
FG_USE_PPCENV
1
+#define C
ONFIG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_SIZE
0x2000
+#define C
ONFIG_ENV_ADDR
(PHYS_FLASH_1 + 0x4000)
+#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" \
"mtd=IXP4XX-Flash.0:256k(uboot),64k(ucode),1152k(linux),-(root)\0" \
"kerneladdr=50050000\0" \
+ "kernelfile=actux1/uImage\0" \
+ "rootfile=actux1/rootfs\0" \
"rootaddr=50170000\0" \
"loadaddr=10000\0" \
"updateboot_ser=mw.b 10000 ff 40000;" \
" loady ${loadaddr};" \
" run eraseboot writeboot\0" \
"updateboot_net=mw.b 10000 ff 40000;" \
"rootaddr=50170000\0" \
"loadaddr=10000\0" \
"updateboot_ser=mw.b 10000 ff 40000;" \
" loady ${loadaddr};" \
" run eraseboot writeboot\0" \
"updateboot_net=mw.b 10000 ff 40000;" \
- " tftp ${loadaddr}
u-boot.bin;"
\
+ " tftp ${loadaddr}
actux1/u-boot.bin;"
\
" run eraseboot writeboot\0" \
"eraseboot=protect off 50000000 50003fff;" \
" protect off 50006000 5003ffff;" \
" run eraseboot writeboot\0" \
"eraseboot=protect off 50000000 50003fff;" \
" protect off 50006000 5003ffff;" \
@@
-224,8
+218,9
@@
" erase 50006000 5003ffff\0" \
"writeboot=cp.b 10000 50000000 4000;" \
" cp.b 16000 50006000 3a000\0" \
" erase 50006000 5003ffff\0" \
"writeboot=cp.b 10000 50000000 4000;" \
" cp.b 16000 50006000 3a000\0" \
- "eraseenv=protect off 50004000 50005fff;" \
- " erase 50004000 50005fff\0" \
+ "updateucode=loady;" \
+ " era ${npe_ucode} +${filesize};" \
+ " cp.b ${loadaddr} ${npe_ucode} ${filesize}\0" \
"updateroot=tftp ${loadaddr} ${rootfile};" \
" era ${rootaddr} +${filesize};" \
" cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \
"updateroot=tftp ${loadaddr} ${rootfile};" \
" era ${rootaddr} +${filesize};" \
" cp.b ${loadaddr} ${rootaddr} ${filesize}\0" \
@@
-236,7
+231,7
@@
" rootfstype=squashfs,jffs2 init=/etc/preinit\0" \
"netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \
" rootfstype=squashfs,jffs2 init=/etc/preinit\0" \
" rootfstype=squashfs,jffs2 init=/etc/preinit\0" \
"netargs=setenv bootargs mtdparts=${mtd} root=/dev/mtdblock3" \
" rootfstype=squashfs,jffs2 init=/etc/preinit\0" \
- "addtty=setenv bootargs ${bootargs} console=ttyS
0
,${baudrate}\0" \
+ "addtty=setenv bootargs ${bootargs} console=ttyS
1
,${baudrate}\0" \
"addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \
"boot_flash=run flashargs addtty addeth;" \
" bootm ${kerneladdr}\0" \
"addeth=setenv bootargs ${bootargs} ethaddr=${ethaddr}\0" \
"boot_flash=run flashargs addtty addeth;" \
" bootm ${kerneladdr}\0" \
@@
-244,4
+239,8
@@
" tftpboot ${loadaddr} ${kernelfile};" \
" bootm\0"
" tftpboot ${loadaddr} ${kernelfile};" \
" bootm\0"
+/* additions for new relocation code, must be added to all boards */
+#define CONFIG_SYS_INIT_SP_ADDR \
+ (CONFIG_SYS_SDRAM_BASE + 0x1000 - GENERATED_GBL_DATA_SIZE)
+
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */