[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-103-g77a4e14
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-103-g77a4e14
|
From: jorasse <jo...@us...> - 2011-05-02 22:07:03
|
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 77a4e144227f0741950365e739d56751ca957fd1 (commit)
via 626b32de86f494d13c5cbe3c4c0ec15ef85914f1 (commit)
via 07a29b67d077ddffbd480fca6ab4684f214c2270 (commit)
from fd138818bafd8a0f5d19c994a509d72f382e9b7d (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 77a4e144227f0741950365e739d56751ca957fd1
Merge: 626b32de86f494d13c5cbe3c4c0ec15ef85914f1 fd138818bafd8a0f5d19c994a509d72f382e9b7d
Author: jorasse <jo...@ar...>
Date: Tue May 3 00:08:52 2011 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 626b32de86f494d13c5cbe3c4c0ec15ef85914f1
Author: jorasse <jo...@ar...>
Date: Tue May 3 00:08:26 2011 +0200
[LINUX][2.6.38][APF51] Fix mx51 NAND OOB definition to be compliant with mx51 chipset specification
commit 07a29b67d077ddffbd480fca6ab4684f214c2270
Author: jorasse <jo...@ar...>
Date: Tue May 3 00:04:30 2011 +0200
[UBOOT][APF51] Change NAND OOB definition to be compliant with mx51 linux kernel NAND driver
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 8 +++++---
.../2.6.38/404-armadeus-fix_nand_ecc_oob.patch | 2 +-
.../u-boot/u-boot-2010.03-407-imx51-nand.patch | 14 ++++++++++----
3 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index bc72ae1..3a4694c 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -2,7 +2,7 @@
*
* Configuration settings for the Armadeus Project apf51 board.
*
- * (C) Copyright 2010 Eric Jarrige, Armadeus Project
+ * (C) Copyright 2010,2011 Eric Jarrige, Armadeus Project
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -20,14 +20,16 @@
* MA 02111-1307 USA
*
* 2010/03/31 Initial version based on apf27 configuration file
+ * 2011/05/02 patch V0.5 updates NAND OOB to be mx51 linux kernel compliant
+ * (at least for the first 11 spare bytes..)
*/
#ifndef __CONFIG_H
#define __CONFIG_H
#define CONFIG_VERSION_VARIABLE
-#define CONFIG_ENV_VERSION "0.4"
-#define CONFIG_IDENT_STRING " apf51 patch 0.4"
+#define CONFIG_ENV_VERSION "0.5"
+#define CONFIG_IDENT_STRING " apf51 patch 0.5"
//#define APF51_PROTO
//#define APF51_RECOVER
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/404-armadeus-fix_nand_ecc_oob.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/404-armadeus-fix_nand_ecc_oob.patch
index 0338f4d..422e8f1 100644
--- a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/404-armadeus-fix_nand_ecc_oob.patch
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.38/404-armadeus-fix_nand_ecc_oob.patch
@@ -19,7 +19,7 @@ Index: linux-2.6.38-alpha/drivers/mtd/nand/mxc_nand.c
+ 136, 137, 138, 139, 140, 141, 142, 143,
+ 200, 201, 202, 203, 204, 205, 206, 207
+ },
-+ .oobfree = { {16, 56}, {80, 56}, {144, 56}, {208, 48} },
++ .oobfree = { {2, 4}, {16, 56}, {80, 56}, {144, 56}, {208, 48} },
+};
+
#ifdef CONFIG_MTD_PARTITIONS
diff --git a/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch b/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
index f0fc854..b7a7c8b 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-407-imx51-nand.patch
@@ -14,7 +14,7 @@ Index: u-boot-2010.03/drivers/mtd/nand/mx51_nand.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2010.03/drivers/mtd/nand/mx51_nand.c 2011-01-05 18:11:47.000000000 +0100
-@@ -0,0 +1,979 @@
+@@ -0,0 +1,985 @@
+/*
+ * Copyright (C) 2010 Eric Jarrige <jo...@ar...>
+ * Copyright 2004-2007 Freescale Semiconductor, Inc.
@@ -175,13 +175,19 @@ Index: u-boot-2010.03/drivers/mtd/nand/mx51_nand.c
+
+
+static struct nand_ecclayout nand_hw_eccoob2k = {
-+ .eccbytes = 8,
++ .eccbytes = 4 * 8,
+ .eccpos = {
+ 8, 9, 10, 11, 12, 13, 14, 15,
++ 72, 73, 74, 75, 76, 77, 78, 79,
++ 136, 137, 138, 139, 140, 141, 142, 143,
++ 200, 201, 202, 203, 204, 205, 206, 207
+ },
+ .oobfree = {
-+ {.offset = 2, .length = 5},
-+ {.offset = 16, .length = 48}
++ {.offset = 2, .length = 4},
++ {.offset = 16, .length = 56},
++ {.offset = 80, .length = 56},
++ {.offset = 144, .length = 56},
++ {.offset = 208, .length = 48}
+ },
+};
+
hooks/post-receive
--
armadeus
|
