Fix build problems on sorcery board.

diff --git a/CHANGELOG b/CHANGELOG
index be18ac206c12a0b2407239cf288962f6a3c1ed66..a288465b3b964c94c2fbdd7351e2974bce2184ea 100644 (file)
--- 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 35d6a06084b2aba691011ae7fb055f90f2b995bf..165e9e2999fd48214efa3f4bf17f07ceae59a172 100644 (file)
--- 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 ca4a04d21e194e20f19b18e51f9dcd37406bc712..4ef214e54027768c0331161928e9a701d706a25d 100644 (file)
--- 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 3d907f888c24e9157d3270ef168a579a25938282..4937638820b94047343f50e799205921f5a27630 100644 (file)
--- 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