From 545026a5549cf3c17a082605bbde175824fd3cb5 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Feb 2022 14:18:44 -0500 Subject: fdtdec.h: Remove gurads around fdtdec_resetup function This function has not been conditionally compiled for some time, so remove the incorrect guards around the declaration. Signed-off-by: Tom Rini --- include/fdtdec.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/fdtdec.h b/include/fdtdec.h index 4b0b505773d..12355afd7fa 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -1169,7 +1169,6 @@ int fdtdec_setup(void); */ int fdtdec_board_setup(const void *fdt_blob); -#if CONFIG_IS_ENABLED(MULTI_DTB_FIT) /** * fdtdec_resetup() - Set up the device tree again * @@ -1188,7 +1187,6 @@ int fdtdec_board_setup(const void *fdt_blob); * Return: 0 if OK, -ve on error */ int fdtdec_resetup(int *rescan); -#endif /** * Board-specific FDT initialization. Returns the address to a device tree blob. -- cgit v1.3.1 From 0ca9f7042327dffb76334273d82123c8efaea37d Mon Sep 17 00:00:00 2001 From: Sinthu Raja Date: Wed, 9 Feb 2022 15:07:01 +0530 Subject: include: configs: Update env for selecting right dtb Now that single defconfig can be used for booting J721E EVM and SK, default device tree will not work for selecting dtb for kernel. Update the findfdt env to select right dtb based on board_name env variable. Signed-off-by: Sinthu Raja --- include/configs/j721e_evm.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 627c363ce66..e4b167dd219 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -66,6 +66,10 @@ "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "findfdt=" \ "setenv name_fdt ${default_device_tree};" \ + "if test $board_name = j721e; then " \ + "setenv name_fdt k3-j721e-common-proc-board.dtb; fi;" \ + "if test $board_name = j721e-eaik || test $board_name = j721e-sk; then " \ + "setenv name_fdt k3-j721e-sk.dtb; fi;" \ "setenv fdtfile ${name_fdt}\0" \ "name_kern=Image\0" \ "console=ttyS2,115200n8\0" \ -- cgit v1.3.1