Commit aa7858fe5e2e ("board: phytec: som_detection: move definitions to source file") moved function definitions from header to source file. Makefile however was not updated to unconditionally (from [..]_SOM_DETECTION) build the imx8 and phytec som detection units. Also remove unused includes that cause build failures on arm 32bit boards. SoM detection shall support 32bit boards as well, but arch specific code should not be included in the generic module.
Fixes: aa7858fe5e2e ("board: phytec: som_detection: move definitions to source file") Signed-off-by: Yannic Moog y.moog@phytec.de --- Changes in v2: - change imx8m_som_detection to conditionally compile when arch is IMX8M - remove unused includes - Add reasoning in commit message --- board/phytec/common/Makefile | 4 ++-- board/phytec/common/phytec_som_detection.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/board/phytec/common/Makefile b/board/phytec/common/Makefile index fe28964ce21..35c81741306 100644 --- a/board/phytec/common/Makefile +++ b/board/phytec/common/Makefile @@ -7,5 +7,5 @@ ifdef CONFIG_SPL_BUILD obj- := __dummy__.o endif
-obj-$(CONFIG_PHYTEC_SOM_DETECTION) += phytec_som_detection.o -obj-$(CONFIG_PHYTEC_IMX8M_SOM_DETECTION) += imx8m_som_detection.o +obj-y += phytec_som_detection.o +obj-$(CONFIG_ARCH_IMX8M) += imx8m_som_detection.o diff --git a/board/phytec/common/phytec_som_detection.c b/board/phytec/common/phytec_som_detection.c index 1b10923b62f..c73bf9721b2 100644 --- a/board/phytec/common/phytec_som_detection.c +++ b/board/phytec/common/phytec_som_detection.c @@ -5,8 +5,6 @@ */
#include <common.h> -#include <asm/mach-imx/mxc_i2c.h> -#include <asm/arch/sys_proto.h> #include <dm/device.h> #include <dm/uclass.h> #include <i2c.h>
--- base-commit: 7a59d520ef0bfd29b339cba5282149271d5ac3b2 change-id: 20240111-wip-y-moog-phytec-de-som-detection-fixup-5cade747a48a
Best regards,