[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-27-gc563adb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.0-27-gc563adb
|
From: jorasse <jo...@us...> - 2012-09-19 15:52:12
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via c563adbbaa563e9c67e30ce2e1309b8f971e362b (commit)
from b092fc2509114028405cf860bcf3738725083e5e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c563adbbaa563e9c67e30ce2e1309b8f971e362b
Author: Eric Jarrige <eri...@ar...>
Date: Wed Sep 19 17:55:50 2012 +0200
[UBOOT] 2012.04: fix bug when programming huge files (>32MiB) to NAND
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-u-boot-2012.04.h | 2 +-
.../device/armadeus/apf28/apf28-u-boot-2012.04.h | 2 +-
.../device/armadeus/apf51/apf51-u-boot-2012.04.h | 2 +-
.../armadeus/apf9328/apf9328-u-boot-2012.04.h | 2 +-
.../device/armadeus/pps/pps-u-boot-2012.04.h | 2 +-
.../2012.04/350-nand_large_file_download.patch | 39 ++++++++++++++------
6 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
index fe53929..315e5fc 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf27/apf27-u-boot-2012.04.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "3.2"
-#define CONFIG_IDENT_STRING " apf27 patch 3.6"
+#define CONFIG_IDENT_STRING " apf27 patch 3.7"
#define CONFIG_BOARD_NAME apf27
/*
diff --git a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
index 0b9257a..09977ca 100644
--- a/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf28/apf28-u-boot-2012.04.h
@@ -26,7 +26,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "1.2"
-#define CONFIG_IDENT_STRING " apf28 patch 1.5"
+#define CONFIG_IDENT_STRING " apf28 patch 1.7"
#define CONFIG_BOARD_NAME apf28
/*
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
index 5fe195a..76442ac 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2012.04.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "1.2"
-#define CONFIG_IDENT_STRING " apf51 patch 1.5"
+#define CONFIG_IDENT_STRING " apf51 patch 1.7"
#define CONFIG_BOARD_NAME apf51
/*
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
index ca95091..b5efe18 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2012.04.h
@@ -24,7 +24,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "5.3"
-#define CONFIG_IDENT_STRING " apf9328 patch 5.5"
+#define CONFIG_IDENT_STRING " apf9328 patch 5.7"
#define CONFIG_BOARD_NAME apf9328
/*
diff --git a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
index d399c3a..2a6b3a5 100644
--- a/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
+++ b/buildroot/target/device/armadeus/pps/pps-u-boot-2012.04.h
@@ -25,7 +25,7 @@
#define CONFIG_VERSION_VARIABLE
#define CONFIG_ENV_VERSION "3.2"
-#define CONFIG_IDENT_STRING " pps patch 3.5"
+#define CONFIG_IDENT_STRING " pps patch 3.7"
#define CONFIG_BOARD_NAME pps
/*
diff --git a/patches/u-boot/2012.04/350-nand_large_file_download.patch b/patches/u-boot/2012.04/350-nand_large_file_download.patch
index 2bbf217..1f1fc09 100644
--- a/patches/u-boot/2012.04/350-nand_large_file_download.patch
+++ b/patches/u-boot/2012.04/350-nand_large_file_download.patch
@@ -88,7 +88,19 @@ index 7aa3e23..c3635c0 100644
/* Well known TFTP port # */
#define WELL_KNOWN_PORT 69
/* Millisecs to timeout for lost pkt */
-@@ -113,8 +118,10 @@ static char default_filename[DEFAULT_NAME_LEN];
+@@ -38,6 +43,11 @@
+ static ulong TftpTimeoutMSecs = TIMEOUT;
+ static int TftpTimeoutCountMax = TIMEOUT_COUNT;
+
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++static int temp_buf_offset = 0;
++unsigned long nand_offset = 0;
++#endif
++
+ /*
+ * These globals govern the timeout behavior when attempting a connection to a
+ * TFTP server. TftpRRQTimeoutMSecs specifies the number of milliseconds to
+@@ -113,8 +123,10 @@ static char default_filename[DEFAULT_NAM
static char tftp_filename[MAX_LEN];
#ifdef CONFIG_SYS_DIRECT_FLASH_TFTP
@@ -99,7 +111,7 @@ index 7aa3e23..c3635c0 100644
/* 512 is poor choice for ethernet, MTU is typically 1500.
* Minus eth.hdrs thats 1468. Can get 2x better throughput with
-@@ -157,12 +164,104 @@ mcast_cleanup(void)
+@@ -157,12 +169,96 @@ mcast_cleanup(void)
#endif /* CONFIG_MCAST_TFTP */
@@ -150,8 +162,6 @@ index 7aa3e23..c3635c0 100644
+static void tftp_2_nand(uchar * src, unsigned len)
+{
+ #define TFTP2NAND_BUFFER_SIZE 4096
-+ static int temp_buf_offset;
-+ static unsigned long nand_offset;
+ static u_char temp_buf[TFTP2NAND_BUFFER_SIZE];
+ size_t nand_page_size;
+ /* retrieve current nand infos */
@@ -171,12 +181,6 @@ index 7aa3e23..c3635c0 100644
+ return;
+ }
+
-+
-+ if (TftpBlock == 1) { /* reset local nand buffer */
-+ temp_buf_offset = 0;
-+ nand_offset = load_addr;
-+ }
-+
+ if (len)
+ (void)memcpy((void *)(temp_buf + temp_buf_offset), src, len);
+ temp_buf_offset += len;
@@ -204,7 +208,7 @@ index 7aa3e23..c3635c0 100644
int i, rc = 0;
for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) {
-@@ -184,6 +283,13 @@ store_block(unsigned block, uchar *src, unsigned len)
+@@ -184,6 +280,13 @@ store_block(unsigned block, uchar *src,
}
}
else
@@ -218,7 +222,18 @@ index 7aa3e23..c3635c0 100644
#endif /* CONFIG_SYS_DIRECT_FLASH_TFTP */
{
(void)memcpy((void *)(load_addr + offset), src, len);
-@@ -295,6 +401,13 @@ static void update_block_number(void)
+@@ -206,6 +309,10 @@ static void new_transfer(void)
+ #ifdef CONFIG_CMD_TFTPPUT
+ TftpFinalBlock = 0;
+ #endif
++#if defined(CONFIG_CMD_NAND) && defined(CONFIG_SYS_DIRECT_FLASH_TFTP)
++ temp_buf_offset = 0;
++ nand_offset = load_addr;
++#endif
+ }
+
+ #ifdef CONFIG_CMD_TFTPPUT
+@@ -295,6 +402,13 @@ static void update_block_number(void)
/* The TFTP get or put is complete */
static void tftp_complete(void)
{
hooks/post-receive
--
armadeus
|
