diff options
Diffstat (limited to 'src/mainboard')
| -rw-r--r-- | src/mainboard/gigabyte/m57sli/Config.lb | 2 | ||||
| -rw-r--r-- | src/mainboard/gigabyte/m57sli/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/gigabyte/m57sli/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/gigabyte/m57sli/Options.lb | 4 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/mainboard/gigabyte/m57sli/Config.lb b/src/mainboard/gigabyte/m57sli/Config.lb index 6d5a13fb5c..b4757df52b 100644 --- a/src/mainboard/gigabyte/m57sli/Config.lb +++ b/src/mainboard/gigabyte/m57sli/Config.lb @@ -150,7 +150,7 @@ else end end -if CONFIG_HAVE_FANCTL +if CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL object fanctl.o end diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig index b5e02d9272..8482c045e6 100644 --- a/src/mainboard/gigabyte/m57sli/Kconfig +++ b/src/mainboard/gigabyte/m57sli/Kconfig @@ -7,6 +7,7 @@ config BOARD_GIGABYTE_M57SLI select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_NVIDIA_MCP55 select SUPERIO_ITE_IT8716F + select SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select USE_PRINTK_IN_CAR @@ -143,9 +144,3 @@ config IRQ_SLOT_COUNT int default 11 depends on BOARD_GIGABYTE_M57SLI - -# not globally defined yet, so can't "select" this -config HAVE_FANCTL - bool - default y - depends on BOARD_GIGABYTE_M57SLI diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc index 62b7fd7a6e..12d966ca38 100644 --- a/src/mainboard/gigabyte/m57sli/Makefile.inc +++ b/src/mainboard/gigabyte/m57sli/Makefile.inc @@ -29,7 +29,7 @@ obj-$(CONFIG_USE_INIT) += cache_as_ram_auto.o obj-$(CONFIG_AP_CODE_IN_CAR) += apc_auto.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += dsdt.o obj-$(CONFIG_GENERATE_ACPI_TABLES) += acpi_tables.o -obj-$(CONFIG_HAVE_FANCTL) += fanctl.o +obj-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.o # This is part of the conversion to init-obj and away from included code. initobj-y += crt0.o diff --git a/src/mainboard/gigabyte/m57sli/Options.lb b/src/mainboard/gigabyte/m57sli/Options.lb index 0a0d29246a..df828f77f8 100644 --- a/src/mainboard/gigabyte/m57sli/Options.lb +++ b/src/mainboard/gigabyte/m57sli/Options.lb @@ -115,7 +115,7 @@ uses CONFIG_WAIT_BEFORE_CPUS_INIT uses CONFIG_USE_PRINTK_IN_CAR -uses CONFIG_HAVE_FANCTL +uses CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL ### ### Build options ### @@ -141,7 +141,7 @@ default CONFIG_RAMTOP=2048*1024 ## ## Set-up automatic fan control ## -default CONFIG_HAVE_FANCTL=1 +default CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL=1 ## ## Build code for the fallback boot |