From 85f4b9114194fbf70960e34765bc788d45bddd4d Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sun, 17 Mar 2024 07:23:38 +0100 Subject: ARM: dts: renesas: Stop using the -u-boot DTs for build The U-Boot build system can automatically paste -u-boot.dtsi at the end of matching .dts during build. Stop emulating this behavior and rename the -u-boot.dts files to -u-boot.dtsi, drop "#include...dts" from those new u-boot.dtsi files, and update board configuration accordingly. The rename, '#include...dts` scrubbing and configuration update has been done using the following script: ``` $ find . -name r[78]\*-u-boot.dts | sort -u | while read line ; do \ git mv ${line%-u-boot.dts}-u-boot.dts ${line%-u-boot.dts}-u-boot.dtsi ; \ done $ sed -i '/^#include.*dts"/ d' `find . -name r[78]\*-u-boot.dtsi` $ sed -i 's@-u-boot@@g' `git grep -li renesas configs` ``` The Salvator-X and ULCB board files have been updated manually. Signed-off-by: Marek Vasut Acked-by: Adam Ford --- board/renesas/salvator-x/salvator-x.c | 6 +++--- board/renesas/ulcb/ulcb.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'board') diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 8c47246ae8b..afb3b63582b 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -79,15 +79,15 @@ int board_fit_config_name_match(const char *name) u32 cpu_type = renesas_get_cpu_type(); if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) && - !strcmp(name, "r8a77950-salvator-x-u-boot")) + !strcmp(name, "r8a77950-salvator-x")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) && - !strcmp(name, "r8a77960-salvator-x-u-boot")) + !strcmp(name, "r8a77960-salvator-x")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A77965) && - !strcmp(name, "r8a77965-salvator-x-u-boot")) + !strcmp(name, "r8a77965-salvator-x")) return 0; return -1; diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 8f5de216995..cda6976602d 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -70,15 +70,15 @@ int board_fit_config_name_match(const char *name) u32 cpu_type = renesas_get_cpu_type(); if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) && - !strcmp(name, "r8a77950-ulcb-u-boot")) + !strcmp(name, "r8a77950-ulcb")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) && - !strcmp(name, "r8a77960-ulcb-u-boot")) + !strcmp(name, "r8a77960-ulcb")) return 0; if ((cpu_type == RENESAS_CPU_TYPE_R8A77965) && - !strcmp(name, "r8a77965-ulcb-u-boot")) + !strcmp(name, "r8a77965-ulcb")) return 0; return -1; -- cgit v1.2.3