summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
committerWolfgang Denk <wd@denx.de>2009-12-07 22:47:17 +0100
commit206c00f26f56af02686cb69bfe5c75e979063171 (patch)
tree4e637df34f87762a2e70649e88f52ac973df1f00
parent39ff7d5f4cc547a2034a8bfc2a5b5f4b62fd5c20 (diff)
parentf8450829f921cf10667af98a8d08edfa3d998f04 (diff)
downloadu-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.zip
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.gz
u-boot-imx-206c00f26f56af02686cb69bfe5c75e979063171.tar.bz2
Merge branch 'master' into next
Conflicts: lib_generic/zlib.c Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--Makefile1
-rw-r--r--README10
-rw-r--r--board/atmel/at91sam9261ek/at91sam9261ek.c9
-rw-r--r--board/mucmc52/mucmc52.c2
-rw-r--r--board/uc101/uc101.c2
-rw-r--r--common/cmd_bootm.c4
-rw-r--r--cpu/arm920t/s3c24x0/timer.c2
-rw-r--r--cpu/arm_cortexa8/omap3/board.c2
-rw-r--r--drivers/mtd/nand/nand_util.c2
-rw-r--r--drivers/net/smc911x.c4
-rw-r--r--lib_generic/zlib.c2
-rw-r--r--net/nfs.c13
12 files changed, 32 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index b891b1b..f5a55c7 100644
--- 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 8047c77..fe6ca98 100644
--- 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 2f6b599..7ead2b8 100644
--- 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 bac49be..b4ed735 100644
--- 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 4030b9d..1485c02 100644
--- 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 e0cb869..efd6aec 100644
--- 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 fcc6c0c..7d47354 100644
--- 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 dd2c940..2aa69b3 100644
--- 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 bec9277..7085d42 100644
--- 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 c027abe..5d51406 100644
--- 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 5721968..26e5af1 100644
--- 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 27395fb..4017c3e 100644
--- 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