Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4F467EB64D7 for ; Fri, 16 Jun 2023 08:56:13 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 210DF8622B; Fri, 16 Jun 2023 10:56:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.b="ijTU7pv0"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 92BAB86217; Fri, 16 Jun 2023 10:56:06 +0200 (CEST) Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 19F1780181 for ; Fri, 16 Jun 2023 10:56:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=eugen.hristev@collabora.com Received: from eugen-station.. (unknown [192.166.149.251]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madras.collabora.co.uk (Postfix) with ESMTPSA id 2DFB66606F76; Fri, 16 Jun 2023 09:55:57 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686905762; bh=yKW3RXBt2UCPiPMtbCOCeZKsoYQ1ByeL8NsDQ/YtseM=; h=From:To:Cc:Subject:Date:From; b=ijTU7pv0RUbToIvT8pIUOsqonN+9qjjQOkzzjmSQKBE/NM/oEndwsdksaaSeiPWfC m+ZH4cXzROj2O9pG2vMA0eylNdou3OPl6ZooA0HV9Ph0GvMKodABGSHeA9+IZt6Xre gB2TlVrSX87lwrc+hfnzvT01kWHvjUngsz2CftL/j/nrJnvYCClqg58Qv0+sYS0wXv dmP+7s5fAxt07XoQRoVxqK3n4G6cD8uIju2mRsuYpYhvGmWXYcNa4D+G6j0yp4woJX e/6UXWcBJInUcTaoPBKgFc5TrhZef66xkBm3RGI3WY3Kh6e8kxJqbRNd0E8Xw6AIov HE/o3hOHQPz1Q== From: Eugen Hristev To: jonas@kwiboo.se, kever.yang@rock-chips.com, u-boot@lists.denx.de Cc: Eugen Hristev Subject: [PATCH] rockchip: allow env defines for SPL build Date: Fri, 16 Jun 2023 11:55:35 +0300 Message-Id: <20230616085535.202503-1-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean For environment in SPL, all these defines are required, otherwise build fails: [...] include/env_default.h:120:9: note: in expansion of macro ‘CFG_EXTRA_ENV_SETTINGS’ 120 | CFG_EXTRA_ENV_SETTINGS | ^~~~~~~~~~~~~~~~~~~~~~ In file included from env/common.c:32: [...] Environment in SPL is needed e.g. for DFU, as dfu_alt is kept as env variable. Signed-off-by: Eugen Hristev --- include/configs/rockchip-common.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 9121bba37384..be20b135066e 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -11,8 +11,6 @@ #define CFG_CPUID_OFFSET 0x7 #endif -#ifndef CONFIG_SPL_BUILD - #define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi" #ifdef CONFIG_ARM64 @@ -28,6 +26,4 @@ "name=boot,size=112M,bootable,uuid=${uuid_gpt_boot};" \ "name=rootfs,size=-,uuid="ROOT_UUID -#endif - #endif /* _ROCKCHIP_COMMON_H_ */ -- 2.34.1