diff options
| author | Furquan Shaikh <furquan@google.com> | 2020-06-10 15:25:52 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2020-06-13 06:51:07 +0000 |
| commit | 31be15c7a2a304399d8a949b7a27684e54c0a117 (patch) | |
| tree | 3b6fccd6118f7dbca0d67710e59b4032456f00e1 /src/arch/x86/memlayout.ld | |
| parent | bc45650b5fba1da8214687aaef36b60a1fa19a6c (diff) | |
arch/x86: Drop early_ram.ld
Now that Picasso uses its own linker script, early_ram.ld from
arch/x86 is unused and hence is dropped as part of this change.
BUG=b:155322763
Signed-off-by: Furquan Shaikh <furquan@google.com>
Change-Id: Ida83d40d005ddab789628a1581389fc487b10d4d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42265
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/arch/x86/memlayout.ld')
| -rw-r--r-- | src/arch/x86/memlayout.ld | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld index 7209034169..08c9b8d23d 100644 --- a/src/arch/x86/memlayout.ld +++ b/src/arch/x86/memlayout.ld @@ -3,15 +3,6 @@ #include <memlayout.h> #include <arch/header.ld> -/* Pull in the either CAR or early DRAM rules. */ -#if ENV_ROMSTAGE_OR_BEFORE -#if ENV_CACHE_AS_RAM -#define EARLY_MEMLAYOUT "car.ld" -#else -#define EARLY_MEMLAYOUT "early_ram.ld" -#endif -#endif - SECTIONS { /* @@ -30,18 +21,18 @@ SECTIONS * Link at 32MiB address and rely on cbfstool to relocate to XIP. */ ROMSTAGE(CONFIG_ROMSTAGE_ADDR, 1M) - #include EARLY_MEMLAYOUT + #include "car.ld" #elif ENV_SEPARATE_VERSTAGE /* The 1M size is not allocated. It's just for basic size checking. * Link at 32MiB address and rely on cbfstool to relocate to XIP. */ VERSTAGE(CONFIG_VERSTAGE_ADDR, 1M) - #include EARLY_MEMLAYOUT + #include "car.ld" #elif ENV_BOOTBLOCK BOOTBLOCK(CONFIG_X86_RESET_VECTOR - CONFIG_C_ENV_BOOTBLOCK_SIZE + 0x10, CONFIG_C_ENV_BOOTBLOCK_SIZE) - #include EARLY_MEMLAYOUT + #include "car.ld" #elif ENV_POSTCAR POSTCAR(32M, 1M) |