diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-09 23:09:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-09 23:09:36 +0200 |
| commit | 2caea1ebee1fb20e1b229f1f821225829fb87f0e (patch) | |
| tree | 86070cd53a417f857754822f15ba8536a9df2c40 /lib_sh | |
| parent | 417faf285b2527acb2de24c5cd3e2621d385408c (diff) | |
| parent | 689c1b30caacba3fbca0b1813facb3ab70b6cd63 (diff) | |
| download | u-boot-imx-2caea1ebee1fb20e1b229f1f821225829fb87f0e.zip u-boot-imx-2caea1ebee1fb20e1b229f1f821225829fb87f0e.tar.gz u-boot-imx-2caea1ebee1fb20e1b229f1f821225829fb87f0e.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-sh
Diffstat (limited to 'lib_sh')
| -rw-r--r-- | lib_sh/Makefile | 2 | ||||
| -rw-r--r-- | lib_sh/board.c | 4 | ||||
| -rw-r--r-- | lib_sh/time.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/lib_sh/Makefile b/lib_sh/Makefile index 0e4fdee..4034381 100644 --- a/lib_sh/Makefile +++ b/lib_sh/Makefile @@ -26,7 +26,7 @@ SOBJS-y += COBJS-y += board.o COBJS-y += bootm.o -#COBJS-y += time.o +# COBJS-y += time.o SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) diff --git a/lib_sh/board.c b/lib_sh/board.c index 807415c..eb81bd9 100644 --- a/lib_sh/board.c +++ b/lib_sh/board.c @@ -112,6 +112,7 @@ static int sh_mem_env_init(void) return 0; } +#if defined(CONFIG_CMD_NET) static int sh_net_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -127,6 +128,7 @@ static int sh_net_init(void) return 0; } +#endif typedef int (init_fnc_t) (void); @@ -170,8 +172,8 @@ void sh_generic_init (void) bd_t *bd; init_fnc_t **init_fnc_ptr; - char *s; int i; + char *s; memset (gd, 0, CFG_GBL_DATA_SIZE); diff --git a/lib_sh/time.c b/lib_sh/time.c index 3d33918..9c1dc50 100644 --- a/lib_sh/time.c +++ b/lib_sh/time.c @@ -22,7 +22,7 @@ */ #include <common.h> -#include <asm/processer.h> +#include <asm/processor.h> static void tmu_timer_start (unsigned int timer) { |