From c05b1a66b320ab0341aae16c217316bec4092f5e Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Fri, 22 Nov 2019 21:01:30 +0100
Subject: Kconfig: Drop the C_ENVIRONMENT_BOOTBLOCK symbol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The romcc bootblock will be deprecated soon and most platforms use
C_ENVIRONMENT_BOOTBLOCK already. This patch drops the
CONFIG_C_ENVIRONMENT_BOOTBLOCK symbol and adds CONFIG_ROMCC_BOOTBLOCK
where needed.

Change-Id: I773a76aade623303b7cd95ebe9b0411e5a7ecbaf
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37154
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Michał Żygowski <michal.zygowski@3mdeb.com>
---
 src/lib/Makefile.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/lib')

diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index dc0c46d460..b444ea3c86 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -268,7 +268,9 @@ postcar-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
 postcar-$(CONFIG_GENERIC_UDELAY) += timer.c
 
 # Use program.ld for all the platforms which use C fo the bootblock.
-bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += program.ld
+ifneq ($(CONFIG_ROMCC_BOOTBLOCK),y)
+bootblock-y += program.ld
+endif
 
 decompressor-y += program.ld
 postcar-y += program.ld
-- 
cgit v1.2.3