summaryrefslogtreecommitdiffstats
path: root/arch/arm/dts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-02-24 14:26:28 -0500
committerTom Rini <trini@konsulko.com>2016-02-24 18:44:19 -0500
commitcdb714d7c9c5974a15ea4e37ef9ae111cd4bdf97 (patch)
tree45b80bf36d34c7ef0408407c5fd21c2db4f99b1b /arch/arm/dts
parentfec26e7270ad31e4179d1bd189e5cd8ab93ccba3 (diff)
parente6e34ca3ad43eae88faccb01282385416d23e6e7 (diff)
downloadblackbird-obmc-uboot-cdb714d7c9c5974a15ea4e37ef9ae111cd4bdf97.tar.gz
blackbird-obmc-uboot-cdb714d7c9c5974a15ea4e37ef9ae111cd4bdf97.zip
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/dts')
-rw-r--r--arch/arm/dts/socfpga_arria5_socdk.dts2
-rw-r--r--arch/arm/dts/socfpga_cyclone5_socdk.dts2
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/dts/socfpga_arria5_socdk.dts b/arch/arm/dts/socfpga_arria5_socdk.dts
index 5933a406cb..9ac48a1683 100644
--- a/arch/arm/dts/socfpga_arria5_socdk.dts
+++ b/arch/arm/dts/socfpga_arria5_socdk.dts
@@ -82,8 +82,10 @@
&qspi {
status = "okay";
+ u-boot,dm-pre-reloc;
flash0: n25q00@0 {
+ u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q00";
diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts
index a202709d60..da134354d1 100644
--- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
+++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
@@ -84,8 +84,10 @@
&qspi {
status = "okay";
+ u-boot,dm-pre-reloc;
flash0: n25q00@0 {
+ u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q00";
OpenPOWER on IntegriCloud