From: Christian Hemp <c.hemp@xxxxxxxxx> Rename sd-ext3 to mmc, remove filesystem type from bootargs and remove bootargs-ip. Add init script 'bootsource' to set boot source priority and bootscript 'spi' for SPI NOR. Signed-off-by: Christian Hemp <c.hemp@xxxxxxxxx> Signed-off-by: Stefan Christ <s.christ@xxxxxxxxx> --- .../phytec-som-imx6/defaultenv-physom-imx6/boot/mmc | 5 +++++ .../phytec-som-imx6/defaultenv-physom-imx6/boot/nand | 1 - .../phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 | 6 ------ .../phytec-som-imx6/defaultenv-physom-imx6/boot/spi | 5 +++++ .../defaultenv-physom-imx6/init/bootsource | 15 +++++++++++++++ .../defaultenv-physom-imx6/nv/boot.default | 1 - 6 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc delete mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi create mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource delete mode 100644 arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc new file mode 100644 index 0000000..332fc26 --- /dev/null +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/mmc @@ -0,0 +1,5 @@ +#!/bin/sh + +global.bootm.image="/mnt/mmc/linuximage" +global.bootm.oftree="/mnt/mmc/oftree" +global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootwait rw" diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand index 79dc03c..a23aa21 100644 --- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand @@ -2,5 +2,4 @@ global.bootm.image="/dev/nand0.kernel.bb" global.bootm.oftree="/dev/nand0.oftree.bb" -bootargs-ip global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw" diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 deleted file mode 100644 index fd35fe0..0000000 --- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/sd-ext3 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -global.bootm.image="/mnt/mmc/linuximage" -global.bootm.oftree="/mnt/mmc/oftree" -bootargs-ip -global.linux.bootargs.dyn.root="root=/dev/mmcblk0p2 rootfstype=ext3 rootwait rw" diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi new file mode 100644 index 0000000..2000a16 --- /dev/null +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/spi @@ -0,0 +1,5 @@ +#!/bin/sh + +global.bootm.image="/dev/m25p0.kernel" +global.bootm.oftree="/dev/m25p0.oftree" +global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw" diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource new file mode 100644 index 0000000..3f2ff4b --- /dev/null +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/init/bootsource @@ -0,0 +1,15 @@ +#!/bin/sh + +if [ -n "$nv.boot.default" ]; then + exit +fi + +if [ $bootsource = mmc ]; then + global.boot.default="mmc nand spi net" +elif [ $bootsource = nand ]; then + global.boot.default="nand spi mmc net" +elif [ $bootsource = spi ]; then + global.boot.default="spi nand mmc net" +elif [ $bootsource = net ]; then + global.boot.default="net nand spi mmc" +fi diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default deleted file mode 100644 index 026a25c..0000000 --- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/nv/boot.default +++ /dev/null @@ -1 +0,0 @@ -nand -- 1.9.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
