[PATCH v4 07/11] rockchip: evb_rk3588 et al.: use DRAM banks from ATAGS
Kever Yang
kever.yang at rock-chips.com
Fri Apr 26 09:42:59 CEST 2024
On 2024/4/25 18:46, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> RK3588-based devices now support creating DRAM banks with proper holes
> by reading the ATAGS from Rockchip TPL blob, so let's use that mechanism
> instead.
>
> Since ft_board_setup isn't defined anymore, there's no need for
> selecting CONFIG_OF_BOARD_SETUP.
>
> Similarly, because the evb_rk3588.c would be empty, it is simply
> removed, with the (would-be-empty) Makefile as well.
>
> The CONFIG_NR_DRAM_BANK now defaults to 10 which is a safe bet for
> reading banks from ATAGS, so let's use the default value instead.
>
> All defconfigs using the CONFIG_TARGET_EVB_RK3588 are updated at once
> since they are impacted by this change.
>
> Co-developed-by: Chris Morgan <macromorgan at hotmail.com>
> Signed-off-by: Chris Morgan <macromorgan at hotmail.com>
> Signed-off-by: Quentin Schulz <quentin.schulz at theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>
Thanks,
- Kever
> ---
> board/rockchip/evb_rk3588/Makefile | 6 -----
> board/rockchip/evb_rk3588/evb-rk3588.c | 39 --------------------------------
> configs/coolpi-4b-rk3588s_defconfig | 2 --
> configs/coolpi-cm5-evb-rk3588_defconfig | 2 --
> configs/evb-rk3588_defconfig | 2 --
> configs/generic-rk3588_defconfig | 2 --
> configs/orangepi-5-plus-rk3588_defconfig | 2 --
> configs/orangepi-5-rk3588s_defconfig | 2 --
> 8 files changed, 57 deletions(-)
>
> diff --git a/board/rockchip/evb_rk3588/Makefile b/board/rockchip/evb_rk3588/Makefile
> deleted file mode 100644
> index 240d2ec597e..00000000000
> --- a/board/rockchip/evb_rk3588/Makefile
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -# SPDX-License-Identifier: GPL-2.0+
> -#
> -# Copyright (c) 2023 Rockchip Electronics Co,. Ltd.
> -#
> -
> -obj-y += evb-rk3588.o
> diff --git a/board/rockchip/evb_rk3588/evb-rk3588.c b/board/rockchip/evb_rk3588/evb-rk3588.c
> deleted file mode 100644
> index caf94d8d29c..00000000000
> --- a/board/rockchip/evb_rk3588/evb-rk3588.c
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+
> -/*
> - * Copyright (c) 2023 Rockchip Electronics Co,. Ltd.
> - */
> -
> -#include <fdtdec.h>
> -#include <fdt_support.h>
> -
> -#ifdef CONFIG_OF_BOARD_SETUP
> -static int rk3588_add_reserved_memory_fdt_nodes(void *new_blob)
> -{
> - struct fdt_memory gap1 = {
> - .start = 0x3fc000000,
> - .end = 0x3fc4fffff,
> - };
> - struct fdt_memory gap2 = {
> - .start = 0x3fff00000,
> - .end = 0x3ffffffff,
> - };
> - unsigned long flags = FDTDEC_RESERVED_MEMORY_NO_MAP;
> - unsigned int ret;
> -
> - /*
> - * Inject the reserved-memory nodes into the DTS
> - */
> - ret = fdtdec_add_reserved_memory(new_blob, "gap1", &gap1, NULL, 0,
> - NULL, flags);
> - if (ret)
> - return ret;
> -
> - return fdtdec_add_reserved_memory(new_blob, "gap2", &gap2, NULL, 0,
> - NULL, flags);
> -}
> -
> -int ft_board_setup(void *blob, struct bd_info *bd)
> -{
> - return rk3588_add_reserved_memory_fdt_nodes(blob);
> -}
> -#endif
> diff --git a/configs/coolpi-4b-rk3588s_defconfig b/configs/coolpi-4b-rk3588s_defconfig
> index a0fe3708344..2608bb67679 100644
> --- a/configs/coolpi-4b-rk3588s_defconfig
> +++ b/configs/coolpi-4b-rk3588s_defconfig
> @@ -2,7 +2,6 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> CONFIG_DEFAULT_DEVICE_TREE="rk3588s-coolpi-4b"
> @@ -23,7 +22,6 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-coolpi-4b.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/coolpi-cm5-evb-rk3588_defconfig b/configs/coolpi-cm5-evb-rk3588_defconfig
> index fc17660da2a..c5bb7a42957 100644
> --- a/configs/coolpi-cm5-evb-rk3588_defconfig
> +++ b/configs/coolpi-cm5-evb-rk3588_defconfig
> @@ -2,7 +2,6 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> CONFIG_DEFAULT_DEVICE_TREE="rk3588-coolpi-cm5-evb"
> @@ -23,7 +22,6 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-coolpi-cm5-evb.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
> index c8db04c076e..187cf26a5c9 100644
> --- a/configs/evb-rk3588_defconfig
> +++ b/configs/evb-rk3588_defconfig
> @@ -2,7 +2,6 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_DEFAULT_DEVICE_TREE="rk3588-evb1-v10"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> @@ -16,7 +15,6 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-evb1-v10.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/generic-rk3588_defconfig b/configs/generic-rk3588_defconfig
> index b50f4f8b800..e7a372a828c 100644
> --- a/configs/generic-rk3588_defconfig
> +++ b/configs/generic-rk3588_defconfig
> @@ -2,7 +2,6 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_DEFAULT_DEVICE_TREE="rk3588-generic"
> CONFIG_ROCKCHIP_RK3588=y
> CONFIG_SPL_SERIAL=y
> @@ -16,7 +15,6 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-generic.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/orangepi-5-plus-rk3588_defconfig b/configs/orangepi-5-plus-rk3588_defconfig
> index d6e23c154f1..ba8005363ad 100644
> --- a/configs/orangepi-5-plus-rk3588_defconfig
> +++ b/configs/orangepi-5-plus-rk3588_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_SYS_HAS_NONCACHED_MEMORY=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> CONFIG_DEFAULT_DEVICE_TREE="rk3588-orangepi-5-plus"
> @@ -24,7 +23,6 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-orangepi-5-plus.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig
> index e6b3da1dc59..d61f85aaa8c 100644
> --- a/configs/orangepi-5-rk3588s_defconfig
> +++ b/configs/orangepi-5-rk3588s_defconfig
> @@ -2,7 +2,6 @@ CONFIG_ARM=y
> CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> CONFIG_DEFAULT_DEVICE_TREE="rk3588s-orangepi-5"
> @@ -23,7 +22,6 @@ CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> CONFIG_LEGACY_IMAGE_FORMAT=y
> -CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588s-orangepi-5.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
>
More information about the U-Boot
mailing list