From 492a4be72d1e5eebbd36517cff0d667e44bdce4e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Jul 2014 15:58:52 +0200 Subject: [PATCH] pcm051: Horrible hacks to get our old kernel to boot init/mtdparts-nand is not read so let's set the cmdline like this and add a backup boot in case the ubifs is failing. --- .../defaultenv-phycore-am335x/boot/nand | 12 ++++++++++-- .../defaultenv-phycore-am335x/boot/nand-backup | 12 ++++++++++++ .../defaultenv-phycore-am335x/config-board | 3 ++- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand-backup diff --git a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand index cdfd93dce..71c12dde2 100644 --- a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand +++ b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand @@ -1,5 +1,13 @@ #!/bin/sh -global.bootm.image="/dev/nand0.kernel.bb" +# Attach and forget about the DeviceTree.. +ubiattach /dev/nand0.root +mount /dev/ubi0.root +oftree -f + +# mtdparts-nand doesn't trigger here.. +mtdargs="mtdparts=omap2-nand.0:128k(nand0.xload),128k(nand0.xload_backup1),128k(nand0.xload_backup2),128k(nand0.xload_backup3),512k(nand0.barebox)ro,128k(nand0.bareboxenv),8M(nand0.backup_kernel)ro,-(nand0.root)" + +global.bootm.image="/mnt/ubi0.root/boot/uImage" #global.bootm.oftree="/env/oftree" -global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs" +global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs ${mtdargs}" diff --git a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand-backup b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand-backup new file mode 100644 index 000000000..e8912c6dc --- /dev/null +++ b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand-backup @@ -0,0 +1,12 @@ +#!/bin/sh + +# Attach and forget about the DeviceTree.. +oftree -f + +# mtdparts-nand doesn't trigger here.. +mtdargs="mtdparts=omap2-nand.0:128k(nand0.xload),128k(nand0.xload_backup1),128k(nand0.xload_backup2),128k(nand0.xload_backup3),512k(nand0.barebox)ro,128k(nand0.bareboxenv),8M(nand0.backup_kernel)ro,-(nand0.root)" + +global.bootm.image="/dev/nand0.backup_kernel.bb" +#global.bootm.oftree="/env/oftree" +global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs ${mtdargs}" + diff --git a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/config-board b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/config-board index 7f0b2b797..9ec193955 100644 --- a/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/config-board +++ b/arch/arm/boards/phytec-phycore-am335x/defaultenv-phycore-am335x/config-board @@ -3,5 +3,6 @@ # board defaults, do not change in running system. Change /env/config # instead -global.hostname=pcm051 +global.hostname=sysmocom-odu +global.boot.default="nand nand-backup" global.linux.bootargs.base="console=ttyO0,115200"