summaryrefslogtreecommitdiff
path: root/src/arch/i386
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-09 13:49:48 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-09 13:49:48 +0000
commitf358c0c55510e4272ace99e192b9494e64f89697 (patch)
tree1f136bfc6a5b6a3aea324317f5723eca21e754de /src/arch/i386
parent306343266b47db9022591a342571631fb864ae18 (diff)
drop now unussed cpu_reset.inc
make it more clear if coreboot is building without payload. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5395 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/arch/i386')
-rw-r--r--src/arch/i386/Makefile.inc5
-rw-r--r--src/arch/i386/lib/cpu_reset.inc12
2 files changed, 1 insertions, 16 deletions
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 8af631a73c..a403b9bab7 100644
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -35,7 +35,7 @@ $(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(call
fi
$(CBFSTOOL) $@.tmp add-stage $(obj)/coreboot_ram $(CONFIG_CBFS_PREFIX)/coreboot_ram $(CBFS_COMPRESS_FLAG)
ifeq ($(CONFIG_PAYLOAD_NONE),y)
- printf " PAYLOAD none (as specified by user)\n"
+ printf " PAYLOAD \e[1;31mnone (as specified by user)\e[0m\n"
else
printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n"
$(CBFSTOOL) $@.tmp add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CONFIG_CBFS_PREFIX)/payload $(CBFS_PAYLOAD_COMPRESS_FLAG)
@@ -112,9 +112,6 @@ ldscripts += $(src)/cpu/x86/32bit/entry32.lds
ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
crt0s += $(src)/cpu/x86/16bit/reset16.inc
ldscripts += $(src)/cpu/x86/16bit/reset16.lds
-ifeq ($(CONFIG_ROMCC),y)
-crt0s += $(src)/arch/i386/lib/cpu_reset.inc
-endif
crt0s += $(src)/arch/i386/lib/id.inc
ldscripts += $(src)/arch/i386/lib/id.lds
endif
diff --git a/src/arch/i386/lib/cpu_reset.inc b/src/arch/i386/lib/cpu_reset.inc
deleted file mode 100644
index fcddd6b027..0000000000
--- a/src/arch/i386/lib/cpu_reset.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- asm -*- */
-
-jmp cpu_reset_out
-
-__cpu_reset:
- /* set the boot_complete flag */
- movl $0xffffffff, %ebp
- jmp __main
-
-cpu_reset_out:
-
-