[oe-commits] Steffen Sledz : u-boot-2009.03: nor flash layout changed for hipox machine

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 86a69a7aa513ab7b2a53f6f6589646952b1e7ebb
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=86a69a7aa513ab7b2a53f6f6589646952b1e7ebb

Author: Steffen Sledz <sledz at dresearch.de>
Date:   Tue Feb  2 17:00:30 2010 +0100

u-boot-2009.03: nor flash layout changed for hipox machine

Signed-off-by: Mario Schuknecht <m.schuknecht at dresearch.de>
Acked-by: Steffen Sledz <sledz at dresearch.de>

---

 .../u-boot/u-boot-2009.03/hipox/04-hipox-env.patch |   24 ++++++++++++++++++++
 recipes/u-boot/u-boot_2009.03.bb                   |    1 +
 2 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch b/recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch
new file mode 100644
index 0000000..57394cb
--- /dev/null
+++ b/recipes/u-boot/u-boot-2009.03/hipox/04-hipox-env.patch
@@ -0,0 +1,24 @@
+--- u-boot-2009.03.orig/include/configs/hipox.h	2010-02-02 10:26:50.000000000 +0000
++++ u-boot-2009.03/include/configs/hipox.h	2010-02-02 12:03:59.000000000 +0000
+@@ -424,8 +424,19 @@
+ #define CONFIG_ENV_SIZE        CONFIG_ENV_SECT_SIZE
+ /* Second parameter block for backup environment */
+ #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
+-/* Main environment occupies first parameter block */
+-#define CONFIG_ENV_ADDR        ((CONFIG_SYS_FLASH_BASE)+(NUM_FLASH_MAIN_BLOCKS)*(FLASH_MAIN_BLOCK_SIZE))
++/** Main environment occupies parameter block at offset 32k, 
++ *  there are two 8k blocks in both flashs. 
++ *
++ * Flash AT49BV163DT:
++ *  -      0 - 1F0000: 31 block 64k (10000)
++ *  - 1F0000 - 200000:  8 block  8k ( 2000)
++ *  Flash A29L160ATG:
++ *  -      0 - 1F0000: 31 block 64k (10000)
++ *  - 1F0000 - 1F8000:  1 block 32k ( 8000)
++ *  - 1F8000 - 1FC000:  2 block  8k ( 2000)
++ *  - 1FC000 - 200000:  1 block 16k ( 4000)
++ */
++#define CONFIG_ENV_ADDR        ((CONFIG_SYS_FLASH_BASE)+(NUM_FLASH_MAIN_BLOCKS)*(FLASH_MAIN_BLOCK_SIZE) + (4 * (CONFIG_ENV_SECT_SIZE)))
+ /* Backup environment occupies second parameter block */
+ #define CONFIG_ENV_ADDR_REDUND ((CONFIG_ENV_ADDR)+(CONFIG_ENV_SECT_SIZE))
+ #endif
diff --git a/recipes/u-boot/u-boot_2009.03.bb b/recipes/u-boot/u-boot_2009.03.bb
index a70fa6a..c3e9326 100644
--- a/recipes/u-boot/u-boot_2009.03.bb
+++ b/recipes/u-boot/u-boot_2009.03.bb
@@ -10,6 +10,7 @@ SRC_URI_append_hipox = "file://00-hipox.patch;patch=1 \
 	file://01-hipox-fix-gmac-reset.patch;patch=1 \
 	file://02-hipox-enable-mmu.patch;patch=1 \
 	file://03-hipox-direct-switch.patch;patch=1 \
+	file://04-hipox-env.patch;patch=1 \
 "
 
 TARGET_LDFLAGS = ""