Message ID | 20240425-rk35xx-dram-atags-v4-3-331401a58e8e@theobroma-systems.com |
---|---|
State | Accepted |
Commit | 97eaedb60aca5657eba1b8380c6365dcb59f08da |
Delegated to: | Kever Yang |
Headers | show |
Series | rockchip: Support getting DRAM banks from TPL for rk3568 and rk3588 | expand |
On 2024/4/25 18:46, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@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 nanopc-t6-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. > > Co-developed-by: Chris Morgan <macromorgan@hotmail.com> > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > board/friendlyelec/nanopc-t6-rk3588/Makefile | 6 ---- > .../nanopc-t6-rk3588/nanopc-t6-rk3588.c | 39 ---------------------- > configs/nanopc-t6-rk3588_defconfig | 2 -- > 3 files changed, 47 deletions(-) > > diff --git a/board/friendlyelec/nanopc-t6-rk3588/Makefile b/board/friendlyelec/nanopc-t6-rk3588/Makefile > deleted file mode 100644 > index c1c49b19708..00000000000 > --- a/board/friendlyelec/nanopc-t6-rk3588/Makefile > +++ /dev/null > @@ -1,6 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > -# > -# Copyright (c) 2023 Rockchip Electronics Co,. Ltd. > -# > - > -obj-y += nanopc-t6-rk3588.o > diff --git a/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c b/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c > deleted file mode 100644 > index 99bbef964e0..00000000000 > --- a/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-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 > -int nanopc_t6_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 nanopc_t6_add_reserved_memory_fdt_nodes(blob); > -} > -#endif > diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig > index 5c7bc0b7196..738dda026b0 100644 > --- a/configs/nanopc-t6-rk3588_defconfig > +++ b/configs/nanopc-t6-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-nanopc-t6" > @@ -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-nanopc-t6.dtb" > # CONFIG_DISPLAY_CPUINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y >
diff --git a/board/friendlyelec/nanopc-t6-rk3588/Makefile b/board/friendlyelec/nanopc-t6-rk3588/Makefile deleted file mode 100644 index c1c49b19708..00000000000 --- a/board/friendlyelec/nanopc-t6-rk3588/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# -# Copyright (c) 2023 Rockchip Electronics Co,. Ltd. -# - -obj-y += nanopc-t6-rk3588.o diff --git a/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c b/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-rk3588.c deleted file mode 100644 index 99bbef964e0..00000000000 --- a/board/friendlyelec/nanopc-t6-rk3588/nanopc-t6-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 -int nanopc_t6_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 nanopc_t6_add_reserved_memory_fdt_nodes(blob); -} -#endif diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig index 5c7bc0b7196..738dda026b0 100644 --- a/configs/nanopc-t6-rk3588_defconfig +++ b/configs/nanopc-t6-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-nanopc-t6" @@ -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-nanopc-t6.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y