mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
81 lines
1.8 KiB
Diff
81 lines
1.8 KiB
Diff
--- a/arch/arm/dts/rk3568-generic-u-boot.dtsi
|
|
+++ b/arch/arm/dts/rk3568-generic-u-boot.dtsi
|
|
@@ -1,10 +1,3 @@
|
|
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
|
|
#include "rk356x-u-boot.dtsi"
|
|
-
|
|
-&sfc {
|
|
- flash@0 {
|
|
- bootph-pre-ram;
|
|
- bootph-some-ram;
|
|
- };
|
|
-};
|
|
--- a/arch/arm/dts/rk3568-generic.dts
|
|
+++ b/arch/arm/dts/rk3568-generic.dts
|
|
@@ -43,18 +43,6 @@
|
|
status = "okay";
|
|
};
|
|
|
|
-&sfc {
|
|
- #address-cells = <1>;
|
|
- #size-cells = <0>;
|
|
- status = "okay";
|
|
-
|
|
- flash@0 {
|
|
- compatible = "jedec,spi-nor";
|
|
- reg = <0>;
|
|
- spi-max-frequency = <24000000>;
|
|
- };
|
|
-};
|
|
-
|
|
&uart2 {
|
|
status = "okay";
|
|
};
|
|
--- a/configs/generic-rk3568_defconfig
|
|
+++ b/configs/generic-rk3568_defconfig
|
|
@@ -5,12 +5,9 @@ CONFIG_ARCH_ROCKCHIP=y
|
|
CONFIG_SF_DEFAULT_SPEED=24000000
|
|
CONFIG_DEFAULT_DEVICE_TREE="rk3568-generic"
|
|
CONFIG_ROCKCHIP_RK3568=y
|
|
-CONFIG_ROCKCHIP_SPI_IMAGE=y
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_DEBUG_UART_BASE=0xFE660000
|
|
CONFIG_DEBUG_UART_CLOCK=24000000
|
|
-CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
-CONFIG_SPL_SPI=y
|
|
CONFIG_SYS_LOAD_ADDR=0xc00800
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_FIT=y
|
|
@@ -25,8 +22,6 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y
|
|
CONFIG_SPL_MAX_SIZE=0x40000
|
|
CONFIG_SPL_PAD_TO=0x7f8000
|
|
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
|
|
-CONFIG_SPL_SPI_LOAD=y
|
|
-CONFIG_SYS_SPI_U_BOOT_OFFS=0x60000
|
|
CONFIG_SPL_ATF=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_GPT=y
|
|
@@ -56,21 +51,12 @@ CONFIG_MMC_DW_ROCKCHIP=y
|
|
CONFIG_MMC_SDHCI=y
|
|
CONFIG_MMC_SDHCI_SDMA=y
|
|
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
|
-CONFIG_SF_DEFAULT_BUS=4
|
|
-CONFIG_SPI_FLASH_SFDP_SUPPORT=y
|
|
-CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
-CONFIG_SPI_FLASH_MACRONIX=y
|
|
-CONFIG_SPI_FLASH_SILICONKAISER=y
|
|
-CONFIG_SPI_FLASH_WINBOND=y
|
|
-CONFIG_SPI_FLASH_XMC=y
|
|
-CONFIG_SPI_FLASH_XTX=y
|
|
CONFIG_PHY_ROCKCHIP_INNO_USB2=y
|
|
CONFIG_SPL_PINCTRL=y
|
|
CONFIG_SPL_RAM=y
|
|
CONFIG_BAUDRATE=1500000
|
|
CONFIG_DEBUG_UART_SHIFT=2
|
|
CONFIG_SYS_NS16550_MEM32=y
|
|
-CONFIG_ROCKCHIP_SFC=y
|
|
CONFIG_SYSRESET=y
|
|
CONFIG_SYSRESET_PSCI=y
|
|
CONFIG_USB=y
|