[PATCH 15/16] rockchip: rk3588: Migrate to OF_UPSTREAM
Kever Yang
kever.yang at rock-chips.com
Tue May 7 09:20:02 CEST 2024
On 2024/5/5 03:43, Jonas Karlman wrote:
> Migrate RK3588 boards that exists in Linux v6.8 to use OF_UPSTREAM.
>
> Following targets is not migrated to use OF_UPSTREAM:
> - generic-rk3588: Generic target only meant for U-Boot use
> - toybrick-rk3588: Merged in v6.9-rc1
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> arch/arm/dts/Makefile | 17 -----------------
> arch/arm/mach-rockchip/Kconfig | 1 +
> configs/coolpi-4b-rk3588s_defconfig | 2 +-
> configs/coolpi-cm5-evb-rk3588_defconfig | 2 +-
> configs/evb-rk3588_defconfig | 2 +-
> configs/generic-rk3588_defconfig | 1 +
> configs/jaguar-rk3588_defconfig | 2 +-
> configs/nanopc-t6-rk3588_defconfig | 2 +-
> configs/neu6a-io-rk3588_defconfig | 2 +-
> configs/neu6b-io-rk3588_defconfig | 2 +-
> configs/orangepi-5-plus-rk3588_defconfig | 2 +-
> configs/orangepi-5-rk3588s_defconfig | 2 +-
> configs/quartzpro64-rk3588_defconfig | 2 +-
> configs/rock5a-rk3588s_defconfig | 2 +-
> configs/rock5b-rk3588_defconfig | 2 +-
> configs/toybrick-rk3588_defconfig | 1 +
> configs/turing-rk1-rk3588_defconfig | 2 +-
> 17 files changed, 16 insertions(+), 30 deletions(-)
>
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 1dfcc05a14be..3bbdbd21e394 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -98,23 +98,6 @@ dtb-$(CONFIG_ROCKCHIP_RK3368) += \
> rk3368-geekbox.dtb \
> rk3368-px5-evb.dtb \
>
> -dtb-$(CONFIG_ROCKCHIP_RK3588) += \
> - rk3588s-coolpi-4b.dtb \
> - rk3588-coolpi-cm5-evb.dtb \
> - rk3588-edgeble-neu6a-io.dtb \
> - rk3588-edgeble-neu6b-io.dtb \
> - rk3588-evb1-v10.dtb \
> - rk3588-generic.dtb \
> - rk3588-jaguar.dtb \
> - rk3588-nanopc-t6.dtb \
> - rk3588s-orangepi-5.dtb \
> - rk3588-orangepi-5-plus.dtb \
> - rk3588-quartzpro64.dtb \
> - rk3588s-rock-5a.dtb \
> - rk3588-rock-5b.dtb \
> - rk3588-toybrick-x0.dtb \
> - rk3588-turing-rk1.dtb
> -
> dtb-$(CONFIG_ROCKCHIP_RV1108) += \
> rv1108-elgin-r1.dtb \
> rv1108-evb.dtb
> diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
> index 03f6bf43fdf4..0b9098426420 100644
> --- a/arch/arm/mach-rockchip/Kconfig
> +++ b/arch/arm/mach-rockchip/Kconfig
> @@ -355,6 +355,7 @@ config ROCKCHIP_RK3588
> imply MISC_INIT_R
> imply MMC_HS200_SUPPORT if MMC_SDHCI_ROCKCHIP
> imply OF_LIBFDT_OVERLAY
> + imply OF_UPSTREAM
> imply PHY_GIGE if DWC_ETH_QOS_ROCKCHIP
> imply RNG_ROCKCHIP
> imply ROCKCHIP_COMMON_BOARD
> diff --git a/configs/coolpi-4b-rk3588s_defconfig b/configs/coolpi-4b-rk3588s_defconfig
> index 2608bb67679b..3d45d939abb2 100644
> --- a/configs/coolpi-4b-rk3588s_defconfig
> +++ b/configs/coolpi-4b-rk3588s_defconfig
> @@ -4,7 +4,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588s-coolpi-4b"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-coolpi-4b"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/coolpi-cm5-evb-rk3588_defconfig b/configs/coolpi-cm5-evb-rk3588_defconfig
> index c5bb7a429574..5190d69c1c58 100644
> --- a/configs/coolpi-cm5-evb-rk3588_defconfig
> +++ b/configs/coolpi-cm5-evb-rk3588_defconfig
> @@ -4,7 +4,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-coolpi-cm5-evb"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-coolpi-cm5-evb"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
> index a8c32c4fcf4a..1d5585677a46 100644
> --- a/configs/evb-rk3588_defconfig
> +++ b/configs/evb-rk3588_defconfig
> @@ -2,7 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-evb1-v10"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-evb1-v10"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> CONFIG_TARGET_EVB_RK3588=y
> diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig
> index 87a171701e42..42bc2c9a7656 100644
> --- a/configs/generic-rk3588_defconfig
> +++ b/configs/generic-rk3588_defconfig
> @@ -32,6 +32,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
> # CONFIG_SPL_DOS_PARTITION is not set
> CONFIG_SPL_OF_CONTROL=y
> CONFIG_OF_LIVE=y
> +# CONFIG_OF_UPSTREAM is not set
> CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_SYS_RELOC_GD_ENV_ADDR=y
> # CONFIG_NET is not set
> diff --git a/configs/jaguar-rk3588_defconfig b/configs/jaguar-rk3588_defconfig
> index f29505ea150b..b69cf4cd057a 100644
> --- a/configs/jaguar-rk3588_defconfig
> +++ b/configs/jaguar-rk3588_defconfig
> @@ -6,7 +6,7 @@ CONFIG_SPL_GPIO=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> CONFIG_ENV_SIZE=0x1f000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-jaguar"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-jaguar"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig
> index 738dda026b01..926267f93ad5 100644
> --- a/configs/nanopc-t6-rk3588_defconfig
> +++ b/configs/nanopc-t6-rk3588_defconfig
> @@ -5,7 +5,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-nanopc-t6"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-nanopc-t6"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/neu6a-io-rk3588_defconfig b/configs/neu6a-io-rk3588_defconfig
> index 56198556affc..ac281e65392c 100644
> --- a/configs/neu6a-io-rk3588_defconfig
> +++ b/configs/neu6a-io-rk3588_defconfig
> @@ -2,7 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-edgeble-neu6a-io"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-edgeble-neu6a-io"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> CONFIG_TARGET_RK3588_NEU6=y
> diff --git a/configs/neu6b-io-rk3588_defconfig b/configs/neu6b-io-rk3588_defconfig
> index 40baec319c9e..c01e5fb0d044 100644
> --- a/configs/neu6b-io-rk3588_defconfig
> +++ b/configs/neu6b-io-rk3588_defconfig
> @@ -2,7 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-edgeble-neu6b-io"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-edgeble-neu6b-io"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> CONFIG_TARGET_RK3588_NEU6=y
> diff --git a/configs/orangepi-5-plus-rk3588_defconfig b/configs/orangepi-5-plus-rk3588_defconfig
> index ba8005363ad0..138a633f320e 100644
> --- a/configs/orangepi-5-plus-rk3588_defconfig
> +++ b/configs/orangepi-5-plus-rk3588_defconfig
> @@ -5,7 +5,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-orangepi-5-plus"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-orangepi-5-plus"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig
> index d61f85aaa8c6..33529d4cac31 100644
> --- a/configs/orangepi-5-rk3588s_defconfig
> +++ b/configs/orangepi-5-rk3588s_defconfig
> @@ -4,7 +4,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588s-orangepi-5"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-orangepi-5"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/quartzpro64-rk3588_defconfig b/configs/quartzpro64-rk3588_defconfig
> index 33cbda88285f..06c5cff3ca55 100644
> --- a/configs/quartzpro64-rk3588_defconfig
> +++ b/configs/quartzpro64-rk3588_defconfig
> @@ -3,7 +3,7 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_SYS_HAS_NONCACHED_MEMORY=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-quartzpro64"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-quartzpro64"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> CONFIG_TARGET_QUARTZPRO64_RK3588=y
> diff --git a/configs/rock5a-rk3588s_defconfig b/configs/rock5a-rk3588s_defconfig
> index 01df911d9dc8..c09e6655f021 100644
> --- a/configs/rock5a-rk3588s_defconfig
> +++ b/configs/rock5a-rk3588s_defconfig
> @@ -2,7 +2,7 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588s-rock-5a"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588s-rock-5a"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> CONFIG_TARGET_ROCK5A_RK3588=y
> diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
> index 9e14b14af7c6..fc118cea7bae 100644
> --- a/configs/rock5b-rk3588_defconfig
> +++ b/configs/rock5b-rk3588_defconfig
> @@ -5,7 +5,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-rock-5b"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-rock-5b"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/toybrick-rk3588_defconfig b/configs/toybrick-rk3588_defconfig
> index 76bfa50c306c..5a190357e454 100644
> --- a/configs/toybrick-rk3588_defconfig
> +++ b/configs/toybrick-rk3588_defconfig
> @@ -31,6 +31,7 @@ CONFIG_CMD_REGULATOR=y
> # CONFIG_SPL_DOS_PARTITION is not set
> CONFIG_SPL_OF_CONTROL=y
> CONFIG_OF_LIVE=y
> +# CONFIG_OF_UPSTREAM is not set
> CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
> CONFIG_ENV_IS_IN_MMC=y
> CONFIG_SPL_DM_SEQ_ALIAS=y
> diff --git a/configs/turing-rk1-rk3588_defconfig b/configs/turing-rk1-rk3588_defconfig
> index 038b14769e50..05ef5bf571c6 100644
> --- a/configs/turing-rk1-rk3588_defconfig
> +++ b/configs/turing-rk1-rk3588_defconfig
> @@ -5,7 +5,7 @@ CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> -CONFIG_DEFAULT_DEVICE_TREE="rk3588-turing-rk1"
> +CONFIG_DEFAULT_DEVICE_TREE="rockchip/rk3588-turing-rk1"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_ROCKCHIP_SPI_IMAGE=y
> CONFIG_SPL_SERIAL=y
More information about the U-Boot
mailing list