Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

Conflicts:

	Makefile

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --git a/Makefile b/Makefile
index ae3db0a6442947f28cfed11e6b2f4eb9b93e9359..a342a88083da5d0bbe7c5829d46c2f4f617b0ac2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1360,13 +1360,15 @@ ml300_config:   unconfig
 
 ml507_flash_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" > $(obj)board/xilinx/ml507/config.mk
+       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-rom.lds" \
+               > $(obj)board/xilinx/ml507/config.mk
        @echo "TEXT_BASE := 0xFE360000" >> $(obj)board/xilinx/ml507/config.mk
        @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 
 ml507_config: unconfig
        @mkdir -p $(obj)include $(obj)board/xilinx/ml507
-       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" > $(obj)board/xilinx/ml507/config.mk
+       @echo "LDSCRIPT  := $(obj)board/xilinx/ppc440-generic/u-boot-ram.lds" \
+               > $(obj)board/xilinx/ml507/config.mk
        @echo "TEXT_BASE := 0x04000000" >> $(obj)board/xilinx/ml507/config.mk
        @$(MKCONFIG) ml507 ppc ppc4xx ml507 xilinx
 

diff --git a/board/atc/atc.c b/board/atc/atc.c
index 79527f438420b5c9b7321dbbeba4442d032cedef..b627c1c6bc6b07ea0a7b688fb6e5bcac84919c54 100644 (file)
--- 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 9e76c72d3e3631ff8140f016974361511965239a..23ec283d4ff796172595539127b7b8b81aeb1704 100644 (file)
--- 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 454987cff299599e26c9eaa80a7b4b033b64796b..c7a96f9131bbf382609607842322b36095db469d 100644 (file)
--- a/board/cpu87/cpu87.c
+++ b/board/cpu87/cpu87.c
@@ -323,7 +323,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 e3d0e435d466ae8f8d58b5b7b4967842f6b2d53e..5c497b62a3433a5fd96354e2afdd0fe42e9706ce 100644 (file)
--- 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/integratorcp/integratorcp.c b/board/integratorcp/integratorcp.c
index d6d6e13d5a475f20290bb86277affe17365522b8..220513f32947bfb492c2e8274b35d6d33242a52c 100644 (file)
--- a/board/integratorcp/integratorcp.c
+++ b/board/integratorcp/integratorcp.c
@@ -34,6 +34,7 @@
  */
 
 #include <common.h>
+#include <div64.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -244,7 +245,11 @@ ulong get_timer_masked (void)
                total_count += lastdec - now;
        }
        lastdec   = now;
-       timestamp = (ulong)(total_count/div_timer);
+
+       /* Reuse "now" */
+       now = total_count;
+       do_div(now, div_timer);
+       timestamp = now;
 
        return timestamp;
 }

diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index 77ee3d7ed72cbbff27fffb83971f6c52ebbc394d..44446501f94b05c4184fee986d510cfd85f1842c 100644 (file)
--- 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 24ce807857413d3a7eda718396ab9717290b597c..1f9a7726f16287a746d62b8027516cf29be9a8d6 100644 (file)
--- 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 a9d63cc35ad36bb436b5fbdf889f5c6133e63c18..6db93fbb4f3afe6f2205364ff5e769dcced6efee 100644 (file)
--- a/board/pm520/pm520.c
+++ b/board/pm520/pm520.c
@@ -316,7 +316,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 d8b0929cf48038c67f3f4677cbcf841719ac8439..2304420a886910acf34662ee9d97bc1de8bbacf1 100644 (file)
--- a/board/pm826/pm826.c
+++ b/board/pm826/pm826.c
@@ -312,7 +312,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 b163d5b35d3895b1ced84a7f120f8e69673b579e..296a199336dc0d1abee42f20023b9aa11410794e 100644 (file)
--- a/board/pm828/pm828.c
+++ b/board/pm828/pm828.c
@@ -345,7 +345,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 06fb18b344c88cddb222d26160ce4f4638e71dfc..48e05b83f760ef37738722f4ee5322d68aef325c 100644 (file)
--- 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);

diff --git a/board/trab/tsc2000.c b/board/trab/tsc2000.c
index 382a85b359300146d456f37f88c10dba6d5d5a40..f13a5a9dc0251d4173472381a1315e5fd448a9fd 100644 (file)
--- a/board/trab/tsc2000.c
+++ b/board/trab/tsc2000.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <s3c2400.h>
+#include <div64.h>
 #include "tsc2000.h"
 
 #include "Pt1000_temp_data.h"
@@ -332,6 +333,7 @@ void tsc2000_reg_init (void)
 int tsc2000_interpolate(long value, long data[][2], long *result)
 {
        int i;
+       unsigned long long val;
 
        /* the data is sorted and the first element is upper
         * limit so we can easily check for out-of-band values
@@ -347,10 +349,10 @@ int tsc2000_interpolate(long value, long data[][2], long *result)
           result in 'long long'.
        */
 
-       *result = data[i-1][1] +
-               ((unsigned long long)(data[i][1] - data[i-1][1])
-                * (unsigned long long)(value - data[i-1][0]))
-               / (data[i][0] - data[i-1][0]);
+       val = ((unsigned long long)(data[i][1] - data[i-1][1])
+                  * (unsigned long long)(value - data[i-1][0]));
+       do_div(val, (data[i][0] - data[i-1][0]));
+       *result = data[i-1][1] + val;
 
        return 0;
 }

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 751f5b99d43b7a7db1e2d0499e2cefca5312b300..8dbab02b87eb30481590399f93d70d4fd37b020c 100644 (file)
--- 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;
        }

diff --git a/cpu/arm1176/s3c64xx/interrupts.c b/cpu/arm1176/s3c64xx/interrupts.c
index 8356ae49e4364d07727a97f8b0d89d190bcf0f1e..e34369f890929f364c73908fe8952ad295a11350 100644 (file)
--- a/cpu/arm1176/s3c64xx/interrupts.c
+++ b/cpu/arm1176/s3c64xx/interrupts.c
@@ -41,6 +41,7 @@
 #include <common.h>
 #include <asm/proc-armv/ptrace.h>
 #include <s3c6400.h>
+#include <div64.h>
 
 static ulong timer_load_val;
 
@@ -148,7 +149,9 @@ void reset_timer(void)
 
 ulong get_timer_masked(void)
 {
-       return get_ticks() / (timer_load_val / (100 * CFG_HZ));
+       unsigned long long res = get_ticks();
+       do_div (res, (timer_load_val / (100 * CFG_HZ)));
+       return res;
 }
 
 ulong get_timer(ulong base)

diff --git a/cpu/arm946es/config.mk b/cpu/arm946es/config.mk
index 81ca2885e227b881aacb71d6bd037ebceef9589a..f774c7e8276dcc98ad26f3b6db5aaa4c558d1b9e 100644 (file)
--- a/cpu/arm946es/config.mk
+++ b/cpu/arm946es/config.mk
@@ -25,3 +25,10 @@ PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
         -msoft-float
 
 PLATFORM_CPPFLAGS +=  -march=armv4
+# =========================================================================
+#
+# Supply options according to compiler version
+#
+# =========================================================================
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))

diff --git a/cpu/arm_intcm/config.mk b/cpu/arm_intcm/config.mk
index 81ca2885e227b881aacb71d6bd037ebceef9589a..f774c7e8276dcc98ad26f3b6db5aaa4c558d1b9e 100644 (file)
--- a/cpu/arm_intcm/config.mk
+++ b/cpu/arm_intcm/config.mk
@@ -25,3 +25,10 @@ PLATFORM_RELFLAGS += -fno-strict-aliasing  -fno-common -ffixed-r8 \
         -msoft-float
 
 PLATFORM_CPPFLAGS +=  -march=armv4
+# =========================================================================
+#
+# Supply options according to compiler version
+#
+# =========================================================================
+PLATFORM_CPPFLAGS +=$(call cc-option,-mapcs-32,-mabi=apcs-gnu)
+PLATFORM_RELFLAGS +=$(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,))

diff --git a/drivers/rtc/mk48t59.c b/drivers/rtc/mk48t59.c
index b6c234e69ffb73fb3761511177658f70456b14e7..dabf3222b8461114908a84a2a562e811ea2976de 100644 (file)
--- 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;
 

diff --git a/drivers/rtc/rs5c372.c b/drivers/rtc/rs5c372.c
index 34514d037d6497e64a30e16b6670e7a2b9852b31..82dd9694e6f75a3609550d6c5ebee3ca257d8286 100644 (file)
--- a/drivers/rtc/rs5c372.c
+++ b/drivers/rtc/rs5c372.c
@@ -195,8 +195,7 @@ rtc_get (struct rtc_time *tmp)
 /*
  * Set the RTC
  */
-void
-rtc_set (struct rtc_time *tmp)
+int rtc_set (struct rtc_time *tmp)
 {
        unsigned char buf[8], reg15;
        int ret;

diff --git a/include/common.h b/include/common.h
index a394988b5ce998a4df93f9366ce28bc7e011e335..33c6e1087d13f91adbf6a3fad75fb6bb2bdb2f97 100644 (file)
--- 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);

diff --git a/include/onenand_uboot.h b/include/onenand_uboot.h
index 6605e4f218d2c99e3a38414dbd1093bd454efc6f..e9602574b780b49c0a4d02bbc55405330a74a33e 100644 (file)
--- a/include/onenand_uboot.h
+++ b/include/onenand_uboot.h
@@ -15,6 +15,7 @@
 #define __UBOOT_ONENAND_H
 
 #include <linux/types.h>
+#include <linux/mtd/mtd.h>
 
 struct mtd_info;
 struct erase_info;

diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 6c2f37e98151920469b09e76663613c0024381e7..772fa7f516a669bc7e986eab72d884d3bffc9bbf 100644 (file)
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -62,7 +62,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
        char    *s;
        int     machid = bd->bi_arch_number;
        void    (*theKernel)(int zero, int arch, uint params);
-       int     ret;
 
 #ifdef CONFIG_CMDLINE_TAG
        char *commandline = getenv ("bootargs");
@@ -125,7 +124,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 
        theKernel (0, machid, bd->bi_boot_params);
        /* does not return */
-error:
+
        return 1;
 }