summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2024-07-18 23:30:23 +0200
committerFelix Held <felix-coreboot@felixheld.de>2024-07-24 00:28:59 +0000
commitdc8123a775e9732e13092f5bf6a4d623b4d97b0d (patch)
tree18bac85559279bcf8d1ac088a97b9ad04bfaa4e7
parent9b99eb5cf8c33ed40041629f1f2784cdf67057e7 (diff)
arch/x86/Makefile.mk: Remove obsolete romcc reference
No assembly.inc file is being generated by romcc anymore. The -I. was only used in a single place that can use the common -Isrc instead. Change-Id: I57a3a6e1c2cf7cf30fb0cd94cc8455f715050490 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/83563 Reviewed-by: Elyes Haouas <ehaouas@noos.fr> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/arch/x86/Makefile.mk3
-rw-r--r--src/northbridge/intel/sandybridge/mrc_wrapper.S2
2 files changed, 1 insertions, 4 deletions
diff --git a/src/arch/x86/Makefile.mk b/src/arch/x86/Makefile.mk
index cf5b2bbb57..2832ac36f5 100644
--- a/src/arch/x86/Makefile.mk
+++ b/src/arch/x86/Makefile.mk
@@ -58,9 +58,6 @@ define x86_stage
# $1 stage name
# $2 oformat
-# The '.' include path is needed for the generated assembly.inc file.
-$(1)-S-ccopts += -I.
-
$$(objcbfs)/$(1).debug: $$$$($(1)-libs) $$$$($(1)-objs)
@printf " LINK $$(subst $$(obj)/,,$$(@))\n"
$$(LD_$(1)) $$(LDFLAGS_$(1)) -o $$@ -L$$(obj) $$(COMPILER_RT_FLAGS_$(1)) --whole-archive --start-group $$(filter-out %.ld,$$($(1)-objs)) $$($(1)-libs) --no-whole-archive $$(COMPILER_RT_$(1)) --end-group -T $(call src-to-obj,$(1),$(CONFIG_MEMLAYOUT_LD_FILE)) --oformat $(2)
diff --git a/src/northbridge/intel/sandybridge/mrc_wrapper.S b/src/northbridge/intel/sandybridge/mrc_wrapper.S
index d68ce091a4..493f808413 100644
--- a/src/northbridge/intel/sandybridge/mrc_wrapper.S
+++ b/src/northbridge/intel/sandybridge/mrc_wrapper.S
@@ -32,6 +32,6 @@ mrc_wrapper:
* function do_putchar to print to console.
*/
-#include <src/cpu/x86/64bit/prot2long.inc>
+#include <cpu/x86/64bit/prot2long.inc>
prot2lm_wrapper do_putchar