From b77b6cba52bb465e89195802c6b5b71aead4061f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 26 May 2025 16:57:39 +0100 Subject: [PATCH] Revert "rockchip: theobroma-systems: use HAVE_VENDOR_COMMON_LIB to simplify Makefile" This reverts commit 8ef075fbc43d038cd4f72f890a4c41004249b0f8. --- board/theobroma-systems/common/Makefile | 9 --------- board/theobroma-systems/jaguar_rk3588/Makefile | 3 +++ board/theobroma-systems/puma_rk3399/Makefile | 3 +++ board/theobroma-systems/ringneck_px30/Makefile | 3 +++ board/theobroma-systems/tiger_rk3588/Makefile | 3 +++ 5 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 board/theobroma-systems/common/Makefile diff --git a/board/theobroma-systems/common/Makefile b/board/theobroma-systems/common/Makefile deleted file mode 100644 index c1cadb4b913..00000000000 --- a/board/theobroma-systems/common/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# Copyright (c) 2025 Cherry Embedded Solutions GmbH -# -# SPDX-License-Identifier: GPL-2.0+ -# - -ifneq ($(CONFIG_XPL_BUILD),y) -obj-y += common.o -endif diff --git a/board/theobroma-systems/jaguar_rk3588/Makefile b/board/theobroma-systems/jaguar_rk3588/Makefile index 38b73d2846c..d43bf194b68 100644 --- a/board/theobroma-systems/jaguar_rk3588/Makefile +++ b/board/theobroma-systems/jaguar_rk3588/Makefile @@ -5,3 +5,6 @@ # obj-y += jaguar_rk3588.o +ifneq ($(CONFIG_XPL_BUILD),y) +obj-y += ../common/common.o +endif diff --git a/board/theobroma-systems/puma_rk3399/Makefile b/board/theobroma-systems/puma_rk3399/Makefile index d962b56f111..2256e72cda1 100644 --- a/board/theobroma-systems/puma_rk3399/Makefile +++ b/board/theobroma-systems/puma_rk3399/Makefile @@ -5,3 +5,6 @@ # obj-y += puma-rk3399.o +ifneq ($(CONFIG_XPL_BUILD),y) +obj-y += ../common/common.o +endif diff --git a/board/theobroma-systems/ringneck_px30/Makefile b/board/theobroma-systems/ringneck_px30/Makefile index 31ada1a6942..4d108f2d011 100644 --- a/board/theobroma-systems/ringneck_px30/Makefile +++ b/board/theobroma-systems/ringneck_px30/Makefile @@ -5,3 +5,6 @@ # obj-y += ringneck-px30.o +ifneq ($(CONFIG_XPL_BUILD),y) +obj-y += ../common/common.o +endif diff --git a/board/theobroma-systems/tiger_rk3588/Makefile b/board/theobroma-systems/tiger_rk3588/Makefile index 900647735fb..94b0859eb35 100644 --- a/board/theobroma-systems/tiger_rk3588/Makefile +++ b/board/theobroma-systems/tiger_rk3588/Makefile @@ -5,3 +5,6 @@ # obj-y += tiger_rk3588.o +ifneq ($(CONFIG_XPL_BUILD),y) +obj-y += ../common/common.o +endif