From c9aecb4440d753168e84039c27906472d6174e3e Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 16 Mar 2021 16:53:00 +0100 Subject: [PATCH] cpu/intel/fit: Reserve the FIT pointer using a .c file No need to do this assembly anymore. Change-Id: I69b42c31e495530fe96030a5a25209775f9d4dca Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/51533 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/cpu/intel/fit/Makefile.inc | 2 +- src/cpu/intel/fit/{fit.S => fit.c} | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) rename src/cpu/intel/fit/{fit.S => fit.c} (57%) diff --git a/src/cpu/intel/fit/Makefile.inc b/src/cpu/intel/fit/Makefile.inc index ee6d55885d..ae4e71a79f 100644 --- a/src/cpu/intel/fit/Makefile.inc +++ b/src/cpu/intel/fit/Makefile.inc @@ -1,4 +1,4 @@ -bootblock-y += fit.S +bootblock-y += fit.c # The FIT table is generated as a separate CBFS file. # The FIT pointer is reserved in fit.c and updated to point to the 'intel_fit' diff --git a/src/cpu/intel/fit/fit.S b/src/cpu/intel/fit/fit.c similarity index 57% rename from src/cpu/intel/fit/fit.S rename to src/cpu/intel/fit/fit.c index ca95a90c2f..060023191a 100644 --- a/src/cpu/intel/fit/fit.S +++ b/src/cpu/intel/fit/fit.c @@ -1,9 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -.section ".fit_pointer", "a", @progbits - .code32 +#include + /* This will get updated by ifittool later on to point to the cbfs 'intel_fit' file. */ -.global fit_pointer -fit_pointer: -.long 0 -.long 0 +__attribute__((used, __section__(".fit_pointer"))) const uint64_t fit_ptr = 0;