From patchwork Thu Jul  9 20:09:25 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Yaroslav Petrov <info@lank.me>
X-Patchwork-Id: 241298
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: info at lank.me (Yaroslav Petrov)
Date: Thu, 9 Jul 2020 22:09:25 +0200
Subject: sunxi: Add SPI Flash support for Orange PI R1
Message-ID: <b5615179-cd82-5a71-edc7-d1426dd640cb@lank.me>


diff --git a/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts 
b/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts
index 3356f4210d..675d38738d 100644
--- a/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts
+++ b/arch/arm/dts/sun8i-h2-plus-orangepi-r1.dts
@@ -65,6 +65,7 @@

 ??????? aliases {
 ??????????????? ethernet1 = &rtl8189etv;
+?????????????? spi0 = &spi0;
 ??????? };
 ?};

@@ -72,6 +73,7 @@
 ??????? status = "okay";

 ??????? flash at 0 {
+?????????????? u-boot,dm-pre-reloc;
 ??????????????? compatible = "mxicy,mx25l12805d", "jedec,spi-nor";
 ??????? };
 ?};
diff --git a/configs/orangepi_r1_defconfig b/configs/orangepi_r1_defconfig
index 6f770fa018..a66c41aa3d 100644
--- a/configs/orangepi_r1_defconfig
+++ b/configs/orangepi_r1_defconfig
@@ -11,3 +11,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-h2-plus-orangepi-r1"
 ?CONFIG_SUN8I_EMAC=y
 ?CONFIG_USB_EHCI_HCD=y
 ?CONFIG_USB_OHCI_HCD=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_SPI=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_DM_SPI=y
+CONFIG_SPI=y
+CONFIG_SPL_SPI_SUNXI=y
\ No newline at end of file