From: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
To: Simon Glass <sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
Kever Yang <kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org>,
Philipp Tomsich
<philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org>
Cc: u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org,
linux-amarula
<linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>,
Jagan Teki
<jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>,
linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
Subject: [PATCH 11/11] roc-rk3399-pc: Add SPI boot support
Date: Sat, 21 Dec 2019 13:24:40 +0530 [thread overview]
Message-ID: <20191221075440.6944-12-jagan@amarulasolutions.com> (raw)
In-Reply-To: <20191221075440.6944-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
Add SPI boot support for ROC-RK3399-PC board.
This would add separate config file for SPI along
with dts changes.
Signed-off-by: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
---
arch/arm/dts/rk3399-roc-pc-u-boot.dtsi | 12 ++++-
board/rockchip/evb_rk3399/MAINTAINERS | 2 +
configs/roc-pc-rk3399-spi_defconfig | 62 ++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 1 deletion(-)
create mode 100644 configs/roc-pc-rk3399-spi_defconfig
diff --git a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
index 5746442981..6e43c7c71b 100644
--- a/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
+++ b/arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
@@ -11,8 +11,18 @@
spi0 = &spi1;
};
+ config {
+ u-boot,spl-payload-offset = <0x40000>; /* @ 256KB */
+ };
+
chosen {
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
+ u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdhci, &sdmmc;
+ };
+};
+
+&spi1 {
+ spi_flash: flash@0 {
+ u-boot,dm-pre-reloc;
};
};
diff --git a/board/rockchip/evb_rk3399/MAINTAINERS b/board/rockchip/evb_rk3399/MAINTAINERS
index eab4c4c525..8de6ec88f1 100644
--- a/board/rockchip/evb_rk3399/MAINTAINERS
+++ b/board/rockchip/evb_rk3399/MAINTAINERS
@@ -57,8 +57,10 @@ F: arch/arm/dts/rk3399-orangepi-u-boot.dtsi
ROC-RK3399-PC
M: Levin Du <djw-Efosm3t9Qi2Pt1CcHtbs0g@public.gmane.org>
+M: Jagan Teki <jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
S: Maintained
F: configs/roc-pc-rk3399_defconfig
+F: configs/roc-pc-rk3399-spi_defconfig
F: arch/arm/dts/rk3399-roc-pc-u-boot.dtsi
ROCK-PI-4
diff --git a/configs/roc-pc-rk3399-spi_defconfig b/configs/roc-pc-rk3399-spi_defconfig
new file mode 100644
index 0000000000..1fdfb10101
--- /dev/null
+++ b/configs/roc-pc-rk3399-spi_defconfig
@@ -0,0 +1,62 @@
+CONFIG_ARM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_SYS_TEXT_BASE=0x00200000
+CONFIG_ROCKCHIP_RK3399=y
+CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_CLOCK=24000000
+CONFIG_DEBUG_UART=y
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_DISPLAY_BOARDINFO_LATE=y
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
+# CONFIG_SPL_MMC_SUPPORT is not set
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SPL_TEXT_BASE=0xff8c2000
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000
+CONFIG_CMD_BOOTZ=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_USB=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TIME=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="rk3399-roc-pc"
+CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ROCKCHIP_GPIO=y
+CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MMC_DW=y
+CONFIG_MMC_DW_ROCKCHIP=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ROCKCHIP=y
+CONFIG_DM_ETH=y
+CONFIG_ETH_DESIGNWARE=y
+CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PMIC_RK8XX=y
+CONFIG_REGULATOR_PWM=y
+CONFIG_REGULATOR_RK8XX=y
+CONFIG_PWM_ROCKCHIP=y
+CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_BAUDRATE=1500000
+CONFIG_DEBUG_UART_SHIFT=2
+CONFIG_SYSRESET=y
+CONFIG_SPI_FLASH_WINBOND=y
+CONFIG_ROCKCHIP_SPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_ASIX88179=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_RTL8152=y
+CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_ERRNO_STR=y
--
2.18.0.321.gffc6fa0e3
next prev parent reply other threads:[~2019-12-21 7:54 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-21 7:54 [PATCH 00/11] rk3399: SPI boot support (fixes, updates) Jagan Teki
[not found] ` <20191221075440.6944-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-21 7:54 ` [PATCH 01/11] spi: rk: Limit transfers to (64K - 1) bytes Jagan Teki
[not found] ` <20191221075440.6944-2-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-23 2:30 ` Kever Yang
2019-12-27 5:55 ` Jagan Teki
2019-12-21 7:54 ` [PATCH 02/11] distro_bootcmd: Add SF support Jagan Teki
2019-12-30 3:07 ` Kever Yang
2020-01-20 17:22 ` Tom Rini
2020-01-20 17:40 ` Alexander Graf
2020-01-23 16:55 ` Jagan Teki
2020-01-23 17:03 ` Tom Rini
2020-01-23 17:11 ` Jagan Teki
2020-01-23 17:15 ` Tom Rini
2020-01-23 17:29 ` Jagan Teki
2020-01-23 17:59 ` Tom Rini
2019-12-21 7:54 ` [PATCH 03/11] rockchip: Include SF on distrocmd devices Jagan Teki
[not found] ` <20191221075440.6944-4-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-30 3:07 ` Kever Yang
2020-01-07 8:44 ` Kever Yang
2019-12-21 7:54 ` [PATCH 04/11] rk3399: Add boot flash script offet, size Jagan Teki
2019-12-30 3:06 ` Kever Yang
2019-12-21 7:54 ` [PATCH 05/11] rk3399: Check MMC env while defining it Jagan Teki
2019-12-30 3:06 ` Kever Yang
2019-12-21 7:54 ` [PATCH 06/11] env: kconfig: Restrict rockchip env for MMC Jagan Teki
2019-12-30 3:05 ` Kever Yang
2019-12-21 7:54 ` [PATCH 07/11] env: Enable SPI flash env for rockchip Jagan Teki
2019-12-23 2:34 ` Kever Yang
2019-12-27 6:50 ` Jagan Teki
2019-12-27 10:02 ` Kever Yang
2019-12-27 10:10 ` Jagan Teki
2019-12-27 10:30 ` Soeren Moch
2019-12-27 12:04 ` Jagan Teki
2019-12-27 13:19 ` Soeren Moch
[not found] ` <30fdf54b-0f71-ffbf-ac57-51050a29b56d-S0/GAf8tV78@public.gmane.org>
2019-12-28 12:08 ` Jagan Teki
2019-12-30 9:04 ` Soeren Moch
2019-12-30 2:59 ` Kever Yang
2019-12-21 7:54 ` [PATCH 08/11] rockchip: dts: Sync ROC-RK3399-PC changes from Linux Jagan Teki
[not found] ` <20191221075440.6944-9-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-30 3:00 ` Kever Yang
2019-12-21 7:54 ` [PATCH 09/11] roc-pc-rk3399: Enable SPI Flash Jagan Teki
[not found] ` <20191221075440.6944-10-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-30 3:00 ` Kever Yang
2019-12-21 7:54 ` [PATCH 10/11] rockpro-rk3399: " Jagan Teki
2019-12-30 3:00 ` Kever Yang
[not found] ` <20191221075440.6944-11-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org>
2019-12-30 11:51 ` Emmanuel Vadot
2020-01-08 12:59 ` Jagan Teki
2019-12-21 7:54 ` Jagan Teki [this message]
2019-12-30 3:05 ` [PATCH 11/11] roc-rk3399-pc: Add SPI boot support Kever Yang
2019-12-30 7:52 ` Jagan Teki
[not found] ` <CAMty3ZA1u3-21QN4N6W=9Sq3n493BBBB2W_FzAEQC9aze4SoMg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2020-01-07 8:53 ` Kever Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191221075440.6944-12-jagan@amarulasolutions.com \
--to=jagan-dyjbcgdgk7pe9whmmfpqlfatqe2ktcn/@public.gmane.org \
--cc=kever.yang-TNX95d0MmH7DzftRWevZcw@public.gmane.org \
--cc=linux-amarula-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org \
--cc=linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=philipp.tomsich-SN7IsUiht6C/RdPyistoZJqQE7yCjDx5@public.gmane.org \
--cc=sjg-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org \
--cc=u-boot-0aAXYlwwYIKGBzrmiIFOJg@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).