Edward O'Callaghan (eocallaghan@alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6555
-gerrit
commit 99e76e36c5ce3056756eb9e7e930c7fcf713adf7 Author: Edward O'Callaghan eocallaghan@alterapraxis.com Date: Sat Aug 9 21:03:38 2014 +1000
southbridge/amd/cs5536: Use prototype for cs5536_early_setup()
Use a prototype for cs5536_early_setup() over using #include .c and fix mainboard's to match.
Change-Id: I88d6d4abbd825d8d77dadf1755226f14f99a9b63 Signed-off-by: Edward O'Callaghan eocallaghan@alterapraxis.com --- src/mainboard/aaeon/pfm-540i_revb/romstage.c | 3 +-- src/mainboard/amd/db800/romstage.c | 3 +-- src/mainboard/amd/norwich/romstage.c | 3 +-- src/mainboard/amd/rumba/romstage.c | 2 +- src/mainboard/artecgroup/dbe61/romstage.c | 3 +-- src/mainboard/bachmann/ot200/romstage.c | 3 +-- src/mainboard/digitallogic/msm800sev/romstage.c | 3 +-- src/mainboard/iei/pcisa-lx-800-r10/romstage.c | 3 +-- src/mainboard/iei/pm-lx-800-r11/romstage.c | 1 - src/mainboard/iei/pm-lx2-800-r10/romstage.c | 1 - src/mainboard/lippert/hurricane-lx/romstage.c | 3 +-- src/mainboard/lippert/literunner-lx/romstage.c | 3 +-- src/mainboard/lippert/roadrunner-lx/romstage.c | 3 +-- src/mainboard/lippert/spacerunner-lx/romstage.c | 3 +-- src/mainboard/pcengines/alix1c/romstage.c | 3 +-- src/mainboard/pcengines/alix2d/romstage.c | 3 +-- src/mainboard/traverse/geos/romstage.c | 3 +-- src/mainboard/winent/pl6064/romstage.c | 3 +-- src/mainboard/wyse/s50/romstage.c | 2 +- src/southbridge/amd/cs5536/Makefile.inc | 3 ++- src/southbridge/amd/cs5536/cs5536.h | 1 + src/southbridge/amd/cs5536/early_setup.c | 2 +- 22 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c index 47c411a..60d3421 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c +++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c @@ -31,10 +31,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/smsc/smscsuperio/smscsuperio.h> #include "northbridge/amd/lx/raminit.h"
diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c index 5db1d98..c864415 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -28,10 +28,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/winbond/common/winbond.h> #include <superio/winbond/w83627hf/w83627hf.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index 4f82db5..0908c7b 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -28,10 +28,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include "northbridge/amd/lx/raminit.h"
int spd_read_byte(unsigned int device, unsigned int address) diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c index 5a0f8a4..839027f 100644 --- a/src/mainboard/amd/rumba/romstage.c +++ b/src/mainboard/amd/rumba/romstage.c @@ -11,7 +11,7 @@ #include <cpu/amd/gx2def.h> #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h>
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1)
diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c index 4631027..9037daf 100644 --- a/src/mainboard/artecgroup/dbe61/romstage.c +++ b/src/mainboard/artecgroup/dbe61/romstage.c @@ -28,11 +28,10 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include "spd_table.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include "northbridge/amd/lx/raminit.h"
int spd_read_byte(unsigned int device, unsigned int address) diff --git a/src/mainboard/bachmann/ot200/romstage.c b/src/mainboard/bachmann/ot200/romstage.c index 684e0f9..8be4c96 100644 --- a/src/mainboard/bachmann/ot200/romstage.c +++ b/src/mainboard/bachmann/ot200/romstage.c @@ -30,9 +30,8 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include "northbridge/amd/lx/raminit.h"
int spd_read_byte(unsigned int device, unsigned int address) diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c index 932e0aa..b77ea44 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -9,10 +9,9 @@ #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> #include <cpu/amd/car.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/winbond/common/winbond.h> #include <superio/winbond/w83627hf/w83627hf.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c index 7de802c..cd12d9c 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c @@ -28,10 +28,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/winbond/common/winbond.h> #include <superio/winbond/w83627hf/w83627hf.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/iei/pm-lx-800-r11/romstage.c b/src/mainboard/iei/pm-lx-800-r11/romstage.c index b591f0d..3b3d2f8 100644 --- a/src/mainboard/iei/pm-lx-800-r11/romstage.c +++ b/src/mainboard/iei/pm-lx-800-r11/romstage.c @@ -31,7 +31,6 @@ #include <cpu/amd/lxdef.h> #include <southbridge/amd/cs5536/cs5536.h> #include <southbridge/amd/cs5536/smbus.h> -#include <southbridge/amd/cs5536/early_setup.c> #include <superio/winbond/common/winbond.h> #include <superio/winbond/w83627ehg/w83627ehg.h> #include <northbridge/amd/lx/raminit.h> diff --git a/src/mainboard/iei/pm-lx2-800-r10/romstage.c b/src/mainboard/iei/pm-lx2-800-r10/romstage.c index ef62ce9..fa4612e 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/romstage.c +++ b/src/mainboard/iei/pm-lx2-800-r10/romstage.c @@ -32,7 +32,6 @@ #include <cpu/amd/lxdef.h> #include <southbridge/amd/cs5536/cs5536.h> #include <southbridge/amd/cs5536/smbus.h> -#include <southbridge/amd/cs5536/early_setup.c> #include <superio/smsc/smscsuperio/smscsuperio.h> #include <northbridge/amd/lx/raminit.h>
diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c index 71da941..f8ce320 100644 --- a/src/mainboard/lippert/hurricane-lx/romstage.c +++ b/src/mainboard/lippert/hurricane-lx/romstage.c @@ -31,10 +31,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/ite/common/ite.h> #include <superio/ite/it8712f/it8712f.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c index dc90053..22a6ff1 100644 --- a/src/mainboard/lippert/literunner-lx/romstage.c +++ b/src/mainboard/lippert/literunner-lx/romstage.c @@ -32,9 +32,8 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/ite/common/ite.h> #include <superio/ite/it8712f/it8712f.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c index 9d970b7..44a7632 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -31,10 +31,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/ite/common/ite.h> #include <superio/ite/it8712f/it8712f.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index 5964388..a30bb15 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -32,9 +32,8 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/ite/common/ite.h> #include <superio/ite/it8712f/it8712f.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index 080553b..c17b7d0 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -30,7 +30,6 @@ #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> #include <cpu/amd/car.h> -#include "southbridge/amd/cs5536/cs5536.h" #include "northbridge/amd/lx/raminit.h"
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) @@ -38,7 +37,7 @@ /* The ALIX1.C has no SMBus; the setup is hard-wired. */ void cs5536_enable_smbus(void) { }
-#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/winbond/common/winbond.h> #include <superio/winbond/w83627hf/w83627hf.h>
diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c index 07bf77e..01ee2c0 100644 --- a/src/mainboard/pcengines/alix2d/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -30,7 +30,6 @@ #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> #include <cpu/amd/car.h> -#include "southbridge/amd/cs5536/cs5536.h" #include "northbridge/amd/lx/raminit.h"
#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) @@ -38,7 +37,7 @@ /* The ALIX.2D has no SMBus; the setup is hard-wired. */ void cs5536_enable_smbus(void) { }
-#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h>
/* The part is a Hynix hy5du121622ctp-d43. * diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c index 95ceffa..dbca981 100644 --- a/src/mainboard/traverse/geos/romstage.c +++ b/src/mainboard/traverse/geos/romstage.c @@ -29,10 +29,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include "northbridge/amd/lx/raminit.h"
int spd_read_byte(unsigned int device, unsigned int address) diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c index 9d1f631..8bb77ee 100644 --- a/src/mainboard/winent/pl6064/romstage.c +++ b/src/mainboard/winent/pl6064/romstage.c @@ -30,10 +30,9 @@ #include "cpu/x86/bist.h" #include "cpu/x86/msr.h" #include <cpu/amd/lxdef.h> -#include "southbridge/amd/cs5536/cs5536.h" #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h> #include <superio/winbond/common/winbond.h> #include <superio/winbond/w83627hf/w83627hf.h> #include "northbridge/amd/lx/raminit.h" diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c index deeeaf5..6efc721 100644 --- a/src/mainboard/wyse/s50/romstage.c +++ b/src/mainboard/wyse/s50/romstage.c @@ -31,7 +31,7 @@ #include <cpu/amd/gx2def.h> #include <spd.h> #include <southbridge/amd/cs5536/smbus.h> -#include "southbridge/amd/cs5536/early_setup.c" +#include <southbridge/amd/cs5536/cs5536.h>
static inline int spd_read_byte(unsigned int device, unsigned int address) { diff --git a/src/southbridge/amd/cs5536/Makefile.inc b/src/southbridge/amd/cs5536/Makefile.inc index f36dcc5..ae530f9 100644 --- a/src/southbridge/amd/cs5536/Makefile.inc +++ b/src/southbridge/amd/cs5536/Makefile.inc @@ -21,4 +21,5 @@ ramstage-y += cs5536.c ramstage-y += ide.c ramstage-y += pirq.c ramstage-y += smbus.c -romstage-y += smbus.c \ No newline at end of file +romstage-y += smbus.c +romstage-y += early_setup.c diff --git a/src/southbridge/amd/cs5536/cs5536.h b/src/southbridge/amd/cs5536/cs5536.h index a76355f..2befaf0 100644 --- a/src/southbridge/amd/cs5536/cs5536.h +++ b/src/southbridge/amd/cs5536/cs5536.h @@ -446,6 +446,7 @@ #if defined(__PRE_RAM__) void cs5536_setup_onchipuart(int uart); void cs5536_disable_internal_uart(void); +void cs5536_early_setup(void); #else void chipsetinit(void); #endif diff --git a/src/southbridge/amd/cs5536/early_setup.c b/src/southbridge/amd/cs5536/early_setup.c index 02af392..c4ff235 100644 --- a/src/southbridge/amd/cs5536/early_setup.c +++ b/src/southbridge/amd/cs5536/early_setup.c @@ -264,7 +264,7 @@ void cs5536_enable_smbus(void) * and we don't want to hang on serial, so they are * commented out */ -static void cs5536_early_setup(void) +void cs5536_early_setup(void) { msr_t msr;