[PATCH 0/3] fix defaultenv

[PATCH 0/3] fix defaultenv

[Marc Kleine-Budde]

Hello,

this series of patches fixes some problems with the defaultenv.

Please review and consider to apply.

cheer, Marc

---

The following changes since commit 3762bb24856e70a9947847cd5b3f124aaa8a8a3a:

  pcm043: remove unused defines (2010-08-16 10:29:36 +0200)

are available in the git repository at:
  git://git.pengutronix.de/git/mkl/barebox.git for-sha

Marc Kleine-Budde (3):
      defaultenv: fix physmap-flash device name
      defaultenv: fix adding of nand_parts
      defaultenv: create /dev/ram0.kernel at offset 8M

 defaultenv/bin/boot |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 1/3] defaultenv: fix physmap-flash device name

[Marc Kleine-Budde]

The first physmap-flash device is called "physmap-flash.0" (like zero),
not "physmap-flash.o" (like in oops).

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 defaultenv/bin/boot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 6a508fb..5312d1e 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -43,7 +43,7 @@ else
 fi
 
 if [ -n $nor_parts ]; then
-	mtdparts="${mtdparts}physmap-flash.o:${nor_parts};"
+	mtdparts="${mtdparts}physmap-flash.0:${nor_parts};"
 fi
 
 if [ -n $nand_parts ]; then
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 2/3] defaultenv: fix adding of nand_parts

[Marc Kleine-Budde]

Really add nand_parts if nand_parts are set, not nor_parts.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 defaultenv/bin/boot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index 5312d1e..a9e589b 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -47,7 +47,7 @@ if [ -n $nor_parts ]; then
 fi
 
 if [ -n $nand_parts ]; then
-	mtdparts="${mtdparts}$nand_device:${nor_parts};"
+	mtdparts="${mtdparts}${nand_device}:${nand_parts};"
 fi
 
 if [ -n $mtdparts ]; then
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH 3/3] defaultenv: create /dev/ram0.kernel at offset 8M

[Marc Kleine-Budde]

otherwise uImages won't boot.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 defaultenv/bin/boot |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/defaultenv/bin/boot b/defaultenv/bin/boot
index a9e589b..6476bdb 100644
--- a/defaultenv/bin/boot
+++ b/defaultenv/bin/boot
@@ -62,7 +62,7 @@ fi
 if [ ! -e /dev/ram0.kernel ]; then
 	# Here we can safely put the kernel without risking of overwriting it
 	# while extracting
-	addpart dev/ram0 8M(kernel)
+	addpart dev/ram0 8M@8M(kernel)
 fi
 
 if [ x$kernel_loc = xnet ]; then
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox