diff options
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | examples/standalone/smc91111_eeprom.c | 2 | ||||
| -rw-r--r-- | examples/standalone/smc911x_eeprom.c | 8 | ||||
| -rw-r--r-- | include/asm-microblaze/unaligned.h | 16 | ||||
| -rw-r--r-- | lib_microblaze/board.c | 1 |
6 files changed, 21 insertions, 13 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3879fde425..e8ba4bc134 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -697,7 +697,7 @@ Stefan Roese <sr@denx.de> Alessandro Rubini <rubini@unipv.it> Nomadik Linux Team <STN_WMM_nomadik_linux@list.st.com> - nmdk8815 ARM926EJS (Nomadik 8815 Soc) + nhk8815 ARM926EJS (Nomadik 8815 Soc) Steve Sakoman <sakoman@gmail.com> @@ -398,8 +398,11 @@ updater: env: $(MAKE) -C tools/env all MTD_VERSION=${MTD_VERSION} || exit 1 +# Explicitly make _depend in subdirs containing multiple targets to prevent +# parallel sub-makes creating .depend files simultaneously. depend dep: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk - for dir in $(SUBDIRS) ; do $(MAKE) -C $$dir _depend ; done + for dir in $(SUBDIRS) cpu/$(CPU) $(dir $(LDSCRIPT)) ; do \ + $(MAKE) -C $$dir _depend ; done TAG_SUBDIRS = $(SUBDIRS) TAG_SUBDIRS += $(dir $(__LIBS)) diff --git a/examples/standalone/smc91111_eeprom.c b/examples/standalone/smc91111_eeprom.c index 428ea7bd2f..9145763e30 100644 --- a/examples/standalone/smc91111_eeprom.c +++ b/examples/standalone/smc91111_eeprom.c @@ -29,8 +29,6 @@ #include <common.h> #include <exports.h> -/* the smc91111.h gets base addr through eth_device' iobase */ -struct eth_device { unsigned long iobase; }; #include "../drivers/net/smc91111.h" #ifndef SMC91111_EEPROM_INIT diff --git a/examples/standalone/smc911x_eeprom.c b/examples/standalone/smc911x_eeprom.c index fff3123464..104047f5a5 100644 --- a/examples/standalone/smc911x_eeprom.c +++ b/examples/standalone/smc911x_eeprom.c @@ -16,13 +16,6 @@ #include <common.h> #include <exports.h> - -/* the smc911x.h gets base addr through eth_device' iobase */ -struct eth_device { - const char *name; - unsigned long iobase; - void *priv; -}; #include "../drivers/net/smc911x.h" /** @@ -324,7 +317,6 @@ int smc911x_eeprom(int argc, char *argv[]) { /* Avoid initializing on stack as gcc likes to call memset() */ struct eth_device dev; - dev.name = __func__; dev.iobase = CONFIG_SMC911X_BASE; /* Print the ABI version */ diff --git a/include/asm-microblaze/unaligned.h b/include/asm-microblaze/unaligned.h new file mode 100644 index 0000000000..785c2e9157 --- /dev/null +++ b/include/asm-microblaze/unaligned.h @@ -0,0 +1,16 @@ +#ifndef _ASM_MICROBLAZE_UNALIGNED_H +#define _ASM_MICROBLAZE_UNALIGNED_H + +#ifdef __KERNEL__ + +/* + * The Microblaze can do unaligned accesses itself in big endian mode. + */ +#include <linux/unaligned/access_ok.h> +#include <linux/unaligned/generic.h> + +#define get_unaligned __get_unaligned_be +#define put_unaligned __put_unaligned_be + +#endif /* __KERNEL__ */ +#endif /* _ASM_MICROBLAZE_UNALIGNED_H */ diff --git a/lib_microblaze/board.c b/lib_microblaze/board.c index 200ea5dd70..d4baea930a 100644 --- a/lib_microblaze/board.c +++ b/lib_microblaze/board.c @@ -43,7 +43,6 @@ extern int interrupts_init (void); #endif #if defined(CONFIG_CMD_NET) extern int eth_init (bd_t * bis); -extern int getenv_IPaddr (char *); #endif /* |