diff options
Diffstat (limited to 'src/mainboard/iwill')
-rw-r--r-- | src/mainboard/iwill/dk8_htx/Config.lb | 8 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8_htx/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8_htx/Makefile.inc | 10 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8_htx/Options.lb | 12 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8s2/Config.lb | 4 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8s2/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8s2/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8s2/Options.lb | 8 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8x/Config.lb | 4 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8x/Kconfig | 1 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8x/Makefile.inc | 4 | ||||
-rw-r--r-- | src/mainboard/iwill/dk8x/Options.lb | 8 |
12 files changed, 34 insertions, 31 deletions
diff --git a/src/mainboard/iwill/dk8_htx/Config.lb b/src/mainboard/iwill/dk8_htx/Config.lb index 54a66c7939..b6ea0e291d 100644 --- a/src/mainboard/iwill/dk8_htx/Config.lb +++ b/src/mainboard/iwill/dk8_htx/Config.lb @@ -15,15 +15,15 @@ driver mainboard.o #needed by irq_tables and mptable and acpi_tables object get_bus_conf.o -if CONFIG_HAVE_MP_TABLE +if CONFIG_GENERATE_MP_TABLE object mptable.o end -if CONFIG_HAVE_PIRQ_TABLE +if CONFIG_GENERATE_PIRQ_TABLE object irq_tables.o end -#if CONFIG_HAVE_ACPI_TABLES +#if CONFIG_GENERATE_ACPI_TABLES # object acpi_tables.o # object fadt.o # if CONFIG_SB_HT_CHAIN_ON_BUS0 @@ -41,7 +41,7 @@ end # end #end -if CONFIG_HAVE_ACPI_TABLES +if CONFIG_GENERATE_ACPI_TABLES object acpi_tables.o object fadt.o makerule dsdt.c diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig index ace16502be..bfdd91b622 100644 --- a/src/mainboard/iwill/dk8_htx/Kconfig +++ b/src/mainboard/iwill/dk8_htx/Kconfig @@ -9,6 +9,7 @@ config BOARD_IWILL_DK8_HTX select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET diff --git a/src/mainboard/iwill/dk8_htx/Makefile.inc b/src/mainboard/iwill/dk8_htx/Makefile.inc index 6135e90b5a..c2a3adeaef 100644 --- a/src/mainboard/iwill/dk8_htx/Makefile.inc +++ b/src/mainboard/iwill/dk8_htx/Makefile.inc @@ -23,11 +23,11 @@ driver-y += mainboard.o # Needed by irq_tables and mptable and acpi_tables. obj-y += get_bus_conf.o -obj-$(CONFIG_HAVE_MP_TABLE) += mptable.o -obj-$(CONFIG_HAVE_PIRQ_TABLE) += irq_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += dsdt.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o +obj-$(CONFIG_GENERATE_MP_TABLE) += mptable.o +obj-$(CONFIG_GENERATE_PIRQ_TABLE) += irq_tables.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o +obj-$(CONFIG_GENERATE_ACPI_TABLES) += fadt.o # ./ssdt.o is in northbridge/amd/amdk8/Config.lb obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o diff --git a/src/mainboard/iwill/dk8_htx/Options.lb b/src/mainboard/iwill/dk8_htx/Options.lb index 55fd1f0166..1e5484a81a 100644 --- a/src/mainboard/iwill/dk8_htx/Options.lb +++ b/src/mainboard/iwill/dk8_htx/Options.lb @@ -1,6 +1,6 @@ -uses CONFIG_HAVE_MP_TABLE -uses CONFIG_HAVE_PIRQ_TABLE -uses CONFIG_HAVE_ACPI_TABLES +uses CONFIG_GENERATE_MP_TABLE +uses CONFIG_GENERATE_PIRQ_TABLE +uses CONFIG_GENERATE_ACPI_TABLES uses CONFIG_HAVE_ACPI_RESUME uses CONFIG_ACPI_SSDTX_NUM uses CONFIG_USE_FALLBACK_IMAGE @@ -125,17 +125,17 @@ 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=11 ## ## 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 ## ACPI tables will be included -default CONFIG_HAVE_ACPI_TABLES=1 +default CONFIG_GENERATE_ACPI_TABLES=1 ## extra SSDT num default CONFIG_ACPI_SSDTX_NUM=3 diff --git a/src/mainboard/iwill/dk8s2/Config.lb b/src/mainboard/iwill/dk8s2/Config.lb index 8f34a30aa3..19fc42afa9 100644 --- a/src/mainboard/iwill/dk8s2/Config.lb +++ b/src/mainboard/iwill/dk8s2/Config.lb @@ -13,8 +13,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 ## ATI Rage XL framebuffering graphics driver diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig index 32d2a2783a..4899127c8e 100644 --- a/src/mainboard/iwill/dk8s2/Kconfig +++ b/src/mainboard/iwill/dk8s2/Kconfig @@ -9,6 +9,7 @@ config BOARD_IWILL_DK8S2 select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET diff --git a/src/mainboard/iwill/dk8s2/Makefile.inc b/src/mainboard/iwill/dk8s2/Makefile.inc index 0f9bd727b6..37671eafe7 100644 --- a/src/mainboard/iwill/dk8s2/Makefile.inc +++ b/src/mainboard/iwill/dk8s2/Makefile.inc @@ -22,8 +22,8 @@ driver-y += mainboard.o # Needed by irq_tables and mptable and acpi_tables. -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 # This is part of the conversion to init-obj and away from included code. diff --git a/src/mainboard/iwill/dk8s2/Options.lb b/src/mainboard/iwill/dk8s2/Options.lb index 208aeee735..911a54bc2c 100644 --- a/src/mainboard/iwill/dk8s2/Options.lb +++ b/src/mainboard/iwill/dk8s2/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 @@ -78,14 +78,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=12 ## ## 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 diff --git a/src/mainboard/iwill/dk8x/Config.lb b/src/mainboard/iwill/dk8x/Config.lb index 7e2dd6dbf5..1bd1cf198d 100644 --- a/src/mainboard/iwill/dk8x/Config.lb +++ b/src/mainboard/iwill/dk8x/Config.lb @@ -13,8 +13,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 if CONFIG_USE_INIT diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig index a18152dc7b..ef07b166ba 100644 --- a/src/mainboard/iwill/dk8x/Kconfig +++ b/src/mainboard/iwill/dk8x/Kconfig @@ -9,6 +9,7 @@ config BOARD_IWILL_DK8X select SOUTHBRIDGE_AMD_AMD8131 select SUPERIO_WINBOND_W83627THF select HAVE_PIRQ_TABLE + select HAVE_MP_TABLE select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET diff --git a/src/mainboard/iwill/dk8x/Makefile.inc b/src/mainboard/iwill/dk8x/Makefile.inc index 86d71e152b..c382cc681d 100644 --- a/src/mainboard/iwill/dk8x/Makefile.inc +++ b/src/mainboard/iwill/dk8x/Makefile.inc @@ -21,8 +21,8 @@ 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 # This is part of the conversion to init-obj and away from included code. diff --git a/src/mainboard/iwill/dk8x/Options.lb b/src/mainboard/iwill/dk8x/Options.lb index a9e396d6ff..5cc8161ab1 100644 --- a/src/mainboard/iwill/dk8x/Options.lb +++ b/src/mainboard/iwill/dk8x/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 @@ -78,14 +78,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 |