From: Wolfgang Denk <wd@pollux.denx.de>
Date: Mon, 4 Sep 2006 00:01:27 +0000 (+0200)
Subject: Fix build problems on sorcery board.
X-Git-Tag: U-Boot-1_1_5~40
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f60ba0d35e13e9dcf839d4563f9436d07468b1ef;p=oweals%2Fu-boot.git

Fix build problems on sorcery board.
---

diff --git a/CHANGELOG b/CHANGELOG
index be18ac206c..a288465b3b 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 35d6a06084..165e9e2999 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 ca4a04d21e..4ef214e540 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 3d907f888c..4937638820 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