Commit ba999c53 authored by Wolfgang Denk's avatar Wolfgang Denk

Cleanup compile warnings. Prepare for release 1.1.5

parent f836e414
====================================================================== ======================================================================
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 * Fix compile problem in include/configs/ep82xxm.h
(must have never been tested before!) (must have never been tested before!)
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
VERSION = 1 VERSION = 1
PATCHLEVEL = 1 PATCHLEVEL = 1
SUBLEVEL = 4 SUBLEVEL = 5
EXTRAVERSION = EXTRAVERSION =
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
VERSION_FILE = $(obj)include/version_autogenerated.h VERSION_FILE = $(obj)include/version_autogenerated.h
......
...@@ -227,8 +227,6 @@ long int initdram(int board_type) ...@@ -227,8 +227,6 @@ long int initdram(int board_type)
#ifndef CFG_RAMBOOT #ifndef CFG_RAMBOOT
volatile immap_t *immap = (immap_t *)CFG_IMMR; volatile immap_t *immap = (immap_t *)CFG_IMMR;
volatile memctl8260_t *memctl = &immap->im_memctl; volatile memctl8260_t *memctl = &immap->im_memctl;
vu_char *ramaddr = (vu_char *)CFG_SDRAM_BASE;
uchar c = 0xFF;
uint psdmr = CFG_PSDMR; uint psdmr = CFG_PSDMR;
int i; int i;
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
static void miiphy_pre (char read, unsigned char addr, unsigned char reg) static void miiphy_pre (char read, unsigned char addr, unsigned char reg)
{ {
int j; /* counter */ 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); volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif #endif
...@@ -126,7 +126,7 @@ int bb_miiphy_read (char *devname, unsigned char addr, ...@@ -126,7 +126,7 @@ int bb_miiphy_read (char *devname, unsigned char addr,
{ {
short rdreg; /* register working value */ short rdreg; /* register working value */
int j; /* counter */ 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); volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif #endif
...@@ -193,7 +193,7 @@ int bb_miiphy_write (char *devname, unsigned char addr, ...@@ -193,7 +193,7 @@ int bb_miiphy_write (char *devname, unsigned char addr,
unsigned char reg, unsigned short value) unsigned char reg, unsigned short value)
{ {
int j; /* counter */ 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); volatile ioport_t *iop = ioport_addr ((immap_t *) CFG_IMMR, MDIO_PORT);
#endif #endif
......
...@@ -190,9 +190,9 @@ int checkcpu (void) ...@@ -190,9 +190,9 @@ int checkcpu (void)
uint pvr = get_pvr(); uint pvr = get_pvr();
ulong clock = gd->cpu_clk; ulong clock = gd->cpu_clk;
char buf[32]; char buf[32];
char addstr[64] = "";
#if !defined(CONFIG_IOP480) #if !defined(CONFIG_IOP480)
char addstr[64] = "";
sys_info_t sys_info; sys_info_t sys_info;
puts ("CPU: "); puts ("CPU: ");
...@@ -362,8 +362,8 @@ int checkcpu (void) ...@@ -362,8 +362,8 @@ int checkcpu (void)
#if defined(SDR0_PINSTP_SHIFT) #if defined(SDR0_PINSTP_SHIFT)
printf (" Bootstrap Option %c - ", (char)bootstrap_option() + 'A'); printf (" Bootstrap Option %c - ", (char)bootstrap_option() + 'A');
printf ("Boot ROM Location %s\n", bootstrap_str[bootstrap_option()]); printf ("Boot ROM Location %s\n", bootstrap_str[bootstrap_option()]);
#endif #endif /* SDR0_PINSTP_SHIFT */
#endif #endif /* I2C_BOOTROM */
#if defined(CONFIG_PCI) #if defined(CONFIG_PCI)
printf (" Internal PCI arbiter %sabled", pci_arbiter_enabled() ? "en" : "dis"); printf (" Internal PCI arbiter %sabled", pci_arbiter_enabled() ? "en" : "dis");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment