Fix compiler warnings

diff --git a/board/flagadm/flagadm.c b/board/flagadm/flagadm.c
index 5922b61cc386805d1a28d596ef548cc972e22e7d..e467430934be020f19974c6193faeadf00676199 100644 (file)
--- a/board/flagadm/flagadm.c
+++ b/board/flagadm/flagadm.c
@@ -26,7 +26,9 @@
 
 /* ------------------------------------------------------------------------- */
 
+#if 0
 static long int dram_size (long int, long int *, long int);
+#endif
 
 /* ------------------------------------------------------------------------- */
 
@@ -99,8 +101,11 @@ long int initdram (int board_type)
        
        udelay(100);
 
-//     size_b0 = dram_size (CFG_MAMR_48_SDR_4, (ulong *)SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE);
+#if 0
+       size_b0 = dram_size (CFG_MAMR_48_SDR_4, (ulong *)SDRAM_BASE2_PRELIM, SDRAM_MAX_SIZE);
+#else
        size_b0 = 16*1024*1024;
+#endif
 
        /*
         * No bank 1
@@ -114,6 +119,7 @@ long int initdram (int board_type)
 
 /* ------------------------------------------------------------------------- */
 
+#if 0
 /*
  * Check memory range for valid RAM. A simple memory test determines
  * the actually available RAM size between addresses `base' and
@@ -163,3 +169,4 @@ static long int dram_size (long int mamr_value, long int *base, long int maxsize
     }
     return (maxsize);
 }
+#endif /* 0 */

diff --git a/board/mousse/mousse.c b/board/mousse/mousse.c
index 36810afc1854d7bbbd85ead696b50d86399852b7..9ef22fc47262048755ead5e2dcf536a73adda32e 100644 (file)
--- a/board/mousse/mousse.c
+++ b/board/mousse/mousse.c
@@ -96,8 +96,7 @@ int misc_init_f (void)
 /*
  * Initialize PCI Devices, report devices found.
  */
-int pci_init(void)
+void pci_init (bd_t *dummy)
 {
   pci_dev_init(0);
-  return 0;
 }

diff --git a/cpu/mpc8xx/cpu_init.c b/cpu/mpc8xx/cpu_init.c
index f3e0b9aaaae36fc5310fe9431375e6ca71ce53c5..ef301eacad16609ca4636440fd60af9699545649 100644 (file)
--- a/cpu/mpc8xx/cpu_init.c
+++ b/cpu/mpc8xx/cpu_init.c
@@ -44,10 +44,6 @@ cpu_init_f (volatile immap_t *immr)
     volatile   memctl8xx_t *memctl = &immr->im_memctl;
     ulong      reg;
 #endif
-#if defined(CONFIG_I2C) && defined(CFG_ALLOC_DPRAM)
-    volatile cpm8xx_t *cp = (cpm8xx_t *)&immr->im_cpm;
-    volatile iic_t *iip = (iic_t *)&cp->cp_dparam[PROFF_IIC];
-#endif
 
     /* SYPCR - contains watchdog control (11-9) */
 

diff --git a/include/config_CRAYL1.h b/include/config_CRAYL1.h
index 63c4dcc604884a158505a24b1ed4c0e1aa3c8daf..001e4c878047727acf80e579112815f88fd88157 100644 (file)
--- a/include/config_CRAYL1.h
+++ b/include/config_CRAYL1.h
@@ -34,8 +34,8 @@
  * (easy to change)
  */
 
-#define CONFIG_PPC405GP                1       /* This is a PPC405 CPU         */
-#define CONFIG_PPC405          1       /* ...member of PPC405 family   */
+#define CONFIG_405GP           1       /* This is a PPC405 CPU         */
+#define CONFIG_405             1       /* ...member of PPC405 family   */
 #define CONFIG_BOARD_PRE_INIT 1 /* setup for 405gp */
 #define CONFIG_SYS_CLK_FREQ     25000000 /* .. frequency in L1 */
 

diff --git a/include/ppcboot.h b/include/ppcboot.h
index 048e2b26264c926b61ec59b7357195d9f5a91c90..c21a29b6dcae45eff785c82b4489f8ee1069a5e6 100644 (file)
--- a/include/ppcboot.h
+++ b/include/ppcboot.h
@@ -196,7 +196,8 @@ void inline         setenv (char *, char *);
     defined (CONFIG_CPCIISER4) || \
     defined (CONFIG_OCRTC)     || \
     defined (CONFIG_DASA_SIM)  || \
-    defined (CONFIG_ERIC)
+    defined (CONFIG_ERIC)      || \
+    defined (CONFIG_MOUSSE)
 /* $(CPU)/405gp_pci.c */
 void    pci_init      (bd_t *);
 void    pciinfo       (int);
@@ -277,7 +278,6 @@ void hermes_start_lxt980 (int speed);
 
 #ifdef CONFIG_EVB64260
 void  evb64260_init(void);
-ulong get_gclk_freq(void);
 void  debug_led(int, int);
 void  display_mem_map(void);
 void  perform_soft_reset(void);
@@ -377,7 +377,9 @@ void        prt_8260_clks (void);
 #elif defined(CONFIG_8xx)      || \
       defined(CONFIG_IOP480)   || \
       defined(CONFIG_4xx)      || \
-      defined(CONFIG_CU824)
+      defined(CONFIG_CU824)    || \
+      defined(CONFIG_EVB64260) || \
+      defined(CONFIG_MOUSSE)
 ulong  get_gclk_freq (void);
 ulong get_OPB_freq (void);
 #ifdef CONFIG_4xx

diff --git a/net/bootp.c b/net/bootp.c
index 7a6d057f02aa1d39bd3c9046d13d0ed5b59467fc..6535434d2684c375449ffa239c96454cf48f1af1 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -333,7 +333,10 @@ BootpTimeout(void)
 static int DhcpExtended(u8 *e, int message_type, IPaddr_t ServerID, IPaddr_t RequestedIP)
 {
     u8 *start = e ;
-    u8 *cnt, *x;
+    u8 *cnt;
+#if (CONFIG_BOOTP_MASK & CONFIG_BOOTP_VENDOREX)
+    u8 *x;
+#endif
 
     *e++ =  99;                /* RFC1048 Magic Cookie */
     *e++ = 130;