Merge branch 'master' into next

Conflicts:
	lib_generic/zlib.c

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

diff --git a/Makefile b/Makefile
index b891b1b72c5dac7bf27676c4842b8a2ff587eb5e..f5a55c703f706cd39499837fe6e42fd61291663f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3266,6 +3266,7 @@ zylonite_config :
 #########################################################################
 
 apollon_config         : unconfig
+       @mkdir -p $(obj)include
        @echo "#define CONFIG_ONENAND_U_BOOT" > $(obj)include/config.h
        @$(MKCONFIG) $(@:_config=) arm arm1136 apollon NULL omap24xx
        @echo "CONFIG_ONENAND_U_BOOT = y" >> $(obj)include/config.mk

diff --git a/README b/README
index 8047c778887051693fda45a41be5c6b63b433aad..fe6ca98d82b3fd9209edf67442cbd117d7218639 100644 (file)
--- a/README
+++ b/README
@@ -846,20 +846,20 @@ The following options need to be configured:
                        Define this to use i/o functions instead of macros
                        (some hardware wont work with macros)
 
-               CONFIG_DRIVER_SMC911X
+               CONFIG_SMC911X
                Support for SMSC's LAN911x and LAN921x chips
 
-                       CONFIG_DRIVER_SMC911X_BASE
+                       CONFIG_SMC911X_BASE
                        Define this to hold the physical address
                        of the device (I/O space)
 
-                       CONFIG_DRIVER_SMC911X_32_BIT
+                       CONFIG_SMC911X_32_BIT
                        Define this if data bus is 32 bits
 
-                       CONFIG_DRIVER_SMC911X_16_BIT
+                       CONFIG_SMC911X_16_BIT
                        Define this if data bus is 16 bits. If your processor
                        automatically converts one 32 bit word to two 16 bit
-                       words you may also try CONFIG_DRIVER_SMC911X_32_BIT.
+                       words you may also try CONFIG_SMC911X_32_BIT.
 
 - USB Support:
                At the moment only the UHCI host controller is

diff --git a/board/atmel/at91sam9261ek/at91sam9261ek.c b/board/atmel/at91sam9261ek/at91sam9261ek.c
index 2f6b599a6ba08e462c56f7495e952f859661de4c..7ead2b8977cd976a1374d193f57ef31d522631b8 100644 (file)
--- a/board/atmel/at91sam9261ek/at91sam9261ek.c
+++ b/board/atmel/at91sam9261ek/at91sam9261ek.c
@@ -265,11 +265,12 @@ int board_init(void)
 }
 
 #ifdef CONFIG_DRIVER_DM9000
- int board_eth_init(bd_t *bis)
- {
+int board_eth_init(bd_t *bis)
+{
        return dm9000_initialize(bis);
- }
- #endif
+}
+#endif
+
 int dram_init(void)
 {
        gd->bd->bi_dram[0].start = PHYS_SDRAM;

diff --git a/board/mucmc52/mucmc52.c b/board/mucmc52/mucmc52.c
index bac49befffe4cd223881158055f2264cc0172389..b4ed7357e44e4de58816490e6ecee146f764da55 100644 (file)
--- a/board/mucmc52/mucmc52.c
+++ b/board/mucmc52/mucmc52.c
@@ -31,6 +31,7 @@
  */
 
 #include <common.h>
+#include <fdt_support.h>
 #include <mpc5xxx.h>
 #include <pci.h>
 #include <malloc.h>
@@ -403,5 +404,6 @@ void pci_init_board (void)
 void ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
+       fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 }
 #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */

diff --git a/board/uc101/uc101.c b/board/uc101/uc101.c
index 4030b9d0d83cebaf87664bbdcd0cb6b96d7d0e74..1485c0249b52b23d7ef6a29b963d56224d597bdb 100644 (file)
--- a/board/uc101/uc101.c
+++ b/board/uc101/uc101.c
@@ -31,6 +31,7 @@
  */
 
 #include <common.h>
+#include <fdt_support.h>
 #include <mpc5xxx.h>
 #include <pci.h>
 #include <malloc.h>
@@ -376,5 +377,6 @@ void hw_watchdog_reset(void)
 void ft_board_setup(void *blob, bd_t *bd)
 {
        ft_cpu_setup(blob, bd);
+       fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize);
 }
 #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index e0cb8695de9ebb486ba9a3437366143798f1905c..efd6aec0cf19f60b36e32f15c5345db6be03865e 100644 (file)
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -475,8 +475,8 @@ cmd_tbl_t cmd_bootm_sub[] = {
 #ifdef CONFIG_OF_LIBFDT
        U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)BOOTM_STATE_FDT, "", ""),
 #endif
-       U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""),
        U_BOOT_CMD_MKENT(cmdline, 0, 1, (void *)BOOTM_STATE_OS_CMDLINE, "", ""),
+       U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""),
        U_BOOT_CMD_MKENT(prep, 0, 1, (void *)BOOTM_STATE_OS_PREP, "", ""),
        U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""),
 };
@@ -1022,8 +1022,8 @@ U_BOOT_CMD(
 #if defined(CONFIG_OF_LIBFDT)
        "\tfdt     - relocate flat device tree\n"
 #endif
-       "\tbdt     - OS specific bd_t processing\n"
        "\tcmdline - OS specific command line processing/setup\n"
+       "\tbdt     - OS specific bd_t processing\n"
        "\tprep    - OS specific prep before relocation or go\n"
        "\tgo      - start OS"
 );

diff --git a/cpu/arm920t/s3c24x0/timer.c b/cpu/arm920t/s3c24x0/timer.c
index fcc6c0cb1b1f536c337b53205c5a242e0ffdfc50..7d47354381c0a68c5ff9491b8bec5244b75f9789 100644 (file)
--- a/cpu/arm920t/s3c24x0/timer.c
+++ b/cpu/arm920t/s3c24x0/timer.c
@@ -198,6 +198,8 @@ void reset_cpu(ulong ignored)
        struct s3c24x0_watchdog *watchdog;
 
 #ifdef CONFIG_TRAB
+       extern void disable_vfd(void);
+
        disable_vfd();
 #endif
 

diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c
index dd2c94073b3805494cdc1a476c23c8ec62075fee..2aa69b383b426c494e712757135a540a6eb35f9a 100644 (file)
--- a/cpu/arm_cortexa8/omap3/board.c
+++ b/cpu/arm_cortexa8/omap3/board.c
@@ -328,7 +328,7 @@ usage:
 
 U_BOOT_CMD(
        nandecc, 2, 1,  do_switch_ecc,
-       "nandecc - switch OMAP3 NAND ECC calculation algorithm\n",
+       "switch OMAP3 NAND ECC calculation algorithm",
        "[hw/sw] - Switch between NAND hardware (hw) or software (sw) ecc algorithm"
 );
 

diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c
index bec927706f976cf3cf4a781badb505d721dfb922..7085d42cc1b92ebc7e4a543863c85867bd7cf245 100644 (file)
--- a/drivers/mtd/nand/nand_util.c
+++ b/drivers/mtd/nand/nand_util.c
@@ -452,7 +452,7 @@ static size_t get_len_incl_bad (nand_info_t *nand, loff_t offset,
                len_incl_bad += block_len;
                offset       += block_len;
 
-               if ((offset + len_incl_bad) >= nand->size)
+               if (offset >= nand->size)
                        break;
        }
 

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index c027abe9f7b1661f4556079a9f588ee5c255156a..5d51406f6fab04a150b648dde3ec7a2e0d6bf526 100644 (file)
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -37,7 +37,7 @@ void pkt_data_push(struct eth_device *dev, u32 addr, u32 val) \
 
 #define mdelay(n)       udelay((n)*1000)
 
-static void smx911x_handle_mac_address(struct eth_device *dev)
+static void smc911x_handle_mac_address(struct eth_device *dev)
 {
        unsigned long addrh, addrl;
        uchar *m = dev->enetaddr;
@@ -155,7 +155,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd)
        /* Configure the PHY, initialize the link state */
        smc911x_phy_configure(dev);
 
-       smx911x_handle_mac_address(dev);
+       smc911x_handle_mac_address(dev);
 
        /* Turn on Tx + Rx */
        smc911x_enable(dev);

diff --git a/lib_generic/zlib.c b/lib_generic/zlib.c
index 572196865a5e32b20474f9487f0da59a57deb41f..26e5af1d8e84bfa74fee86b90adb5d4cbed4b40b 100644 (file)
--- a/lib_generic/zlib.c
+++ b/lib_generic/zlib.c
@@ -30,6 +30,8 @@
 #include <compiler.h>
 #include <asm/unaligned.h>
 #include "u-boot/zlib.h"
+#undef OFF                             /* avoid conflicts */
+
 /* To avoid a build time warning */
 #ifdef STDC
 #include <malloc.h>

diff --git a/net/nfs.c b/net/nfs.c
index 27395fbf2e4b7068dc0de94d7f2df7f3118696f3..4017c3e3539bc277d2fc95eb0770c649efd8e0f6 100644 (file)
--- a/net/nfs.c
+++ b/net/nfs.c
@@ -516,7 +516,7 @@ nfs_readlink_reply (uchar *pkt, unsigned len)
                strcat (nfs_path, "/");
                pathlen = strlen(nfs_path);
                memcpy (nfs_path+pathlen, (uchar *)&(rpc_pkt.u.reply.data[2]), rlen);
-               nfs_path[pathlen+rlen+1] = 0;
+               nfs_path[pathlen + rlen] = 0;
        } else {
                memcpy (nfs_path, (uchar *)&(rpc_pkt.u.reply.data[2]), rlen);
                nfs_path[rlen] = 0;
@@ -571,13 +571,14 @@ Interfaces of U-BOOT
 static void
 NfsTimeout (void)
 {
-       if ( NfsTimeoutCount++ < NFS_RETRY_COUNT ) {
+       if ( ++NfsTimeoutCount > NFS_RETRY_COUNT ) {
+               puts ("\nRetry count exceeded; starting again\n");
+               NetStartAgain ();
+       } else {
+               puts("T ");
+               NetSetTimeout (NFS_TIMEOUT, NfsTimeout);
                NfsSend ();
-               return;
        }
-       puts ("Timeout\n");
-       NetState = NETLOOP_FAIL;
-       return;
 }
 
 static void