From 35d115dc491a8fb8cc6c81d3d8a06416211752b4 Mon Sep 17 00:00:00 2001 From: zador-blood-stained Date: Sat, 3 Dec 2016 18:51:34 +0300 Subject: [PATCH] Adjust some Clearfog patches --- .../marvell-default/add-clearfog-base-dts.patch | 13 ++----------- .../u-boot-armada/add-spinor-and-sata-targets.patch | 4 ++-- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/patch/kernel/marvell-default/add-clearfog-base-dts.patch b/patch/kernel/marvell-default/add-clearfog-base-dts.patch index 7a8752cfd..294a8356b 100644 --- a/patch/kernel/marvell-default/add-clearfog-base-dts.patch +++ b/patch/kernel/marvell-default/add-clearfog-base-dts.patch @@ -14,10 +14,10 @@ index 04f1729..df7fade 100644 imx25-pdk.dtb \ diff --git a/arch/arm/boot/dts/armada-388-clearfog-base.dts b/arch/arm/boot/dts/armada-388-clearfog-base.dts new file mode 100644 -index 0000000..63046d4 +index 0000000..5f036ee --- /dev/null +++ b/arch/arm/boot/dts/armada-388-clearfog-base.dts -@@ -0,0 +1,179 @@ +@@ -0,0 +1,170 @@ +/* + * Device Tree file for SolidRun's ClearFog-a1 board + * @@ -181,19 +181,10 @@ index 0000000..63046d4 + + pcie-controller { + status = "okay"; -+ /* -+ * The two PCIe units are accessible through -+ * standard PCIe slots on the board. -+ */ + pcie@2,0 { + /* Port 1, Lane 0 */ + status = "okay"; + }; -+ pcie@3,0 { -+ /* Port 2, Lane 0 */ -+ status = "okay"; -+ }; -+ + }; + }; +}; diff --git a/patch/u-boot/u-boot-armada/add-spinor-and-sata-targets.patch b/patch/u-boot/u-boot-armada/add-spinor-and-sata-targets.patch index f53b18bb8..a11555474 100644 --- a/patch/u-boot/u-boot-armada/add-spinor-and-sata-targets.patch +++ b/patch/u-boot/u-boot-armada/add-spinor-and-sata-targets.patch @@ -7,8 +7,8 @@ index 9fd8afe..a867c8d 100755 echo y | $(obj)tools/marvell/doimage -T uart -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.uart.bin u-boot.bin u-boot-uart.sata +$(obj)u-boot.flash: $(obj)u-boot.bin -+ echo y | $(obj)tools/marvell/doimage -T flash -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.bin u-boot.bin u-boot.flash -+ echo y | $(obj)tools/marvell/doimage -T flash -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.uart.bin u-boot.bin u-boot-uart.flash ++ echo y | $(obj)tools/marvell/doimage -T flash -D 0xFFFFFFFF -E 0xD4013580 -G $(obj)tools/marvell/bin_hdr/bin_hdr.bin u-boot.bin u-boot.flash ++ echo y | $(obj)tools/marvell/doimage -T uart -D 0x0 -E 0x0 -G $(obj)tools/marvell/bin_hdr/bin_hdr.uart.bin u-boot.bin u-boot-uart.flash $(obj)u-boot.img: $(obj)u-boot.bin $(obj)tools/mkimage -A $(ARCH) -T firmware -C none \