summaryrefslogtreecommitdiff
path: root/lib_sh
diff options
context:
space:
mode:
authorNobuhiro Iwamatsu <iwamatsu@nigauri.org>2008-07-08 12:03:24 +0900
committerNobuhiro Iwamatsu <iwamatsu@nigauri.org>2008-07-08 12:03:24 +0900
commit9e23fe0560b84e324dc5f0ff8813dab2aa34f074 (patch)
tree335c5b4f6de32e2c616078890b1facd351c6e63e /lib_sh
parent873d97aabc0b1c8822ed1d87e8c5c8ae0a7e4ae9 (diff)
sh: Fix SH-boards compile error
By Cleanup out-or-tree building for some boards (.depend) (commit:c8a3b109f07f02342d097b30908965f7261d9f15) because filse ware changed, some SH-boards have compile error. I revised this problem. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Diffstat (limited to 'lib_sh')
-rw-r--r--lib_sh/Makefile2
-rw-r--r--lib_sh/board.c4
-rw-r--r--lib_sh/time.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/lib_sh/Makefile b/lib_sh/Makefile
index 0e4fdee0935..40343812f74 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 807415c548f..eb81bd97ec4 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 3d33918f28f..9c1dc509bb7 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)
{