From e334fea94b126760cf34f93131a884886a6de3a7 Mon Sep 17 00:00:00 2001
From: Furquan Shaikh <furquan@google.com>
Date: Wed, 10 Jun 2020 15:29:02 -0700
Subject: arch/x86: Include id.ld unconditionally in memlayout.ld

Now that Picasso uses its own memlayout.ld, always include id.ld in
arch/x86/memlayout.ld.

Signed-off-by: Furquan Shaikh <furquan@google.com>
Change-Id: I04b59c2a273cad0a2e64dbc325c0b09fca254558
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42266
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/arch/x86/memlayout.ld | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index 08c9b8d23d..12974ca09a 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -43,9 +43,7 @@ SECTIONS
 /* Bootblock specific scripts which provide more SECTION directives. */
 #include <cpu/x86/16bit/entry16.ld>
 #include <cpu/x86/16bit/reset16.ld>
-#if !CONFIG(RESET_VECTOR_IN_RAM)
 #include <arch/x86/id.ld>
-#endif
 #if CONFIG(CPU_INTEL_FIRMWARE_INTERFACE_TABLE)
 #include <cpu/intel/fit/fit.ld>
 #endif
-- 
cgit v1.2.3