Fix some builds with Kconfig.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4883 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
4ec4fbe0e9
commit
8d09e231fe
|
@ -49,11 +49,11 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
mv dsdt.hex $@
|
mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h
|
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h
|
||||||
|
|
|
@ -53,11 +53,11 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
$(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
mv dsdt.hex $@
|
mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/dsdt.c
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h
|
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/cache_as_ram_auto.c $(obj)/option_table.h
|
||||||
|
|
|
@ -8,7 +8,6 @@ config BOARD_DIGITALLOGIC_ADL855PC
|
||||||
select HAVE_PIRQ_TABLE
|
select HAVE_PIRQ_TABLE
|
||||||
select UDELAY_TSC
|
select UDELAY_TSC
|
||||||
select BOARD_ROMSIZE_KB_1024
|
select BOARD_ROMSIZE_KB_1024
|
||||||
select HAVE_HARD_RESET
|
|
||||||
|
|
||||||
config MAINBOARD_DIR
|
config MAINBOARD_DIR
|
||||||
string
|
string
|
||||||
|
|
|
@ -2,7 +2,6 @@ uses CONFIG_GENERATE_MP_TABLE
|
||||||
uses CONFIG_GENERATE_PIRQ_TABLE
|
uses CONFIG_GENERATE_PIRQ_TABLE
|
||||||
uses CONFIG_USE_FALLBACK_IMAGE
|
uses CONFIG_USE_FALLBACK_IMAGE
|
||||||
uses CONFIG_HAVE_FALLBACK_BOOT
|
uses CONFIG_HAVE_FALLBACK_BOOT
|
||||||
uses CONFIG_HAVE_HARD_RESET
|
|
||||||
uses CONFIG_HAVE_OPTION_TABLE
|
uses CONFIG_HAVE_OPTION_TABLE
|
||||||
uses CONFIG_USE_OPTION_TABLE
|
uses CONFIG_USE_OPTION_TABLE
|
||||||
uses CONFIG_ROM_PAYLOAD
|
uses CONFIG_ROM_PAYLOAD
|
||||||
|
@ -54,11 +53,6 @@ default CONFIG_HAVE_FALLBACK_BOOT=1
|
||||||
##
|
##
|
||||||
default CONFIG_GENERATE_MP_TABLE=0
|
default CONFIG_GENERATE_MP_TABLE=0
|
||||||
|
|
||||||
##
|
|
||||||
## Build code to reset the motherboard from coreboot
|
|
||||||
##
|
|
||||||
default CONFIG_HAVE_HARD_RESET=1
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## use io based udelay function
|
## use io based udelay function
|
||||||
##
|
##
|
||||||
|
|
|
@ -20,3 +20,8 @@ config IRQ_SLOT_COUNT
|
||||||
int
|
int
|
||||||
default 6
|
default 6
|
||||||
depends on BOARD_EMULATION_QEMU_X86
|
depends on BOARD_EMULATION_QEMU_X86
|
||||||
|
|
||||||
|
config HAVE_INIT_TIMER
|
||||||
|
bool
|
||||||
|
default n
|
||||||
|
depends on BOARD_EMULATION_QEMU_X86
|
||||||
|
|
|
@ -26,6 +26,13 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds
|
||||||
|
|
||||||
ifdef POST_EVALUATION
|
ifdef POST_EVALUATION
|
||||||
|
|
||||||
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
|
iasl -p $(obj)/mainboard/$(MAINBOARDDIR)/dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.dsl
|
||||||
|
mv $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.hex $@
|
||||||
|
|
||||||
|
$(obj)/mainboard/$(MAINBOARDDIR)/dsdt.o: $(obj)/mainboard/$(MAINBOARDDIR)/dsdt.c
|
||||||
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c $< -o $@
|
||||||
|
|
||||||
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h
|
$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h
|
||||||
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
|
$(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@
|
||||||
perl -e 's/\.rodata/.rom.data/g' -pi $@
|
perl -e 's/\.rodata/.rom.data/g' -pi $@
|
||||||
|
|
|
@ -12,7 +12,6 @@ config BOARD_MSI_MS9185
|
||||||
select USE_PRINTK_IN_CAR
|
select USE_PRINTK_IN_CAR
|
||||||
select USE_DCACHE_RAM
|
select USE_DCACHE_RAM
|
||||||
select HAVE_HARD_RESET
|
select HAVE_HARD_RESET
|
||||||
select HAVE_ACPI_TABLES
|
|
||||||
select IOAPIC
|
select IOAPIC
|
||||||
select LIFT_BSP_APIC_ID
|
select LIFT_BSP_APIC_ID
|
||||||
select BOARD_ROMSIZE_KB_512
|
select BOARD_ROMSIZE_KB_512
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
include $(src)/mainboard/Makefile.k8_ck804.inc
|
include $(src)/mainboard/Makefile.k8_CAR.inc
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
include $(src)/mainboard/Makefile.k8_ck804.inc
|
include $(src)/mainboard/Makefile.k8_CAR.inc
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
include $(src)/mainboard/Makefile.k8_ck804.inc
|
include $(src)/mainboard/Makefile.k8_CAR.inc
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
include $(src)/mainboard/Makefile.k8_ck804.inc
|
include $(src)/mainboard/Makefile.k8_CAR.inc
|
||||||
|
obj-y += get_bus_conf.o
|
||||||
driver-y += ../../../drivers/i2c/adm1027/adm1027.o
|
driver-y += ../../../drivers/i2c/adm1027/adm1027.o
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
include $(src)/mainboard/Makefile.k8_ck804.inc
|
include $(src)/mainboard/Makefile.k8_CAR.inc
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
include $(src)/mainboard/Makefile.k8_ck804.inc
|
include $(src)/mainboard/Makefile.k8_CAR.inc
|
||||||
|
obj-y += get_bus_conf.o
|
||||||
|
|
Loading…
Reference in New Issue