From: John Jacques <john.jacq...@intel.com>
Add 32 core versions for Lionfish simulation and update the flash
partitions to include all the images involved in redundant boot.
Signed-off-by: John Jacques <john.jacq...@intel.com>
---
arch/arm64/boot/dts/intel/Makefile | 6 +-
arch/arm64/boot/dts/intel/axc6704-emu.dts | 48 +++++-
arch/arm64/boot/dts/intel/axc6704-sim.dts | 30 +++-
arch/arm64/boot/dts/intel/axc6712-emu.dts | 48 +++++-
arch/arm64/boot/dts/intel/axc6716-sim.dts | 30 +++-
arch/arm64/boot/dts/intel/axc6732-cpus.dtsi | 259 ++++++++++++++++++++++++++++
arch/arm64/boot/dts/intel/axc6732-sim.dts | 208 ++++++++++++++++++++++
arch/arm64/boot/dts/intel/axm5601-emu.dts | 66 -------
arch/arm64/boot/dts/intel/axm5602-emu.dts | 63 -------
arch/arm64/boot/dts/intel/axm5604-sim.dts | 30 +++-
arch/arm64/boot/dts/intel/axm5606-emu.dts | 48 ++++++
arch/arm64/boot/dts/intel/axm5608-sim.dts | 30 +++-
arch/arm64/boot/dts/intel/axm5616-sim.dts | 30 +++-
13 files changed, 748 insertions(+), 148 deletions(-)
create mode 100644 arch/arm64/boot/dts/intel/axc6732-cpus.dtsi
create mode 100644 arch/arm64/boot/dts/intel/axc6732-sim.dts
delete mode 100644 arch/arm64/boot/dts/intel/axm5601-emu.dts
delete mode 100644 arch/arm64/boot/dts/intel/axm5602-emu.dts
diff --git a/arch/arm64/boot/dts/intel/Makefile
b/arch/arm64/boot/dts/intel/Makefile
index 5dc9168..500d78e 100644
--- a/arch/arm64/boot/dts/intel/Makefile
+++ b/arch/arm64/boot/dts/intel/Makefile
@@ -1,4 +1,8 @@
-dtb-$(CONFIG_ARCH_AXXIA) += axm5604-sim.dtb axm5608-sim.dtb axm5616-sim.dtb
axm5601-emu.dtb axm5602-emu.dtb axm5606-emu.dtb axc6704-sim.dtb axc6716-sim.dtb
axc6704-emu.dtb axc6712-emu.dtb
+dtb-$(CONFIG_ARCH_AXXIA) += \
+ axm5604-sim.dtb axm5608-sim.dtb axm5616-sim.dtb \
+ axm5606-emu.dtb \
+ axc6704-sim.dtb axc6716-sim.dtb axc6732-sim.dtb \
+ axc6704-emu.dtb axc6712-emu.dtb
always := $(dtb-y)
subdir-y := $(dts-dirs)
diff --git a/arch/arm64/boot/dts/intel/axc6704-emu.dts
b/arch/arm64/boot/dts/intel/axc6704-emu.dts
index a3549bb..e544f99 100644
--- a/arch/arm64/boot/dts/intel/axc6704-emu.dts
+++ b/arch/arm64/boot/dts/intel/axc6704-emu.dts
@@ -51,10 +51,56 @@
};
};
-
&trng {
status = "okay";
};
+
&pci0 {
status = "okay";
};
+
+&spi0 {
+ status = "okay";
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25fl016k";
+ reg = <0>;
+ spi-max-frequency = <25000000>;
+ pl022,com-mode = <1>;
+
+ partition@0 {
+ label = "spl-0";
+ reg = <0x0 0x40000>;
+ };
+ partition@40000 {
+ label = "spl-1";
+ reg = <0x40000 0x40000>;
+ };
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/intel/axc6704-sim.dts
b/arch/arm64/boot/dts/intel/axc6704-sim.dts
index 3ccee25..7f6f482 100644
--- a/arch/arm64/boot/dts/intel/axc6704-sim.dts
+++ b/arch/arm64/boot/dts/intel/axc6704-sim.dts
@@ -99,18 +99,42 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "s25fl016k";
- reg = <0x0>;
+ reg = <0>;
spi-max-frequency = <25000000>;
pl022,com-mode = <1>;
partition@0 {
- label = "bl2a";
+ label = "spl-0";
reg = <0x0 0x40000>;
};
partition@40000 {
- label = "bl2b";
+ label = "spl-1";
reg = <0x40000 0x40000>;
};
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
};
};
diff --git a/arch/arm64/boot/dts/intel/axc6712-emu.dts
b/arch/arm64/boot/dts/intel/axc6712-emu.dts
index 0ab1fd5..f69d6f2 100644
--- a/arch/arm64/boot/dts/intel/axc6712-emu.dts
+++ b/arch/arm64/boot/dts/intel/axc6712-emu.dts
@@ -36,7 +36,6 @@
phy-handle = <&phy0>;
};
-
&trng {
status = "okay";
};
@@ -45,7 +44,6 @@
status = "okay";
};
-
&mdio0 {
status = "okay";
lsi,mdio-clk-offset = <0x5>;
@@ -56,3 +54,49 @@
max-speed = <10>;
};
};
+
+&spi0 {
+ status = "okay";
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25fl016k";
+ reg = <0>;
+ spi-max-frequency = <25000000>;
+ pl022,com-mode = <1>;
+
+ partition@0 {
+ label = "spl-0";
+ reg = <0x0 0x40000>;
+ };
+ partition@40000 {
+ label = "spl-1";
+ reg = <0x40000 0x40000>;
+ };
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/intel/axc6716-sim.dts
b/arch/arm64/boot/dts/intel/axc6716-sim.dts
index a31f2e0..a4718c55 100644
--- a/arch/arm64/boot/dts/intel/axc6716-sim.dts
+++ b/arch/arm64/boot/dts/intel/axc6716-sim.dts
@@ -99,18 +99,42 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "s25fl016k";
- reg = <0x0>;
+ reg = <0>;
spi-max-frequency = <25000000>;
pl022,com-mode = <1>;
partition@0 {
- label = "bl2a";
+ label = "spl-0";
reg = <0x0 0x40000>;
};
partition@40000 {
- label = "bl2b";
+ label = "spl-1";
reg = <0x40000 0x40000>;
};
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
};
};
diff --git a/arch/arm64/boot/dts/intel/axc6732-cpus.dtsi
b/arch/arm64/boot/dts/intel/axc6732-cpus.dtsi
new file mode 100644
index 0000000..a4c2ed3
--- /dev/null
+++ b/arch/arm64/boot/dts/intel/axc6732-cpus.dtsi
@@ -0,0 +1,259 @@
+/*
+ * arch/arm64/boot/dts/intel/axc6716-cpus.dtsi
+ *
+ * Copyright (C) 2015 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+/ {
+ cpus {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu@0 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0>;
+ enable-method = "psci";
+ };
+
+ cpu@1 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <1>;
+ enable-method = "psci";
+ };
+
+ cpu@2 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <2>;
+ enable-method = "psci";
+ };
+
+ cpu@3 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <3>;
+ enable-method = "psci";
+ };
+
+ cpu@4 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x100>;
+ enable-method = "psci";
+ };
+
+ cpu@5 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x101>;
+ enable-method = "psci";
+ };
+
+ cpu@6 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x102>;
+ enable-method = "psci";
+ };
+
+ cpu@7 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x103>;
+ enable-method = "psci";
+
+ };
+
+ cpu@8 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x200>;
+ enable-method = "psci";
+ };
+
+ cpu@9 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x201>;
+ enable-method = "psci";
+ };
+
+ cpu@10 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x202>;
+ enable-method = "psci";
+ };
+
+ cpu@11 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x203>;
+ enable-method = "psci";
+ };
+
+ cpu@12 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x300>;
+ enable-method = "psci";
+ };
+
+ cpu@13 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x301>;
+ enable-method = "psci";
+ };
+
+ cpu@14 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x302>;
+ enable-method = "psci";
+ };
+
+ cpu@15 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x303>;
+ enable-method = "psci";
+
+ };
+
+ cpu@16 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x400>;
+ enable-method = "psci";
+
+ };
+
+ cpu@17 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x401>;
+ enable-method = "psci";
+
+ };
+
+ cpu@18 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x402>;
+ enable-method = "psci";
+
+ };
+
+ cpu@19 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x403>;
+ enable-method = "psci";
+
+ };
+
+ cpu@20 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x500>;
+ enable-method = "psci";
+
+ };
+
+ cpu@21 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x501>;
+ enable-method = "psci";
+
+ };
+
+ cpu@22 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x502>;
+ enable-method = "psci";
+
+ };
+
+ cpu@23 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x503>;
+ enable-method = "psci";
+
+ };
+
+ cpu@24 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x600>;
+ enable-method = "psci";
+
+ };
+
+ cpu@25 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x601>;
+ enable-method = "psci";
+
+ };
+
+ cpu@26 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x602>;
+ enable-method = "psci";
+
+ };
+
+ cpu@27 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x603>;
+ enable-method = "psci";
+
+ };
+
+ cpu@28 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x700>;
+ enable-method = "psci";
+
+ };
+
+ cpu@29 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x701>;
+ enable-method = "psci";
+
+ };
+
+ cpu@30 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x702>;
+ enable-method = "psci";
+
+ };
+
+ cpu@31 {
+ device_type = "cpu";
+ compatible = "arm,armv8";
+ reg = <0x703>;
+ enable-method = "psci";
+
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/intel/axc6732-sim.dts
b/arch/arm64/boot/dts/intel/axc6732-sim.dts
new file mode 100644
index 0000000..8846890
--- /dev/null
+++ b/arch/arm64/boot/dts/intel/axc6732-sim.dts
@@ -0,0 +1,208 @@
+/*
+ * arch/arm64/boot/dts/intel/axc6716-sim.dts
+ *
+ * Copyright (C) 2015 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+/dts-v1/;
+
+#include "axc67xx.dtsi"
+#include "axc6732-cpus.dtsi"
+
+/ {
+ model = "Lionfish Simulator";
+ compatible = "lsi,axc6732";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x00000000 0x40000000>;
+ };
+
+ soc {
+ virtio_block@8021000000 {
+ compatible = "virtio,mmio";
+ reg = <0x80 0x34000000 0x1000>;
+ interrupts = <GIC_SPI 639 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ vmfs@8034010000 {
+ compatible = "arm,messagebox";
+ reg = <0x80 0x34010000 0x1000>;
+ interrupts = <GIC_SPI 638 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ ethernet@8020000000 {
+ compatible = "smsc,lan91c111";
+ reg = <0x80 0x33000000 0x1000000>;
+ interrupts = <GIC_SPI 640 IRQ_TYPE_LEVEL_HIGH>;
+ phy-mode = "mii";
+ reg-io-width = <4>;
+ smsc,irq-active-high;
+ smsc,irq-push-pull;
+ };
+ };
+};
+
+&serial0 {
+ status = "okay";
+};
+
+&serial1 {
+ status = "okay";
+};
+
+&serial2 {
+ status = "okay";
+};
+
+&gpio0 {
+ status = "okay";
+};
+
+&gpio1 {
+ status = "okay";
+};
+
+&gpio2 {
+ status = "okay";
+};
+
+&gpio3 {
+ status = "okay";
+};
+
+&gpio4 {
+ status = "okay";
+};
+
+&gpio5 {
+ status = "okay";
+};
+
+&gpio6 {
+ status = "okay";
+};
+
+&gpio7 {
+ status = "okay";
+};
+
+&spi0 {
+ status = "okay";
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25fl016k";
+ reg = <0>;
+ spi-max-frequency = <25000000>;
+ pl022,com-mode = <1>;
+
+ partition@0 {
+ label = "spl-0";
+ reg = <0x0 0x40000>;
+ };
+ partition@40000 {
+ label = "spl-1";
+ reg = <0x40000 0x40000>;
+ };
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
+ };
+};
+
+&spi1 {
+ status = "okay";
+};
+
+&spi2 {
+ status = "okay";
+};
+
+&i2c0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
+
+&i2c4 {
+ status = "okay";
+};
+
+&i2c5 {
+ status = "okay";
+};
+
+&i2c6 {
+ status = "okay";
+};
+
+&i2c7 {
+ status = "okay";
+};
+
+&i2c8 {
+ status = "okay";
+};
+
+&i2c9 {
+ status = "okay";
+};
+
+&i2c10 {
+ status = "okay";
+};
+
+&i2c11 {
+ status = "okay";
+};
+
+
+&gpdma0 {
+ status = "okay";
+};
+
+&gpdma1 {
+ status = "okay";
+};
+
+&pci0 {
+ status = "okay";
+};
diff --git a/arch/arm64/boot/dts/intel/axm5601-emu.dts
b/arch/arm64/boot/dts/intel/axm5601-emu.dts
deleted file mode 100644
index 9388fa0..0000000
--- a/arch/arm64/boot/dts/intel/axm5601-emu.dts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * arch/arm64/boot/dts/intel/axm5601-emu.dts
- *
- * Copyright (C) 2013 LSI
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/dts-v1/;
-
-#include "axm56xx.dtsi"
-#include "axm5601-cpus.dtsi"
-
-/ {
- model = "AXM56xx Emulation";
- compatible = "lsi,axm5616";
-
- memory {
- device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
- };
-
- mmc_3v3: fixedregulator@0 {
- compatible = "regulator-fixed";
- regulator-name = "3V3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- soc {
- };
-};
-
-&serial0 {
- status = "okay";
-};
-
-&nemac {
- status = "okay";
- phy-handle = <&phy0>;
-};
-
-&mdio {
- status = "okay";
- lsi,mdio-clk-offset = <0x5>;
- lsi,mdio-clk-period = <0xc>;
-
- phy0: ethernet-phy@3 {
- reg = <0x3>;
- max-speed = <10>;
- };
-};
-&mtc {
- status = "okay";
-};
-
-&trng {
- status = "okay";
-};
-&pci1 {
- status = "okay";
-};
diff --git a/arch/arm64/boot/dts/intel/axm5602-emu.dts
b/arch/arm64/boot/dts/intel/axm5602-emu.dts
deleted file mode 100644
index 5add2ff..0000000
--- a/arch/arm64/boot/dts/intel/axm5602-emu.dts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * arch/arm64/boot/dts/intel/axm5602-emu.dts
- *
- * Copyright (C) 2013 LSI
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-/dts-v1/;
-
-#include "axm56xx.dtsi"
-#include "axm5602-cpus.dtsi"
-
-/ {
- model = "AXM56xx Emulation";
- compatible = "lsi,axm5616";
-
- memory {
- device_type = "memory";
- reg = <0 0x00000000 0x40000000>;
- };
-
- mmc_3v3: fixedregulator@0 {
- compatible = "regulator-fixed";
- regulator-name = "3V3";
- regulator-min-microvolt = <3300000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- soc {
- };
-};
-
-&serial0 {
- status = "okay";
-};
-
-&nemac {
- status = "okay";
- phy-handle = <&phy0>;
-};
-
-&mdio {
- status = "okay";
- lsi,mdio-clk-offset = <0x5>;
- lsi,mdio-clk-period = <0xc>;
- max-speed = <10>;
-
- phy0: ethernet-phy@3 {
- reg = <0x3>;
- };
-};
-&mtc {
- status = "okay";
-};
-
-&trng {
- status = "okay";
-};
diff --git a/arch/arm64/boot/dts/intel/axm5604-sim.dts
b/arch/arm64/boot/dts/intel/axm5604-sim.dts
index 1705339..7757a80 100644
--- a/arch/arm64/boot/dts/intel/axm5604-sim.dts
+++ b/arch/arm64/boot/dts/intel/axm5604-sim.dts
@@ -103,18 +103,42 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "s25fl016k";
- reg = <0x0>;
+ reg = <0>;
spi-max-frequency = <25000000>;
pl022,com-mode = <1>;
partition@0 {
- label = "bl2a";
+ label = "spl-0";
reg = <0x0 0x40000>;
};
partition@40000 {
- label = "bl2b";
+ label = "spl-1";
reg = <0x40000 0x40000>;
};
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
};
};
diff --git a/arch/arm64/boot/dts/intel/axm5606-emu.dts
b/arch/arm64/boot/dts/intel/axm5606-emu.dts
index d99ba6a..6888ce6 100644
--- a/arch/arm64/boot/dts/intel/axm5606-emu.dts
+++ b/arch/arm64/boot/dts/intel/axm5606-emu.dts
@@ -54,9 +54,57 @@
reg = <0x3>;
};
};
+
&mtc {
status = "okay";
};
+
&trng {
status = "okay";
};
+
+&spi0 {
+ status = "okay";
+
+ flash@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "s25fl016k";
+ reg = <0>;
+ spi-max-frequency = <25000000>;
+ pl022,com-mode = <1>;
+
+ partition@0 {
+ label = "spl-0";
+ reg = <0x0 0x40000>;
+ };
+ partition@40000 {
+ label = "spl-1";
+ reg = <0x40000 0x40000>;
+ };
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/intel/axm5608-sim.dts
b/arch/arm64/boot/dts/intel/axm5608-sim.dts
index eda277c..a81a47d 100644
--- a/arch/arm64/boot/dts/intel/axm5608-sim.dts
+++ b/arch/arm64/boot/dts/intel/axm5608-sim.dts
@@ -103,18 +103,42 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "s25fl016k";
- reg = <0x0>;
+ reg = <0>;
spi-max-frequency = <25000000>;
pl022,com-mode = <1>;
partition@0 {
- label = "bl2a";
+ label = "spl-0";
reg = <0x0 0x40000>;
};
partition@40000 {
- label = "bl2b";
+ label = "spl-1";
reg = <0x40000 0x40000>;
};
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
};
};
diff --git a/arch/arm64/boot/dts/intel/axm5616-sim.dts
b/arch/arm64/boot/dts/intel/axm5616-sim.dts
index 6828edb..554b08a 100644
--- a/arch/arm64/boot/dts/intel/axm5616-sim.dts
+++ b/arch/arm64/boot/dts/intel/axm5616-sim.dts
@@ -103,18 +103,42 @@
#address-cells = <1>;
#size-cells = <1>;
compatible = "s25fl016k";
- reg = <0x0>;
+ reg = <0>;
spi-max-frequency = <25000000>;
pl022,com-mode = <1>;
partition@0 {
- label = "bl2a";
+ label = "spl-0";
reg = <0x0 0x40000>;
};
partition@40000 {
- label = "bl2b";
+ label = "spl-1";
reg = <0x40000 0x40000>;
};
+ partition@80000 {
+ label = "parameters-0";
+ reg = <0x80000 0x10000>;
+ };
+ partition@90000 {
+ label = "parameters-1";
+ reg = <0x90000 0x10000>;
+ };
+ partition@a0000 {
+ label = "env-0";
+ reg = <0xa0000 0x10000>;
+ };
+ partition@b0000 {
+ label = "env-1";
+ reg = <0xb0000 0x10000>;
+ };
+ partition@100000 {
+ label = "u-boot-0";
+ reg = <0x100000 0x200000>;
+ };
+ partition@300000 {
+ label = "u-boot-1";
+ reg = <0x300000 0x200000>;
+ };
};
};
--
1.9.1
--
_______________________________________________
linux-yocto mailing list
linux-yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/linux-yocto
