Merge branch 'for-next/clps711x'

10 files changed, 9 insertions, 12 deletions

diff --git a/arch/arm/boards/clep7212/Makefile b/arch/arm/boards/clep7212/Makefile
index 4b0304feb3..a5001df9b5 100644
--- a/arch/arm/boards/clep7212/Makefile
+++ b/arch/arm/boards/clep7212/Makefile
@@ -1,2 +1,3 @@
 obj-y += clep7212.o
 lwl-y += lowlevel.o
+bbenv-y += defaultenv-clep7212
diff --git a/arch/arm/boards/clep7212/clep7212.c b/arch/arm/boards/clep7212/clep7212.c
index de125ea9ee..584ecdcab2 100644
--- a/arch/arm/boards/clep7212/clep7212.c
+++ b/arch/arm/boards/clep7212/clep7212.c
@@ -9,6 +9,7 @@
 
 #include <common.h>
 #include <driver.h>
+#include <envfs.h>
 #include <init.h>
 #include <partition.h>
 #include <io.h>
@@ -30,7 +31,7 @@ static int clps711x_devices_init(void)
 	clps711x_setup_memcfg(1, MEMCFG_WAITSTATE_6_1 | MEMCFG_BUS_WIDTH_8);
 	clps711x_setup_memcfg(2, MEMCFG_WAITSTATE_8_3 | MEMCFG_BUS_WIDTH_16 |
 			      MEMCFG_CLKENB);
-	clps711x_setup_memcfg(3, MEMCFG_WAITSTATE_6_1 | MEMCFG_BUS_WIDTH_32);
+	clps711x_setup_memcfg(3, MEMCFG_WAITSTATE_7_1 | MEMCFG_BUS_WIDTH_32);
 
 	cfi_io = map_io_sections(CS0_BASE, (void *)0x90000000, SZ_32M);
 	add_cfi_flash_device(DEVICE_ID_DYNAMIC, (unsigned long)cfi_io, SZ_32M,
@@ -44,6 +45,8 @@ static int clps711x_devices_init(void)
 	armlinux_set_architecture(MACH_TYPE_CLEP7212);
 	armlinux_set_serial(((u64)serial_h << 32) | serial_l);
 
+	defaultenv_append_directory(defaultenv_clep7212);
+
 	return 0;
 }
 device_initcall(clps711x_devices_init);
diff --git a/arch/arm/boards/clep7212/env/boot/nor b/arch/arm/boards/clep7212/defaultenv-clep7212/boot/nor
index d53f07ec5d..f584307d7a 100644
--- a/arch/arm/boards/clep7212/env/boot/nor
+++ b/arch/arm/boards/clep7212/defaultenv-clep7212/boot/nor
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-global.bootm.image="/dev/kernel"
+global.bootm.image="/dev/nor0.kernel"
 global.linux.bootargs.dyn.root="root=/dev/mtdblock3 ro"
diff --git a/arch/arm/boards/clep7212/env/init/mtdparts-nor b/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor
index 8702b4059c..8702b4059c 100644
--- a/arch/arm/boards/clep7212/env/init/mtdparts-nor
+++ b/arch/arm/boards/clep7212/defaultenv-clep7212/init/mtdparts-nor
diff --git a/arch/arm/boards/clep7212/env/nv/autoboot_timeout b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/autoboot_timeout
index 0cfbf08886..0cfbf08886 100644
--- a/arch/arm/boards/clep7212/env/nv/autoboot_timeout
+++ b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/autoboot_timeout
diff --git a/arch/arm/boards/clep7212/defaultenv-clep7212/nv/boot.default b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/boot.default
new file mode 100644
index 0000000000..aa244dc6b4
--- /dev/null
+++ b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/boot.default
@@ -0,0 +1 @@
+nor
diff --git a/arch/arm/boards/clep7212/defaultenv-clep7212/nv/linux.bootargs.console b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/linux.bootargs.console
new file mode 100644
index 0000000000..0b9dc01cef
--- /dev/null
+++ b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/linux.bootargs.console
@@ -0,0 +1 @@
+console=ttyCL0,57600n8
diff --git a/arch/arm/boards/clep7212/defaultenv-clep7212/nv/linux.bootargs.debug b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/linux.bootargs.debug
new file mode 100644
index 0000000000..7106a19f79
--- /dev/null
+++ b/arch/arm/boards/clep7212/defaultenv-clep7212/nv/linux.bootargs.debug
@@ -0,0 +1 @@
+earlyprintk
diff --git a/arch/arm/boards/clep7212/env/init/bootsource b/arch/arm/boards/clep7212/env/init/bootsource
deleted file mode 100644
index 2f09c0cef5..0000000000
--- a/arch/arm/boards/clep7212/env/init/bootsource
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
-	exit
-fi
-
-if [ -e /dev/nor0 ]; then
-	global.boot.default=nor
-fi
diff --git a/arch/arm/boards/clep7212/env/nv/linux.bootargs.console b/arch/arm/boards/clep7212/env/nv/linux.bootargs.console
deleted file mode 100644
index 77ea2ecf0f..0000000000
--- a/arch/arm/boards/clep7212/env/nv/linux.bootargs.console
+++ /dev/null
@@ -1 +0,0 @@
-earlyprintk console=ttyCL0,57600n8