diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-11-25 15:46:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-12-10 14:35:34 +0100 |
| commit | b037240d1fcf1ab974946514f7ef5f24c34b9fa0 (patch) | |
| tree | 38ad350efd9048737dc409258b9439a1571777fe /arch | |
| parent | 9dd7b7a0f2c41e29a45dc9886c1c438364da45c8 (diff) | |
| download | barebox-b037240d1fcf1ab974946514f7ef5f24c34b9fa0.tar.gz barebox-b037240d1fcf1ab974946514f7ef5f24c34b9fa0.tar.xz | |
ARM: am335x Phytec phyCORE: Move partition descriptions to devicetree
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boards/pcm051/env/init/mtdparts-nand | 11 | ||||
| -rw-r--r-- | arch/arm/boards/pcm051/env/init/mtdparts-nor | 12 | ||||
| -rw-r--r-- | arch/arm/dts/am335x-phytec-phycore.dts | 59 |
3 files changed, 57 insertions, 25 deletions
diff --git a/arch/arm/boards/pcm051/env/init/mtdparts-nand b/arch/arm/boards/pcm051/env/init/mtdparts-nand deleted file mode 100644 index 12f0ffd4db..0000000000 --- a/arch/arm/boards/pcm051/env/init/mtdparts-nand +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NAND partitions" - exit -fi - -mtdparts="128k(nand0.xload),128k(nand0.xload_backup1),128k(nand0.xload_backup2),128k(nand0.xload_backup3),512k(nand0.barebox)ro,128k(nand0.bareboxenv),8M(nand0.kernel),-(nand0.root)" -kernelname="omap2-nand.0" - -mtdparts-add -b -d nand0 -k ${kernelname} -p ${mtdparts} diff --git a/arch/arm/boards/pcm051/env/init/mtdparts-nor b/arch/arm/boards/pcm051/env/init/mtdparts-nor deleted file mode 100644 index 5c762ada4c..0000000000 --- a/arch/arm/boards/pcm051/env/init/mtdparts-nor +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -if [ "$1" = menu ]; then - init-menu-add-entry "$0" "NOR partitions" - exit -fi - -mtdparts="128k(m25p0.xload),512k(m25p0.barebox),128k(m25p0.bareboxenv),4M(m25p0.kernel),-(m25p0.root)" -kernelname="spi_flash" - -mtdparts-add -d m25p0 -k ${kernelname} -p ${mtdparts} - diff --git a/arch/arm/dts/am335x-phytec-phycore.dts b/arch/arm/dts/am335x-phytec-phycore.dts index 3888c67945..8fbfae60ce 100644 --- a/arch/arm/dts/am335x-phytec-phycore.dts +++ b/arch/arm/dts/am335x-phytec-phycore.dts @@ -161,8 +161,23 @@ #size-cells = <1>; partition@0 { - label = "barebox-environment"; - reg = <0x80000 0x80000>; + label = "xload"; + reg = <0x0 0x20000>; + }; + + partition@1 { + label = "barebox"; + reg = <0x20000 0x80000>; + }; + + partition@2 { + label = "bareboxenv"; + reg = <0xa0000 0x20000>; + }; + + partition@3 { + label = "kernel"; + reg = <0xc0000 0x400000>; }; }; }; @@ -229,5 +244,45 @@ #address-cells = <1>; #size-cells = <1>; elm_id = <&elm>; + + partition@0 { + label = "xload"; + reg = <0x0 0x20000>; + }; + + partition@1 { + label = "xload_backup1"; + reg = <0x20000 0x20000>; + }; + + partition@2 { + label = "xload_backup2"; + reg = <0x40000 0x20000>; + }; + + partition@3 { + label = "xload_backup3"; + reg = <0x60000 0x20000>; + }; + + partition@4 { + label = "barebox"; + reg = <0x80000 0x80000>; + }; + + partition@5 { + label = "bareboxenv"; + reg = <0x100000 0x20000>; + }; + + partition@6 { + label = "kernel"; + reg = <0x120000 0x800000>; + }; + + partition@7 { + label = "root"; + reg = <0x920000 0x1f6e0000>; + }; }; }; |