Platform/bootloader: update patch stack to include NOR flash support

Its now possible to replace the vendor specific bootloader in
the NOR flash by a well known barebox.
This includes patches provided by Guille Rodriguez.

Signed-off-by: Juergen Borleis <jbe@pengutronix.de>

12 files changed, 340 insertions, 186 deletions

diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/add_more_info.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0001-mini2440-Add-more-info-about-possible-SDRAM-and-flas.patch
index 004fe5b..1d03668 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/add_more_info.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0001-mini2440-Add-more-info-about-possible-SDRAM-and-flas.patch
@@ -1,19 +1,21 @@
+From f9e0fe306dd80cf9dfb43e7be056e805638dc073 Mon Sep 17 00:00:00 2001
 From: Juergen Beisert <juergen@kreuzholzen.de>
-Subject: mini2440: Add more info about possible SDRAM and flash devices
+Date: Sun, 2 Nov 2014 16:38:11 +0100
+Subject: [PATCH 01/10] mini2440: Add more info about possible SDRAM and flash
+ devices
 
 It seems there are various combinations of the mini2440 in the wild. Not only
 the SDRAM differ, but more important the NAND also differs.
 
 Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
-
 ---
- arch/arm/boards/mini2440/mini2440.c |   56 +++++++++++++++++++++++++-----------
+ arch/arm/boards/mini2440/mini2440.c | 56 ++++++++++++++++++++++++++-----------
  1 file changed, 39 insertions(+), 17 deletions(-)
 
-Index: barebox-2011.04.0/arch/arm/boards/mini2440/mini2440.c
-===================================================================
---- barebox-2011.04.0.orig/arch/arm/boards/mini2440/mini2440.c
-+++ barebox-2011.04.0/arch/arm/boards/mini2440/mini2440.c
+diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c
+index 448aa40..2eb6eba 100644
+--- a/arch/arm/boards/mini2440/mini2440.c
++++ b/arch/arm/boards/mini2440/mini2440.c
 @@ -312,27 +312,49 @@ console_initcall(mini2440_console_init);
  
  This system is based on a Samsung S3C2440 CPU. The card is shipped with:
@@ -81,3 +83,6 @@ Index: barebox-2011.04.0/arch/arm/boards/mini2440/mini2440.c
  - NOR Flash (up to 22 address lines available)
     - AM29LV160DB, 2 MiB
     - SST39VF1601, 2 MiB
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/distinguish_64M_and_128M_NAND.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0002-Distinguish-the-various-NAND-sizes.patch
index 6220516..62abf28 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/distinguish_64M_and_128M_NAND.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0002-Distinguish-the-various-NAND-sizes.patch
@@ -1,5 +1,7 @@
+From eb823a34ec4782c7521effb9eb61f8fc0ea8b2e8 Mon Sep 17 00:00:00 2001
 From: Juergen Beisert <juergen@kreuzholzen.de>
-Subject: Distinguish the various NAND sizes
+Date: Sun, 2 Nov 2014 16:38:11 +0100
+Subject: [PATCH 02/10] Distinguish the various NAND sizes
 
 Its important to distinguish the NAND size, as the 64 MiB NAND has 16 kiB block
 size and the 128 MiB and above have 128 kiB block sizes.
@@ -24,16 +26,15 @@ Note: Using this patch needs some adaptions in the default environment.
 At least the "nand_parts" variable must be adapted!
 
 Signed-off-by: Juergen Beisert <juergen@kreuzholzen.de>
-
 ---
- arch/arm/boards/mini2440/mini2440.c |   16 +++++++++++++++-
- arch/arm/mach-s3c24xx/Kconfig       |   22 ++++++++++++++++++++++
+ arch/arm/boards/mini2440/mini2440.c | 16 +++++++++++++++-
+ arch/arm/mach-s3c24xx/Kconfig       | 22 ++++++++++++++++++++++
  2 files changed, 37 insertions(+), 1 deletion(-)
 
-Index: barebox-2011.04.0/arch/arm/boards/mini2440/mini2440.c
-===================================================================
---- barebox-2011.04.0.orig/arch/arm/boards/mini2440/mini2440.c
-+++ barebox-2011.04.0/arch/arm/boards/mini2440/mini2440.c
+diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c
+index 2eb6eba..bf12ea8 100644
+--- a/arch/arm/boards/mini2440/mini2440.c
++++ b/arch/arm/boards/mini2440/mini2440.c
 @@ -259,15 +259,29 @@ static int mini2440_devices_init(void)
  	register_device(&sdram_dev);
  	register_device(&dm9000_dev);
@@ -65,10 +66,10 @@ Index: barebox-2011.04.0/arch/arm/boards/mini2440/mini2440.c
  	register_device(&mci_dev);
  	armlinux_add_dram(&sdram_dev);
  	armlinux_set_bootparams((void *)sdram_dev.map_base + 0x100);
-Index: barebox-2011.04.0/arch/arm/mach-s3c24xx/Kconfig
-===================================================================
---- barebox-2011.04.0.orig/arch/arm/mach-s3c24xx/Kconfig
-+++ barebox-2011.04.0/arch/arm/mach-s3c24xx/Kconfig
+diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
+index 33d230c..fd44683 100644
+--- a/arch/arm/mach-s3c24xx/Kconfig
++++ b/arch/arm/mach-s3c24xx/Kconfig
 @@ -67,6 +67,28 @@ config MACH_A9M2410DEV
  
  endchoice
@@ -98,3 +99,6 @@ Index: barebox-2011.04.0/arch/arm/mach-s3c24xx/Kconfig
  endmenu
  
  menu "S3C24X0 Features              "
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/fix_generic_nand_issue.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0003-nand-nand_base-Always-initialise-oob_poi-before-writ.patch
index ccb9fdc..5e453ff 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/fix_generic_nand_issue.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0003-nand-nand_base-Always-initialise-oob_poi-before-writ.patch
@@ -1,5 +1,8 @@
+From 7f75e03496f68fe456fa101d4a79eefb2e2786d6 Mon Sep 17 00:00:00 2001
 From: "THOMSON, Adam (Adam)" <adam.thomson@alcatel-lucent.com>
-Subject: [PATCH] nand: nand_base: Always initialise oob_poi before writing OOB data
+Date: Sun, 2 Nov 2014 16:38:11 +0100
+Subject: [PATCH 03/10] nand: nand_base: Always initialise oob_poi before
+ writing OOB data
 
 In nand_do_write_ops() code it is possible for a caller to provide
 ops.oobbuf populated and ops.mode == MTD_OOB_AUTO, which currently
@@ -25,16 +28,15 @@ to 0xFF to make sure no left over data is inadvertently written
 back to OOB data.
 
 Signed-off-by: Adam Thomson <adam.thomson@alcatel-lucent.com>
-
 ---
- drivers/mtd/nand/nand_base.c |    6 +++---
+ drivers/mtd/nand/nand_base.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-Index: barebox-2011.05.0/drivers/mtd/nand/nand_base.c
-===================================================================
---- barebox-2011.05.0.orig/drivers/mtd/nand/nand_base.c
-+++ barebox-2011.05.0/drivers/mtd/nand/nand_base.c
-@@ -1645,9 +1645,9 @@ static int nand_do_write_ops(struct mtd_
+diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
+index 22d2127..1c18e40 100644
+--- a/drivers/mtd/nand/nand_base.c
++++ b/drivers/mtd/nand/nand_base.c
+@@ -1645,9 +1645,9 @@ static int nand_do_write_ops(struct mtd_info *mtd, loff_t to,
  	    (chip->pagebuf << chip->page_shift) < (to + ops->len))
  		chip->pagebuf = -1;
  
@@ -47,3 +49,6 @@ Index: barebox-2011.05.0/drivers/mtd/nand/nand_base.c
  
  	while(1) {
  		int bytes = mtd->writesize;
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/fix_dhcp_env_race.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0004-DHCP-and-NFSroot-TFTP.patch
index f2fc557..59837e0 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/fix_dhcp_env_race.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0004-DHCP-and-NFSroot-TFTP.patch
@@ -1,34 +1,22 @@
+From 6090ca546676dff547d478f0eefaf765a890b224 Mon Sep 17 00:00:00 2001
 From: Juergen Beisert <jbe@pengutronix.de>
-Subject: DHCP and NFSroot/TFTP
+Date: Sun, 2 Nov 2014 16:38:11 +0100
+Subject: [PATCH 04/10] DHCP and NFSroot/TFTP
 
 Setting up NFS root/TFTP related variables is successfull only if the network
 interface is already configured. For the case someone is using DHCP, this
 fails, because all these vars are still empty.
 
 Signed off by: Juergen Beisert <jbe@pengutronix.de>
-
 ---
- arch/arm/boards/mini2440/env/config |    2 +-
- defaultenv/bin/boot                 |    2 +-
+ arch/arm/boards/mini2440/env/config | 2 +-
+ defaultenv/bin/boot                 | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: barebox-2011.05.0/defaultenv/bin/boot
-===================================================================
---- barebox-2011.05.0.orig/defaultenv/bin/boot
-+++ barebox-2011.05.0/defaultenv/bin/boot
-@@ -21,7 +21,7 @@ if [ x$ip = xdhcp ]; then
- elif [ x$ip = xnone ]; then
- 	bootargs="$bootargs ip=none"
- else
--	bootargs="$bootargs ip=$eth0.ipaddr::$eth0.gateway:$eth0.netmask:::"
-+	bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
- fi
- 
- 
-Index: barebox-2011.05.0/arch/arm/boards/mini2440/env/config
-===================================================================
---- barebox-2011.05.0.orig/arch/arm/boards/mini2440/env/config
-+++ barebox-2011.05.0/arch/arm/boards/mini2440/env/config
+diff --git a/arch/arm/boards/mini2440/env/config b/arch/arm/boards/mini2440/env/config
+index ff6f1ea..884348d 100644
+--- a/arch/arm/boards/mini2440/env/config
++++ b/arch/arm/boards/mini2440/env/config
 @@ -38,7 +38,7 @@ if [ -n $user ]; then
  	nfsroot="${eth0.serverip}:/home/${user}/nfsroot/${machine}"
  	rootfsimage="${user}"-"${rootfsimage}"
@@ -38,3 +26,19 @@ Index: barebox-2011.05.0/arch/arm/boards/mini2440/env/config
  fi
  
  autoboot_timeout=3
+diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
+index de4fa24..3d0dc9d 100644
+--- a/defaultenv/bin/boot
++++ b/defaultenv/bin/boot
+@@ -21,7 +21,7 @@ if [ x$ip = xdhcp ]; then
+ elif [ x$ip = xnone ]; then
+ 	bootargs="$bootargs ip=none"
+ else
+-	bootargs="$bootargs ip=$eth0.ipaddr::$eth0.gateway:$eth0.netmask:::"
++	bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
+ fi
+ 
+ 
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/add_mmc_boot_support.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0005-patch-for-mmc-mount-rootds.patch
index 523ece1..669a240 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/add_mmc_boot_support.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0005-patch-for-mmc-mount-rootds.patch
@@ -1,5 +1,7 @@
+From fd8537d86a58c09f7b272904721066731897185c Mon Sep 17 00:00:00 2001
 From: Laurent Verstraeten <laurentv@tritechbelgium.com>
-Subject: [barebox] patch for mmc mount rootds
+Date: Sun, 2 Nov 2014 16:38:11 +0100
+Subject: [PATCH 05/10] patch for mmc mount rootds
 
 I wrote a quick patch for mounting rootfs from mmc (sdCard).
 I post it here in case it's helpful for someone else.
@@ -8,100 +10,15 @@ Signed-off-by: Laurent Verstraeten <laurentv@tritechbelgium.com>
 
 With some modifications from:
 Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-
 ---
- arch/arm/boards/mini2440/env/config |   49 +++++++++++++++++++++++++-----------
- defaultenv/bin/boot                 |   36 +++++++++++++++++---------
+ arch/arm/boards/mini2440/env/config | 49 ++++++++++++++++++++++++++-----------
+ defaultenv/bin/boot                 | 36 ++++++++++++++++++---------
  2 files changed, 59 insertions(+), 26 deletions(-)
 
-Index: barebox-2011.05.0/defaultenv/bin/boot
-===================================================================
---- barebox-2011.05.0.orig/defaultenv/bin/boot
-+++ barebox-2011.05.0/defaultenv/bin/boot
-@@ -5,15 +5,30 @@
- if [ x$1 = xnand ]; then
- 	rootfs_loc=nand
- 	kernel_loc=nand
--elif [ x$1 = xnor ]; then
--	rootfs_loc=nor
--	kernel_loc=nor
-+	rootfs_type=$rootfs_mtdblock_type
- elif [ x$1 = xnfs ]; then
- 	rootfs_loc=net
- 	kernel_loc=nfs
-+	if [ x$ip = xnone ]; then
-+		ip=
-+	fi
- elif [ x$1 = xtftp ]; then
- 	rootfs_loc=net
- 	kernel_loc=tftp
-+	if [ x$ip = xnone ]; then
-+		ip=
-+	fi
-+elif [ x$1 = xmmc ]; then
-+	rootfs_loc=mmc
-+	kernel_loc=mmc
-+	rootfs_type=$rootfs_mmc_type
-+fi
-+
-+if [ x$kernel_loc = xmmc ]; then
-+	if [ $mci0.probe = 0 ]; then
-+		echo "probing mci for sd card now"
-+		mci0.probe=1
-+	fi
- fi
- 
- if [ x$ip = xdhcp ]; then
-@@ -32,8 +47,6 @@ elif [ x$rootfs_loc = xinitrd ]; then
- else
- 	if [ x$rootfs_loc = xnand ]; then
- 		rootfs_mtdblock=$rootfs_mtdblock_nand
--	else
--		rootfs_mtdblock=$rootfs_mtdblock_nor
- 	fi
- 
- 	if [ x$rootfs_type = xubifs ]; then
-@@ -41,6 +54,9 @@ else
- 			ubiroot="root"
- 		fi
- 		bootargs="$bootargs root=ubi0:$ubiroot ubi.mtd=$rootfs_mtdblock"
-+	elif [ x$rootfs_loc = xmmc ]; then
-+		bootargs="$bootargs root=/dev/mmcblk0p$rootfs_mmc_part rootwait"
-+		rootfstype=
- 	else
- 		bootargs="$bootargs root=/dev/mtdblock$rootfs_mtdblock"
- 	fi
-@@ -48,10 +64,6 @@ else
- 	bootargs="$bootargs rootfstype=$rootfs_type noinitrd"
- fi
- 
--if [ -n $nor_parts ]; then
--	mtdparts="${mtdparts}physmap-flash.0:${nor_parts}"
--fi
--
- if [ -n $nand_parts ]; then
- 	if [ -n ${mtdparts} ]; then
- 		mtdparts="${mtdparts};"
-@@ -92,12 +104,12 @@ if [ x$kernel_loc = xnfs ] || [ x$kernel
- 	fi
- 	$kernel_loc $kernelimage $netload || exit 1
- 	kdev="$netload"
--elif [ x$kernel_loc = xnor ]; then
--	kdev="/dev/nor0.kernel"
- elif [ x$kernel_loc = xnand ]; then
- 	kdev="/dev/nand0.kernel.bb"
-+elif [ x$kernel_loc = xmmc ]; then
-+	kdev="/dev/disk0.$kernel_mmc_part"
- else
--	echo "error: set kernel_loc to one of 'nfs', 'tftp', 'nand' or 'nor'"
-+	echo "error: set kernel_loc to one of 'nfs', 'tftp', 'nand' or 'mmc'"
- 	exit 1
- fi
- 
-Index: barebox-2011.05.0/arch/arm/boards/mini2440/env/config
-===================================================================
---- barebox-2011.05.0.orig/arch/arm/boards/mini2440/env/config
-+++ barebox-2011.05.0/arch/arm/boards/mini2440/env/config
+diff --git a/arch/arm/boards/mini2440/env/config b/arch/arm/boards/mini2440/env/config
+index 884348d..6d72f12 100644
+--- a/arch/arm/boards/mini2440/env/config
++++ b/arch/arm/boards/mini2440/env/config
 @@ -1,7 +1,6 @@
  #!/bin/sh
  
@@ -185,3 +102,90 @@ Index: barebox-2011.05.0/arch/arm/boards/mini2440/env/config
 +rootfs_mmc_part=2
 +# used when manually booting with "boot mmc" command
 +rootfs_mmc_type=ext2
+diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
+index 3d0dc9d..f71e5c8 100644
+--- a/defaultenv/bin/boot
++++ b/defaultenv/bin/boot
+@@ -5,15 +5,30 @@
+ if [ x$1 = xnand ]; then
+ 	rootfs_loc=nand
+ 	kernel_loc=nand
+-elif [ x$1 = xnor ]; then
+-	rootfs_loc=nor
+-	kernel_loc=nor
++	rootfs_type=$rootfs_mtdblock_type
+ elif [ x$1 = xnfs ]; then
+ 	rootfs_loc=net
+ 	kernel_loc=nfs
++	if [ x$ip = xnone ]; then
++		ip=
++	fi
+ elif [ x$1 = xtftp ]; then
+ 	rootfs_loc=net
+ 	kernel_loc=tftp
++	if [ x$ip = xnone ]; then
++		ip=
++	fi
++elif [ x$1 = xmmc ]; then
++	rootfs_loc=mmc
++	kernel_loc=mmc
++	rootfs_type=$rootfs_mmc_type
++fi
++
++if [ x$kernel_loc = xmmc ]; then
++	if [ $mci0.probe = 0 ]; then
++		echo "probing mci for sd card now"
++		mci0.probe=1
++	fi
+ fi
+ 
+ if [ x$ip = xdhcp ]; then
+@@ -32,8 +47,6 @@ elif [ x$rootfs_loc = xinitrd ]; then
+ else
+ 	if [ x$rootfs_loc = xnand ]; then
+ 		rootfs_mtdblock=$rootfs_mtdblock_nand
+-	else
+-		rootfs_mtdblock=$rootfs_mtdblock_nor
+ 	fi
+ 
+ 	if [ x$rootfs_type = xubifs ]; then
+@@ -41,6 +54,9 @@ else
+ 			ubiroot="root"
+ 		fi
+ 		bootargs="$bootargs root=ubi0:$ubiroot ubi.mtd=$rootfs_mtdblock"
++	elif [ x$rootfs_loc = xmmc ]; then
++		bootargs="$bootargs root=/dev/mmcblk0p$rootfs_mmc_part rootwait"
++		rootfstype=
+ 	else
+ 		bootargs="$bootargs root=/dev/mtdblock$rootfs_mtdblock"
+ 	fi
+@@ -48,10 +64,6 @@ else
+ 	bootargs="$bootargs rootfstype=$rootfs_type noinitrd"
+ fi
+ 
+-if [ -n $nor_parts ]; then
+-	mtdparts="${mtdparts}physmap-flash.0:${nor_parts}"
+-fi
+-
+ if [ -n $nand_parts ]; then
+ 	if [ -n ${mtdparts} ]; then
+ 		mtdparts="${mtdparts};"
+@@ -92,12 +104,12 @@ if [ x$kernel_loc = xnfs ] || [ x$kernel_loc = xtftp ]; then
+ 	fi
+ 	$kernel_loc $kernelimage $netload || exit 1
+ 	kdev="$netload"
+-elif [ x$kernel_loc = xnor ]; then
+-	kdev="/dev/nor0.kernel"
+ elif [ x$kernel_loc = xnand ]; then
+ 	kdev="/dev/nand0.kernel.bb"
++elif [ x$kernel_loc = xmmc ]; then
++	kdev="/dev/disk0.$kernel_mmc_part"
+ else
+-	echo "error: set kernel_loc to one of 'nfs', 'tftp', 'nand' or 'nor'"
++	echo "error: set kernel_loc to one of 'nfs', 'tftp', 'nand' or 'mmc'"
+ 	exit 1
+ fi
+ 
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/Add_a_editor_status_line.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0006-edit-Add-a-status-line.patch
index 73a1cdc..6bb7b64 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/Add_a_editor_status_line.diff
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0006-edit-Add-a-status-line.patch
@@ -1,19 +1,21 @@
+From cec4945c9b81c2381897ec667fffea1cf585f23f Mon Sep 17 00:00:00 2001
 From: Sascha Hauer <s.hauer@pengutronix.de>
-Subject: [PATCH] edit: Add a status line
+Date: Sun, 2 Nov 2014 16:38:11 +0100
+Subject: [PATCH 06/10] edit: Add a status line
 
 When invoked from a skript it's useful to know which file is edited. Also
 Add information how to exit the editor to the status line.
 
 Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
 ---
- commands/edit.c |   17 ++++++++++++++---
+ commands/edit.c | 17 ++++++++++++++---
  1 file changed, 14 insertions(+), 3 deletions(-)
 
-Index: barebox-2011.05.0/commands/edit.c
-===================================================================
---- barebox-2011.05.0.orig/commands/edit.c
-+++ barebox-2011.05.0/commands/edit.c
-@@ -62,7 +62,7 @@ static int scrcol = 0;		/* the first col
+diff --git a/commands/edit.c b/commands/edit.c
+index 3519b09..d4ce1c3 100644
+--- a/commands/edit.c
++++ b/commands/edit.c
+@@ -62,7 +62,7 @@ static int scrcol = 0;		/* the first column on screen */
  
  static void pos(int x, int y)
  {
@@ -22,7 +24,7 @@ Index: barebox-2011.05.0/commands/edit.c
  }
  
  static char *screenline(char *line, int *pos)
-@@ -419,6 +419,17 @@ static int do_edit(struct command * cmdt
+@@ -419,6 +419,17 @@ static int do_edit(struct command * cmdtp, int argc, char *argv[])
  	lastscrcol = 0;
  
  	printf("%c[2J", 27);
@@ -40,7 +42,7 @@ Index: barebox-2011.05.0/commands/edit.c
  	refresh(1);
  
  	while (1) {
-@@ -426,7 +437,7 @@ static int do_edit(struct command * cmdt
+@@ -426,7 +437,7 @@ static int do_edit(struct command * cmdtp, int argc, char *argv[])
  
  		if (textx > curlen)
  			textx = curlen;
@@ -49,7 +51,7 @@ Index: barebox-2011.05.0/commands/edit.c
  			textx = 0;
  
  		screenline(curline->data, &linepos);
-@@ -541,7 +552,7 @@ static int do_edit(struct command * cmdt
+@@ -541,7 +552,7 @@ static int do_edit(struct command * cmdtp, int argc, char *argv[])
  	}
  out:
  	free_buffer();
@@ -58,3 +60,6 @@ Index: barebox-2011.05.0/commands/edit.c
  	printf("\n");
  	return 0;
  }
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0007-NOR-flash-add-support-for-the-NOR-flash-in-the-Mini2.patch b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0007-NOR-flash-add-support-for-the-NOR-flash-in-the-Mini2.patch
new file mode 100644
index 0000000..ef0af36
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0007-NOR-flash-add-support-for-the-NOR-flash-in-the-Mini2.patch
@@ -0,0 +1,42 @@
+From 9e250475f608948711b9572ad9a5780e1574933d Mon Sep 17 00:00:00 2001
+From: Guille Rodriguez <guille.rodriguez@gmail.com>
+Date: Sun, 2 Nov 2014 17:33:12 +0100
+Subject: [PATCH 07/10] NOR flash: add support for the NOR flash in the
+ Mini2440 board
+
+Signed-off-by: Guille Rodriguez <guille.rodriguez@gmail.com>
+---
+ arch/arm/boards/mini2440/mini2440.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm/boards/mini2440/mini2440.c b/arch/arm/boards/mini2440/mini2440.c
+index bf12ea8..5fc42de 100644
+--- a/arch/arm/boards/mini2440/mini2440.c
++++ b/arch/arm/boards/mini2440/mini2440.c
+@@ -65,6 +65,13 @@ static struct device_d nand_dev = {
+ 	.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,9 @@ static int mini2440_devices_init(void)
+ #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);
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0008-Environment-add-a-local-copy-for-easier-modification.patch b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0008-Environment-add-a-local-copy-for-easier-modification.patch
new file mode 100644
index 0000000..12f6b42
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0008-Environment-add-a-local-copy-for-easier-modification.patch
@@ -0,0 +1,54 @@
+From eb34c1dc07f371b96ad1126448e39798d128e32d Mon Sep 17 00:00:00 2001
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Sun, 2 Nov 2014 17:57:12 +0100
+Subject: [PATCH 08/10] Environment: add a local copy for easier modification
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ arch/arm/boards/mini2440/env/bin/init | 34 ++++++++++++++++++++++++++++++++++
+ 1 file changed, 34 insertions(+)
+ create mode 100644 arch/arm/boards/mini2440/env/bin/init
+
+diff --git a/arch/arm/boards/mini2440/env/bin/init b/arch/arm/boards/mini2440/env/bin/init
+new file mode 100644
+index 0000000..b66f7d9
+--- /dev/null
++++ b/arch/arm/boards/mini2440/env/bin/init
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++PATH=/env/bin
++export PATH
++
++. /env/config
++if [ -e /dev/nor0 -a -n "$nor_parts" ]; then
++	addpart /dev/nor0 $nor_parts
++fi
++
++if [ -e /dev/disk0 -a -n "$disk_parts" ]; then
++	addpart /dev/disk0 $disk_parts
++fi
++
++if [ -e /dev/nand0 -a -n "$nand_parts" ]; then
++	addpart /dev/nand0 $nand_parts
++
++	# Uh, oh, hush first expands wildcards and then starts executing
++	# commands. What a bug!
++	source /env/bin/hush_hack
++fi
++
++if [ -f /env/bin/init_board ]; then
++	/env/bin/init_board
++fi
++
++echo
++echo -n "Hit any key to stop autoboot: "
++timeout -a $autoboot_timeout
++if [ $? != 0 ]; then
++	exit
++fi
++
++boot
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0009-Init-make-it-possible-to-disable-autoboot-from-board.patch b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0009-Init-make-it-possible-to-disable-autoboot-from-board.patch
new file mode 100644
index 0000000..393ccff
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0009-Init-make-it-possible-to-disable-autoboot-from-board.patch
@@ -0,0 +1,31 @@
+From ad9449cd5ab5d45ce7a7bb6fdb6e9b8347a29503 Mon Sep 17 00:00:00 2001
+From: Guille Rodriguez <guille.rodriguez@gmail.com>
+Date: Sun, 2 Nov 2014 17:42:58 +0100
+Subject: [PATCH 09/10] Init: make it possible to disable autoboot from board
+ config script
+
+Intendet to stop auto booting in the emergency boot case via NOR flash.
+
+Signed-off-by: Guille Rodriguez <guille.rodriguez@gmail.com>
+---
+ arch/arm/boards/mini2440/env/bin/init | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/arch/arm/boards/mini2440/env/bin/init b/arch/arm/boards/mini2440/env/bin/init
+index b66f7d9..47c9493 100644
+--- a/arch/arm/boards/mini2440/env/bin/init
++++ b/arch/arm/boards/mini2440/env/bin/init
+@@ -24,6 +24,10 @@ if [ -f /env/bin/init_board ]; then
+ 	/env/bin/init_board
+ fi
+ 
++if [ "$autoboot_disable" -eq 1 ]; then
++	exit
++fi
++
+ echo
+ echo -n "Hit any key to stop autoboot: "
+ timeout -a $autoboot_timeout
+-- 
+1.8.1
+
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0010-Add-the-unique-release-marker.patch b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0010-Add-the-unique-release-marker.patch
new file mode 100644
index 0000000..f7d3d2e
--- /dev/null
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/0010-Add-the-unique-release-marker.patch
@@ -0,0 +1,26 @@
+From 67583107e19f234fd28d6377b8156bf03d0f85cf Mon Sep 17 00:00:00 2001
+From: Juergen Borleis <jbe@pengutronix.de>
+Date: Sun, 2 Nov 2014 17:56:16 +0100
+Subject: [PATCH 10/10] Add the unique release marker
+
+Signed-off-by: Juergen Borleis <jbe@pengutronix.de>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 88e9ee5..933d43c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,7 @@
+ VERSION = 2011
+ PATCHLEVEL = 05
+ SUBLEVEL = 0
+-EXTRAVERSION =
++EXTRAVERSION = -ptx-2014.11.0
+ NAME = Amissive Actinocutious Kiwi
+ 
+ # *DOCUMENTATION*
+-- 
+1.8.1
+
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..9c2ab71 100644
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/series
+++ b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/series
@@ -1,19 +1,10 @@
-# just more info
-add_more_info.diff
-
-# last minute additions
-distinguish_64M_and_128M_NAND.diff
-
-# fix some corner cases
-fix_generic_nand_issue.diff
-
-fix_dhcp_env_race.diff
-
-# add boot support from SD/MMC card
-add_mmc_boot_support.diff
-
-# add a useful editor feature
-Add_a_editor_status_line.diff
-
-# odor marker
-set-marker.diff
+0001-mini2440-Add-more-info-about-possible-SDRAM-and-flas.patch
+0002-Distinguish-the-various-NAND-sizes.patch
+0003-nand-nand_base-Always-initialise-oob_poi-before-writ.patch
+0004-DHCP-and-NFSroot-TFTP.patch
+0005-patch-for-mmc-mount-rootds.patch
+0006-edit-Add-a-status-line.patch
+0007-NOR-flash-add-support-for-the-NOR-flash-in-the-Mini2.patch
+0008-Environment-add-a-local-copy-for-easier-modification.patch
+0009-Init-make-it-possible-to-disable-autoboot-from-board.patch
+0010-Add-the-unique-release-marker.patch
diff --git a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/set-marker.diff b/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/set-marker.diff
deleted file mode 100644
index d734ff8..0000000
--- a/configs/platform-friendlyarm-mini2440/patches/barebox-2011.05.0/set-marker.diff
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: barebox-2011.05.0/Makefile
-===================================================================
---- barebox-2011.05.0.orig/Makefile
-+++ barebox-2011.05.0/Makefile
-@@ -1,7 +1,7 @@
- VERSION = 2011
- PATCHLEVEL = 05
- SUBLEVEL = 0
--EXTRAVERSION =
-+EXTRAVERSION = -ptx-2012.12.0
- NAME = Amissive Actinocutious Kiwi
- 
- # *DOCUMENTATION*