Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9e23fe0560b84e324dc5f0ff8813dab2aa34f074

Authored by Nobuhiro Iwamatsu
1 parent 873d97aabc
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 14 changed files with 16 additions and 14 deletions Side-by-side Diff

... ... @@ -749,7 +749,7 @@
749 749 LIST_sh4=" \
750 750 ms7750se \
751 751 ms7722se \
752   - Migo-R \
  752 + MigoR \
753 753 r7780mp \
754 754 r2dplus \
755 755 sh7763rdp \
board/MigoR/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -26,7 +26,7 @@
26 26  
27 27 LIB = $(obj)lib$(BOARD).a
28 28  
29   -OBJS := migo_r.o
  29 +COBJS := migo_r.o
30 30 SOBJS := lowlevel_init.o
31 31  
32 32 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
... ... @@ -32,7 +32,7 @@
32 32  
33 33 LIB = $(obj)lib$(BOARD).a
34 34  
35   -OBJS := mpr2.o
  35 +COBJS := mpr2.o
36 36 SOBJS := lowlevel_init.o
37 37  
38 38 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/ms7720se/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -29,7 +29,7 @@
29 29  
30 30 LIB = $(obj)lib$(BOARD).a
31 31  
32   -OBJS := ms7720se.o
  32 +COBJS := ms7720se.o
33 33 SOBJS := lowlevel_init.o
34 34  
35 35 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/ms7722se/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -26,7 +26,7 @@
26 26  
27 27 LIB = $(obj)lib$(BOARD).a
28 28  
29   -OBJS := ms7722se.o
  29 +COBJS := ms7722se.o
30 30 SOBJS := lowlevel_init.o
31 31  
32 32 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/ms7750se/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -21,7 +21,7 @@
21 21  
22 22 LIB = $(obj)lib$(BOARD).a
23 23  
24   -OBJS := ms7750se.o
  24 +COBJS := ms7750se.o
25 25 SOBJS := lowlevel_init.o
26 26  
27 27 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/r2dplus/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -21,7 +21,7 @@
21 21  
22 22 LIB = $(obj)lib$(BOARD).a
23 23  
24   -OBJS := r2dplus.o
  24 +COBJS := r2dplus.o
25 25 SOBJS := lowlevel_init.o
26 26  
27 27 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/r7780mp/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -22,7 +22,7 @@
22 22  
23 23 LIB = $(obj)lib$(BOARD).a
24 24  
25   -OBJS := r7780mp.o
  25 +COBJS := r7780mp.o
26 26 SOBJS := lowlevel_init.o
27 27  
28 28 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
board/sh7763rdp/Makefile
Diff comments   View file @ 9e23fe0
... ... @@ -25,7 +25,7 @@
25 25  
26 26 LIB = $(obj)lib$(BOARD).a
27 27  
28   -OBJS := sh7763rdp.o
  28 +COBJS := sh7763rdp.o
29 29 SOBJS := lowlevel_init.o
30 30  
31 31 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
... ... @@ -32,7 +32,7 @@
32 32 LIB = $(obj)lib$(CPU).a
33 33  
34 34 SOBJS = start.o
35   -OBJS = cpu.o interrupts.o watchdog.o time.o cache.o
  35 +COBJS = cpu.o interrupts.o watchdog.o time.o cache.o
36 36  
37 37 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
38 38 OBJS := $(addprefix $(obj),$(COBJS))
... ... @@ -29,7 +29,7 @@
29 29 LIB = $(obj)lib$(CPU).a
30 30  
31 31 SOBJS = start.o
32   -OBJS = cpu.o interrupts.o watchdog.o time.o cache.o
  32 +COBJS = cpu.o interrupts.o watchdog.o time.o cache.o
33 33  
34 34 SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
35 35 OBJS := $(addprefix $(obj),$(COBJS))
... ... @@ -26,7 +26,7 @@
26 26  
27 27 COBJS-y += board.o
28 28 COBJS-y += bootm.o
29   -#COBJS-y += time.o
  29 +# COBJS-y += time.o
30 30  
31 31 SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
32 32 OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
... ... @@ -112,6 +112,7 @@
112 112 return 0;
113 113 }
114 114  
  115 +#if defined(CONFIG_CMD_NET)
115 116 static int sh_net_init(void)
116 117 {
117 118 DECLARE_GLOBAL_DATA_PTR;
... ... @@ -127,6 +128,7 @@
127 128  
128 129 return 0;
129 130 }
  131 +#endif
130 132  
131 133 typedef int (init_fnc_t) (void);
132 134  
133 135  
... ... @@ -170,8 +172,8 @@
170 172  
171 173 bd_t *bd;
172 174 init_fnc_t **init_fnc_ptr;
173   - char *s;
174 175 int i;
  176 + char *s;
175 177  
176 178 memset (gd, 0, CFG_GBL_DATA_SIZE);
177 179  
... ... @@ -22,7 +22,7 @@
22 22 */
23 23  
24 24 #include <common.h>
25   -#include <asm/processer.h>
  25 +#include <asm/processor.h>
26 26  
27 27 static void tmu_timer_start (unsigned int timer)
28 28 {