From b6676d7db0523d6c761f72ef68e55caac528f70f Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 11 Jul 2014 17:06:40 +0200 Subject: [PATCH] pcm051: Load a oftree if it exists For forward compability with later kernels and device tree check if there is a dtb inside the rootfs and use it. --- .../phytec-phycore-am335x/defaultenv-phycore-am335x/boot/nand | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 71c12dde2..7dd131c4c 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 @@ -9,5 +9,7 @@ oftree -f 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" +if [ -e /mnt/ubi0.root/boot/kernel.dtb ]; then + global.bootm.oftree="/mnt/ubi0.root/boot/kernel.dtb" +fi global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=nand0.root,2048 rootfstype=ubifs ${mtdargs}"