diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-04 02:01:27 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-09-04 02:01:27 +0200 |
| commit | f60ba0d35e13e9dcf839d4563f9436d07468b1ef (patch) | |
| tree | cf469c74cf6824cb7a32c3e36ef68cc6c093cf3f | |
| parent | 6741ae92f37caea8a22d1dcfaeab356f94b64676 (diff) | |
Fix build problems on sorcery board.
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | board/sorcery/sorcery.c | 2 | ||||
| -rw-r--r-- | cpu/mpc8220/pci.c | 2 | ||||
| -rw-r--r-- | include/configs/sorcery.h | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index be18ac206c1..a288465b3b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,8 @@ Changes since U-Boot 1.1.4: ====================================================================== +* Fix build problems on sorcery board. + * Fix coldfire build problems. Patch by Marian Balakowicz, 01 Sep 2006 diff --git a/board/sorcery/sorcery.c b/board/sorcery/sorcery.c index 35d6a06084b..165e9e2999f 100644 --- a/board/sorcery/sorcery.c +++ b/board/sorcery/sorcery.c @@ -33,7 +33,7 @@ long int initdram (int board_type) size = dramSetup (); - return get_ram_size((ulong *)CFG_SDRAM_BASE, size); + return get_ram_size(CFG_SDRAM_BASE, size); } int checkboard (void) diff --git a/cpu/mpc8220/pci.c b/cpu/mpc8220/pci.c index ca4a04d21e1..4ef214e5402 100644 --- a/cpu/mpc8220/pci.c +++ b/cpu/mpc8220/pci.c @@ -170,7 +170,7 @@ pci_mpc8220_init(struct pci_controller *hose) hose->region_count = 3; hose->cfg_addr = &(xcpci->cfg_adr); - hose->cfg_data = CONFIG_PCI_CFG_BUS; + hose->cfg_data = (volatile unsigned char *)CONFIG_PCI_CFG_BUS; pci_set_ops(hose, mpc8220_pci_read_config_byte, diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h index 3d907f888c2..4937638820b 100644 --- a/include/configs/sorcery.h +++ b/include/configs/sorcery.h @@ -261,6 +261,7 @@ #define CONFIG_MPC8220_FEC 1 #define CONFIG_FEC_10MBIT 1 /* Workaround for FEC 100Mbit problem */ #define CONFIG_PHY_ADDR 0x1F +#define CONFIG_MII 1 /* * Miscellaneous configurable options |