GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

superio/winbond/w83627ehg: Avoid .c includes 

Following the same reasoning as commit
d304331 superio/fintek/f81865f: Avoid .c includes
Clean up the early_serial #include directives in mainboard/romstage
code.

Change-Id: Ib3a12fb8160729008bdaa8026365675a11325da0
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5448
Tested-by: build bot (Jenkins)
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
This commit is contained in:
Edward O'Callaghan 2014-04-03 14:30:58 +11:00 committed by Alexandru Gagniuc
parent 59674d25be
commit 793a429eb5
12 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mainboard/asus/a8v-e_deluxe/romstage.c
View File

@ -38,7 +38,7 @@ unsigned int get_sbdn(unsigned bus);
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/early_ht.c" #include "northbridge/amd/amdk8/early_ht.c"
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "southbridge/via/vt8237r/early_smbus.c" #include "southbridge/via/vt8237r/early_smbus.c"
#include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"

2
src/mainboard/asus/a8v-e_se/romstage.c
View File

@ -38,7 +38,7 @@ unsigned int get_sbdn(unsigned bus);
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/early_ht.c" #include "northbridge/amd/amdk8/early_ht.c"
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "southbridge/via/vt8237r/early_smbus.c" #include "southbridge/via/vt8237r/early_smbus.c"
#include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */ #include "northbridge/amd/amdk8/debug.c" /* After vt8237r/early_smbus.c! */
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"

2
src/mainboard/ibase/mb899/romstage.c
View File

@ -31,7 +31,7 @@
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <console/console.h> #include <console/console.h>
#include <cpu/x86/bist.h> #include <cpu/x86/bist.h>
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "northbridge/intel/i945/i945.h" #include "northbridge/intel/i945/i945.h"
#include "northbridge/intel/i945/raminit.h" #include "northbridge/intel/i945/raminit.h"
#include "southbridge/intel/i82801gx/i82801gx.h" #include "southbridge/intel/i82801gx/i82801gx.h"

2
src/mainboard/iei/pm-lx-800-r11/romstage.c
View File

@ -32,7 +32,7 @@
#include <southbridge/amd/cs5536/cs5536.h> #include <southbridge/amd/cs5536/cs5536.h>
#include <southbridge/amd/cs5536/early_smbus.c> #include <southbridge/amd/cs5536/early_smbus.c>
#include <southbridge/amd/cs5536/early_setup.c> #include <southbridge/amd/cs5536/early_setup.c>
#include <superio/winbond/w83627ehg/early_serial.c> #include <superio/winbond/w83627ehg/w83627ehg.h>
#include <northbridge/amd/lx/raminit.h> #include <northbridge/amd/lx/raminit.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83627EHG_SP1) #define SERIAL_DEV PNP_DEV(0x2e, W83627EHG_SP1)

3
src/mainboard/msi/ms7260/romstage.c
View File

@ -37,8 +37,7 @@
#include <spd.h> #include <spd.h>
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "superio/winbond/w83627ehg/early_init.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "northbridge/amd/amdk8/debug.c" #include "northbridge/amd/amdk8/debug.c"
#include "northbridge/amd/amdk8/setup_resource_map.c" #include "northbridge/amd/amdk8/setup_resource_map.c"

2
src/mainboard/msi/ms9282/romstage.c
View File

@ -37,7 +37,7 @@
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/debug.c" #include "northbridge/amd/amdk8/debug.c"
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include <spd.h> #include <spd.h>
#include "northbridge/amd/amdk8/setup_resource_map.c" #include "northbridge/amd/amdk8/setup_resource_map.c"

2
src/mainboard/msi/ms9652_fam10/romstage.c
View File

@ -39,7 +39,7 @@
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdfam10/reset_test.c" #include "northbridge/amd/amdfam10/reset_test.c"
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "northbridge/amd/amdfam10/debug.c" #include "northbridge/amd/amdfam10/debug.c"
#include "northbridge/amd/amdfam10/setup_resource_map.c" #include "northbridge/amd/amdfam10/setup_resource_map.c"

3
src/mainboard/nvidia/l1_2pvv/romstage.c
View File

@ -36,8 +36,7 @@
#include "lib/delay.c" #include "lib/delay.c"
#include "cpu/x86/lapic.h" #include "cpu/x86/lapic.h"
#include "northbridge/amd/amdk8/reset_test.c" #include "northbridge/amd/amdk8/reset_test.c"
#include "superio/winbond/w83627ehg/early_serial.c" #include <superio/winbond/w83627ehg/w83627ehg.h>
#include "superio/winbond/w83627ehg/early_init.c"
#include "cpu/x86/bist.h" #include "cpu/x86/bist.h"
#include "northbridge/amd/amdk8/debug.c" #include "northbridge/amd/amdk8/debug.c"
#include "northbridge/amd/amdk8/setup_resource_map.c" #include "northbridge/amd/amdk8/setup_resource_map.c"

3
src/superio/winbond/w83627ehg/Makefile.inc
View File

@ -19,5 +19,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
romstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += early_init.c
romstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += early_serial.c
ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.c ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.c

2
src/superio/winbond/w83627ehg/early_init.c
View File

@ -19,8 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <stdint.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/pnp.h>
#include "w83627ehg.h" #include "w83627ehg.h"
void w83627ehg_disable_dev(device_t dev) void w83627ehg_disable_dev(device_t dev)

5
src/superio/winbond/w83627ehg/early_serial.c
View File

@ -20,16 +20,17 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <device/pnp.h>
#include "w83627ehg.h" #include "w83627ehg.h"
static void pnp_enter_ext_func_mode(device_t dev) void pnp_enter_ext_func_mode(device_t dev)
{ {
u16 port = dev >> 8; u16 port = dev >> 8;
outb(0x87, port); outb(0x87, port);
outb(0x87, port); outb(0x87, port);
} }
static void pnp_exit_ext_func_mode(device_t dev) void pnp_exit_ext_func_mode(device_t dev)
{ {
u16 port = dev >> 8; u16 port = dev >> 8;
outb(0xaa, port); outb(0xaa, port);

5
src/superio/winbond/w83627ehg/w83627ehg.h
View File

@ -60,4 +60,7 @@ void w83627ehg_disable_dev(device_t dev);
void w83627ehg_enable_serial(device_t dev, u16 iobase); void w83627ehg_enable_serial(device_t dev, u16 iobase);
#endif #endif
#endif void pnp_enter_ext_func_mode(device_t dev);
void pnp_exit_ext_func_mode(device_t dev);
#endif /* SUPERIO_WINBOND_W83627EHG_W83627EHG_H */