diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-18 16:33:39 +0300 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2019-08-21 07:00:45 +0000 |
commit | 12b121cdb450d96309dd96b2ccc25fc5501d2250 (patch) | |
tree | 1d94c123c23512b811d69d9876ac9a860bbbe0f6 /src/southbridge/intel/i82801gx | |
parent | 544b572c07bb09aba36705b5d8ffca3b793323f6 (diff) |
southbridge/intel: Tidy up preprocessor and headers
Change-Id: I52a7b39566acd64ac21a345046675e05649a40f5
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34980
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/southbridge/intel/i82801gx')
-rw-r--r-- | src/southbridge/intel/i82801gx/azalia.c | 1 | ||||
-rw-r--r-- | src/southbridge/intel/i82801gx/i82801gx.h | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c index 938dc4edd6..56baab1edc 100644 --- a/src/southbridge/intel/i82801gx/azalia.c +++ b/src/southbridge/intel/i82801gx/azalia.c @@ -22,6 +22,7 @@ #include <device/mmio.h> #include <delay.h> #include <device/azalia_device.h> +#include "chip.h" #include "i82801gx.h" #define HDA_ICII_REG 0x68 diff --git a/src/southbridge/intel/i82801gx/i82801gx.h b/src/southbridge/intel/i82801gx/i82801gx.h index fb855dc743..7fc0114aac 100644 --- a/src/southbridge/intel/i82801gx/i82801gx.h +++ b/src/southbridge/intel/i82801gx/i82801gx.h @@ -34,13 +34,14 @@ #ifndef __ACPI__ #define DEBUG_PERIODIC_SMIS 0 -#if !defined(__ASSEMBLER__) -#if !defined(__PRE_RAM__) -#if !defined(__SIMPLE_DEVICE__) +#ifndef __ROMCC__ +#include <device/device.h> void i82801gx_enable(struct device *dev); #endif -#else + void enable_smbus(void); + +#if ENV_ROMSTAGE int smbus_read_byte(unsigned int device, unsigned int address); int i2c_eeprom_read(unsigned int device, unsigned int cmd, unsigned int bytes, u8 *buf); @@ -48,7 +49,6 @@ int smbus_block_read(unsigned int device, unsigned int cmd, u8 bytes, u8 *buf); int smbus_block_write(unsigned int device, unsigned int cmd, u8 bytes, const u8 *buf); #endif -#endif #define MAINBOARD_POWER_OFF 0 #define MAINBOARD_POWER_ON 1 |