From: grodriguez <guille.rodrig...@gmail.com>
---
.../barebox-128m-env/config | 4 ++
.../barebox-64m-env/config | 4 ++
.../barebox-NAND-128M.config | 9 +++++-
.../barebox-NAND-64M.config | 9 +++++-
.../barebox-2011.05.0/Add_mini2440_nor_flash.diff | 30 ++++++++++++++++++++
.../patches/barebox-2011.05.0/series | 3 ++
6 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644
configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/Add_mini2440_nor_flash.diff
diff --git a/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
b/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
index 691b37d..822e491 100644
--- a/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
+++ b/configs/platform-friendlyarm-mini2440/barebox-128m-env/config
@@ -50,6 +50,10 @@ fi
autoboot_timeout=3
+if [ -e /dev/nor0 ]; then
+ nor_parts="512k(barebox)"
+fi
+
#
# "mini2440" kernel parameter
# 0 .. 9 = screen type
diff --git a/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
b/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
index f31233a..d3d4d42 100644
--- a/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
+++ b/configs/platform-friendlyarm-mini2440/barebox-64m-env/config
@@ -50,6 +50,10 @@ fi
autoboot_timeout=3
+if [ -e /dev/nor0 ]; then
+ nor_parts="512k(barebox)"
+fi
+
#
# "mini2440" kernel parameter
# 0 .. 9 = screen type
diff --git a/configs/platform-friendlyarm-mini2440/barebox-NAND-128M.config
b/configs/platform-friendlyarm-mini2440/barebox-NAND-128M.config
index 6064c9d..8a61e01 100644
--- a/configs/platform-friendlyarm-mini2440/barebox-NAND-128M.config
+++ b/configs/platform-friendlyarm-mini2440/barebox-NAND-128M.config
@@ -236,7 +236,14 @@ CONFIG_DRIVER_NET_DM9000=y
#
# flash drivers
#
-# CONFIG_DRIVER_CFI is not set
+CONFIG_DRIVER_CFI=y
+# CONFIG_DRIVER_CFI_INTEL is not set
+CONFIG_DRIVER_CFI_AMD=y
+# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
+CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
+# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
+# CONFIG_CFI_BUFFER_WRITE is not set
CONFIG_MTD=y
CONFIG_NAND=y
CONFIG_NAND_S3C24X0=y
diff --git a/configs/platform-friendlyarm-mini2440/barebox-NAND-64M.config
b/configs/platform-friendlyarm-mini2440/barebox-NAND-64M.config
index cf29d12..14376f2 100644
--- a/configs/platform-friendlyarm-mini2440/barebox-NAND-64M.config
+++ b/configs/platform-friendlyarm-mini2440/barebox-NAND-64M.config
@@ -236,7 +236,14 @@ CONFIG_DRIVER_NET_DM9000=y
#
# flash drivers
#
-# CONFIG_DRIVER_CFI is not set
+CONFIG_DRIVER_CFI=y
+# CONFIG_DRIVER_CFI_INTEL is not set
+CONFIG_DRIVER_CFI_AMD=y
+# CONFIG_DRIVER_CFI_BANK_WIDTH_1 is not set
+CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
+CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
+# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
+# CONFIG_CFI_BUFFER_WRITE is not set
CONFIG_MTD=y
CONFIG_NAND=y
CONFIG_NAND_S3C24X0=y
diff --git
a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/Add_mini2440_nor_flash.diff
b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/Add_mini2440_nor_flash.diff
new file mode 100644
index 0000000..470fedf
--- /dev/null
+++
b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/Add_mini2440_nor_flash.diff
@@ -0,0 +1,30 @@
+Index: barebox-2011.05.0/arch/arm/boards/mini2440/mini2440.c
+===================================================================
+--- barebox-2011.05.0.orig/arch/arm/boards/mini2440/mini2440.c 2014-09-01
08:58:28.446096372 +0200
++++ barebox-2011.05.0/arch/arm/boards/mini2440/mini2440.c 2014-09-01
08:59:21.356093913 +0200
+@@ -65,6 +65,13 @@
+ .platform_data = &nand_info,
+ };
+
++static struct device_d nor_dev = {
++ .id = -1,
++ .name = "cfi_flash",
++ .map_base = CS0_BASE,
++ .size = 2 * 1024 * 1024,
++};
++
+ /*
+ * dm9000 network controller onboard
+ * Connected to CS line 4 and interrupt line EINT7,
+@@ -282,6 +289,11 @@
+ #endif
+
+ #endif
++
++#ifdef CONFIG_DRIVER_CFI
++ register_device(&nor_dev);
++#endif
++
+ register_device(&mci_dev);
+ armlinux_add_dram(&sdram_dev);
+ armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100);
diff --git
a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/series
b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/series
index 986e358..473df11 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/series
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/series
@@ -17,3 +17,6 @@ Add_a_editor_status_line.diff
# odor marker
set-marker.diff
+
+# NOR support for mini2440
+Add_mini2440_nor_flash.diff
--
1.7.0.4
