hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AT91 DT for 4.20 #2 

- fixes NAND size and partitions for some boards
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEADBLyYlprFuNbTVNPjnmE/d7ZC0FAlu0uWMACgkQPjnmE/d7
 ZC33TQ/5AVHffcShgbkBGekjmcJjF7b86ZVD4jLfOsKtH6ArVy+fIHIe+InQ+clp
 YlkpJ2X8HB8hVNYdACfCGqat4fHDB7OPkTmXrWnIDg5PZVgwf5YYmOAMlBkI8uTH
 s034wR/g55qzNcU4BcK0iLrnP1+72pTQb+HykFALLy68zzWUA1eBNo9RUneAb4mg
 g7nO19R4Cg7FFkwWziPWNnGs5Qvt7KGMXfLK0qr21OrV3y7pA9Sf+s06CaPioZoU
 pWnOBEWi3x/gX9dwGG+1ZV+ra9npswli6jraViNE8OR4Fus9pf4+uCcramixP6LO
 sivPjr3xsedxfidDVzYL2AfooUe3E+KFrj48CRHXcTuex/wHN/10FjgJ/KP/6e6j
 1fjRIB1M/UfYNysNcPUGtxg5LoUdYLdBgj77DUl3+4sByKOTQNDi3/wtAGbVUgFF
 ncQQL/SyToLZq6ShoS//BI2LyLsHPtdfFnrrAV5MO/Jx0xl0wzMRsdqVxls/wIfO
 MOOxGDqpFdfhi8CO0crfg+yODYkWEFckfVn/BauzTR3z0U9u2Uv42nTluHhhVTDA
 +7KChd7QjrYDiRIIVo4lwMZxfLu5bPSq4d0Gn4h+j0x5sFrAdtoOIJmYNnUdrgJK
 j58rm8N6WUz1LyzCrowdcgAmGJFr8Q4KW4iRi8te/cEIGT7APFc=
 =cGzy
 -----END PGP SIGNATURE-----

Merge tag 'at91-4.20-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into next/dt

AT91 DT for 4.20 #2

 - fixes NAND size and partitions for some boards

* tag 'at91-4.20-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d4_xplained: even nand memory partitions
  ARM: dts: at91: sama5d3_xplained: even nand memory partitions
  ARM: dts: at91: at91sam9x5cm: even nand memory partitions
  ARM: dts: at91: sama5d2_ptc_ek: fix bootloader env offsets
  ARM: dts: at91: at91sam9x5cm: fix addressable nand flash size
  ARM: dts: at91: sama5d4_xplained: fix addressable nand flash size

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2018-10-04 17:04:53 +02:00
parent 3f8b181eb4 767466b63d
commit b9734c59ea
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts
View File

@ -91,13 +91,13 @@
reg = <0x40000 0xc0000>;
};
bootloaderenv@0x100000 {
label = "bootloader env";
bootloaderenvred@0x100000 {
label = "bootloader env redundant";
reg = <0x100000 0x40000>;
};
bootloaderenvred@0x140000 {
label = "bootloader env redundant";
bootloaderenv@0x140000 {
label = "bootloader env";
reg = <0x140000 0x40000>;
};

11
arch/arm/boot/dts/at91-sama5d3_xplained.dts
View File

@ -297,12 +297,17 @@
bootloader@40000 {
label = "bootloader";
reg = <0x40000 0x80000>;
reg = <0x40000 0xc0000>;
};
bootloaderenv@c0000 {
bootloaderenvred@100000 {
label = "bootloader env redundant";
reg = <0x100000 0x40000>;
};
bootloaderenv@140000 {
label = "bootloader env";
reg = <0xc0000 0xc0000>;
reg = <0x140000 0x40000>;
};
dtb@180000 {

13
arch/arm/boot/dts/at91-sama5d4_xplained.dts
View File

@ -232,12 +232,17 @@
bootloader@40000 {
label = "bootloader";
reg = <0x40000 0x80000>;
reg = <0x40000 0xc0000>;
};
bootloaderenv@c0000 {
bootloaderenvred@100000 {
label = "bootloader env redundant";
reg = <0x100000 0x40000>;
};
bootloaderenv@140000 {
label = "bootloader env";
reg = <0xc0000 0xc0000>;
reg = <0x140000 0x40000>;
};
dtb@180000 {
@ -252,7 +257,7 @@
rootfs@800000 {
label = "rootfs";
reg = <0x800000 0x0f800000>;
reg = <0x800000 0x1f800000>;
};
};
};

18
arch/arm/boot/dts/at91sam9x5cm.dtsi
View File

@ -85,12 +85,22 @@
uboot@40000 {
label = "u-boot";
reg = <0x40000 0x80000>;
reg = <0x40000 0xc0000>;
};
ubootenv@c0000 {
ubootenvred@100000 {
label = "U-Boot Env Redundant";
reg = <0x100000 0x40000>;
};
ubootenv@140000 {
label = "U-Boot Env";
reg = <0xc0000 0x140000>;
reg = <0x140000 0x40000>;
};
dtb@180000 {
label = "device tree";
reg = <0x180000 0x80000>;
};
kernel@200000 {
@ -100,7 +110,7 @@
rootfs@800000 {
label = "rootfs";
reg = <0x800000 0x1f800000>;
reg = <0x800000 0x0f800000>;
};
};
};