167 lines
6.3 KiB
Diff
167 lines
6.3 KiB
Diff
From 367b3afc360e6fc92bd4cdca643ed2e4d928472d Mon Sep 17 00:00:00 2001
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
|
Date: Wed, 13 Mar 2024 19:14:50 +0000
|
|
Subject: [PATCH] rockchip: Enable preboot start for pci/usb
|
|
|
|
Enable the preboot so nvme works OOTB
|
|
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
|
---
|
|
configs/firefly-rk3399_defconfig | 2 ++
|
|
configs/nanopc-t4-rk3399_defconfig | 2 ++
|
|
configs/pinebook-pro-rk3399_defconfig | 1 +
|
|
configs/roc-pc-mezzanine-rk3399_defconfig | 2 ++
|
|
configs/rock-4c-plus-rk3399_defconfig | 2 ++
|
|
configs/rock-4se-rk3399_defconfig | 2 ++
|
|
configs/rock-pi-4-rk3399_defconfig | 2 ++
|
|
configs/rock-pi-4c-rk3399_defconfig | 2 ++
|
|
configs/rock-pi-n10-rk3399pro_defconfig | 2 ++
|
|
configs/rock960-rk3399_defconfig | 1 +
|
|
configs/rockpro64-rk3399_defconfig | 2 ++
|
|
11 files changed, 20 insertions(+)
|
|
|
|
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
|
index b7c8e95b7b8..1e33083c138 100644
|
|
--- a/configs/firefly-rk3399_defconfig
|
|
+++ b/configs/firefly-rk3399_defconfig
|
|
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-firefly.dtb"
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_MISC_INIT_R=y
|
|
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
|
|
index c18e7b1bd16..e9a18eb3e9f 100644
|
|
--- a/configs/nanopc-t4-rk3399_defconfig
|
|
+++ b/configs/nanopc-t4-rk3399_defconfig
|
|
@@ -17,6 +17,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopc-t4.dtb"
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_MAX_SIZE=0x2e000
|
|
diff --git a/configs/pinebook-pro-rk3399_defconfig b/configs/pinebook-pro-rk3399_defconfig
|
|
index de357415fbe..4168adb1935 100644
|
|
--- a/configs/pinebook-pro-rk3399_defconfig
|
|
+++ b/configs/pinebook-pro-rk3399_defconfig
|
|
@@ -24,6 +24,7 @@ CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-pinebook-pro.dtb"
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_MISC_INIT_R=y
|
|
diff --git a/configs/roc-pc-mezzanine-rk3399_defconfig b/configs/roc-pc-mezzanine-rk3399_defconfig
|
|
index de6539bedf4..61c6182d27e 100644
|
|
--- a/configs/roc-pc-mezzanine-rk3399_defconfig
|
|
+++ b/configs/roc-pc-mezzanine-rk3399_defconfig
|
|
@@ -23,6 +23,8 @@ CONFIG_SPL_SPI=y
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
diff --git a/configs/rock-4c-plus-rk3399_defconfig b/configs/rock-4c-plus-rk3399_defconfig
|
|
index 18525c8bf50..89e9f69eb63 100644
|
|
--- a/configs/rock-4c-plus-rk3399_defconfig
|
|
+++ b/configs/rock-4c-plus-rk3399_defconfig
|
|
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-4c-plus.dtb"
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
diff --git a/configs/rock-4se-rk3399_defconfig b/configs/rock-4se-rk3399_defconfig
|
|
index 171de23ec8f..d2769a2f516 100644
|
|
--- a/configs/rock-4se-rk3399_defconfig
|
|
+++ b/configs/rock-4se-rk3399_defconfig
|
|
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_SPL_FIT_SIGNATURE=y
|
|
CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
|
|
index 83fc4ad7dab..24ca614fe5a 100644
|
|
--- a/configs/rock-pi-4-rk3399_defconfig
|
|
+++ b/configs/rock-pi-4-rk3399_defconfig
|
|
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_SPL_FIT_SIGNATURE=y
|
|
CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
diff --git a/configs/rock-pi-4c-rk3399_defconfig b/configs/rock-pi-4c-rk3399_defconfig
|
|
index 089344097e0..83c2cfba157 100644
|
|
--- a/configs/rock-pi-4c-rk3399_defconfig
|
|
+++ b/configs/rock-pi-4c-rk3399_defconfig
|
|
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4c.dtb"
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
diff --git a/configs/rock-pi-n10-rk3399pro_defconfig b/configs/rock-pi-n10-rk3399pro_defconfig
|
|
index dc4b3b40380..db34bc70a22 100644
|
|
--- a/configs/rock-pi-n10-rk3399pro_defconfig
|
|
+++ b/configs/rock-pi-n10-rk3399pro_defconfig
|
|
@@ -18,6 +18,8 @@ CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
# CONFIG_ANDROID_BOOT_IMAGE is not set
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399pro-rock-pi-n10.dtb"
|
|
# CONFIG_CONSOLE_MUX is not set
|
|
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
|
index b93dda56593..6d1b352a855 100644
|
|
--- a/configs/rock960-rk3399_defconfig
|
|
+++ b/configs/rock960-rk3399_defconfig
|
|
@@ -17,6 +17,7 @@ CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock960.dtb"
|
|
CONFIG_SYS_PBSIZE=1052
|
|
CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
|
index 711541f8462..8c1ea1a0b63 100644
|
|
--- a/configs/rockpro64-rk3399_defconfig
|
|
+++ b/configs/rockpro64-rk3399_defconfig
|
|
@@ -21,6 +21,8 @@ CONFIG_SPL_SPI=y
|
|
CONFIG_SYS_LOAD_ADDR=0x800800
|
|
CONFIG_PCI=y
|
|
CONFIG_DEBUG_UART=y
|
|
+CONFIG_USE_PREBOOT=y
|
|
+CONFIG_PREBOOT="pci enum; usb start; nvme scan;"
|
|
CONFIG_SPL_FIT_SIGNATURE=y
|
|
CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
CONFIG_BOOTSTAGE=y
|
|
--
|
|
2.44.0
|
|
|