- drop remaining CONFIG_ROM_IMAGE_SIZE

- re-enable .data section check for bootblock.
- rename ldscript_fallback_cbfs.lb to bootblock.ld

Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Acked-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6497 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index a2fb71d4c67a64f817da6106ef239783ba7e306d..e620e1cd09ad7008de61c7a0c216df32e5524041 100644 (file)
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -165,7 +165,7 @@ endif
 
 crt0s = $(src)/arch/x86/init/prologue.inc
 ldscripts =
-ldscripts += $(src)/arch/x86/init/ldscript_fallback_cbfs.lb
+ldscripts += $(src)/arch/x86/init/bootblock.ld
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 crt0s += $(src)/cpu/x86/16bit/entry16.inc
 ldscripts += $(src)/cpu/x86/16bit/entry16.lds

diff --git a/src/arch/x86/init/bootblock.ld b/src/arch/x86/init/bootblock.ld
new file mode 100644 (file)
index 0000000..8363ab1
--- /dev/null
+++ b/src/arch/x86/init/bootblock.ld
@@ -0,0 +1,53 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2006 Advanced Micro Devices, Inc.
+ * Copyright (C) 2008-2010 coresystems GmbH
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ */
+
+/* We use ELF as output format. So that we can debug the code in some form. */
+OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_ARCH(i386)
+
+TARGET(binary)
+SECTIONS
+{
+       . = CONFIG_ROMBASE;
+
+       /* cut _start into last 64k*/
+       _x = .;
+       . = (_x < CONFIG_ROMBASE) ? (CONFIG_ROMBASE) : _x;
+
+       /* This section might be better named .setup */
+       .rom . : {
+               _rom = .;
+               *(.rom.text);
+               *(.rom.data);
+               *(.rodata);
+               *(.rodata.*);
+               *(.rom.data.*);
+               . = ALIGN(16);
+               _erom = .;
+       }
+
+       /DISCARD/ : {
+               *(.comment)
+               *(.note)
+               *(.comment.*)
+               *(.note.*)
+       }
+       _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage");
+}

diff --git a/src/arch/x86/init/ldscript_fallback_cbfs.lb b/src/arch/x86/init/ldscript_fallback_cbfs.lb
deleted file mode 100644 (file)
index 082b211..0000000
--- a/src/arch/x86/init/ldscript_fallback_cbfs.lb
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2006 Advanced Micro Devices, Inc.
- * Copyright (C) 2008-2010 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- */
-
-/* We use ELF as output format. So that we can debug the code in some form. */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
-OUTPUT_ARCH(i386)
-
-TARGET(binary)
-SECTIONS
-{
-       . = CONFIG_ROMBASE;
-
-       /* cut _start into last 64k*/
-       _x = .;
-       . = (_x < (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE)) ? (CONFIG_ROMBASE - 0x10000 +  CONFIG_ROM_IMAGE_SIZE) : _x;
-
-       /* This section might be better named .setup */
-       .rom . : {
-               _rom = .;
-               *(.rom.text);
-               *(.rom.data);
-               *(.rodata);
-               *(.rodata.*);
-               *(.rom.data.*);
-               . = ALIGN(16);
-               _erom = .;
-       }
-
-       /DISCARD/ : {
-               *(.comment)
-               *(.note)
-               *(.comment.*)
-               *(.note.*)
-       }
-/*     _bogus = ASSERT((SIZEOF(.bss) + SIZEOF(.data)) == 0, "Do not use global variables in romstage"); */
-       _bogus = ASSERT((SIZEOF(.bss)) == 0, "Do not use global variables in romstage"); 
-}