[U-Boot] [PATCH] mk48t59: fix compile problem introduced by commit d1e23194

[U-Boot] [PATCH] mk48t59: fix compile problem introduced by commit d1e23194

[Wolfgang Denk]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 drivers/rtc/mk48t59.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/rtc/mk48t59.c b/drivers/rtc/mk48t59.c
index b6c234e..dabf322 100644
--- a/drivers/rtc/mk48t59.c
+++ b/drivers/rtc/mk48t59.c
@@ -227,7 +227,7 @@ void rtc_reset (void)
 	rtc_write(RTC_CONTROLB, control_b);
 }
 
-int rtc_set_watchdog(short multi, short res)
+void rtc_set_watchdog(short multi, short res)
 {
 	uchar wd_value;
 
-- 
1.5.6.1

[U-Boot] [PATCH] BMW, PCIPPC2, PCIPPC6, RBC82: fix compile warnings

[Wolfgang Denk]

missing doc_probe() prototype.

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 include/common.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/include/common.h b/include/common.h
index a394988..33c6e10 100644
--- a/include/common.h
+++ b/include/common.h
@@ -236,6 +236,9 @@ int	autoscript (ulong addr, const char *fit_uname);
 
 extern ulong load_addr;		/* Default Load Address */
 
+/* common/cmd_doc.c */
+void	doc_probe(unsigned long physadr);
+
 /* common/cmd_nvedit.c */
 int	env_init     (void);
 void	env_relocate (void);
-- 
1.5.6.1

[U-Boot] [PATCH] common/cmd_bootm.c: fix printf() format warnings

[Wolfgang Denk]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 common/cmd_bootm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 751f5b9..8dbab02 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -337,13 +337,13 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)
 		return BOOTM_ERR_UNIMPLEMENTED;
 	}
 	puts ("OK\n");
-	debug ("   kernel loaded at 0x%08lx, end = 0x%08lx\n", load, load_end);
+	debug ("   kernel loaded at 0x%08lx, end = 0x%8p\n", load, load_end);
 	if (boot_progress)
 		show_boot_progress (7);
 
 	if ((load < blob_end) && (*load_end > blob_start)) {
 		debug ("images.os.start = 0x%lX, images.os.end = 0x%lx\n", blob_start, blob_end);
-		debug ("images.os.load = 0x%lx, load_end = 0x%lx\n", load, load_end);
+		debug ("images.os.load = 0x%lx, load_end = 0x%p\n", load, load_end);
 
 		return BOOTM_ERR_OVERLAP;
 	}
-- 
1.5.6.1

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Wolfgang Denk]

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 Makefile |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8d82ef5..91f542e 100644
--- a/Makefile
+++ b/Makefile
@@ -1358,13 +1358,13 @@ ml300_config:	unconfig
 
 ml507_flash_config:	unconfig
 	@mkdir -p $(obj)include $(obj)board/xilinx/ml507
-	@cp $(obj)board/xilinx/ml507/u-boot-rom.lds  $(obj)board/xilinx/ml507/u-boot.lds
+	@cp board/xilinx/ml507/u-boot-rom.lds  $(obj)board/xilinx/ml507/u-boot.lds
 	@echo "TEXT_BASE = 0xFE360000" > $(obj)board/xilinx/ml507/config.tmp
 	@$(MKCONFIG) $(@:_flash_config=) ppc ppc4xx ml507 xilinx
 
 ml507_config:	unconfig
 	@mkdir -p $(obj)include $(obj)board/xilinx/ml507
-	@cp $(obj)board/xilinx/ml507/u-boot-ram.lds  $(obj)board/xilinx/ml507/u-boot.lds
+	@cp board/xilinx/ml507/u-boot-ram.lds  $(obj)board/xilinx/ml507/u-boot.lds
 	@$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx
 
 ocotea_config:	unconfig
-- 
1.5.6.1

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Ricardo]

Hello Wolfgang

  This problem is solved in "Unification of virtex5 pp440 boards",
which is ready to be merged in mainline (Today's pullgit by Stefan),
Please revert this patch in order to have less problems merging
Stefan's ppc4xx branch.

        Regards


On Mon, Sep 8, 2008 at 16:50, Wolfgang Denk <wd@denx.de> wrote:
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> ---
>  Makefile |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 8d82ef5..91f542e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1358,13 +1358,13 @@ ml300_config:   unconfig
>
>  ml507_flash_config:    unconfig
>        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
> -       @cp $(obj)board/xilinx/ml507/u-boot-rom.lds  $(obj)board/xilinx/ml507/u-boot.lds
> +       @cp board/xilinx/ml507/u-boot-rom.lds  $(obj)board/xilinx/ml507/u-boot.lds
>        @echo "TEXT_BASE = 0xFE360000" > $(obj)board/xilinx/ml507/config.tmp
>        @$(MKCONFIG) $(@:_flash_config=) ppc ppc4xx ml507 xilinx
>
>  ml507_config:  unconfig
>        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
> -       @cp $(obj)board/xilinx/ml507/u-boot-ram.lds  $(obj)board/xilinx/ml507/u-boot.lds
> +       @cp board/xilinx/ml507/u-boot-ram.lds  $(obj)board/xilinx/ml507/u-boot.lds
>        @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx
>
>  ocotea_config: unconfig
> --
> 1.5.6.1
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>



-- 
Ricardo Ribalda
http://www.eps.uam.es/~rribalda/

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Wolfgang Denk]

Dear Ricardo,

In message <aa76a2be0809081539o7516834bm1247bb830fd5e429@mail.gmail.com> you wrote:
> 
>   This problem is solved in "Unification of virtex5 pp440 boards",
> which is ready to be merged in mainline (Today's pullgit by Stefan),
> Please revert this patch in order to have less problems merging
> Stefan's ppc4xx branch.

If your fix is the same, then git will sort it out with no problem.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Shakespeare's Law of Prototyping: (Hamlet III, iv, 156-160)
        O, throw away the worser part of it,
        And live the purer with the other half.

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Ricardo]

Hello again

  It has change, there is no more copies. Instead of that I used the
method that you sugggested for re-using linking scripts. If you keep
you patch you will have a conflict merging.

            Regards & Thanks


On Mon, Sep 8, 2008 at 19:19, Wolfgang Denk <wd@denx.de> wrote:
> Dear Ricardo,
>
> In message <aa76a2be0809081539o7516834bm1247bb830fd5e429@mail.gmail.com> you wrote:
>>
>>   This problem is solved in "Unification of virtex5 pp440 boards",
>> which is ready to be merged in mainline (Today's pullgit by Stefan),
>> Please revert this patch in order to have less problems merging
>> Stefan's ppc4xx branch.
>
> If your fix is the same, then git will sort it out with no problem.
>
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
> Shakespeare's Law of Prototyping: (Hamlet III, iv, 156-160)
>        O, throw away the worser part of it,
>        And live the purer with the other half.
>



-- 
Ricardo Ribalda
http://www.eps.uam.es/~rribalda/

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Wolfgang Denk]

Dear Ricardo,

In message <aa76a2be0809081644p588a3f0bna8a221e490dc4cca@mail.gmail.com> you wrote:
> 
>   It has change, there is no more copies. Instead of that I used the
> method that you sugggested for re-using linking scripts. If you keep
> you patch you will have a conflict merging.

So I will have to resolve these. I need a fix that cleans the build
now.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Peace was the way.
	-- Kirk, "The City on the Edge of Forever", stardate unknown

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Wolfgang Denk]

Dear Ricardo,

In message <aa76a2be0809081644p588a3f0bna8a221e490dc4cca@mail.gmail.com> you wrote:
> 
>   It has change, there is no more copies. Instead of that I used the
> method that you sugggested for re-using linking scripts. If you keep
> you patch you will have a conflict merging.

With the latest code changes applied, out-of-tree building now breaks
for   the   ml507,   ml507_flash,   v5fx30teval,   v5fx30teval_flash,
xilinx-ppc440-generic and xilinx-ppc440-generic_flash configurations:

MAKEALL_LOGDIR=/work/wd/tmp-ml507-LOG \
+ BUILD_DIR=/work/wd/tmp-ml507 \
+ JOBS=-j4 \
+ ./MAKEALL ml507
Configuring for ml507 board...
In file included from /work/wd/tmp-ml507/tools/environment.c:30:
/home/wd/git/u-boot/custodians/include/environment.h:63:39: error: operator '>=' has no right operand
envcrc.c:52:39: error: operator '>=' has no right operand
/home/wd/git/u-boot/custodians/tools/envcrc.c:52:39: error: operator '>=' has no right operand
make[1]: *** [/work/wd/tmp-ml507/tools/envcrc.o] Error 1
make: *** [tools] Error 2
make: *** Waiting for unfinished jobs....
board.c: In function 'mem_malloc_init':
board.c:149: error: 'TEXT_BASE' undeclared (first use in this function)
board.c:149: error: (Each undeclared identifier is reported only once
board.c:149: error: for each function it appears in.)
board.c: In function 'board_init_f':
board.c:433: error: 'TEXT_BASE' undeclared (first use in this function)
board.c: In function 'board_init_r':
board.c:671: error: 'TEXT_BASE' undeclared (first use in this function)
make[1]: *** [/work/wd/tmp-ml507/lib_ppc/board.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [/work/wd/tmp-ml507/lib_ppc/libppc.a] Error 2
ppc_6xx-size: '/work/wd/tmp-ml507/u-boot': No such file


Please fix!

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Never give in.  Never give in.  Never. Never. Never."
- Winston Churchill

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Wolfgang Denk]

Dear Ricardo,

I wrote:

> With the latest code changes applied, out-of-tree building now breaks
> for   the   ml507,   ml507_flash,   v5fx30teval,   v5fx30teval_flash,
> xilinx-ppc440-generic and xilinx-ppc440-generic_flash configurations:

Also, the code does not clean up correctly. It leaves  a  stale  file
board/xilinx/ml507/u-boot.lds behind when running "make mrproper".

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Pardon me for breathing, which I never do anyway so I don't know why
I bother to say it, oh God, I'm so depressed. Here's another of those
self-satisfied doors. Life! Don't talk to me about life."
                                        - Marvin the Paranoid Android

[U-Boot] [PATCH] ml507: fix out of tree build problem

[Ricardo]

Hello Wolfgang

   The version on your repositore do not create that file. It should
be an ancient file of older versions


       Best Regards

On Tue, Sep 9, 2008 at 03:33, Wolfgang Denk <wd@denx.de> wrote:
> Dear Ricardo,
>
> I wrote:
>
>> With the latest code changes applied, out-of-tree building now breaks
>> for   the   ml507,   ml507_flash,   v5fx30teval,   v5fx30teval_flash,
>> xilinx-ppc440-generic arnd xilinx-ppc440-generic_flash configurations:
>
> Also, the code does not clean up correctly. It leaves  a  stale  file
> board/xilinx/ml507/u-boot.lds behind when running "make mrproper".
>
> Best regards,
>
> Wolfgang Denk
>
> --
> DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
> "Pardon me for breathing, which I never do anyway so I don't know why
> I bother to say it, oh God, I'm so depressed. Here's another of those
> self-satisfied doors. Life! Don't talk to me about life."
>                                        - Marvin the Paranoid Android
>



-- 
Ricardo Ribalda
http://www.eps.uam.es/~rribalda/

[U-Boot] [PATCH] disk-on-chip: remove duplicate doc_probe declaration

[Jean-Christophe PLAGNIOL-VILLARD]

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 board/atc/atc.c                |    1 -
 board/cpu86/cpu86.c            |    1 -
 board/cpu87/cpu87.c            |    1 -
 board/gen860t/gen860t.c        |    2 --
 board/mcc200/mcc200.c          |    1 -
 board/mpl/common/common_util.c |    1 -
 board/pm520/pm520.c            |    1 -
 board/pm826/pm826.c            |    1 -
 board/pm828/pm828.c            |    1 -
 board/svm_sc8xx/svm_sc8xx.c    |    1 -
 10 files changed, 0 insertions(+), 11 deletions(-)

diff --git a/board/atc/atc.c b/board/atc/atc.c
index 79527f4..b627c1c 100644
--- a/board/atc/atc.c
+++ b/board/atc/atc.c
@@ -380,7 +380,6 @@ phys_size_t initdram (int board_type)
 }
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/cpu86/cpu86.c b/board/cpu86/cpu86.c
index 9e76c72..23ec283 100644
--- a/board/cpu86/cpu86.c
+++ b/board/cpu86/cpu86.c
@@ -313,7 +313,6 @@ phys_size_t initdram (int board_type)
 }
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/cpu87/cpu87.c b/board/cpu87/cpu87.c
index f5a5de5..bb8be6b 100644
--- a/board/cpu87/cpu87.c
+++ b/board/cpu87/cpu87.c
@@ -322,7 +322,6 @@ phys_size_t initdram (int board_type)
 }
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/gen860t/gen860t.c b/board/gen860t/gen860t.c
index e3d0e43..5c497b6 100644
--- a/board/gen860t/gen860t.c
+++ b/board/gen860t/gen860t.c
@@ -223,8 +223,6 @@ phys_size_t initdram (int board_type)
  * The DOC lives in the CS2* space
  */
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
-
 void doc_init (void)
 {
 	printf ("Probing at 0x%.8x: ", DOC_BASE);
diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 8eb0649..65b8184 100644
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -323,7 +323,6 @@ void ide_set_reset (int idereset)
 #endif
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/mpl/common/common_util.c b/board/mpl/common/common_util.c
index 88b864c..8454420 100644
--- a/board/mpl/common/common_util.c
+++ b/board/mpl/common/common_util.c
@@ -565,7 +565,6 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe(ulong physadr);
 void doc_init (void)
 {
   doc_probe(MULTI_PURPOSE_SOCKET_ADDR);
diff --git a/board/pm520/pm520.c b/board/pm520/pm520.c
index 83d9bcd..e00e2d8 100644
--- a/board/pm520/pm520.c
+++ b/board/pm520/pm520.c
@@ -315,7 +315,6 @@ void ide_set_reset (int idereset)
 #endif
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/pm826/pm826.c b/board/pm826/pm826.c
index 7ee3ab6..58914b4 100644
--- a/board/pm826/pm826.c
+++ b/board/pm826/pm826.c
@@ -311,7 +311,6 @@ phys_size_t initdram (int board_type)
 }
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/pm828/pm828.c b/board/pm828/pm828.c
index 6038e97..e1a7d57 100644
--- a/board/pm828/pm828.c
+++ b/board/pm828/pm828.c
@@ -344,7 +344,6 @@ phys_size_t initdram (int board_type)
 }
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	doc_probe (CFG_DOC_BASE);
diff --git a/board/svm_sc8xx/svm_sc8xx.c b/board/svm_sc8xx/svm_sc8xx.c
index 06fb18b..48e05b8 100644
--- a/board/svm_sc8xx/svm_sc8xx.c
+++ b/board/svm_sc8xx/svm_sc8xx.c
@@ -154,7 +154,6 @@ phys_size_t initdram (int board_type)
 }
 
 #if defined(CONFIG_CMD_DOC)
-extern void doc_probe (ulong physadr);
 void doc_init (void)
 {
 	        doc_probe (CFG_DOC_BASE);
-- 
1.5.6.5

[U-Boot] [PATCH] disk-on-chip: remove duplicate doc_probe declaration

[Wolfgang Denk]

Dear Jean-Christophe PLAGNIOL-VILLARD,

In message <1220916159-1916-1-git-send-email-plagnioj@jcrosoft.com> you wrote:
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
>  board/atc/atc.c                |    1 -
>  board/cpu86/cpu86.c            |    1 -
>  board/cpu87/cpu87.c            |    1 -
>  board/gen860t/gen860t.c        |    2 --
>  board/mcc200/mcc200.c          |    1 -
>  board/mpl/common/common_util.c |    1 -
>  board/pm520/pm520.c            |    1 -
>  board/pm826/pm826.c            |    1 -
>  board/pm828/pm828.c            |    1 -
>  board/svm_sc8xx/svm_sc8xx.c    |    1 -
>  10 files changed, 0 insertions(+), 11 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In the realm of scientific observation, luck is granted only to those
who are prepared.                                     - Louis Pasteur