152 lines
4.2 KiB
Diff
152 lines
4.2 KiB
Diff
|
diff --git a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
|
||
|
|
index c17e769f..30f977db 100644
|
||
|
|
--- a/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
|
||
|
|
+++ b/arch/arm/dts/rk3399-rock-pi-4-u-boot.dtsi
|
||
|
|
@@ -8,7 +7,27 @@
|
||
|
|
|
||
|
|
/ {
|
||
|
|
chosen {
|
||
|
|
- u-boot,spl-boot-order = "same-as-spl", &sdhci, &sdmmc;
|
||
|
|
+ u-boot,spl-boot-order = "same-as-spl", &spi_flash, &sdmmc, &sdhci;
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
+ config {
|
||
|
|
+ u-boot,spl-payload-offset = <0x60000>; /* @ 384KB */
|
||
|
|
+ };
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+&spi1 {
|
||
|
|
+ status = "okay";
|
||
|
|
+
|
||
|
|
+ flash@0 {
|
||
|
|
+ compatible = "jedec,spi-nor";
|
||
|
|
+ reg = <0>;
|
||
|
|
+ spi-max-frequency = <10000000>;
|
||
|
|
+ };
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+&spi1 {
|
||
|
|
+ spi_flash: flash@0 {
|
||
|
|
+ u-boot,dm-pre-reloc;
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
|
||
|
|
index 764e2b56..11b57434 100644
|
||
|
|
--- a/configs/rock-pi-4-rk3399_defconfig
|
||
|
|
+++ b/configs/rock-pi-4-rk3399_defconfig
|
||
|
|
@@ -2,12 +2,16 @@ CONFIG_ARM=y
|
||
|
|
CONFIG_ARCH_ROCKCHIP=y
|
||
|
|
CONFIG_SYS_TEXT_BASE=0x00200000
|
||
|
|
CONFIG_NR_DRAM_BANKS=1
|
||
|
|
+CONFIG_ENV_SIZE=0x6000
|
||
|
|
CONFIG_ENV_OFFSET=0x3F8000
|
||
|
|
+CONFIG_ENV_SECT_SIZE=0x1000
|
||
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b"
|
||
|
|
CONFIG_ROCKCHIP_RK3399=y
|
||
|
|
CONFIG_TARGET_EVB_RK3399=y
|
||
|
|
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||
|
|
CONFIG_DEBUG_UART_CLOCK=24000000
|
||
|
|
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||
|
|
+CONFIG_SPL_SPI=y
|
||
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
||
|
|
CONFIG_DEBUG_UART=y
|
||
|
|
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
||
|
|
@@ -16,6 +20,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||
|
|
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
||
|
|
CONFIG_SPL_STACK_R=y
|
||
|
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
||
|
|
+CONFIG_SPL_SPI_LOAD=y
|
||
|
|
CONFIG_TPL=y
|
||
|
|
CONFIG_CMD_BOOTZ=y
|
||
|
|
CONFIG_CMD_GPT=y
|
||
|
|
@@ -26,8 +31,9 @@ CONFIG_CMD_USB=y
|
||
|
|
CONFIG_CMD_TIME=y
|
||
|
|
CONFIG_SPL_OF_CONTROL=y
|
||
|
|
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_MMC=y
|
||
|
|
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||
|
|
+CONFIG_SPL_DM_SEQ_ALIAS=y
|
||
|
|
CONFIG_ROCKCHIP_GPIO=y
|
||
|
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
||
|
|
CONFIG_MISC=y
|
||
|
|
@@ -35,6 +41,10 @@ CONFIG_MMC_DW=y
|
||
|
|
CONFIG_MMC_DW_ROCKCHIP=y
|
||
|
|
CONFIG_MMC_SDHCI=y
|
||
|
|
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
||
|
|
+CONFIG_SF_DEFAULT_BUS=1
|
||
|
|
+CONFIG_SPI_FLASH_GIGADEVICE=y
|
||
|
|
+CONFIG_SPI_FLASH_WINBOND=y
|
||
|
|
+CONFIG_SPI_FLASH_XTX=y
|
||
|
|
CONFIG_DM_ETH=y
|
||
|
|
CONFIG_ETH_DESIGNWARE=y
|
||
|
|
CONFIG_GMAC_ROCKCHIP=y
|
||
|
|
@@ -50,6 +60,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
|
||
|
|
CONFIG_DM_RESET=y
|
||
|
|
CONFIG_BAUDRATE=1500000
|
||
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
||
|
|
+CONFIG_ROCKCHIP_SPI=y
|
||
|
|
CONFIG_SYSRESET=y
|
||
|
|
CONFIG_USB=y
|
||
|
|
CONFIG_USB_XHCI_HCD=y
|
||
|
|
diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig
|
||
|
|
index 671c0c10..874f4061 100644
|
||
|
|
--- a/configs/rock-pi-4c-rk3399_defconfig
|
||
|
|
+++ b/configs/rock-pi-4c-rk3399_defconfig
|
||
|
|
@@ -2,12 +2,16 @@ CONFIG_ARM=y
|
||
|
|
CONFIG_ARCH_ROCKCHIP=y
|
||
|
|
CONFIG_SYS_TEXT_BASE=0x00200000
|
||
|
|
CONFIG_NR_DRAM_BANKS=1
|
||
|
|
+CONFIG_ENV_SIZE=0x6000
|
||
|
|
CONFIG_ENV_OFFSET=0x3F8000
|
||
|
|
+CONFIG_ENV_SECT_SIZE=0x1000
|
||
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4c"
|
||
|
|
CONFIG_ROCKCHIP_RK3399=y
|
||
|
|
CONFIG_TARGET_EVB_RK3399=y
|
||
|
|
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||
|
|
CONFIG_DEBUG_UART_CLOCK=24000000
|
||
|
|
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||
|
|
+CONFIG_SPL_SPI=y
|
||
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
||
|
|
CONFIG_DEBUG_UART=y
|
||
|
|
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
|
||
|
|
@@ -16,6 +20,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
||
|
|
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
||
|
|
CONFIG_SPL_STACK_R=y
|
||
|
|
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
|
||
|
|
+CONFIG_SPL_SPI_LOAD=y
|
||
|
|
CONFIG_TPL=y
|
||
|
|
CONFIG_CMD_BOOTZ=y
|
||
|
|
CONFIG_CMD_GPT=y
|
||
|
|
@@ -26,8 +31,9 @@ CONFIG_CMD_USB=y
|
||
|
|
CONFIG_CMD_TIME=y
|
||
|
|
CONFIG_SPL_OF_CONTROL=y
|
||
|
|
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_MMC=y
|
||
|
|
+CONFIG_ENV_IS_IN_SPI_FLASH=y
|
||
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||
|
|
+CONFIG_SPL_DM_SEQ_ALIAS=y
|
||
|
|
CONFIG_ROCKCHIP_GPIO=y
|
||
|
|
CONFIG_SYS_I2C_ROCKCHIP=y
|
||
|
|
CONFIG_MISC=y
|
||
|
|
@@ -35,6 +41,10 @@ CONFIG_MMC_DW=y
|
||
|
|
CONFIG_MMC_DW_ROCKCHIP=y
|
||
|
|
CONFIG_MMC_SDHCI=y
|
||
|
|
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
||
|
|
+CONFIG_SF_DEFAULT_BUS=1
|
||
|
|
+CONFIG_SPI_FLASH_GIGADEVICE=y
|
||
|
|
+CONFIG_SPI_FLASH_WINBOND=y
|
||
|
|
+CONFIG_SPI_FLASH_XTX=y
|
||
|
|
CONFIG_DM_ETH=y
|
||
|
|
CONFIG_ETH_DESIGNWARE=y
|
||
|
|
CONFIG_GMAC_ROCKCHIP=y
|
||
|
|
@@ -50,6 +60,7 @@ CONFIG_RAM_RK3399_LPDDR4=y
|
||
|
|
CONFIG_DM_RESET=y
|
||
|
|
CONFIG_BAUDRATE=1500000
|
||
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
||
|
|
+CONFIG_ROCKCHIP_SPI=y
|
||
|
|
CONFIG_SYSRESET=y
|
||
|
|
CONFIG_USB=y
|
||
|
|
CONFIG_USB_XHCI_HCD=y
|