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 --- MAKEALL | 2 +- board/MigoR/Makefile | 2 +- board/mpr2/Makefile | 2 +- board/ms7720se/Makefile | 2 +- board/ms7722se/Makefile | 2 +- board/ms7750se/Makefile | 2 +- board/r2dplus/Makefile | 2 +- board/r7780mp/Makefile | 2 +- board/sh7763rdp/Makefile | 2 +- cpu/sh3/Makefile | 2 +- cpu/sh4/Makefile | 2 +- lib_sh/Makefile | 2 +- lib_sh/board.c | 4 +++- lib_sh/time.c | 2 +- 14 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 9f80b3d..e00bb9c 100755 --- a/MAKEALL +++ b/MAKEALL @@ -749,7 +749,7 @@ LIST_sh3=" \ LIST_sh4=" \ ms7750se \ ms7722se \ - Migo-R \ + MigoR \ r7780mp \ r2dplus \ sh7763rdp \ diff --git a/board/MigoR/Makefile b/board/MigoR/Makefile index bced511..661b59d 100644 --- a/board/MigoR/Makefile +++ b/board/MigoR/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := migo_r.o +COBJS := migo_r.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/mpr2/Makefile b/board/mpr2/Makefile index 080476b..9f8fb80 100644 --- a/board/mpr2/Makefile +++ b/board/mpr2/Makefile @@ -32,7 +32,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := mpr2.o +COBJS := mpr2.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/ms7720se/Makefile b/board/ms7720se/Makefile index 545889f..18745ec 100644 --- a/board/ms7720se/Makefile +++ b/board/ms7720se/Makefile @@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := ms7720se.o +COBJS := ms7720se.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/ms7722se/Makefile b/board/ms7722se/Makefile index 744744e..b203b6d 100644 --- a/board/ms7722se/Makefile +++ b/board/ms7722se/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := ms7722se.o +COBJS := ms7722se.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/ms7750se/Makefile b/board/ms7750se/Makefile index d806101..01ddf69 100644 --- a/board/ms7750se/Makefile +++ b/board/ms7750se/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := ms7750se.o +COBJS := ms7750se.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/r2dplus/Makefile b/board/r2dplus/Makefile index 8529857..e96a8aa 100644 --- a/board/r2dplus/Makefile +++ b/board/r2dplus/Makefile @@ -21,7 +21,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := r2dplus.o +COBJS := r2dplus.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/r7780mp/Makefile b/board/r7780mp/Makefile index 0ab6d1d..c100e7e 100644 --- a/board/r7780mp/Makefile +++ b/board/r7780mp/Makefile @@ -22,7 +22,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := r7780mp.o +COBJS := r7780mp.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/board/sh7763rdp/Makefile b/board/sh7763rdp/Makefile index 8a04477..62a683d 100644 --- a/board/sh7763rdp/Makefile +++ b/board/sh7763rdp/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).a
-OBJS := sh7763rdp.o +COBJS := sh7763rdp.o SOBJS := lowlevel_init.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) diff --git a/cpu/sh3/Makefile b/cpu/sh3/Makefile index a7eb1e2..587413d 100644 --- a/cpu/sh3/Makefile +++ b/cpu/sh3/Makefile @@ -32,7 +32,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a
SOBJS = start.o -OBJS = cpu.o interrupts.o watchdog.o time.o cache.o +COBJS = cpu.o interrupts.o watchdog.o time.o cache.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/cpu/sh4/Makefile b/cpu/sh4/Makefile index e38e04f..d3c5eef 100644 --- a/cpu/sh4/Makefile +++ b/cpu/sh4/Makefile @@ -29,7 +29,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(CPU).a
SOBJS = start.o -OBJS = cpu.o interrupts.o watchdog.o time.o cache.o +COBJS = cpu.o interrupts.o watchdog.o time.o cache.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) 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..d0dd41c 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,7 +172,6 @@ void sh_generic_init (void)
bd_t *bd; init_fnc_t **init_fnc_ptr; - char *s; int i;
memset (gd, 0, CFG_GBL_DATA_SIZE); @@ -203,6 +204,7 @@ void sh_generic_init (void) eth_initialize(gd->bd);
if ((s = getenv ("bootfile")) != NULL) { + char *s; copy_filename (BootFile, s, sizeof (BootFile)); } #endif /* CONFIG_CMD_NET */ 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) {