[oe-commits] Roger Monk : linux-davinci: Add patches to disable NAND SUBPAGE on da850-omapl138-evm/hawkboard
git version control
git at git.openembedded.org
Mon Aug 30 07:38:06 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 8dd16b11ebf4056881b69c9545dff0d367004890
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8dd16b11ebf4056881b69c9545dff0d367004890
Author: Roger Monk <r-monk at ti.com>
Date: Fri Aug 27 17:25:53 2010 +0100
linux-davinci: Add patches to disable NAND SUBPAGE on da850-omapl138-evm/hawkboard
* NAND SUBPAGE seen to give problems with UBIFS
* Workaround identified by Caglar
* Applied configuration locally here to board files
* Add Initial UBI settings to da850-omapl138 machine
* Bump PR
Signed-off-by: Roger Monk <r-monk at ti.com>
Signed-off-by: Koen Kooi <k-kooi at ti.com>
---
conf/machine/da850-omapl138-evm.conf | 15 ++++++++++
conf/machine/include/davinci.inc | 2 +-
...0001-board-da850-evm-Disable-NAND-SUBPAGE.patch | 29 ++++++++++++++++++++
...001-board-da850-hawk-Disable-NAND-SUBPAGE.patch | 27 ++++++++++++++++++
recipes/linux/linux-davinci_git.bb | 5 +++-
5 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/conf/machine/da850-omapl138-evm.conf b/conf/machine/da850-omapl138-evm.conf
index b61c00c..85a4ba0 100644
--- a/conf/machine/da850-omapl138-evm.conf
+++ b/conf/machine/da850-omapl138-evm.conf
@@ -11,4 +11,19 @@ UBOOT_LOADADDRESS = "0xc0008000"
MACHINE_FEATURES = "kernel26 serial ethernet"
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit: 2048
+# UBI: logical eraseblock size: 129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 971 LEBs (125282304 bytes, 119.5 MiB), available 958 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 950"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit: 2048
+# UBI: physical eraseblock size: 131072 bytes (128 KiB)
+# UBI: sub-page size: 512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index 79c001f..a9a137c 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
require conf/machine/include/tune-arm926ejs.inc
# Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r46"
+MACHINE_KERNEL_PR = "r47"
TARGET_ARCH = "arm"
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch b/recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
new file mode 100644
index 0000000..3653bdf
--- /dev/null
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/0001-board-da850-evm-Disable-NAND-SUBPAGE.patch
@@ -0,0 +1,29 @@
+From 2ee9f2c655710d9e60a5a9b49871edc316e5363d Mon Sep 17 00:00:00 2001
+From: Roger Monk <r-monk at ti.com>
+Date: Wed, 25 Aug 2010 17:29:14 +0100
+Subject: [PATCH] board-da850-evm: Disable NAND SUBPAGE
+
+ * This was causing issues with UBI
+ * Solution/Workaround identified by Caglar Akyuz - now applied locally to board file
+
+Signed-off-by: Roger Monk <r-monk at ti.com>
+---
+ arch/arm/mach-davinci/board-da850-evm.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
+index cfed439..502b914 100755
+--- a/arch/arm/mach-davinci/board-da850-evm.c
++++ b/arch/arm/mach-davinci/board-da850-evm.c
+@@ -187,7 +187,7 @@ static struct davinci_nand_pdata da850_evm_nandflash_data = {
+ .nr_parts = ARRAY_SIZE(da850_evm_nandflash_partition),
+ .ecc_mode = NAND_ECC_HW,
+ .ecc_bits = 4,
+- .options = NAND_USE_FLASH_BBT,
++ .options = NAND_USE_FLASH_BBT | NAND_NO_SUBPAGE_WRITE,
+ .timing = &da850_evm_nandflash_timing,
+ };
+
+--
+1.6.0.4
+
diff --git a/recipes/linux/linux-davinci/hawkboard/0001-board-da850-hawk-Disable-NAND-SUBPAGE.patch b/recipes/linux/linux-davinci/hawkboard/0001-board-da850-hawk-Disable-NAND-SUBPAGE.patch
new file mode 100644
index 0000000..4ffe0e1
--- /dev/null
+++ b/recipes/linux/linux-davinci/hawkboard/0001-board-da850-hawk-Disable-NAND-SUBPAGE.patch
@@ -0,0 +1,27 @@
+From 69600e5a42512204bc4eb83a3a459496b049107f Mon Sep 17 00:00:00 2001
+From: Roger Monk <r-monk at ti.com>
+Date: Wed, 25 Aug 2010 17:47:16 +0100
+Subject: [PATCH] board-da850-hawk: Disable NAND SUBPAGE
+
+ * This was causing issues with UBI
+ * Solution/Workaround identified by Caglar Akyuz - now applied locally to board file
+---
+ arch/arm/mach-davinci/board-da850-hawk.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/mach-davinci/board-da850-hawk.c b/arch/arm/mach-davinci/board-da850-hawk.c
+index 87ed017..bbfe32a 100644
+--- a/arch/arm/mach-davinci/board-da850-hawk.c
++++ b/arch/arm/mach-davinci/board-da850-hawk.c
+@@ -118,7 +118,7 @@ static struct davinci_nand_pdata da850_hawk_nandflash_data = {
+ .nr_parts = ARRAY_SIZE(da850_hawk_nandflash_partition),
+ .ecc_mode = NAND_ECC_HW,
+ .ecc_bits = 4,
+- .options = NAND_USE_FLASH_BBT,
++ .options = NAND_USE_FLASH_BBT | NAND_NO_SUBPAGE_WRITE,
+ .timing = &da850_hawk_nandflash_timing,
+ };
+
+--
+1.6.0.4
+
diff --git a/recipes/linux/linux-davinci_git.bb b/recipes/linux/linux-davinci_git.bb
index 01259d9..3f28a53 100644
--- a/recipes/linux/linux-davinci_git.bb
+++ b/recipes/linux/linux-davinci_git.bb
@@ -68,10 +68,13 @@ SRC_URI_append_da850-omapl138-evm = ${ARAGO_L1_URI}
SRC_URI_append_hawkboard = ${ARAGO_L1_URI}
SRC_URI_append_da850-omapl138-evm = "file://logo_linux_clut224.ppm \
+ file://0001-board-da850-evm-Disable-NAND-SUBPAGE.patch \
"
SRC_URI_append_hawkboard = "file://logo_linux_clut224.ppm \
- file://patch-2.6.33rc4-psp-to-hawkboard.patch "
+ file://patch-2.6.33rc4-psp-to-hawkboard.patch \
+ file://0001-board-da850-hawk-Disable-NAND-SUBPAGE.patch \
+ "
do_configure_prepend_dm355-leopard() {
sed -i s:2138:1381:g ${S}/arch/arm/tools/mach-types
More information about the Openembedded-commits
mailing list