diff options
| author | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:35:03 -0400 |
|---|---|---|
| committer | Daniel Schaeffer <daniel.schaeffer@timesys.com> | 2009-10-08 13:35:03 -0400 |
| commit | b4707b70a20621a22266452bd18f21fc0c82ef81 (patch) | |
| tree | d9ab65ce18928b9086287609bfb1b05cd40e2ce9 | |
| parent | 954237a65dc8fd061892b84c79b31beccf1cc3a6 (diff) | |
This patch originally from LogicPD OMAP35x Release 1.6.1 Original Patch Name: u-boot-2009.03-lv-som-04-nand-tftp.patch
| -rw-r--r-- | include/configs/omap3_lv_som.h | 11 | ||||
| -rw-r--r-- | net/net.c | 4 | ||||
| -rw-r--r-- | net/tftp.c | 5 |
3 files changed, 15 insertions, 5 deletions
diff --git a/include/configs/omap3_lv_som.h b/include/configs/omap3_lv_som.h index c765377ee2..4733ab51cd 100644 --- a/include/configs/omap3_lv_som.h +++ b/include/configs/omap3_lv_som.h @@ -121,6 +121,9 @@ */ #if defined(CONFIG_CMD_NET) +#define CONFIG_TFTP_BLOCKSIZE_512 // Force TFTP blocksize to stay at + // 512 - prevents fragmentation + #define CONFIG_DRIVER_SMC911X #define CONFIG_DRIVER_SMC911X_16_BIT #define CONFIG_DRIVER_SMC911X_BASE 0x08000000 @@ -276,7 +279,7 @@ /* Configure the PISMO */ #define PISMO1_NAND_SIZE GPMC_SIZE_128M -#define PISMO1_ONEN_SIZE GPMC_SIZE_128M +// #define PISMO1_ONEN_SIZE GPMC_SIZE_128M #define CONFIG_SYS_MAX_FLASH_SECT 520 /* max number of sectors on */ /* one chip */ @@ -287,15 +290,13 @@ /* Monitor at start of flash */ #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP #define CONFIG_ENV_IS_IN_NAND 1 -#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */ -#define SMNAND_ENV_OFFSET 0x260000 /* environment starts here */ +#define SMNAND_ENV_OFFSET 0xffe0000 /* environment starts here */ #define CONFIG_SYS_ENV_SECT_SIZE boot_flash_sec #define CONFIG_ENV_OFFSET boot_flash_off -#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET +#define CONFIG_ENV_ADDR boot_flash_env_addr /*----------------------------------------------------------------------- * CFI FLASH driver setup @@ -660,6 +660,10 @@ NetSetTimeout(ulong iv, thand_f * f) timeHandler = f; timeStart = get_timer(0); timeDelta = iv; +#ifdef CONFIG_OMAP3_LV_SOM + // iv is in ms, get_timer returns ticks, scale appropriately... + timeDelta = (timeDelta * CONFIG_SYS_HZ) / 1000; +#endif } } diff --git a/net/tftp.c b/net/tftp.c index b0f1cca0b6..2cdcf62253 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -87,7 +87,12 @@ extern flash_info_t flash_info[]; * Minus eth.hdrs thats 1468. Can get 2x better throughput with * almost-MTU block sizes. At least try... fall back to 512 if need be. */ +#if defined(CONFIG_TFTP_BLOCKSIZE_512) +#define TFTP_MTU_BLOCKSIZE 512 +#else #define TFTP_MTU_BLOCKSIZE 1468 +#endif + static unsigned short TftpBlkSize=TFTP_BLOCK_SIZE; static unsigned short TftpBlkSizeOption=TFTP_MTU_BLOCKSIZE; |