diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:47:10 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-05 11:47:10 +0200 |
| commit | 992b402bbf3185d67750a4b3e824bc63078f80ce (patch) | |
| tree | 25d8b10bd0dbd05c6eee5fb8c130dcd035f1775b | |
| parent | 2c61f14c60ccc5a1c90205991bf555872887a831 (diff) | |
Minor fixes to PM854 board
Patch by Josef Wagner, 03 Aug 2005
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | board/pm854/Makefile | 2 | ||||
| -rw-r--r-- | include/configs/PM854.h | 28 |
3 files changed, 21 insertions, 12 deletions
diff --git a/CHANGELOG b/CHANGELOG index 48c6ef877ac..c2b601bff0c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,9 @@ Changes for U-Boot 1.1.3: ====================================================================== +* Minor fixes to PM854 board + Patch by Josef Wagner, 03 Aug 2005 + * Adjust configuration of XENIAX board (chip select and GPIO required for USB operation) diff --git a/board/pm854/Makefile b/board/pm854/Makefile index c6b4cae216f..78281660d67 100644 --- a/board/pm854/Makefile +++ b/board/pm854/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB = lib$(BOARD).a -OBJS := $(BOARD).o flash.o +OBJS := $(BOARD).o SOBJS := init.o #SOBJS := diff --git a/include/configs/PM854.h b/include/configs/PM854.h index 69e1bafcfda..b3e1f5e98ee 100644 --- a/include/configs/PM854.h +++ b/include/configs/PM854.h @@ -102,7 +102,7 @@ /* * Determine DDR configuration from I2C interface. */ - #define SPD_EEPROM_ADDRESS 0x51 /* DDR DIMM */ + #define SPD_EEPROM_ADDRESS 0x58 /* DDR DIMM */ #else /* @@ -144,6 +144,12 @@ #undef CFG_RAMBOOT #endif +#define CFG_FLASH_CFI_DRIVER +#define CFG_FLASH_CFI +#define CFG_FLASH_EMPTY_INFO + +#undef CONFIG_CLOCKS_IN_MHZ + /* * Local Bus Definitions */ @@ -251,16 +257,16 @@ #define CONFIG_MII 1 /* MII PHY management */ #define CONFIG_MPC85XX_TSEC1 1 #define CONFIG_MPC85XX_TSEC2 1 -#define TSEC1_PHY_ADDR 2 -#define TSEC2_PHY_ADDR 3 +#define TSEC1_PHY_ADDR 0 +#define TSEC2_PHY_ADDR 1 #define TSEC1_PHYIDX 0 #define TSEC2_PHYIDX 0 #define CONFIG_MPC85XX_FEC 1 -#define FEC_PHY_ADDR 1 +#define FEC_PHY_ADDR 3 #define FEC_PHYIDX 0 -#define CONFIG_ETHPRIME "MOTO ENET0" +#define CONFIG_ETHPRIME "ENET0" #define CONFIG_HAS_ETH1 1 #define CONFIG_HAS_ETH2 1 @@ -382,13 +388,13 @@ #define CONFIG_ETH2ADDR 00:40:42:01:00:02 #endif -#define CONFIG_IPADDR 192.168.0.103 -#define CONFIG_HOSTNAME PM854 -#define CONFIG_ROOTPATH /opt/eldk30/ppc_82xx -#define CONFIG_BOOTFILE uImage +#define CONFIG_ROOTPATH /opt/eldk/ppc_85xx +#define CONFIG_BOOTFILE pm854/uImage -#define CONFIG_SERVERIP 192.168.0.54 +#define CONFIG_HOSTNAME pm854 +#define CONFIG_IPADDR 192.168.0.103 +#define CONFIG_SERVERIP 192.168.0.64 #define CONFIG_GATEWAYIP 192.168.0.1 #define CONFIG_NETMASK 255.255.255.0 @@ -403,7 +409,7 @@ "netdev=eth0\0" \ "consoledev=ttyS0\0" \ "ramdiskaddr=400000\0" \ - "ramdiskfile=uRamdisk\0" + "ramdiskfile=pm854/uRamdisk\0" #define CONFIG_NFSBOOTCOMMAND \ "setenv bootargs root=/dev/nfs rw " \ |