Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 9d5b470605a6e5df5c46444c2b2c108d21f9a24a

Authored by Dan Murphy
2 parents c883f50c5b ab05cccaed
Exists in ti-linux-3.12.y and in 3 other branches newt-ti-linux-3.12.y, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y

Merge branch 'connectivity-ti-linux-3.12.y' of git://git.ti.com/connectivity-int… 

…egration-tree/connectivity-ti-linux-kernel into ti-linux-3.12.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-3.12.y

* 'connectivity-ti-linux-3.12.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  arm: dts: am43x-epos: Fix qspi partition.
  arm: dts: dra7-evm: Fix qspi partition.

Signed-off-by: Dan Murphy <DMurphy@ti.com>

Showing 2 changed files Side-by-side Diff

arch/arm/boot/dts/am43x-epos-evm.dts
Diff comments   View file @ 9d5b470
... ... @@ -603,7 +603,7 @@
603 603 };
604 604 partition@5 {
605 605 label = "QSPI.u-boot-spl-os";
606   - reg = <0x00150000 0x00010000>;
  606 + reg = <0x00140000 0x00010000>;
607 607 };
608 608 partition@6 {
609 609 label = "QSPI.u-boot-env";
arch/arm/boot/dts/dra7-evm.dts
Diff comments   View file @ 9d5b470
... ... @@ -697,7 +697,7 @@
697 697 };
698 698 partition@8 {
699 699 label = "QSPI.kernel";
700   - reg = <0x00170000 0x00970000>;
  700 + reg = <0x00170000 0x0800000>;
701 701 };
702 702 partition@9 {
703 703 label = "QSPI.file-system";