[PATCH v3 11/11] rockchip: rk356x: use DRAM banks from ATAGS
Kever Yang
kever.yang at rock-chips.com
Mon Apr 22 10:37:47 CEST 2024
On 2024/4/15 22:17, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz at theobroma-systems.com>
>
> RK356x-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.
>
> 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.
>
> 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
> ---
> configs/anbernic-rgxx3-rk3566_defconfig | 1 -
> configs/bpi-r2-pro-rk3568_defconfig | 1 -
> configs/evb-rk3568_defconfig | 1 -
> configs/generic-rk3568_defconfig | 1 -
> configs/lubancat-2-rk3568_defconfig | 1 -
> configs/nanopi-r5c-rk3568_defconfig | 1 -
> configs/nanopi-r5s-rk3568_defconfig | 1 -
> configs/odroid-m1-rk3568_defconfig | 1 -
> configs/pinetab2-rk3566_defconfig | 1 -
> configs/quartz64-a-rk3566_defconfig | 1 -
> configs/quartz64-b-rk3566_defconfig | 1 -
> configs/radxa-cm3-io-rk3566_defconfig | 1 -
> configs/radxa-e25-rk3568_defconfig | 1 -
> configs/rock-3a-rk3568_defconfig | 1 -
> configs/soquartz-blade-rk3566_defconfig | 1 -
> configs/soquartz-cm4-rk3566_defconfig | 1 -
> configs/soquartz-model-a-rk3566_defconfig | 1 -
> 17 files changed, 17 deletions(-)
>
> diff --git a/configs/anbernic-rgxx3-rk3566_defconfig b/configs/anbernic-rgxx3-rk3566_defconfig
> index c8c9238f96f..aa3809e00c1 100644
> --- a/configs/anbernic-rgxx3-rk3566_defconfig
> +++ b/configs/anbernic-rgxx3-rk3566_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SPL_GPIO=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_DEFAULT_DEVICE_TREE="rk3566-anbernic-rgxx3"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
> diff --git a/configs/bpi-r2-pro-rk3568_defconfig b/configs/bpi-r2-pro-rk3568_defconfig
> index 5cc95241ba4..0f85dc63c55 100644
> --- a/configs/bpi-r2-pro-rk3568_defconfig
> +++ b/configs/bpi-r2-pro-rk3568_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="rk3568-bpi-r2-pro"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
> index 6e8061f5f48..f2f429d33c4 100644
> --- a/configs/evb-rk3568_defconfig
> +++ b/configs/evb-rk3568_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="rk3568-evb"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/generic-rk3568_defconfig b/configs/generic-rk3568_defconfig
> index e7d5e55bbfd..8f4a6259a27 100644
> --- a/configs/generic-rk3568_defconfig
> +++ b/configs/generic-rk3568_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="rk3568-generic"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/lubancat-2-rk3568_defconfig b/configs/lubancat-2-rk3568_defconfig
> index 1c50a0ccbe6..ea67b6a7286 100644
> --- a/configs/lubancat-2-rk3568_defconfig
> +++ b/configs/lubancat-2-rk3568_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="rk3568-lubancat-2"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/nanopi-r5c-rk3568_defconfig b/configs/nanopi-r5c-rk3568_defconfig
> index 0f1a9461a0c..00743b7f926 100644
> --- a/configs/nanopi-r5c-rk3568_defconfig
> +++ b/configs/nanopi-r5c-rk3568_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_DEFAULT_DEVICE_TREE="rk3568-nanopi-r5c"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/nanopi-r5s-rk3568_defconfig b/configs/nanopi-r5s-rk3568_defconfig
> index 4ebf0cc9ee8..91e3a19dea6 100644
> --- a/configs/nanopi-r5s-rk3568_defconfig
> +++ b/configs/nanopi-r5s-rk3568_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_DEFAULT_DEVICE_TREE="rk3568-nanopi-r5s"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig
> index b5ed9e4bc98..e749f9af9d2 100644
> --- a/configs/odroid-m1-rk3568_defconfig
> +++ b/configs/odroid-m1-rk3568_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=0x1000
> CONFIG_DEFAULT_DEVICE_TREE="rk3568-odroid-m1"
> diff --git a/configs/pinetab2-rk3566_defconfig b/configs/pinetab2-rk3566_defconfig
> index bc7a77aa52f..940aa16a465 100644
> --- a/configs/pinetab2-rk3566_defconfig
> +++ b/configs/pinetab2-rk3566_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SPL_GPIO=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_SF_DEFAULT_MODE=0x1000
> CONFIG_DEFAULT_DEVICE_TREE="rk3566-pinetab2-v2.0"
> CONFIG_ROCKCHIP_RK3568=y
> diff --git a/configs/quartz64-a-rk3566_defconfig b/configs/quartz64-a-rk3566_defconfig
> index fef80439d89..535e34fb990 100644
> --- a/configs/quartz64-a-rk3566_defconfig
> +++ b/configs/quartz64-a-rk3566_defconfig
> @@ -3,7 +3,6 @@ CONFIG_SKIP_LOWLEVEL_INIT=y
> CONFIG_COUNTER_FREQUENCY=24000000
> CONFIG_ARCH_ROCKCHIP=y
> CONFIG_SPL_GPIO=y
> -CONFIG_NR_DRAM_BANKS=2
> CONFIG_SF_DEFAULT_SPEED=24000000
> CONFIG_SF_DEFAULT_MODE=0x2000
> CONFIG_DEFAULT_DEVICE_TREE="rk3566-quartz64-a"
> diff --git a/configs/quartz64-b-rk3566_defconfig b/configs/quartz64-b-rk3566_defconfig
> index bb541ed1af6..e197defd3af 100644
> --- a/configs/quartz64-b-rk3566_defconfig
> +++ b/configs/quartz64-b-rk3566_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="rk3566-quartz64-b"
> diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
> index bf61db44d3a..d23ab57ada5 100644
> --- a/configs/radxa-cm3-io-rk3566_defconfig
> +++ b/configs/radxa-cm3-io-rk3566_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="rk3566-radxa-cm3-io"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/radxa-e25-rk3568_defconfig b/configs/radxa-e25-rk3568_defconfig
> index 43aa8ec20e4..dbb77b85f5d 100644
> --- a/configs/radxa-e25-rk3568_defconfig
> +++ b/configs/radxa-e25-rk3568_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_DEFAULT_DEVICE_TREE="rk3568-radxa-e25"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
> index c161bc974fb..b06b57fe0bf 100644
> --- a/configs/rock-3a-rk3568_defconfig
> +++ b/configs/rock-3a-rk3568_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="rk3568-rock-3a"
> diff --git a/configs/soquartz-blade-rk3566_defconfig b/configs/soquartz-blade-rk3566_defconfig
> index b9ac6b9f33d..9d565c162ef 100644
> --- a/configs/soquartz-blade-rk3566_defconfig
> +++ b/configs/soquartz-blade-rk3566_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="rk3566-soquartz-blade"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/soquartz-cm4-rk3566_defconfig b/configs/soquartz-cm4-rk3566_defconfig
> index e87a6392c52..fe2c771db71 100644
> --- a/configs/soquartz-cm4-rk3566_defconfig
> +++ b/configs/soquartz-cm4-rk3566_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="rk3566-soquartz-cm4"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
> diff --git a/configs/soquartz-model-a-rk3566_defconfig b/configs/soquartz-model-a-rk3566_defconfig
> index b2c1684515e..db9eee21751 100644
> --- a/configs/soquartz-model-a-rk3566_defconfig
> +++ b/configs/soquartz-model-a-rk3566_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="rk3566-soquartz-model-a"
> CONFIG_ROCKCHIP_RK3568=y
> CONFIG_SPL_SERIAL=y
>
More information about the U-Boot
mailing list