diff --git a/[refs] b/[refs] index 5b8a655a8ae9..1f01a23188d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cb4e73575e3c66b73ccda811b2ba70339703ea5 +refs/heads/master: d78504774435d5fc961f58a92ba7ec441d8b74c9 diff --git a/trunk/arch/arm/boot/dts/usb_a9g20.dts b/trunk/arch/arm/boot/dts/usb_a9g20.dts index 7c2399c532e5..0f88ec83cc1b 100644 --- a/trunk/arch/arm/boot/dts/usb_a9g20.dts +++ b/trunk/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/trunk/arch/arm/mach-at91/board-usb-a926x.c b/trunk/arch/arm/mach-at91/board-usb-a926x.c index 332ecd40bd02..95393fcaf199 100644 --- a/trunk/arch/arm/mach-at91/board-usb-a926x.c +++ b/trunk/arch/arm/mach-at91/board-usb-a926x.c @@ -171,6 +171,10 @@ static struct mtd_partition __initdata ek_nand_partition[] = { .name = "bareboxenv2", .offset = MTDPART_OFS_NXTBLK, .size = SZ_128K, + }, { + .name = "oftree", + .offset = MTDPART_OFS_NXTBLK, + .size = SZ_128K, }, { .name = "kernel", .offset = MTDPART_OFS_NXTBLK,