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>

diff --git a/MAKEALL b/MAKEALL
index 9f80b3df01793023fefeb048d066974d35b2f1db..e00bb9c3c430f9d79ad5ee1a4a491c20c68c58c0 100755 (executable)
--- 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 bced5114dd1ca47c9a48522f73ea99a1b29c6c8f..661b59d005047dbec090b5a4af8a8c4be7ac89eb 100644 (file)
--- 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 080476bde13033e770ef5e4761dd6c5c9cff35b5..9f8fb807aba43a8ce39806c4af7f2170a2757b91 100644 (file)
--- 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 545889f9214f4ac34aefd7f55c0279716c440e02..18745ecff3c8845ee5e889d208eec2e1aea690aa 100644 (file)
--- 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 744744e96ab0ab48dd5babd7ff254a3291133121..b203b6d4c7c4cf4744fc64e018b43d59449e6d99 100644 (file)
--- 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 d806101ff8014fc2eb655a1460fe0b912a44df72..01ddf69201e4ec510a5a5df75d9c8eecb8d68111 100644 (file)
--- 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 8529857c2f412d7734f67394b8876852809270e2..e96a8aa9866e035f966da84385f5cbefa98b0a1c 100644 (file)
--- 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 0ab6d1d40ae6c539f38266403304dd699fb3dd3f..c100e7e2ade847b941a133f0596de2a16cecc26c 100644 (file)
--- 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 8a04477e6b3b5134049a14072f309f4bb891384d..62a683d57f5f5653c7f9bf754dbe8562178c0451 100644 (file)
--- 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 a7eb1e22fa8e9566d59581e741decdeec7201936..587413d2e15ec3ec8d7c3133b4197778ddd4b0df 100644 (file)
--- 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 e38e04f29e0dc6ef95fbda05b09d35b21851df22..d3c5eef6be205397b669d84f51fc85938e49c12f 100644 (file)
--- 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 0e4fdee0935c13d80bb56cc0c9673e1161d79e67..40343812f74a23666affaef56d35e707a393b8ce 100644 (file)
--- 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 807415c548fe27672c7835b96a3ae7fba16ef881..eb81bd97ec43c1624ce753874102892d61881502 100644 (file)
--- 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 3d33918f28f8d7f1d537b638b77e4ccadfb8bce4..9c1dc509bb7cc757deda31db43925e02296acb6a 100644 (file)
--- 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)
 {