nanopi-m6: add support for SPI flash boot

[efectn]

Description

This PR adds SPI Flash boot support to NanoPi M6. Also add some missing Uboot config properties which are necessary for M2 SSD boot.

• Since eMMC and SPI Flash shares the same PINMUX, they can not be activated from devicetree at the same time. Enabling SPI node breaks eMMC when the MMC is attached. It is necessary to build two defconfigs/uboot to solve it.

Kernel PR: armbian/linux-rockchip#314

GitHub issue reference:
Jira reference number [AR-9999]

How Has This Been Tested?

• Test SPI Flash + M2 boot
• Test eMMC boot

Checklist:

Please delete options that are not relevant.

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• My changes generate no new warnings
• Any dependent changes have been merged and published in downstream modules

[rpardini]

diff --git a/config/boards/nanopi-m6.conf b/config/boards/nanopi-m6.conf
index 0589dccd0a..2c0fd87fa4 100644
--- a/config/boards/nanopi-m6.conf
+++ b/config/boards/nanopi-m6.conf
@@ -12,10 +12,12 @@ BOOT_FDT_FILE="rockchip/rk3588s-nanopi-m6.dtb"
 BOOT_SCENARIO="spl-blobs"

 DEFAULT_OVERLAYS="nanopi-m6-display-dsi1-yx35" # Enable YX35 LCD
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"

 function post_family_config__nanopi_m6_support_spi_boot() {
        UBOOT_TARGET_MAP="nanopi-m6-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb
-nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB;; rkspi_loader.img"
+    nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img"
 }

[efectn]

diff --git a/config/boards/nanopi-m6.conf b/config/boards/nanopi-m6.conf
index 0589dccd0a..2c0fd87fa4 100644
--- a/config/boards/nanopi-m6.conf
+++ b/config/boards/nanopi-m6.conf
@@ -12,10 +12,12 @@ BOOT_FDT_FILE="rockchip/rk3588s-nanopi-m6.dtb"
 BOOT_SCENARIO="spl-blobs"

 DEFAULT_OVERLAYS="nanopi-m6-display-dsi1-yx35" # Enable YX35 LCD
+BOOT_SUPPORT_SPI="yes"
+BOOT_SPI_RKSPI_LOADER="yes"

 function post_family_config__nanopi_m6_support_spi_boot() {
        UBOOT_TARGET_MAP="nanopi-m6-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;idbloader.img u-boot.itb
-nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB;; rkspi_loader.img"
+    nanopi-m6-spi-rk3588s_defconfig BL31=$RKBIN_DIR/$BL31_BLOB spl/u-boot-spl.bin u-boot.dtb u-boot.itb;;rkspi_loader.img"
 }

Thanks Ricardo, everything is OK now!