Fix AMCC bamboo eval board compilation errors.

diff --git a/CHANGELOG b/CHANGELOG
index afd34f17be6bc516f895a4b12e51dec1bbd7c902..c873c8ec89a103a9ffb04908c6d77fd990d9bb85 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Fix AMCC bamboo eval board compilation errors.
+
 * Add system memory to the PCI region list for AMCC PPC44x CPUs.
   Enabled it for Yucca board.
 

diff --git a/board/amcc/bamboo/bamboo.c b/board/amcc/bamboo/bamboo.c
index 7c989200fe18f0a5500ec79989eee6fc0103ccdf..c93ba6e3ca10002b87ae2711915400dfef0e853f 100644 (file)
--- a/board/amcc/bamboo/bamboo.c
+++ b/board/amcc/bamboo/bamboo.c
@@ -435,7 +435,7 @@ long int initdram (int board_type)
         */
        init_spd_array();
 
-       dram_size = spd_sdram (0);
+       dram_size = spd_sdram();
 
        return dram_size;
 }

diff --git a/board/amcc/bamboo/bamboo.h b/board/amcc/bamboo/bamboo.h
index 5f5fcde825e0bafab252d2b8faa592211f81a177..1ce6366da4a8a58fe55cebcb84b4638922a462f2 100644 (file)
--- a/board/amcc/bamboo/bamboo.h
+++ b/board/amcc/bamboo/bamboo.h
@@ -283,10 +283,8 @@
 /*----------------------------------------------------------------------------+
   | PPC440EP GPIOs addresses.
   +----------------------------------------------------------------------------*/
-#define GPIO0_BASE      0xEF600B00
 #define GPIO0_REAL      0xEF600B00
 
-#define GPIO1_BASE      0xEF600C00
 #define GPIO1_REAL      0xEF600C00
 
 /* Offsets */
@@ -331,17 +329,6 @@
 #define GPIO_IS3(x)    (x+GPIOx_IS3L)   /* GPIO Input register3 High or Low */
 
 
-/*----------------------------------------------------------------------------+
-  | Declare Configuration values
-  +----------------------------------------------------------------------------*/
-typedef enum gpio_select { GPIO_SEL, GPIO_ALT1, GPIO_ALT2, GPIO_ALT3 } gpio_select_t;
-typedef enum gpio_driver { GPIO_DIS, GPIO_IN, GPIO_OUT, GPIO_BI } gpio_driver_t;
-
-typedef struct { unsigned long add;    /* gpio core base address */
-       gpio_driver_t  in_out; /* Driver Setting */
-       gpio_select_t  alt_nb; /* Selected Alternate */
-} gpio_param_s;
-
 /*----------------------------------------------------------------------------+
   |                    XX     XX
   |