[commit] r5395 - in trunk/src/arch/i386: . lib

[repository service]

Author: stepan
Date: Fri Apr  9 15:49:48 2010
New Revision: 5395
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5395

Log:
drop now unussed cpu_reset.inc
make it more clear if coreboot is building without payload.
Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Deleted:
   trunk/src/arch/i386/lib/cpu_reset.inc
Modified:
   trunk/src/arch/i386/Makefile.inc

Modified: trunk/src/arch/i386/Makefile.inc
==============================================================================
--- trunk/src/arch/i386/Makefile.inc	Fri Apr  9 15:35:03 2010	(r5394)
+++ trunk/src/arch/i386/Makefile.inc	Fri Apr  9 15:49:48 2010	(r5395)
@@ -35,7 +35,7 @@
    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 @@
 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