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
This commit is contained in:
parent
306343266b
commit
f358c0c555
|
@ -35,7 +35,7 @@ $(obj)/coreboot.rom: $(obj)/coreboot.pre $(obj)/coreboot_ram $(CBFSTOOL) $(call
|
||||||
fi
|
fi
|
||||||
$(CBFSTOOL) $@.tmp add-stage $(obj)/coreboot_ram $(CONFIG_CBFS_PREFIX)/coreboot_ram $(CBFS_COMPRESS_FLAG)
|
$(CBFSTOOL) $@.tmp add-stage $(obj)/coreboot_ram $(CONFIG_CBFS_PREFIX)/coreboot_ram $(CBFS_COMPRESS_FLAG)
|
||||||
ifeq ($(CONFIG_PAYLOAD_NONE),y)
|
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
|
else
|
||||||
printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(CBFS_PAYLOAD_COMPRESS_FLAG)\n"
|
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)
|
$(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)
|
ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
|
||||||
crt0s += $(src)/cpu/x86/16bit/reset16.inc
|
crt0s += $(src)/cpu/x86/16bit/reset16.inc
|
||||||
ldscripts += $(src)/cpu/x86/16bit/reset16.lds
|
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
|
crt0s += $(src)/arch/i386/lib/id.inc
|
||||||
ldscripts += $(src)/arch/i386/lib/id.lds
|
ldscripts += $(src)/arch/i386/lib/id.lds
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
/* -*- asm -*- */
|
|
||||||
|
|
||||||
jmp cpu_reset_out
|
|
||||||
|
|
||||||
__cpu_reset:
|
|
||||||
/* set the boot_complete flag */
|
|
||||||
movl $0xffffffff, %ebp
|
|
||||||
jmp __main
|
|
||||||
|
|
||||||
cpu_reset_out:
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue