summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-11 19:40:31 +0400
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-20 19:17:08 +0400
commitd78504774435d5fc961f58a92ba7ec441d8b74c9 (patch)
tree58ec9e72432a3533f7be2cd305cef1fc33fe3ecf /arch
parent5cb4e73575e3c66b73ccda811b2ba70339703ea5 (diff)
downloadlinux-d78504774435d5fc961f58a92ba7ec441d8b74c9.tar.xz
ARM: at91: USB A926x update nand partition
We now store the dtb in a nand partition. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/usb_a9g20.dts11
-rw-r--r--arch/arm/mach-at91/board-usb-a926x.c4
2 files changed, 12 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/usb_a9g20.dts b/arch/arm/boot/dts/usb_a9g20.dts
index 7c2399c532e5..0f88ec83cc1b 100644
--- a/arch/arm/boot/dts/usb_a9g20.dts
+++ b/arch/arm/boot/dts/usb_a9g20.dts
@@ -74,19 +74,24 @@
reg = <0x80000 0x20000>;
};
+ oftree@80000 {
+ label = "oftree";
+ reg = <0xa0000 0x20000>;
+ };
+
kernel@a0000 {
label = "kernel";
- reg = <0xa0000 0x400000>;
+ reg = <0xc0000 0x400000>;
};
rootfs@4a0000 {
label = "rootfs";
- reg = <0x4a0000 0x7800000>;
+ reg = <0x4c0000 0x7800000>;
};
data@7ca0000 {
label = "data";
- reg = <0x7ca0000 0x8360000>;
+ reg = <0x7cc0000 0x8340000>;
};
};
diff --git a/arch/arm/mach-at91/board-usb-a926x.c b/arch/arm/mach-at91/board-usb-a926x.c
index 332ecd40bd02..95393fcaf199 100644
--- a/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@ -172,6 +172,10 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
.offset = MTDPART_OFS_NXTBLK,
.size = SZ_128K,
}, {
+ .name = "oftree",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = SZ_128K,
+ }, {
.name = "kernel",
.offset = MTDPART_OFS_NXTBLK,
.size = 4 * SZ_1M,