[coreboot-gerrit] New patch to review for coreboot: d2a4337 superio/ite/it8728f: Make SIO HWM conf conditional

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Mon May 26 23:46:49 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5876

-gerrit

commit d2a433746bfe2cf3eafeba53c9b226a4c039d9a0
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Tue May 27 07:45:43 2014 +1000

    superio/ite/it8728f: Make SIO HWM conf conditional
    
    Not everyone may like to enable the Super I/O HWM on their board or for
    their purposes. Hence, make hwm configuration conditional in Kconfig.
    
    Change-Id: Ib111970f565c4393477dd7efeb2b6fea1834592b
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/mainboard/asus/f2a85-m/Kconfig         | 1 +
 src/superio/ite/Kconfig                    | 7 +++++++
 src/superio/ite/it8728f/Makefile.inc       | 2 +-
 src/superio/ite/it8728f/chip.h             | 2 ++
 src/superio/ite/it8728f/it8728f_internal.h | 4 ++++
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index 6dea246..4e6db01 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -31,6 +31,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
 	select SUPERIO_ITE_IT8728F
+	select SUPERIO_ITE_IT8728F_HWMEC
 	select BOARD_ROMSIZE_KB_8192
 	select GFXUMA
 
diff --git a/src/superio/ite/Kconfig b/src/superio/ite/Kconfig
index 8a5378d..6a8a25b 100644
--- a/src/superio/ite/Kconfig
+++ b/src/superio/ite/Kconfig
@@ -57,6 +57,13 @@ config SUPERIO_ITE_IT8728F
 	bool
 	select SUPERIO_ITE_COMMON_ROMSTAGE
 
+config CONFIG_SUPERIO_ITE_IT8728F_HWMEC
+	bool "ITE IT8728F HWM/EC"
+	depends on SUPERIO_ITE_IT8728F
+	help
+	  Configure the ITE Super I/O hardware monitor fan control registers in
+	  devicetree.cb.
+
 config SUPERIO_ITE_IT8772F
 	bool
 	select SUPERIO_ITE_COMMON_ROMSTAGE
diff --git a/src/superio/ite/it8728f/Makefile.inc b/src/superio/ite/it8728f/Makefile.inc
index 00cceeb..91df41d 100644
--- a/src/superio/ite/it8728f/Makefile.inc
+++ b/src/superio/ite/it8728f/Makefile.inc
@@ -18,5 +18,5 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 ##
 
-ramstage-$(CONFIG_SUPERIO_ITE_IT8728F) += it8728f_hwm.c
+ramstage-$(CONFIG_SUPERIO_ITE_IT8728F_HWMEC) += it8728f_hwm.c
 ramstage-$(CONFIG_SUPERIO_ITE_IT8728F) += superio.c
diff --git a/src/superio/ite/it8728f/chip.h b/src/superio/ite/it8728f/chip.h
index 678c19b..1edb02a 100644
--- a/src/superio/ite/it8728f/chip.h
+++ b/src/superio/ite/it8728f/chip.h
@@ -23,12 +23,14 @@
 
 struct superio_ite_it8728f_config {
 	/* HWM configuration registers */
+#if IS_ENABLED(CONFIG_SUPERIO_ITE_IT8728F_HWMEC)
 	uint8_t hwm_ctl_register;
 	uint8_t hwm_main_ctl_register;
 	uint8_t hwm_adc_temp_chan_en_reg;
 	uint8_t hwm_fan1_ctl_pwm;
 	uint8_t hwm_fan2_ctl_pwm;
 	uint8_t hwm_fan3_ctl_pwm;
+#endif /* CONFIG_SUPERIO_ITE_IT8728F_HWMEC */
 };
 
 #endif /* SUPERIO_ITE_IT8728F_CHIP_H */
diff --git a/src/superio/ite/it8728f/it8728f_internal.h b/src/superio/ite/it8728f/it8728f_internal.h
index 89aecb4..b5e1645 100644
--- a/src/superio/ite/it8728f/it8728f_internal.h
+++ b/src/superio/ite/it8728f/it8728f_internal.h
@@ -23,6 +23,10 @@
 
 #include <device/device.h>
 
+#if IS_ENABLED(CONFIG_SUPERIO_ITE_IT8728F_HWMEC)
 void it8728f_hwm_ec_init(device_t dev);
+#else
+void it8728f_hwm_ec_init(device_t dev) {}
+#endif /* CONFIG_SUPERIO_ITE_IT8728F_HWMEC */
 
 #endif /* SUPERIO_ITE_IT8728F_INTERNAL_H */



More information about the coreboot-gerrit mailing list