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 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
[oweals/u-boot.git]
/
include
/
configs
/
MPC8323ERDB.h
diff --git
a/include/configs/MPC8323ERDB.h
b/include/configs/MPC8323ERDB.h
index 94c4c6b040e78570c250dfd55794c8838d8cde24..1ae5bae7c0f29ef6cf982160838f3dd1e4a9164c 100644
(file)
--- a/
include/configs/MPC8323ERDB.h
+++ b/
include/configs/MPC8323ERDB.h
@@
-155,7
+155,7
@@
#undef CFG_RAMBOOT
#endif
#undef CFG_RAMBOOT
#endif
-/* CFG_MONITOR_LEN must be a multiple of C
F
G_ENV_SECT_SIZE */
+/* CFG_MONITOR_LEN must be a multiple of C
ONFI
G_ENV_SECT_SIZE */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
#define CFG_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
#define CFG_MALLOC_LEN (128 * 1024) /* Reserved for malloc */
@@
-178,9
+178,10
@@
* FLASH on the Local Bus
*/
#define CFG_FLASH_CFI /* use the Common Flash Interface */
* FLASH on the Local Bus
*/
#define CFG_FLASH_CFI /* use the Common Flash Interface */
-#define C
FG_FLASH_CFI_DRIVER
/* use the CFI driver */
+#define C
ONFIG_FLASH_CFI_DRIVER
/* use the CFI driver */
#define CFG_FLASH_BASE 0xFE000000 /* FLASH base address */
#define CFG_FLASH_SIZE 16 /* FLASH size is 16M */
#define CFG_FLASH_BASE 0xFE000000 /* FLASH base address */
#define CFG_FLASH_SIZE 16 /* FLASH size is 16M */
+#define CFG_FLASH_PROTECTION 1 /* Use h/w Flash protection. */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE /* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000018 /* 32MB window size */
#define CFG_LBLAWBAR0_PRELIM CFG_FLASH_BASE /* Window base at flash base */
#define CFG_LBLAWAR0_PRELIM 0x80000018 /* 32MB window size */
@@
-323,8
+324,11
@@
/*
* Config on-board EEPROM
*/
/*
* Config on-board EEPROM
*/
-#define CFG_I2C_EEPROM_ADDR 0x50
-#define CFG_I2C_EEPROM_ADDR_LEN 2
+#define CFG_I2C_EEPROM_ADDR 0x50
+#define CFG_I2C_EEPROM_ADDR_LEN 2
+#define CFG_EEPROM_PAGE_WRITE_BITS 6
+#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10
+#define CFG_EEPROM_PAGE_WRITE_ENABLE
/*
* General PCI
/*
* General PCI
@@
-341,7
+345,7
@@
#define CFG_PCI1_IO_SIZE 0x04000000 /* 64M */
#ifdef CONFIG_PCI
#define CFG_PCI1_IO_SIZE 0x04000000 /* 64M */
#ifdef CONFIG_PCI
-
+#define CONFIG_PCI_SKIP_HOST_BRIDGE
#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
#define CONFIG_NET_MULTI
#define CONFIG_PCI_PNP /* do pci plug-and-play */
@@
-388,15
+392,15
@@
* Environment
*/
#ifndef CFG_RAMBOOT
* Environment
*/
#ifndef CFG_RAMBOOT
- #define C
FG_ENV_IS_IN_FLASH
1
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
- #define C
FG_ENV_SECT_SIZE
0x20000
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_IS_IN_FLASH
1
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+ #define C
ONFIG_ENV_SECT_SIZE
0x20000
+ #define C
ONFIG_ENV_SIZE
0x2000
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
#else
#define CFG_NO_FLASH 1 /* Flash is not usable now */
- #define C
FG_ENV_IS_NOWHERE
1 /* Store ENV in memory only */
- #define C
FG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
- #define C
FG_ENV_SIZE
0x2000
+ #define C
ONFIG_ENV_IS_NOWHERE
1 /* Store ENV in memory only */
+ #define C
ONFIG_ENV_ADDR
(CFG_MONITOR_BASE - 0x1000)
+ #define C
ONFIG_ENV_SIZE
0x2000
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#endif
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
@@
-465,6
+469,7
@@
/*
* MMU Setup
*/
/*
* MMU Setup
*/
+#define CONFIG_HIGH_BATS 1 /* High BATs supported */
/* DDR: cache cacheable */
#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
/* DDR: cache cacheable */
#define CFG_IBAT0L (CFG_SDRAM_BASE | BATL_PP_10 | BATL_MEMCOHERENCE)
@@
-549,6
+554,9
@@
#define CONFIG_HAS_ETH1 /* add support for "eth1addr" */
#define CONFIG_ETH1ADDR 00:04:9f:ef:03:02
#define CONFIG_HAS_ETH1 /* add support for "eth1addr" */
#define CONFIG_ETH1ADDR 00:04:9f:ef:03:02
+/* use mac_read_from_eeprom() to read ethaddr from I2C EEPROM (see CFG_I2C_EEPROM) */
+#define CFG_I2C_MAC_OFFSET 0x7f00 /* MAC address offset in I2C EEPROM */
+
#define CONFIG_IPADDR 10.0.0.2
#define CONFIG_SERVERIP 10.0.0.1
#define CONFIG_GATEWAYIP 10.0.0.1
#define CONFIG_IPADDR 10.0.0.2
#define CONFIG_SERVERIP 10.0.0.1
#define CONFIG_GATEWAYIP 10.0.0.1
@@
-562,8
+570,8
@@
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc832x_rdb.dtb
#define CONFIG_UBOOTPATH u-boot.bin /* U-Boot image on TFTP server */
#define CONFIG_FDTFILE mpc832x_rdb.dtb
-#define CONFIG_LOADADDR
2
00000 /* default location for tftp and bootm */
-#define CONFIG_BOOTDELAY
-1
/* -1 disables auto-boot */
+#define CONFIG_LOADADDR
5
00000 /* default location for tftp and bootm */
+#define CONFIG_BOOTDELAY
6
/* -1 disables auto-boot */
#define CONFIG_BAUDRATE 115200
#define XMK_STR(x) #x
#define CONFIG_BAUDRATE 115200
#define XMK_STR(x) #x