[U-Boot] [PATCH 1/5] sh: Fix warning about uninitialized value of ramdisk_flags

Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- arch/sh/lib/bootm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/sh/lib/bootm.c b/arch/sh/lib/bootm.c index 019e8ec..f38d0b0 100644 --- a/arch/sh/lib/bootm.c +++ b/arch/sh/lib/bootm.c @@ -103,7 +103,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima sh_check_cmd_arg(bootargs, CMD_ARG_RD_DOLOAD, 10); /* Initrd */ if (images->rd_start || images->rd_end) { - unsigned long ramdisk_flags; + unsigned long ramdisk_flags = 0; int val = sh_check_cmd_arg(bootargs, CMD_ARG_RD_PROMPT, 10); if (val == 1) ramdisk_flags |= RD_PROMPT;

Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- board/renesas/sh7785lcr/config.mk | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk index 1a9038c..6853d2b 100644 --- a/board/renesas/sh7785lcr/config.mk +++ b/board/renesas/sh7785lcr/config.mk @@ -24,6 +24,8 @@ # sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
-ifndef CONFIG_SYS_TEXT_BASE +ifdef CONFIG_SH_32BIT +CONFIG_SYS_TEXT_BASE = 0x8FF80000 +else CONFIG_SYS_TEXT_BASE = 0x0ff80000 endif

Move the rsk7203 target out of the Makefile and into boards.cfg. And fix sh2 of MAKEALL.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- MAKEALL | 5 ++--- Makefile | 8 -------- boards.cfg | 1 + 3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/MAKEALL b/MAKEALL index c1f3842..9066a40 100755 --- a/MAKEALL +++ b/MAKEALL @@ -614,9 +614,8 @@ LIST_blackfin="$(boards_by_arch blackfin) ## SH Systems #########################################################################
-LIST_sh2=" \ - rsk7203 \ -" +LIST_sh2="$(boards_by_cpu sh2)" + LIST_sh3=" \ mpr2 \ ms7720se \ diff --git a/Makefile b/Makefile index 30a564d..868fdb7 100644 --- a/Makefile +++ b/Makefile @@ -1189,14 +1189,6 @@ bf527-ezkit-v2_config : unconfig #========================================================================
######################################################################### -## sh2 (Renesas SuperH) -######################################################################### -rsk7203_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_RSK7203 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh2 rsk7203 renesas - -######################################################################### ## sh3 (Renesas SuperH) #########################################################################
diff --git a/boards.cfg b/boards.cfg index 3a965e9..06e9d5d 100644 --- a/boards.cfg +++ b/boards.cfg @@ -718,5 +718,6 @@ davinci_dm6467evm arm arm926ejs dm6467evm davinci davinci davinci_schmoogie arm arm926ejs schmoogie davinci davinci davinci_dm355leopard arm arm926ejs dm355leopard davinci davinci bf527-ad7160-eval blackfin blackfin +rsk7203 sh sh2 rsk7203 renesas - # Target ARCH CPU Board name Vendor SoC Options ###############################################################################################

Move the sh3 target boards out of the Makefile and into boards.cfg. And fix sh3 of MAKEALL.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- MAKEALL | 6 +----- Makefile | 14 -------------- boards.cfg | 2 ++ 3 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 9066a40..155131a 100755 --- a/MAKEALL +++ b/MAKEALL @@ -615,11 +615,7 @@ LIST_blackfin="$(boards_by_arch blackfin) #########################################################################
LIST_sh2="$(boards_by_cpu sh2)" - -LIST_sh3=" \ - mpr2 \ - ms7720se \ -" +LIST_sh3="$(boards_by_cpu sh3)"
LIST_sh4=" \ ms7750se \ diff --git a/Makefile b/Makefile index 868fdb7..481add9 100644 --- a/Makefile +++ b/Makefile @@ -1189,20 +1189,6 @@ bf527-ezkit-v2_config : unconfig #========================================================================
######################################################################### -## sh3 (Renesas SuperH) -######################################################################### - -mpr2_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_MPR2 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh3 mpr2 - -ms7720se_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_MS7720SE 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh3 ms7720se - -######################################################################### ## sh4 (Renesas SuperH) #########################################################################
diff --git a/boards.cfg b/boards.cfg index 06e9d5d..f8f9579 100644 --- a/boards.cfg +++ b/boards.cfg @@ -719,5 +719,7 @@ davinci_schmoogie arm arm926ejs schmoogie davinci davinci davinci_dm355leopard arm arm926ejs dm355leopard davinci davinci bf527-ad7160-eval blackfin blackfin rsk7203 sh sh2 rsk7203 renesas - +mpr2 sh sh3 mpr2 - - +ms7720se sh sh3 ms7720se - - # Target ARCH CPU Board name Vendor SoC Options ###############################################################################################

Move the sh4 target boards out of the Makefile and into boards.cfg. And fix sh4 of MAKEALL.
Signed-off-by: Nobuhiro Iwamatsu iwamatsu@nigauri.org --- MAKEALL | 19 ++----------------- Makefile | 60 ------------------------------------------------------------ boards.cfg | 10 ++++++++++ 3 files changed, 12 insertions(+), 77 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 155131a..43c0cdd 100755 --- a/MAKEALL +++ b/MAKEALL @@ -616,24 +616,9 @@ LIST_blackfin="$(boards_by_arch blackfin)
LIST_sh2="$(boards_by_cpu sh2)" LIST_sh3="$(boards_by_cpu sh3)" +LIST_sh4="$(boards_by_cpu sh4)"
-LIST_sh4=" \ - ms7750se \ - ms7722se \ - MigoR \ - r7780mp \ - r2dplus \ - sh7763rdp \ - sh7785lcr \ - ap325rxa \ - espt \ -" - -LIST_sh=" \ - ${LIST_sh2} \ - ${LIST_sh3} \ - ${LIST_sh4} \ -" +LIST_sh="$(boards_by_arch sh)"
######################################################################### ## SPARC Systems diff --git a/Makefile b/Makefile index 481add9..b4be8bc 100644 --- a/Makefile +++ b/Makefile @@ -1184,66 +1184,6 @@ bf527-ezkit-v2_config : unconfig @$(MKCONFIG) -t BF527_EZKIT_REV_2_1 \ bf527-ezkit blackfin blackfin bf527-ezkit
-#======================================================================== -# SH3 (SuperH) -#======================================================================== - -######################################################################### -## sh4 (Renesas SuperH) -######################################################################### - -MigoR_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_MIGO_R 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 MigoR renesas - -ms7750se_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_MS7750SE 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 ms7750se - -ms7722se_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_MS7722SE 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 ms7722se - -r2dplus_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_R2DPLUS 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 r2dplus renesas - -r7780mp_config: unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_R7780MP 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 r7780mp renesas - -sh7763rdp_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_SH7763RDP 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 sh7763rdp renesas - -sh7785lcr_32bit_config \ -sh7785lcr_config : unconfig - @mkdir -p $(obj)include - @mkdir -p $(obj)board/renesas/sh7785lcr - @echo "#define CONFIG_SH7785LCR 1" > $(obj)include/config.h - @if [ "$(findstring 32bit, $@)" ] ; then \ - echo "#define CONFIG_SH_32BIT 1" >> $(obj)include/config.h ; \ - echo "CONFIG_SYS_TEXT_BASE = 0x8ff80000" > \ - $(obj)board/renesas/sh7785lcr/config.tmp ; \ - fi - @$(MKCONFIG) -n $@ -a sh7785lcr sh sh4 sh7785lcr renesas - -ap325rxa_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_AP325RXA 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 ap325rxa renesas - -espt_config : unconfig - @mkdir -p $(obj)include - @echo "#define CONFIG_ESPT 1" > $(obj)include/config.h - @$(MKCONFIG) -a $@ sh sh4 espt - ######################################################################### #########################################################################
diff --git a/boards.cfg b/boards.cfg index f8f9579..bf4ff28 100644 --- a/boards.cfg +++ b/boards.cfg @@ -721,5 +721,15 @@ bf527-ad7160-eval blackfin blackfin rsk7203 sh sh2 rsk7203 renesas - mpr2 sh sh3 mpr2 - - ms7720se sh sh3 ms7720se - - +MigoRsh sh4 MigoR renesas - +ms7750se sh sh4 ms7750se - - +ms7722se sh sh4 ms7722se - - +r2dplus sh sh4 r2dplus renesas - +r7780mp sh sh4 r7780mp renesas - +sh7763rdp sh sh4 sh7763rdp renesas - +sh7785lcr sh sh4 sh7785lcr renesas - +sh7785lcr_32bit sh sh4 sh7785lcr renesas - sh7785lcr:SH_32BIT=1 +ap325rxa sh sh4 ap325rxa renesas - +espt sh sh4 espt - - # Target ARCH CPU Board name Vendor SoC Options ###############################################################################################
participants (1)
-
Nobuhiro Iwamatsu