From cf239b47f8d742eba1677d62bc085b13cb971f89 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 7 Nov 2015 17:22:01 +0100 Subject: [PATCH] OWHW: only set global.initrd if the system0/1 partition contains one --- .../phytec-som-am335x/defaultenv-gsmk-owhw/boot/system0 | 4 +++- .../phytec-som-am335x/defaultenv-gsmk-owhw/boot/system1 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system0 b/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system0 index 79256caab..fd79fa623 100644 --- a/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system0 +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system0 @@ -5,7 +5,9 @@ global bootm.image.loadaddr=0x81000000 if [ -e /mnt/system0/devicetree ]; then global bootm.oftree=/mnt/system0/devicetree fi -global bootm.initrd=/mnt/system0/initramfs +if [ -e /mnt/system0/initramfs ]; then + global bootm.initrd=/mnt/system0/initramfs +fi global linux.bootargs.dyn.root="root=ubi0:system0 rootfstype=ubifs ro rauc.slot=system0" global linux.bootargs.dyn.mtd="mtdparts=omap2-nand.0:${nand0.partitions} ubi.mtd=root,2048" diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system1 b/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system1 index c2dd45a66..720ac3ff4 100644 --- a/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system1 +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-gsmk-owhw/boot/system1 @@ -5,7 +5,9 @@ global bootm.image.loadaddr=0x81000000 if [ -e /mnt/system1/devicetree ]; then global bootm.oftree=/mnt/system1/devicetree fi -global bootm.initrd=/mnt/system1/initramfs +if [ -e /mnt/system1/initramfs ]; then + global bootm.initrd=/mnt/system1/initramfs +fi global linux.bootargs.dyn.root="root=ubi0:system1 rootfstype=ubifs ro rauc.slot=system1" global linux.bootargs.dyn.mtd="mtdparts=omap2-nand.0:${nand0.partitions} ubi.mtd=root,2048"