summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/x86/bootblock_crt0.S3
-rw-r--r--src/arch/x86/prologue.inc6
-rw-r--r--src/cpu/intel/fit/fit.S2
-rw-r--r--src/cpu/x86/16bit/entry16.inc1
-rw-r--r--src/lib/program.ld6
5 files changed, 4 insertions, 14 deletions
diff --git a/src/arch/x86/bootblock_crt0.S b/src/arch/x86/bootblock_crt0.S
index 7291c47b92..9f45413e70 100644
--- a/src/arch/x86/bootblock_crt0.S
+++ b/src/arch/x86/bootblock_crt0.S
@@ -10,11 +10,12 @@
#include <cpu/x86/cr.h>
+.section .text
+
/*
* Include the old code for reset vector and protected mode entry. That code has
* withstood the test of time.
*/
-#include <arch/x86/prologue.inc>
#include <cpu/x86/16bit/entry16.inc>
#include <cpu/x86/16bit/reset16.inc>
#include <cpu/x86/32bit/entry32.inc>
diff --git a/src/arch/x86/prologue.inc b/src/arch/x86/prologue.inc
deleted file mode 100644
index 6d2ae1e039..0000000000
--- a/src/arch/x86/prologue.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <cpu/x86/post_code.h>
-
-.section ".rom.data", "a", @progbits
-.section ".rom.text", "ax", @progbits
diff --git a/src/cpu/intel/fit/fit.S b/src/cpu/intel/fit/fit.S
index 149d2d0384..3b7396c5ce 100644
--- a/src/cpu/intel/fit/fit.S
+++ b/src/cpu/intel/fit/fit.S
@@ -8,7 +8,7 @@ fit_pointer:
.long 0
.previous
-.section ".rom.data", "a", @progbits
+.section .text
.align 16
.global fit_table
.global fit_table_end
diff --git a/src/cpu/x86/16bit/entry16.inc b/src/cpu/x86/16bit/entry16.inc
index c71acb0bff..13d12beb66 100644
--- a/src/cpu/x86/16bit/entry16.inc
+++ b/src/cpu/x86/16bit/entry16.inc
@@ -26,6 +26,7 @@
*/
#include <arch/rom_segs.h>
+#include <cpu/x86/post_code.h>
/* Symbol _start16bit must be aligned to 4kB to start AP CPUs with
* Startup IPI message without RAM.
diff --git a/src/lib/program.ld b/src/lib/program.ld
index 734f040fcd..17aa3db72c 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -13,12 +13,6 @@
.text . : {
_program = .;
_text = .;
- /*
- * The .rom.* sections are to acommodate x86 romstage. romcc as well
- * as the assembly files put their text and data in these sections.
- */
- *(.rom.text);
- *(.rom.data);
*(.text._start);
*(.text.stage_entry);
#if (ENV_DECOMPRESSOR || ENV_BOOTBLOCK && \