diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-17 23:04:07 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-17 23:04:07 +0200 |
| commit | f889cedfadb20eb54fd05714f3770cad072bdf19 (patch) | |
| tree | c9aad0bfc19ba424e639f5b4e2a28d8ff05faa65 | |
| parent | 569460ebf14b87bd8fdb2352bde95d35ee96e13b (diff) | |
| parent | 292ed489dba8cc97b458579003a8001cd4703cd8 (diff) | |
| download | u-boot-imx-f889cedfadb20eb54fd05714f3770cad072bdf19.zip u-boot-imx-f889cedfadb20eb54fd05714f3770cad072bdf19.tar.gz u-boot-imx-f889cedfadb20eb54fd05714f3770cad072bdf19.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
| -rw-r--r-- | include/asm-microblaze/byteorder.h | 4 | ||||
| -rw-r--r-- | lib_microblaze/board.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/asm-microblaze/byteorder.h b/include/asm-microblaze/byteorder.h index 51cacb0..a4a75b7 100644 --- 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 1a42640..cfed5fe 100644 --- a/lib_microblaze/board.c +++ b/lib_microblaze/board.c @@ -112,10 +112,6 @@ void board_init (void) #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); gd->bd = (bd_t *) (gd + 1); /* At end of global data */ |