diff options
Diffstat (limited to 'src/mainboard/dell/s1850')
| -rw-r--r-- | src/mainboard/dell/s1850/Config.lb | 4 | ||||
| -rw-r--r-- | src/mainboard/dell/s1850/Kconfig | 3 | ||||
| -rw-r--r-- | src/mainboard/dell/s1850/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/mainboard/dell/s1850/Options.lb | 8 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb index 4eb4a026be..0f28b50b10 100644 --- a/src/mainboard/dell/s1850/Config.lb +++ b/src/mainboard/dell/s1850/Config.lb @@ -18,8 +18,8 @@ arch i386 end ## driver mainboard.o -if CONFIG_HAVE_MP_TABLE object mptable.o end -if CONFIG_HAVE_PIRQ_TABLE object irq_tables.o end +if CONFIG_GENERATE_MP_TABLE object mptable.o end +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end object reset.o ## diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index 49c4ae86af..4466e44763 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -6,7 +6,8 @@ config BOARD_DELL_S1850 select SOUTHBRIDGE_INTEL_I82801ER select SOUTHBRIDGE_INTEL_PXHD select SUPERIO_NSC_PC8374 - select PIRQ_TABLE + select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE config MAINBOARD_DIR string diff --git a/src/mainboard/dell/s1850/Makefile.inc b/src/mainboard/dell/s1850/Makefile.inc index a3473c7e7e..ade0e18d4d 100644 --- a/src/mainboard/dell/s1850/Makefile.inc +++ b/src/mainboard/dell/s1850/Makefile.inc @@ -41,8 +41,8 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds driver-y += mainboard.o -obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o -obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o +obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o ifdef POST_EVALUATION diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb index 61ce744f6c..fb65f8d8e2 100644 --- a/src/mainboard/dell/s1850/Options.lb +++ b/src/mainboard/dell/s1850/Options.lb @@ -1,5 +1,5 @@ -uses CONFIG_HAVE_MP_TABLE -uses CONFIG_HAVE_PIRQ_TABLE +uses CONFIG_GENERATE_MP_TABLE +uses CONFIG_GENERATE_PIRQ_TABLE uses CONFIG_USE_FALLBACK_IMAGE uses CONFIG_HAVE_FALLBACK_BOOT uses CONFIG_HAVE_HARD_RESET @@ -80,14 +80,14 @@ default CONFIG_HAVE_HARD_RESET=1 ## ## Build code to export a programmable irq routing table ## -default CONFIG_HAVE_PIRQ_TABLE=1 +default CONFIG_GENERATE_PIRQ_TABLE=1 default CONFIG_IRQ_SLOT_COUNT=9 ## ## Build code to export an x86 MP table ## Useful for specifying IRQ routing values ## -default CONFIG_HAVE_MP_TABLE=1 +default CONFIG_GENERATE_MP_TABLE=1 ## ## Build code to export a CMOS option table |