[PATCH 3/4] ARM: OMAP: pcm051: Update enviroment

[Teresa Gámez]

- Fixed NAND booting
- removed config and added config-board
- Load rootfs from nand when booting from SPI flash
- renamed boot/<options> to use $bootsource as global.boot.default

Signed-off-by: Teresa Gámez <t.gamez at phytec.de>
---
 arch/arm/boards/pcm051/env/boot/mmc      |   10 ++++++++++
 arch/arm/boards/pcm051/env/boot/nand     |   10 ++++++++++
 arch/arm/boards/pcm051/env/boot/nand-ubi |   10 ----------
 arch/arm/boards/pcm051/env/boot/sd       |   10 ----------
 arch/arm/boards/pcm051/env/boot/spi      |   11 +++++++++++
 arch/arm/boards/pcm051/env/boot/spi-nor  |   12 ------------
 arch/arm/boards/pcm051/env/config        |   22 ----------------------
 arch/arm/boards/pcm051/env/config-board  |    7 +++++++
 8 files changed, 38 insertions(+), 54 deletions(-)
 create mode 100644 arch/arm/boards/pcm051/env/boot/mmc
 create mode 100644 arch/arm/boards/pcm051/env/boot/nand
 delete mode 100644 arch/arm/boards/pcm051/env/boot/nand-ubi
 delete mode 100644 arch/arm/boards/pcm051/env/boot/sd
 create mode 100644 arch/arm/boards/pcm051/env/boot/spi
 delete mode 100644 arch/arm/boards/pcm051/env/boot/spi-nor
 delete mode 100644 arch/arm/boards/pcm051/env/config
 create mode 100644 arch/arm/boards/pcm051/env/config-board

diff --git a/arch/arm/boards/pcm051/env/boot/mmc b/arch/arm/boards/pcm051/env/boot/mmc
new file mode 100644
index 0000000..93a2357
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/mmc
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+	boot-menu-add-entry "$0" "kernel & rootfs on SD card"
+	exit
+fi
+
+global.bootm.image=/boot/uImage
+#global.bootm.oftree=/boot/oftree
+global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/pcm051/env/boot/nand b/arch/arm/boards/pcm051/env/boot/nand
new file mode 100644
index 0000000..22d657e
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/nand
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+	boot-menu-add-entry "$0" "nand (UBI)"
+	exit
+fi
+
+global.bootm.image="/dev/nand0.kernel.bb"
+#global.bootm.oftree="/env/oftree"
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs"
diff --git a/arch/arm/boards/pcm051/env/boot/nand-ubi b/arch/arm/boards/pcm051/env/boot/nand-ubi
deleted file mode 100644
index efea518..0000000
--- a/arch/arm/boards/pcm051/env/boot/nand-ubi
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-	boot-menu-add-entry "$0" "nand (UBI)"
-	exit
-fi
-
-global.bootm.image="/dev/nand0.kernel.bb"
-#global.bootm.oftree="/env/oftree"
-bootargs-root-ubi -r root -m nand0.root,2048
diff --git a/arch/arm/boards/pcm051/env/boot/sd b/arch/arm/boards/pcm051/env/boot/sd
deleted file mode 100644
index 93a2357..0000000
--- a/arch/arm/boards/pcm051/env/boot/sd
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-	boot-menu-add-entry "$0" "kernel & rootfs on SD card"
-	exit
-fi
-
-global.bootm.image=/boot/uImage
-#global.bootm.oftree=/boot/oftree
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
diff --git a/arch/arm/boards/pcm051/env/boot/spi b/arch/arm/boards/pcm051/env/boot/spi
new file mode 100644
index 0000000..2d10184
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/boot/spi
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+if [ "$1" = menu ]; then
+        boot-menu-add-entry "$0" "SPI NOR Flash"
+        exit
+fi
+
+global.bootm.image="/dev/m25p0.kernel"
+
+# Use rootfs form NAND for now as rootfs partition < 4MB
+global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs"
diff --git a/arch/arm/boards/pcm051/env/boot/spi-nor b/arch/arm/boards/pcm051/env/boot/spi-nor
deleted file mode 100644
index 9273b84..0000000
--- a/arch/arm/boards/pcm051/env/boot/spi-nor
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ "$1" = menu ]; then
-        boot-menu-add-entry "$0" "SPI NOR Flash"
-        exit
-fi
-
-global.bootm.image="/dev/m25p0.kernel"
-
-# Use rootfs form SD-Card for now as rootfs partition < 4MB
-global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
-
diff --git a/arch/arm/boards/pcm051/env/config b/arch/arm/boards/pcm051/env/config
deleted file mode 100644
index dd35ff4..0000000
--- a/arch/arm/boards/pcm051/env/config
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# change network settings in /env/network/eth0
-# change mtd partition settings and automountpoints in /env/init/*
-
-global.hostname=pcm051
-
-# set to false if you do not want to have colors
-global.allow_color=true
-
-# user (used for network filenames)
-global.user=none
-
-# timeout in seconds before the default boot entry is started
-global.autoboot_timeout=3
-
-# default boot entry (one of /env/boot/*)
-global.boot.default=sd
-
-# base bootargs
-global.linux.bootargs.base="console=ttyO0,115200n8"
-
diff --git a/arch/arm/boards/pcm051/env/config-board b/arch/arm/boards/pcm051/env/config-board
new file mode 100644
index 0000000..7f0b2b7
--- /dev/null
+++ b/arch/arm/boards/pcm051/env/config-board
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# board defaults, do not change in running system. Change /env/config
+# instead
+
+global.hostname=pcm051
+global.linux.bootargs.base="console=ttyO0,115200"
-- 
1.7.0.4