diff options
| author | Christian Hemp <christian.hemp@gmail.com> | 2016-12-03 20:50:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-04-16 09:58:06 +0200 |
| commit | c5f5d175e9904358ff201924d174ef62347af8dc (patch) | |
| tree | 8dc219d8dcc9fefcbe7d9ea68b1b17363dcfaa48 /arch/arm | |
| parent | 92fd61d12723418dfbc8f428c051cd269b3f6fd5 (diff) | |
| download | barebox-c5f5d175e9904358ff201924d174ef62347af8dc.tar.gz barebox-c5f5d175e9904358ff201924d174ef62347af8dc.tar.xz | |
ARM: i.MX: phytec-som-imx: Remove kernel and oftree partiton in NAND
We store kernel and oftree in static UBI volumes now. No need
for separate partitions any more.
Signed-off-by: Christian Hemp <christian.hemp@gmail.com>
Acked-by: Stefan Lengfeld <s.lengfeld@phytec.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6/boot/nand | 6 | ||||
| -rw-r--r-- | arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-pfla02.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi | 12 |
4 files changed, 7 insertions, 35 deletions
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 a23aa21cc7..e4eded530d 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 @@ -1,5 +1,7 @@ #!/bin/sh -global.bootm.image="/dev/nand0.kernel.bb" -global.bootm.oftree="/dev/nand0.oftree.bb" +[ ! -e /dev/nand0.root.ubi ] && ubiattach /dev/nand0.root + +global.bootm.image="/dev/nand0.root.ubi.kernel" +global.bootm.oftree="/dev/nand0.root.ubi.oftree" global.linux.bootargs.dyn.root="root=ubi0:root ubi.mtd=root rootfstype=ubifs rw" diff --git a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi index a6ea7b5cce..63dd966b87 100644 --- a/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi +++ b/arch/arm/dts/imx6q-phytec-pcaaxl3.dtsi @@ -145,18 +145,8 @@ }; partition@420000 { - label = "oftree"; - reg = <0x420000 0x20000>; - }; - - partition@440000 { - label = "kernel"; - reg = <0x440000 0x800000>; - }; - - partition@C40000 { label = "root"; - reg = <0xC40000 0x0>; + reg = <0x420000 0x0>; }; }; diff --git a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi index 9a8c7024a3..862d856d00 100644 --- a/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-pfla02.dtsi @@ -115,18 +115,8 @@ }; partition@500000 { - label = "oftree"; - reg = <0x500000 0x100000>; - }; - - partition@600000 { - label = "kernel"; - reg = <0x600000 0x800000>; - }; - - partition@e00000 { label = "root"; - reg = <0xe00000 0x0>; + reg = <0x500000 0x0>; }; }; diff --git a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi index b10530cbcf..3a5b0dbf24 100644 --- a/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi +++ b/arch/arm/dts/imx6qdl-phytec-phycore-som.dtsi @@ -112,18 +112,8 @@ }; partition@500000 { - label = "oftree"; - reg = <0x500000 0x100000>; - }; - - partition@600000 { - label = "kernel"; - reg = <0x600000 0x800000>; - }; - - partition@e00000 { label = "root"; - reg = <0xe00000 0x0>; + reg = <0x500000 0x0>; }; }; |