Merge branch 'master' of git://git.denx.de/u-boot-microblaze

diff --git a/include/asm-microblaze/byteorder.h b/include/asm-microblaze/byteorder.h
index 51cacb048b6ed6078d5c716f3112c11efacce2c3..a4a75b7a6dc78d3aa850ceff6ecadd55899349d7 100644 (file)
--- a/include/asm-microblaze/byteorder.h
+++ b/include/asm-microblaze/byteorder.h
@@ -27,7 +27,9 @@
 
    I think this is a symptom of a bug in mb-gcc.  JW 20040303
 */
-static __inline__ __const__ __u16 ___arch__swab16 (__u16 half_word)
+
+
+static __inline__ __u16 ___arch__swab16 (__u16 half_word)
 {
        /* 32 bit temp to cast result, forcing clearing of high word */
        __u32 temp;

diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c
index 1a426400ecd7b29273883a04f8ef75fc43631e8f..cfed5fefcd7b958b87d41db10aa68c10167fc930 100644 (file)
--- a/lib_microblaze/board.c
+++ b/lib_microblaze/board.c
@@ -111,10 +111,6 @@ void board_init (void)
        gd = (gd_t *) CONFIG_SYS_GBL_DATA_OFFSET;
 #if defined(CONFIG_CMD_FLASH)
        ulong flash_size = 0;
-#endif
-#if defined(CONFIG_CMD_NET)
-       char *s, *e;
-       int i;
 #endif
        asm ("nop");    /* FIXME gd is not initialize - wait */
        memset ((void *)gd, 0, CONFIG_SYS_GBL_DATA_SIZE);