diff --git a/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue index 41f53893d..4ec2a30b3 100644 --- a/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue @@ -1,9 +1,11 @@ #!/bin/sh -global bootm.image=/mnt/rescue/boot/uImage +global bootm.image=/mnt/rescue/kernel global bootm.image.loadaddr=0x81000000 -#global bootm.oftree= -#global bootm.initrd= +if [ -e /mnt/rescue/devicetree ]; then + global bootm.oftree=/mnt/rescue/devicetree +fi +global bootm.initrd=/mnt/rescue/initramfs -global linux.bootargs.dyn.root="root=ubi0:rescue ubi.mtd=root,2048 rootfstype=ubifs ro rauc.slot=rescue" -global linux.bootargs.dyn.mtd="mtdparts=omap2-nand.0:${nand0.partitions}" +global linux.bootargs.dyn.root="rdinit=/sbin/init rauc.slot=rescue" +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-sysmocom-odu/boot/rescue-net b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue-net index ad0d479f4..1a30f0f59 100644 --- a/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue-net +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/rescue-net @@ -2,8 +2,10 @@ global bootm.image=/mnt/tftp/linux/arch/arm/boot/zImage global bootm.image.loadaddr=0x81000000 -#global bootm.oftree= -#global bootm.initrd= +if [ -e /mnt/rescue/devicetree ]; then + global bootm.oftree=/mnt/rescue/devicetree +fi +global bootm.initrd=/mnt/rescue/initramfs -global linux.bootargs.dyn.root="root=ubi0:rescue ubi.mtd=root,2048 rootfstype=ubifs ro rauc.slot=rescue" -global linux.bootargs.dyn.mtd="mtdparts=omap2-nand.0:${nand0.partitions}" +global linux.bootargs.dyn.root="rdinit=/sbin/init rauc.slot=rescue" +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-sysmocom-odu/boot/system0 b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/system0 index e54f832b8..79256caab 100644 --- a/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/system0 +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/system0 @@ -7,5 +7,5 @@ if [ -e /mnt/system0/devicetree ]; then fi global bootm.initrd=/mnt/system0/initramfs -global linux.bootargs.dyn.root="root=ubi0:system0 ubi.mtd=root,2048 rootfstype=ubifs ro rauc.slot=system0" -global linux.bootargs.dyn.mtd="mtdparts=omap2-nand.0:${nand0.partitions}" +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-sysmocom-odu/boot/system1 b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/system1 index b9606d9e7..c2dd45a66 100644 --- a/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/system1 +++ b/arch/arm/boards/phytec-som-am335x/defaultenv-sysmocom-odu/boot/system1 @@ -7,5 +7,5 @@ if [ -e /mnt/system1/devicetree ]; then fi global bootm.initrd=/mnt/system1/initramfs -global linux.bootargs.dyn.root="root=ubi0:system1 ubi.mtd=root,2048 rootfstype=ubifs ro rauc.slot=system1" -global linux.bootargs.dyn.mtd="mtdparts=omap2-nand.0:${nand0.partitions}" +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"