Cleanup compile warnings. Prepare for release 1.1.5

diff --git a/CHANGELOG b/CHANGELOG
index 6983b689314f385cc7fc15b21439ea6d0310ff9d..727a7b691d59a8f07d990f5e200473fc4f7ba3c7 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,9 @@
 ======================================================================
-Changes since U-Boot 1.1.4:
+Changes for U-Boot 1.1.5:
 ======================================================================
 
+* Cleanup compile warnings. Prepare for release 1.1.5
+
 * Fix compile problem in include/configs/ep82xxm.h
   (must have never been tested before!)
 

diff --git a/Makefile b/Makefile
index 37769d40cc5e5e2e2c4b8d2627fc3bd89dfbc1a1..92034947962ad328dbf1fdba3042f4868aaa5017 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
 
 VERSION = 1
 PATCHLEVEL = 1
-SUBLEVEL = 4
+SUBLEVEL = 5
 EXTRAVERSION =
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 VERSION_FILE = $(obj)include/version_autogenerated.h

diff --git a/board/ep82xxm/ep82xxm.c b/board/ep82xxm/ep82xxm.c
index 35e644df8c30b4138f43451911c71d13a951fa94..fe3f78e7380b270793260cac24301f98f3ba49f7 100644 (file)
--- a/board/ep82xxm/ep82xxm.c
+++ b/board/ep82xxm/ep82xxm.c
@@ -227,8 +227,6 @@ long int initdram(int board_type)
 #ifndef CFG_RAMBOOT
        volatile immap_t *immap = (immap_t *)CFG_IMMR;
        volatile memctl8260_t *memctl = &immap->im_memctl;
-       vu_char *ramaddr = (vu_char *)CFG_SDRAM_BASE;
-       uchar c = 0xFF;
        uint psdmr = CFG_PSDMR;
        int i;
 

diff --git a/common/miiphybb.c b/common/miiphybb.c
index adb697ca6bd0fa86e57ea87ad715e15f91922ce7..537c15d29b85e8bb226c050a3bbab10c70692ce0 100644 (file)
--- a/common/miiphybb.c
+++ b/common/miiphybb.c
@@ -41,7 +41,7 @@
 static void miiphy_pre (char read, unsigned char addr, unsigned char reg)
 {
        int j;                  /* counter */
-#ifndef CONFIG_EP8248
+#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
        volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
 #endif
 
@@ -126,7 +126,7 @@ int bb_miiphy_read (char *devname, unsigned char addr,
 {
        short rdreg;            /* register working value */
        int j;                  /* counter */
-#ifndef CONFIG_EP8248
+#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
        volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
 #endif
 
@@ -193,7 +193,7 @@ int bb_miiphy_write (char *devname, unsigned char addr,
                unsigned char reg, unsigned short value)
 {
        int j;                  /* counter */
-#ifndef CONFIG_EP8248
+#if !(defined(CONFIG_EP8248) || defined(CONFIG_EP82XXM))
        volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
 #endif
 

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 6badfb1b24993d4a662b8a9c358f888e0c6dd60d..f4a7208c8f3d4e32b80e7e819ce57e2aef9d937e 100644 (file)
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -190,9 +190,9 @@ int checkcpu (void)
        uint pvr = get_pvr();
        ulong clock = gd->cpu_clk;
        char buf[32];
-       char addstr[64] = "";
 
 #if !defined(CONFIG_IOP480)
+       char addstr[64] = "";
        sys_info_t sys_info;
 
        puts ("CPU:   ");
@@ -362,8 +362,8 @@ int checkcpu (void)
 #if defined(SDR0_PINSTP_SHIFT)
        printf ("       Bootstrap Option %c - ", (char)bootstrap_option() + 'A');
        printf ("Boot ROM Location %s\n", bootstrap_str[bootstrap_option()]);
-#endif
-#endif
+#endif /* SDR0_PINSTP_SHIFT */
+#endif /* I2C_BOOTROM */
 
 #if defined(CONFIG_PCI)
        printf ("       Internal PCI arbiter %sabled", pci_arbiter_enabled() ? "en" : "dis");