From: John Jacques <[email protected]>
Signed-off-by: John Jacques <[email protected]>
---
arch/arm/boot/dts/Makefile | 6 +-
arch/arm/boot/dts/axm5504-sim-mmc.dts | 127 +++++++++++++++++++++++++++++
arch/arm/boot/dts/axm5504-sim-virtio.dts | 126 +++++++++++++++++++++++++++++
arch/arm/boot/dts/axm5504-sim.dts | 133 -------------------------------
arch/arm/boot/dts/axm5516-sim-mmc.dts | 127 +++++++++++++++++++++++++++++
arch/arm/boot/dts/axm5516-sim-virtio.dts | 126 +++++++++++++++++++++++++++++
arch/arm/boot/dts/axm5516-sim.dts | 133 -------------------------------
arch/arm/boot/fmboot/Makefile | 3 +-
8 files changed, 511 insertions(+), 270 deletions(-)
create mode 100644 arch/arm/boot/dts/axm5504-sim-mmc.dts
create mode 100644 arch/arm/boot/dts/axm5504-sim-virtio.dts
delete mode 100644 arch/arm/boot/dts/axm5504-sim.dts
create mode 100644 arch/arm/boot/dts/axm5516-sim-mmc.dts
create mode 100644 arch/arm/boot/dts/axm5516-sim-virtio.dts
delete mode 100644 arch/arm/boot/dts/axm5516-sim.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 1b5fcd7..3e26406 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -220,8 +220,10 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
wm8505-ref.dtb \
wm8650-mid.dtb \
wm8850-w70v2.dtb
-dtb-$(CONFIG_ARCH_AXXIA) += axm5504-sim.dtb \
- axm5516-sim.dtb \
+dtb-$(CONFIG_ARCH_AXXIA) += axm5504-sim-mmc.dtb \
+ axm5504-sim-virtio.dtb \
+ axm5516-sim-mmc.dtb \
+ axm5516-sim-virtio.dtb \
axm5504-emu.dtb \
axm5507-emu.dtb \
axm5516-amarillo.dtb \
diff --git a/arch/arm/boot/dts/axm5504-sim-mmc.dts
b/arch/arm/boot/dts/axm5504-sim-mmc.dts
new file mode 100644
index 0000000..22ee70f
--- /dev/null
+++ b/arch/arm/boot/dts/axm5504-sim-mmc.dts
@@ -0,0 +1,127 @@
+/*
+ * arch/arm/boot/dts/axm5504-amarillo.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/;
+
+/memreserve/ 0x00000000 0x00400000;
+
+/include/ "axm55xx.dtsi"
+/include/ "axm5504-cpus.dtsi"
+
+/ {
+ model = "Simulation Platform AXM5500";
+ compatible = "lsi,axm5500-sim", "lsi,axm5500";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x00000000 0 0x40000000>;
+ };
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu {
+ frequency = <1400000000>;
+ };
+
+ peripheral {
+ frequency = <400000000>;
+ };
+
+ emmc {
+ frequency = <25000000>;
+ };
+ };
+
+ sim {
+ compatible = "arm,amba-bus", "simple-bus";
+ device_type = "soc";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ interrupt-parent = <&gic>;
+ ranges;
+
+ mmci@020101E0000 {
+ compatible = "arm,pl180", "arm,primecell";
+ reg = <0x20 0x101E0000 0x00 0x1000>;
+ interrupts = <0 222 4>,
+ <0 223 4>;
+ };
+
+ ethernet@201100000000 {
+ compatible = "smsc,lan91c111";
+ device_type = "network";
+ reg = <0x20 0x11000000 0 0x10000>;
+ interrupts = <0 1 4>;
+ phy-mode = "mii";
+ reg-io-width = <4>;
+ smsc,irq-active-high;
+ smsc,irq-push-pull;
+ };
+ };
+};
+
+&mtc {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&serial0 {
+ status = "okay";
+};
+
+&serial1 {
+ status = "okay";
+};
+
+&serial2 {
+ status = "okay";
+};
+
+&serial3 {
+ status = "okay";
+};
+
+&gpio0 {
+ status = "okay";
+};
+
+&gpio1 {
+ status = "okay";
+};
+
+&spics {
+ status = "okay";
+};
+
+&spi0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/axm5504-sim-virtio.dts
b/arch/arm/boot/dts/axm5504-sim-virtio.dts
new file mode 100644
index 0000000..68560e5
--- /dev/null
+++ b/arch/arm/boot/dts/axm5504-sim-virtio.dts
@@ -0,0 +1,126 @@
+/*
+ * arch/arm/boot/dts/axm5504-amarillo.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/;
+
+/memreserve/ 0x00000000 0x00400000;
+
+/include/ "axm55xx.dtsi"
+/include/ "axm5504-cpus.dtsi"
+
+/ {
+ model = "Simulation Platform AXM5500";
+ compatible = "lsi,axm5500-sim", "lsi,axm5500";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x00000000 0 0x40000000>;
+ };
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu {
+ frequency = <1400000000>;
+ };
+
+ peripheral {
+ frequency = <400000000>;
+ };
+
+ emmc {
+ frequency = <25000000>;
+ };
+ };
+
+ sim {
+ compatible = "arm,amba-bus", "simple-bus";
+ device_type = "soc";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ interrupt-parent = <&gic>;
+ ranges;
+
+ virtio_block@0130000 {
+ compatible = "virtio,mmio";
+ reg = <0x20 0x101f0000 0 0x10000>;
+ interrupts = <0 223 4>;
+ };
+
+ ethernet@201100000000 {
+ compatible = "smsc,lan91c111";
+ device_type = "network";
+ reg = <0x20 0x11000000 0 0x10000>;
+ interrupts = <0 1 4>;
+ phy-mode = "mii";
+ reg-io-width = <4>;
+ smsc,irq-active-high;
+ smsc,irq-push-pull;
+ };
+ };
+};
+
+&mtc {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&serial0 {
+ status = "okay";
+};
+
+&serial1 {
+ status = "okay";
+};
+
+&serial2 {
+ status = "okay";
+};
+
+&serial3 {
+ status = "okay";
+};
+
+&gpio0 {
+ status = "okay";
+};
+
+&gpio1 {
+ status = "okay";
+};
+
+&spics {
+ status = "okay";
+};
+
+&spi0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/axm5504-sim.dts
b/arch/arm/boot/dts/axm5504-sim.dts
deleted file mode 100644
index 543c908..0000000
--- a/arch/arm/boot/dts/axm5504-sim.dts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * arch/arm/boot/dts/axm5504-amarillo.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/;
-
-/memreserve/ 0x00000000 0x00400000;
-
-/include/ "axm55xx.dtsi"
-/include/ "axm5504-cpus.dtsi"
-
-/ {
- model = "Simulation Platform AXM5500";
- compatible = "lsi,axm5500-sim", "lsi,axm5500";
-
- memory {
- device_type = "memory";
- reg = <0 0x00000000 0 0x40000000>;
- };
-
- clocks {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu {
- frequency = <1400000000>;
- };
-
- peripheral {
- frequency = <400000000>;
- };
-
- emmc {
- frequency = <25000000>;
- };
- };
-
- sim {
- compatible = "arm,amba-bus", "simple-bus";
- device_type = "soc";
- #address-cells = <2>;
- #size-cells = <2>;
- interrupt-parent = <&gic>;
- ranges;
-
- virtio_block@0130000 {
- compatible = "virtio,mmio";
- reg = <0x20 0x101f0000 0 0x10000>;
- interrupts = <0 223 4>;
- };
-
- mmci@020101E0000 {
- compatible = "arm,pl180", "arm,primecell";
- reg = <0x20 0x101E0000 0x00 0x1000>;
- interrupts = <0 222 4>,
- <0 223 4>;
- };
-
- ethernet@201100000000 {
- compatible = "smsc,lan91c111";
- device_type = "network";
- reg = <0x20 0x11000000 0 0x10000>;
- interrupts = <0 1 4>;
- phy-mode = "mii";
- reg-io-width = <4>;
- smsc,irq-active-high;
- smsc,irq-push-pull;
- };
- };
-};
-
-&mtc {
- status = "okay";
-};
-
-&pcie0 {
- status = "okay";
-};
-
-&pcie1 {
- status = "okay";
-};
-
-&serial0 {
- status = "okay";
-};
-
-&serial1 {
- status = "okay";
-};
-
-&serial2 {
- status = "okay";
-};
-
-&serial3 {
- status = "okay";
-};
-
-&gpio0 {
- status = "okay";
-};
-
-&gpio1 {
- status = "okay";
-};
-
-&spics {
- status = "okay";
-};
-
-&spi0 {
- status = "okay";
-};
-
-&i2c1 {
- status = "okay";
-};
-
-&i2c2 {
- status = "okay";
-};
-
-&i2c3 {
- status = "okay";
-};
diff --git a/arch/arm/boot/dts/axm5516-sim-mmc.dts
b/arch/arm/boot/dts/axm5516-sim-mmc.dts
new file mode 100644
index 0000000..e9fe852
--- /dev/null
+++ b/arch/arm/boot/dts/axm5516-sim-mmc.dts
@@ -0,0 +1,127 @@
+/*
+ * arch/arm/boot/dts/axm5516-sim.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/;
+
+/memreserve/ 0x00000000 0x00400000;
+
+/include/ "axm55xx.dtsi"
+/include/ "axm5516-cpus.dtsi"
+
+/ {
+ model = "Simulation Platform AXM5500";
+ compatible = "lsi,axm5500-sim", "lsi,axm5500";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x00000000 0 0x40000000>;
+ };
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu {
+ frequency = <1400000000>;
+ };
+
+ peripheral {
+ frequency = <400000000>;
+ };
+
+ emmc {
+ frequency = <25000000>;
+ };
+ };
+
+ sim {
+ compatible = "arm,amba-bus", "simple-bus";
+ device_type = "soc";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ interrupt-parent = <&gic>;
+ ranges;
+
+ mmci@020101E0000 {
+ compatible = "arm,pl180", "arm,primecell";
+ reg = <0x20 0x101E0000 0x00 0x1000>;
+ interrupts = <0 222 4>,
+ <0 223 4>;
+ };
+
+ ethernet@201100000000 {
+ compatible = "smsc,lan91c111";
+ device_type = "network";
+ reg = <0x20 0x11000000 0 0x10000>;
+ interrupts = <0 1 4>;
+ phy-mode = "mii";
+ reg-io-width = <4>;
+ smsc,irq-active-high;
+ smsc,irq-push-pull;
+ };
+ };
+};
+
+&mtc {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&serial0 {
+ status = "okay";
+};
+
+&serial1 {
+ status = "okay";
+};
+
+&serial2 {
+ status = "okay";
+};
+
+&serial3 {
+ status = "okay";
+};
+
+&gpio0 {
+ status = "okay";
+};
+
+&gpio1 {
+ status = "okay";
+};
+
+&spics {
+ status = "okay";
+};
+
+&spi0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/axm5516-sim-virtio.dts
b/arch/arm/boot/dts/axm5516-sim-virtio.dts
new file mode 100644
index 0000000..3533467
--- /dev/null
+++ b/arch/arm/boot/dts/axm5516-sim-virtio.dts
@@ -0,0 +1,126 @@
+/*
+ * arch/arm/boot/dts/axm5516-sim.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/;
+
+/memreserve/ 0x00000000 0x00400000;
+
+/include/ "axm55xx.dtsi"
+/include/ "axm5516-cpus.dtsi"
+
+/ {
+ model = "Simulation Platform AXM5500";
+ compatible = "lsi,axm5500-sim", "lsi,axm5500";
+
+ memory {
+ device_type = "memory";
+ reg = <0 0x00000000 0 0x40000000>;
+ };
+
+ clocks {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ cpu {
+ frequency = <1400000000>;
+ };
+
+ peripheral {
+ frequency = <400000000>;
+ };
+
+ emmc {
+ frequency = <25000000>;
+ };
+ };
+
+ sim {
+ compatible = "arm,amba-bus", "simple-bus";
+ device_type = "soc";
+ #address-cells = <2>;
+ #size-cells = <2>;
+ interrupt-parent = <&gic>;
+ ranges;
+
+ virtio_block@0130000 {
+ compatible = "virtio,mmio";
+ reg = <0x20 0x101f0000 0 0x10000>;
+ interrupts = <0 223 4>;
+ };
+
+ ethernet@201100000000 {
+ compatible = "smsc,lan91c111";
+ device_type = "network";
+ reg = <0x20 0x11000000 0 0x10000>;
+ interrupts = <0 1 4>;
+ phy-mode = "mii";
+ reg-io-width = <4>;
+ smsc,irq-active-high;
+ smsc,irq-push-pull;
+ };
+ };
+};
+
+&mtc {
+ status = "okay";
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&serial0 {
+ status = "okay";
+};
+
+&serial1 {
+ status = "okay";
+};
+
+&serial2 {
+ status = "okay";
+};
+
+&serial3 {
+ status = "okay";
+};
+
+&gpio0 {
+ status = "okay";
+};
+
+&gpio1 {
+ status = "okay";
+};
+
+&spics {
+ status = "okay";
+};
+
+&spi0 {
+ status = "okay";
+};
+
+&i2c1 {
+ status = "okay";
+};
+
+&i2c2 {
+ status = "okay";
+};
+
+&i2c3 {
+ status = "okay";
+};
diff --git a/arch/arm/boot/dts/axm5516-sim.dts
b/arch/arm/boot/dts/axm5516-sim.dts
deleted file mode 100644
index 33aa9d6..0000000
--- a/arch/arm/boot/dts/axm5516-sim.dts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * arch/arm/boot/dts/axm5516-sim.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/;
-
-/memreserve/ 0x00000000 0x00400000;
-
-/include/ "axm55xx.dtsi"
-/include/ "axm5516-cpus.dtsi"
-
-/ {
- model = "Simulation Platform AXM5500";
- compatible = "lsi,axm5500-sim", "lsi,axm5500";
-
- memory {
- device_type = "memory";
- reg = <0 0x00000000 0 0x40000000>;
- };
-
- clocks {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu {
- frequency = <1400000000>;
- };
-
- peripheral {
- frequency = <400000000>;
- };
-
- emmc {
- frequency = <25000000>;
- };
- };
-
- sim {
- compatible = "arm,amba-bus", "simple-bus";
- device_type = "soc";
- #address-cells = <2>;
- #size-cells = <2>;
- interrupt-parent = <&gic>;
- ranges;
-
- virtio_block@0130000 {
- compatible = "virtio,mmio";
- reg = <0x20 0x101f0000 0 0x10000>;
- interrupts = <0 223 4>;
- };
-
- mmci@020101E0000 {
- compatible = "arm,pl180", "arm,primecell";
- reg = <0x20 0x101E0000 0x00 0x1000>;
- interrupts = <0 222 4>,
- <0 223 4>;
- };
-
- ethernet@201100000000 {
- compatible = "smsc,lan91c111";
- device_type = "network";
- reg = <0x20 0x11000000 0 0x10000>;
- interrupts = <0 1 4>;
- phy-mode = "mii";
- reg-io-width = <4>;
- smsc,irq-active-high;
- smsc,irq-push-pull;
- };
- };
-};
-
-&mtc {
- status = "okay";
-};
-
-&pcie0 {
- status = "okay";
-};
-
-&pcie1 {
- status = "okay";
-};
-
-&serial0 {
- status = "okay";
-};
-
-&serial1 {
- status = "okay";
-};
-
-&serial2 {
- status = "okay";
-};
-
-&serial3 {
- status = "okay";
-};
-
-&gpio0 {
- status = "okay";
-};
-
-&gpio1 {
- status = "okay";
-};
-
-&spics {
- status = "okay";
-};
-
-&spi0 {
- status = "okay";
-};
-
-&i2c1 {
- status = "okay";
-};
-
-&i2c2 {
- status = "okay";
-};
-
-&i2c3 {
- status = "okay";
-};
diff --git a/arch/arm/boot/fmboot/Makefile b/arch/arm/boot/fmboot/Makefile
index 5b046c0..85216dd 100644
--- a/arch/arm/boot/fmboot/Makefile
+++ b/arch/arm/boot/fmboot/Makefile
@@ -4,7 +4,7 @@ AS = $(CROSS_COMPILE)gcc -c
LD = $(CROSS_COMPILE)ld
DTC = $(obj)/../../../../scripts/dtc/dtc
-DTS = $(obj)/../dts/axm5504-sim.dts
+DTS = $(obj)/../dts/axm5504-sim-mmc.dts
ZIMAGE = $(obj)/../zImage
clean:
@@ -13,7 +13,6 @@ clean:
arch/arm/boot/linux.img: $(obj)/fmboot.o $(srctree)/$(obj)/fmboot.lds
$(obj)/zImage.fm
cd $(obj) && $(LD) -o ../linux.img --script=$(srctree)/$(obj)/fmboot.lds
tar jcf $(obj)/../linux.img.tar.bz2 $(obj)/../linux.img
- #rm -rf $(obj)/../linux.img
$(obj)/zImage.fm: $(ZIMAGE) $(obj)/axm5504-sim.dtb
python $(srctree)/$(obj)/pack.py $(ZIMAGE) $(obj)/axm5504-sim.dtb > $@
--
1.8.1.4
--
_______________________________________________
linux-yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/linux-yocto
