diff options
author | Simon Baatz <gmbnomis@gmail.com> | 2016-08-12 19:12:50 +0200 |
---|---|---|
committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2016-08-26 11:30:51 +0200 |
commit | a778937888867aac17a33887d1c429120790fbc2 (patch) | |
tree | 57d149e21420bba26b5ed1c48b1f70f9a856e457 /arch/arm/boot/dts/kirkwood-ib62x0.dts | |
parent | d9fd3c918114cfd3995947339549c7341181efb0 (diff) | |
download | linux-stable-a778937888867aac17a33887d1c429120790fbc2.tar.gz linux-stable-a778937888867aac17a33887d1c429120790fbc2.tar.bz2 linux-stable-a778937888867aac17a33887d1c429120790fbc2.zip |
ARM: kirkwood: ib62x0: fix size of u-boot environment partition
Commit 148c274ea644 ("ARM: kirkwood: ib62x0: add u-boot environment
partition") split the "u-boot" partition into "u-boot" and "u-boot
environment". However, instead of the size of the environment, an offset
was given, resulting in overlapping partitions.
Signed-off-by: Simon Baatz <gmbnomis@gmail.com>
Fixes: 148c274ea644 ("ARM: kirkwood: ib62x0: add u-boot environment partition")
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Luka Perkov <luka@openwrt.org>
Cc: stable@vger.kernel.org # 3.13+
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-ib62x0.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-ib62x0.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts index ef84d8699a76..5bf62897014c 100644 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts @@ -113,7 +113,7 @@ partition@e0000 { label = "u-boot environment"; - reg = <0xe0000 0x100000>; + reg = <0xe0000 0x20000>; }; partition@100000 { |