- make HAVE_HARD_RESET match what newconfig did
- introduce BOARD_HAS_HARD_RESET and use it if a board provides hard_reset in $(MAINBOARDDIR)/reset.c, instead of some chipset component - move a couple of rules out of the mainboards' Makefiles into src/arch/i386/Makefile.inc: initobj-y += crt0.o obj-y += mainboard.o obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o obj-$(CONFIG_BOARD_HAS_HARD_RESET) += reset.o - remove Makefile.incs that are empty (or comment-only) after these changes, incl. Makefile.romccboard.inc (and references to it) - Make include not fail if Makefile.inc doesn't exist. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Myles Watson <mylesgw@gmail.com> Acked-by: Peter Stuge <peter@stuge.se> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5168 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
@@ -197,6 +197,23 @@ $(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/
|
||||
mv $@.tmp $@
|
||||
rm -f $@.tmp1
|
||||
endif
|
||||
|
||||
else
|
||||
# Only in first pass
|
||||
|
||||
# Things that appear in every board
|
||||
initobjs += $(obj)/mainboard/$(MAINBOARDDIR)/crt0.o
|
||||
objs += $(obj)/mainboard/$(MAINBOARDDIR)/mainboard.o
|
||||
ifeq ($(CONFIG_GENERATE_MP_TABLE),y)
|
||||
objs += $(obj)/mainboard/$(MAINBOARDDIR)/mptable.o
|
||||
endif
|
||||
ifeq ($(CONFIG_GENERATE_PIRQ_TABLE),y)
|
||||
objs += $(obj)/mainboard/$(MAINBOARDDIR)/irq_tables.o
|
||||
endif
|
||||
ifeq ($(CONFIG_BOARD_HAS_HARD_RESET),y)
|
||||
objs += $(obj)/mainboard/$(MAINBOARDDIR)/reset.o
|
||||
endif
|
||||
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_TINY_BOOTBLOCK),y)
|
||||
|
Reference in New Issue
Block a user