]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot
authorH. Nikolaus Schaller <hns@goldelico.com>
Tue, 31 Jul 2018 07:11:12 +0000 (09:11 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 26 Nov 2019 12:16:32 +0000 (13:16 +0100)
BugLink: https://bugs.launchpad.net/bugs/1853915
[ Upstream commit fa99c21ecb3cd4021a60d0e8bf880e78b5bd0729 ]

Vendor defined U-Boot has changed the partition scheme a while ago:

* kernel partition 6MB
* file system partition uses the remainder up to end of the NAND
* increased size of the environment partition (to get an OneNAND compatible base address)
* shrink the U-Boot partition

Let's be compatible (e.g. Debian kernel built from upstream).

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/arm/boot/dts/omap3-gta04.dtsi

index 9d077aad785fb6a41e84fd95579d9423b4a3b359..f93d164ea81a228d2c044d3d25cf79ca5840f274 100644 (file)
 
                bootloaders@80000 {
                        label = "U-Boot";
-                       reg = <0x80000 0x1e0000>;
+                       reg = <0x80000 0x1c0000>;
                };
 
-               bootloaders_env@260000 {
+               bootloaders_env@240000 {
                        label = "U-Boot Env";
-                       reg = <0x260000 0x20000>;
+                       reg = <0x240000 0x40000>;
                };
 
                kernel@280000 {
                        label = "Kernel";
-                       reg = <0x280000 0x400000>;
+                       reg = <0x280000 0x600000>;
                };
 
-               filesystem@680000 {
+               filesystem@880000 {
                        label = "File System";
-                       reg = <0x680000 0xf980000>;
+                       reg = <0x880000 0>;     /* 0 = MTDPART_SIZ_FULL */
                };
        };
 };