coreboot-gerrit June 2014

coreboot-gerrit@coreboot.org

1 participants
922 discussions

Patch set updated for coreboot: d072b8a SPI flash: Fix alignment checks in Page Program commands
by Kyösti Mälkki 30 Jun '14

30 Jun '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6162 -gerrit commit d072b8a4bb6b19bb9400dfd3723d5a8078dc9937 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jun 29 16:15:39 2014 +0300 SPI flash: Fix alignment checks in Page Program commands There are two separate restrictions to take into account: Page Program command must not cross address boundaries defined by the flash part's page size. Total number of bytes for any command sent to flash part is restricted by the SPI controller capabilities. Consider CONTROLLER_PAGE_LIMIT=64, page_size=256, offset=62, len=4. This write would be split at offset 64 for no reason. Consider CONTROLLER_PAGE_LIMIT=40, page_size=256, offset=254, len=4. This write would not be split at page boundary as required. We do not really hit the second case. Nevertheless, CONTROLLER_PAGE_LIMIT is a misnomer for the maximum payload length supported by the SPI controller and is removed in a followup. Change-Id: I727f2e7de86a91b6a509460ff1f374acd006a0bc Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/drivers/spi/adesto.c | 3 ++- src/drivers/spi/amic.c | 3 ++- src/drivers/spi/gigadevice.c | 3 ++- src/drivers/spi/macronix.c | 3 ++- src/drivers/spi/stmicro.c | 3 ++- src/drivers/spi/winbond.c | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index 83be8b8..9dc8e14 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -88,7 +88,7 @@ static int adesto_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << stm->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -100,6 +100,7 @@ static int adesto_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_AT25DF_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index fa17036..4cccc71 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -70,7 +70,7 @@ static int amic_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(1 << amic->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << amic->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -82,6 +82,7 @@ static int amic_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_A25_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index 5a8f82f..3fb89c7 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -128,7 +128,7 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset, int ret; u8 cmd[4]; - page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << stm->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -141,6 +141,7 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); ret = spi_flash_cmd(flash->spi, CMD_GD25_WREN, NULL, 0); if (ret < 0) { diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index bbc3704..3611599 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -131,7 +131,7 @@ static int macronix_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(mcx->params->page_size, CONTROLLER_PAGE_LIMIT); + page_size = mcx->params->page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -144,6 +144,7 @@ static int macronix_write(struct spi_flash *flash, ret = 0; for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_MX25XX_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index af23853..c825bd0 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -143,7 +143,7 @@ static int stmicro_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(stm->params->page_size, CONTROLLER_PAGE_LIMIT); + page_size = stm->params->page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -155,6 +155,7 @@ static int stmicro_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_M25PXX_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 52c7b61..eb0868e 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -122,7 +122,7 @@ static int winbond_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << stm->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -134,6 +134,7 @@ static int winbond_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_W25_PP; cmd[1] = (offset >> 16) & 0xff;

1 0

Patch set updated for coreboot: efb1d57 stdlib: Drop duplicates of min() and max()
by Kyösti Mälkki 30 Jun '14

30 Jun '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6161 -gerrit commit efb1d57536657844edaf74b0bbee5e89b1120cdc Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Jun 30 09:40:19 2014 +0300 stdlib: Drop duplicates of min() and max() Change-Id: Ib2f6fad735e085d237a0d46e0586e123eef6e0e2 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/drivers/ati/ragexl/atyfb.h | 2 -- src/drivers/pc80/tpm.c | 2 -- src/include/spi_flash.h | 2 -- src/include/stdlib.h | 3 +++ src/northbridge/intel/gm45/raminit.c | 2 +- src/northbridge/intel/nehalem/raminit.c | 4 +--- src/southbridge/intel/common/spi.c | 2 -- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/drivers/ati/ragexl/atyfb.h b/src/drivers/ati/ragexl/atyfb.h index 557ead7..94f31fe 100644 --- a/src/drivers/ati/ragexl/atyfb.h +++ b/src/drivers/ati/ragexl/atyfb.h @@ -6,8 +6,6 @@ #define EINVAL -1 -#define max(x,y) (x>=y)?x:y - #if CONFIG_CONSOLE_BTEXT /* * Elements of the hardware specific atyfb_par structure diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm.c index f581ab4..40f1e7b 100644 --- a/src/drivers/pc80/tpm.c +++ b/src/drivers/pc80/tpm.c @@ -50,8 +50,6 @@ TPM_DEBUG("Write reg 0x%x with 0x%x\n", (reg_), (val_)) #define printf(x...) printk(BIOS_ERR, x) -#define min(a,b) MIN(a,b) -#define max(a,b) MAX(a,b) #define readb(_a) (*(volatile unsigned char *) (_a)) #define writeb(_v, _a) (*(volatile unsigned char *) (_a) = (_v)) #define readl(_a) (*(volatile unsigned long *) (_a)) diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h index fe48d3b..8e51471 100644 --- a/src/include/spi_flash.h +++ b/src/include/spi_flash.h @@ -39,8 +39,6 @@ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) -#define min(a, b) ((a)<(b)?(a):(b)) - #define CONFIG_ICH_SPI #ifdef CONFIG_ICH_SPI #define CONTROLLER_PAGE_LIMIT 64 diff --git a/src/include/stdlib.h b/src/include/stdlib.h index cb5a6ca7..44d7c01 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -13,6 +13,9 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define min(a,b) MIN((a),(b)) +#define max(a,b) MAX((a),(b)) + #if !defined(__PRE_RAM__) void *memalign(size_t boundary, size_t size); void *malloc(size_t size); diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index d607f84..0636d9f 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/src/northbridge/intel/gm45/raminit.c @@ -20,6 +20,7 @@ */ #include <stdint.h> +#include <stdlib.h> #include <arch/cpu.h> #include <arch/io.h> #include <device/pci_def.h> @@ -361,7 +362,6 @@ static void collect_ddr3(spdinfo_t *const config) } } -#define min(a, b) ((a) < (b))?(a):(b) #define ROUNDUP_DIV(val, by) (((val) + (by) - 1) / (by)) #define ROUNDUP_DIV_THIS(val, by) val = ROUNDUP_DIV(val, by) static fsb_clock_t read_fsb_clock(void) diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c index a2960f6..632abc0 100644 --- a/src/northbridge/intel/nehalem/raminit.c +++ b/src/northbridge/intel/nehalem/raminit.c @@ -25,6 +25,7 @@ #endif #if REAL +#include <stdlib.h> #include <console/console.h> #include <string.h> #include <arch/hlt.h> @@ -571,9 +572,6 @@ static int find_lowest_bit_set32(u32 val) return -1; } -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) - enum { DEVICE_TYPE = 2, MODULE_TYPE = 3, diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index b323dbb..51586cc 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -35,8 +35,6 @@ #include <spi-generic.h> -#define min(a, b) ((a)<(b)?(a):(b)) - #define HSFC_FCYCLE_OFF 1 /* 1-2: FLASH Cycle */ #define HSFC_FCYCLE (0x3 << HSFC_FCYCLE_OFF) #define HSFC_FDBC_OFF 8 /* 8-13: Flash Data Byte Count */

1 0

Patch set updated for coreboot: f455a0f Intel: Add common header file for CAR setup
by Edward O'Callaghan 30 Jun '14

30 Jun '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5872 -gerrit commit f455a0f9e6f62cde39ac69a9c1eae20179d48917 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Mon May 26 17:38:23 2014 +1000 Intel: Add common header file for CAR setup When passing '-ffreestanding' the 'main' romstage.c may no longer necessarily be considered the entry point. From the C specification in 5.1.2.1 Freestanding environment; "In a freestanding environment (in which C program execution may take place without any benefit of an operating system), the name and type of the function called at program startup are implementation-defined." Clang complains about these being missing as Clang is somewhat more strict about the spec than GNU/GCC is. An advantage here is that a different entry-point type-signature shall now be warned about at compile time. Change-Id: I467001adabd47958c30c9a15e3248e42ed1151f3 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/include/cpu/intel/car.h | 7 +++++++ src/mainboard/a-trend/atc-6220/romstage.c | 1 + src/mainboard/a-trend/atc-6240/romstage.c | 1 + src/mainboard/aaeon/pfm-540i_revb/romstage.c | 1 + src/mainboard/abit/be6-ii_v2_0/romstage.c | 1 + src/mainboard/advantech/pcm-5820/romstage.c | 1 + src/mainboard/amd/db800/romstage.c | 1 + src/mainboard/amd/norwich/romstage.c | 1 + src/mainboard/amd/rumba/romstage.c | 1 + src/mainboard/aopen/dxplplusu/romstage.c | 1 + src/mainboard/artecgroup/dbe61/romstage.c | 1 + src/mainboard/asi/mb_5blgp/romstage.c | 1 + src/mainboard/asi/mb_5blmp/romstage.c | 1 + src/mainboard/asus/dsbf/romstage.c | 1 + src/mainboard/asus/mew-am/romstage.c | 1 + src/mainboard/asus/mew-vm/romstage.c | 1 + src/mainboard/asus/p2b-d/romstage.c | 1 + src/mainboard/asus/p2b-ds/romstage.c | 1 + src/mainboard/asus/p2b-f/romstage.c | 1 + src/mainboard/asus/p2b-ls/romstage.c | 1 + src/mainboard/asus/p2b/romstage.c | 1 + src/mainboard/asus/p3b-f/romstage.c | 1 + src/mainboard/axus/tc320/romstage.c | 1 + src/mainboard/azza/pt-6ibd/romstage.c | 1 + src/mainboard/bachmann/ot200/romstage.c | 1 + src/mainboard/bcom/winnet100/romstage.c | 1 + src/mainboard/bcom/winnetp680/romstage.c | 1 + src/mainboard/biostar/m6tba/romstage.c | 1 + src/mainboard/compaq/deskpro_en_sff_p600/romstage.c | 1 + src/mainboard/digitallogic/adl855pc/romstage.c | 1 + src/mainboard/digitallogic/msm586seg/romstage.c | 1 + src/mainboard/digitallogic/msm800sev/romstage.c | 1 + src/mainboard/dmp/vortex86ex/romstage.c | 1 + src/mainboard/eaglelion/5bcm/romstage.c | 1 + src/mainboard/ecs/p6iwp-fe/romstage.c | 1 + src/mainboard/emulation/qemu-i440fx/romstage.c | 2 +- src/mainboard/emulation/qemu-q35/romstage.c | 1 + src/mainboard/getac/p470/romstage.c | 1 + src/mainboard/gigabyte/ga-6bxc/romstage.c | 1 + src/mainboard/gigabyte/ga-6bxe/romstage.c | 1 + src/mainboard/google/butterfly/romstage.c | 1 + src/mainboard/google/link/romstage.c | 1 + src/mainboard/google/parrot/romstage.c | 1 + src/mainboard/google/stout/romstage.c | 1 + src/mainboard/hp/e_vectra_p2706t/romstage.c | 1 + src/mainboard/ibase/mb899/romstage.c | 1 + src/mainboard/iei/juki-511p/romstage.c | 1 + src/mainboard/iei/nova4899r/romstage.c | 1 + src/mainboard/iei/pcisa-lx-800-r10/romstage.c | 1 + src/mainboard/iei/pm-lx-800-r11/romstage.c | 1 + src/mainboard/iei/pm-lx2-800-r10/romstage.c | 1 + src/mainboard/intel/d810e2cb/romstage.c | 1 + src/mainboard/intel/d945gclf/romstage.c | 1 + src/mainboard/intel/eagleheights/romstage.c | 1 + src/mainboard/intel/emeraldlake2/romstage.c | 1 + src/mainboard/intel/jarrell/romstage.c | 1 + src/mainboard/intel/mtarvon/romstage.c | 1 + src/mainboard/intel/truxton/romstage.c | 1 + src/mainboard/intel/xe7501devkit/romstage.c | 1 + src/mainboard/iwave/iWRainbowG6/romstage.c | 1 + src/mainboard/jetway/j7f2/romstage.c | 1 + src/mainboard/kontron/986lcd-m/romstage.c | 1 + src/mainboard/kontron/ktqm77/romstage.c | 1 + src/mainboard/lanner/em8510/romstage.c | 1 + src/mainboard/lenovo/t520/romstage.c | 1 + src/mainboard/lenovo/t530/romstage.c | 1 + src/mainboard/lenovo/t60/romstage.c | 1 + src/mainboard/lenovo/x201/romstage.c | 1 + src/mainboard/lenovo/x230/romstage.c | 1 + src/mainboard/lenovo/x60/romstage.c | 1 + src/mainboard/lippert/frontrunner/romstage.c | 1 + src/mainboard/lippert/hurricane-lx/romstage.c | 1 + src/mainboard/lippert/literunner-lx/romstage.c | 1 + src/mainboard/lippert/roadrunner-lx/romstage.c | 1 + src/mainboard/lippert/spacerunner-lx/romstage.c | 1 + src/mainboard/mitac/6513wu/romstage.c | 1 + src/mainboard/msi/ms6119/romstage.c | 1 + src/mainboard/msi/ms6147/romstage.c | 1 + src/mainboard/msi/ms6156/romstage.c | 1 + src/mainboard/msi/ms6178/romstage.c | 1 + src/mainboard/nec/powermate2000/romstage.c | 1 + src/mainboard/nokia/ip530/romstage.c | 1 + src/mainboard/packardbell/ms2290/romstage.c | 1 + src/mainboard/pcengines/alix1c/romstage.c | 1 + src/mainboard/pcengines/alix2d/romstage.c | 1 + src/mainboard/rca/rm4100/romstage.c | 1 + src/mainboard/roda/rk886ex/romstage.c | 1 + src/mainboard/roda/rk9/romstage.c | 1 + src/mainboard/samsung/lumpy/romstage.c | 1 + src/mainboard/samsung/stumpy/romstage.c | 1 + src/mainboard/soyo/sy-6ba-plus-iii/romstage.c | 1 + src/mainboard/supermicro/x6dai_g/romstage.c | 1 + src/mainboard/supermicro/x6dhe_g/romstage.c | 1 + src/mainboard/supermicro/x6dhe_g2/romstage.c | 1 + src/mainboard/supermicro/x6dhr_ig/romstage.c | 1 + src/mainboard/supermicro/x6dhr_ig2/romstage.c | 1 + src/mainboard/supermicro/x7db8/romstage.c | 1 + src/mainboard/technologic/ts5300/romstage.c | 1 + src/mainboard/televideo/tc7020/romstage.c | 1 + src/mainboard/thomson/ip1000/romstage.c | 1 + src/mainboard/traverse/geos/romstage.c | 1 + src/mainboard/tyan/s1846/romstage.c | 1 + src/mainboard/tyan/s2735/romstage.c | 1 + src/mainboard/via/epia-cn/romstage.c | 1 + src/mainboard/via/epia-m/romstage.c | 1 + src/mainboard/via/epia-m700/romstage.c | 1 + src/mainboard/via/epia-m850/romstage.c | 1 + src/mainboard/via/epia-n/romstage.c | 1 + src/mainboard/via/epia/romstage.c | 1 + src/mainboard/via/pc2500e/romstage.c | 1 + src/mainboard/via/vt8454c/romstage.c | 1 + src/mainboard/winent/pl6064/romstage.c | 1 + src/mainboard/wyse/s50/romstage.c | 1 + 113 files changed, 119 insertions(+), 1 deletion(-) diff --git a/src/include/cpu/intel/car.h b/src/include/cpu/intel/car.h new file mode 100644 index 0000000..dc89ffc --- /dev/null +++ b/src/include/cpu/intel/car.h @@ -0,0 +1,7 @@ +#ifndef _CPU_INTEL_CAR_H +#define _CPU_INTEL_CAR_H + +/* std signature of entry-point to romstage.c */ +void main(unsigned long bist); + +#endif /* _CPU_INTEL_CAR_H */ diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c index 22d3270..3c3f9eb 100644 --- a/src/mainboard/a-trend/atc-6220/romstage.c +++ b/src/mainboard/a-trend/atc-6220/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c index 41d5d2a..a153730 100644 --- a/src/mainboard/a-trend/atc-6240/romstage.c +++ b/src/mainboard/a-trend/atc-6240/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c index f80ef95..7f78dce 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c +++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c @@ -54,6 +54,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c index 510c8ce..a17e68f 100644 --- a/src/mainboard/abit/be6-ii_v2_0/romstage.c +++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c @@ -43,6 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c index b710aad..51a713c 100644 --- a/src/mainboard/advantech/pcm-5820/romstage.c +++ b/src/mainboard/advantech/pcm-5820/romstage.c @@ -30,6 +30,7 @@ #define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c index 564380e..f645812 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -49,6 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index 9322508..2daef93 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -45,6 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c index c5a3fc3..9158aad 100644 --- a/src/mainboard/amd/rumba/romstage.c +++ b/src/mainboard/amd/rumba/romstage.c @@ -31,6 +31,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "cpu/amd/geode_gx2/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = { diff --git a/src/mainboard/aopen/dxplplusu/romstage.c b/src/mainboard/aopen/dxplplusu/romstage.c index 94546b1..7ef8a47 100644 --- a/src/mainboard/aopen/dxplplusu/romstage.c +++ b/src/mainboard/aopen/dxplplusu/romstage.c @@ -39,6 +39,7 @@ int spd_read_byte(unsigned device, unsigned address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c index 073d2b8..7f1ee30 100644 --- a/src/mainboard/artecgroup/dbe61/romstage.c +++ b/src/mainboard/artecgroup/dbe61/romstage.c @@ -57,6 +57,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/asi/mb_5blgp/romstage.c b/src/mainboard/asi/mb_5blgp/romstage.c index d661387..c7f3090 100644 --- a/src/mainboard/asi/mb_5blgp/romstage.c +++ b/src/mainboard/asi/mb_5blgp/romstage.c @@ -30,6 +30,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asi/mb_5blmp/romstage.c b/src/mainboard/asi/mb_5blmp/romstage.c index e8befe4..6c18d8f 100644 --- a/src/mainboard/asi/mb_5blmp/romstage.c +++ b/src/mainboard/asi/mb_5blmp/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/dsbf/romstage.c b/src/mainboard/asus/dsbf/romstage.c index e013371..6db0866 100644 --- a/src/mainboard/asus/dsbf/romstage.c +++ b/src/mainboard/asus/dsbf/romstage.c @@ -110,6 +110,7 @@ int mainboard_set_fbd_clock(int speed) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c index 2392ac2..9ea6c04 100644 --- a/src/mainboard/asus/mew-am/romstage.c +++ b/src/mainboard/asus/mew-am/romstage.c @@ -34,6 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c index 5962aab..87f8d65 100644 --- a/src/mainboard/asus/mew-vm/romstage.c +++ b/src/mainboard/asus/mew-vm/romstage.c @@ -34,6 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { lpc47b272_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c index b03dfd5..4faae20 100644 --- a/src/mainboard/asus/p2b-d/romstage.c +++ b/src/mainboard/asus/p2b-d/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c index b4dbe32..070b002 100644 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ b/src/mainboard/asus/p2b-ds/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c index b857754..64b4dae 100644 --- a/src/mainboard/asus/p2b-f/romstage.c +++ b/src/mainboard/asus/p2b-f/romstage.c @@ -43,6 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c index d046c4b..8cf2b42 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c index 22d3270..3c3f9eb 100644 --- a/src/mainboard/asus/p2b/romstage.c +++ b/src/mainboard/asus/p2b/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c index e7a7f43..825457e 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -74,6 +74,7 @@ static void disable_spd(void) outb(0x67, PM_IO_BASE + 0x37); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/axus/tc320/romstage.c b/src/mainboard/axus/tc320/romstage.c index 053da17..e733003 100644 --- a/src/mainboard/axus/tc320/romstage.c +++ b/src/mainboard/axus/tc320/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c index b4252a6..7325618 100644 --- a/src/mainboard/azza/pt-6ibd/romstage.c +++ b/src/mainboard/azza/pt-6ibd/romstage.c @@ -43,6 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/bachmann/ot200/romstage.c b/src/mainboard/bachmann/ot200/romstage.c index 39385c7..41a65dd 100644 --- a/src/mainboard/bachmann/ot200/romstage.c +++ b/src/mainboard/bachmann/ot200/romstage.c @@ -46,6 +46,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/bcom/winnet100/romstage.c b/src/mainboard/bcom/winnet100/romstage.c index 053da17..e733003 100644 --- a/src/mainboard/bcom/winnet100/romstage.c +++ b/src/mainboard/bcom/winnet100/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c index a252e00..3676a6d 100644 --- a/src/mainboard/bcom/winnetp680/romstage.c +++ b/src/mainboard/bcom/winnetp680/romstage.c @@ -81,6 +81,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c index dd7684a..43158bd 100644 --- a/src/mainboard/biostar/m6tba/romstage.c +++ b/src/mainboard/biostar/m6tba/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c index 37b28df..8de8a83 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c +++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { /* FIXME: Should be PC97307! */ diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c index 5935af2..0ae7610 100644 --- a/src/mainboard/digitallogic/adl855pc/romstage.c +++ b/src/mainboard/digitallogic/adl855pc/romstage.c @@ -26,6 +26,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/i855/raminit.c" #include "northbridge/intel/i855/reset_test.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c index e67ec68..b6412e8 100644 --- a/src/mainboard/digitallogic/msm586seg/romstage.c +++ b/src/mainboard/digitallogic/msm586seg/romstage.c @@ -154,6 +154,7 @@ static inline void irqinit(void){ #endif } +#include <cpu/intel/car.h> static void main(unsigned long bist) { volatile int i; diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c index 986e918..6075565 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -30,6 +30,7 @@ int spd_read_byte(unsigned device, unsigned address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c index 8889015..040b937 100644 --- a/src/mainboard/dmp/vortex86ex/romstage.c +++ b/src/mainboard/dmp/vortex86ex/romstage.c @@ -300,6 +300,7 @@ static void enable_l2_cache(void) pci_write_config8(NB1, 0xe8, reg_nb_f1_e8); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { device_t dev; diff --git a/src/mainboard/eaglelion/5bcm/romstage.c b/src/mainboard/eaglelion/5bcm/romstage.c index 2f803aa..cbfe04d 100644 --- a/src/mainboard/eaglelion/5bcm/romstage.c +++ b/src/mainboard/eaglelion/5bcm/romstage.c @@ -12,6 +12,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c index c014c57..7deb730 100644 --- a/src/mainboard/ecs/p6iwp-fe/romstage.c +++ b/src/mainboard/ecs/p6iwp-fe/romstage.c @@ -37,6 +37,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define CLKIN_DEV PNP_DEV(0x2e, IT8712F_GPIO) +#include <cpu/intel/car.h> void main(unsigned long bist) { ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_24); diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c index bf33dee..8dc61b2 100644 --- a/src/mainboard/emulation/qemu-i440fx/romstage.c +++ b/src/mainboard/emulation/qemu-i440fx/romstage.c @@ -33,7 +33,7 @@ #include "memory.c" -void main(unsigned long bist); +#include <cpu/intel/car.h> void main(unsigned long bist) { int cbmem_was_initted; diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c index 190c775..635a44f 100644 --- a/src/mainboard/emulation/qemu-q35/romstage.c +++ b/src/mainboard/emulation/qemu-q35/romstage.c @@ -34,6 +34,7 @@ #include "../qemu-i440fx/memory.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { int cbmem_was_initted; diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c index b0dd2bc..5ebc451 100644 --- a/src/mainboard/getac/p470/romstage.c +++ b/src/mainboard/getac/p470/romstage.c @@ -265,6 +265,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c index 1b2e29b..d28ac34 100644 --- a/src/mainboard/gigabyte/ga-6bxc/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/gigabyte/ga-6bxe/romstage.c b/src/mainboard/gigabyte/ga-6bxe/romstage.c index c3926f0..cad3694 100644 --- a/src/mainboard/gigabyte/ga-6bxe/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { it8671f_48mhz_clkin(); diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c index d946ea3..1c7b8ba 100644 --- a/src/mainboard/google/butterfly/romstage.c +++ b/src/mainboard/google/butterfly/romstage.c @@ -112,6 +112,7 @@ static void rcba_config(void) RCBA32(FD) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c index 18c833a..25c6529 100644 --- a/src/mainboard/google/link/romstage.c +++ b/src/mainboard/google/link/romstage.c @@ -150,6 +150,7 @@ static void copy_spd(struct pei_data *peid) sizeof(peid->spd_data[0])); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c index 45cf7fe..a4daae5 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -113,6 +113,7 @@ static void rcba_config(void) RCBA32(FD) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c index 0e29b33..008f1f8 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/romstage.c @@ -154,6 +154,7 @@ static void early_ec_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c index 81e1ad2..85660c0 100644 --- a/src/mainboard/hp/e_vectra_p2706t/romstage.c +++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c @@ -37,6 +37,7 @@ /* TODO: It's a PC87364 actually! */ #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { /* TODO: It's a PC87364 actually! */ diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c index 0e74418..eec574d 100644 --- a/src/mainboard/ibase/mb899/romstage.c +++ b/src/mainboard/ibase/mb899/romstage.c @@ -223,6 +223,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c index 8b26b40..b8daac4 100644 --- a/src/mainboard/iei/juki-511p/romstage.c +++ b/src/mainboard/iei/juki-511p/romstage.c @@ -32,6 +32,7 @@ #define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/iei/nova4899r/romstage.c b/src/mainboard/iei/nova4899r/romstage.c index 174953d..9a89107 100644 --- a/src/mainboard/iei/nova4899r/romstage.c +++ b/src/mainboard/iei/nova4899r/romstage.c @@ -32,6 +32,7 @@ #include "northbridge/amd/gx1/raminit.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c index a75691c..2af0b2f 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c @@ -49,6 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/iei/pm-lx-800-r11/romstage.c b/src/mainboard/iei/pm-lx-800-r11/romstage.c index bf34e9a..d2e331e 100644 --- a/src/mainboard/iei/pm-lx-800-r11/romstage.c +++ b/src/mainboard/iei/pm-lx-800-r11/romstage.c @@ -53,6 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include <cpu/amd/geode_lx/syspreinit.c> #include <cpu/amd/geode_lx/msrinit.c> +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/iei/pm-lx2-800-r10/romstage.c b/src/mainboard/iei/pm-lx2-800-r10/romstage.c index b34bce4..947b52d 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/romstage.c +++ b/src/mainboard/iei/pm-lx2-800-r10/romstage.c @@ -53,6 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include <cpu/amd/geode_lx/syspreinit.c> #include <cpu/amd/geode_lx/msrinit.c> +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c index 6c277d5..982060c 100644 --- a/src/mainboard/intel/d810e2cb/romstage.c +++ b/src/mainboard/intel/d810e2cb/romstage.c @@ -35,6 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Set southbridge and Super I/O GPIOs. */ diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c index 586e035..0c22990 100644 --- a/src/mainboard/intel/d945gclf/romstage.c +++ b/src/mainboard/intel/d945gclf/romstage.c @@ -184,6 +184,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c index 249fda4..99445b8 100644 --- a/src/mainboard/intel/eagleheights/romstage.c +++ b/src/mainboard/intel/eagleheights/romstage.c @@ -120,6 +120,7 @@ static void early_config(void) pci_write_config8(PCI_DEV(0, 0x1F, 2), SATA_MAP, (SATA_MODE_AHCI << 6) | (0 << 0)); } +#include <cpu/intel/car.h> void main(unsigned long bist) { /* int boot_mode = 0; */ diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c index 5597a2d..12abb54 100644 --- a/src/mainboard/intel/emeraldlake2/romstage.c +++ b/src/mainboard/intel/emeraldlake2/romstage.c @@ -162,6 +162,7 @@ static void setup_sio_gpios(void) outb(0xaa, port); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/intel/jarrell/romstage.c b/src/mainboard/intel/jarrell/romstage.c index bddb34a..a672afa 100644 --- a/src/mainboard/intel/jarrell/romstage.c +++ b/src/mainboard/intel/jarrell/romstage.c @@ -38,6 +38,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "debug.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c index 0cab9bd..2e99be5 100644 --- a/src/mainboard/intel/mtarvon/romstage.c +++ b/src/mainboard/intel/mtarvon/romstage.c @@ -51,6 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address) #include "arch/x86/lib/stages.c" #endif +#include <cpu/intel/car.h> void main(unsigned long bist) { msr_t msr; diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c index 71c5f38..c56b1df 100644 --- a/src/mainboard/intel/truxton/romstage.c +++ b/src/mainboard/intel/truxton/romstage.c @@ -51,6 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address) #define SERIAL_DEV PNP_DEV(0x4e, I3100_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { msr_t msr; diff --git a/src/mainboard/intel/xe7501devkit/romstage.c b/src/mainboard/intel/xe7501devkit/romstage.c index 342e6f1..f35f93b 100644 --- a/src/mainboard/intel/xe7501devkit/romstage.c +++ b/src/mainboard/intel/xe7501devkit/romstage.c @@ -33,6 +33,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" // This function MUST appear last (ROMCC limitation) +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/iwave/iWRainbowG6/romstage.c b/src/mainboard/iwave/iWRainbowG6/romstage.c index 39fce07..b68a4e3 100644 --- a/src/mainboard/iwave/iWRainbowG6/romstage.c +++ b/src/mainboard/iwave/iWRainbowG6/romstage.c @@ -332,6 +332,7 @@ static void poulsbo_setup_Stage2Regs(void) printk(BIOS_DEBUG, " done.\n"); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/jetway/j7f2/romstage.c b/src/mainboard/jetway/j7f2/romstage.c index 8455610..cc207b1 100644 --- a/src/mainboard/jetway/j7f2/romstage.c +++ b/src/mainboard/jetway/j7f2/romstage.c @@ -86,6 +86,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c index 9c76a42..842f7bc 100644 --- a/src/mainboard/kontron/986lcd-m/romstage.c +++ b/src/mainboard/kontron/986lcd-m/romstage.c @@ -329,6 +329,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c index 09fd634..98f1739 100644 --- a/src/mainboard/kontron/ktqm77/romstage.c +++ b/src/mainboard/kontron/ktqm77/romstage.c @@ -150,6 +150,7 @@ static void superio_gpio_config(void) pnp_exit_ext_func_mode(dev); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c index 4ae5c12..186e9fd 100644 --- a/src/mainboard/lanner/em8510/romstage.c +++ b/src/mainboard/lanner/em8510/romstage.c @@ -48,6 +48,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/i855/raminit.c" #include "northbridge/intel/i855/reset_test.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c index 548c040..df46092 100644 --- a/src/mainboard/lenovo/t520/romstage.c +++ b/src/mainboard/lenovo/t520/romstage.c @@ -108,6 +108,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/romstage.c index d65031a..b2cd616 100644 --- a/src/mainboard/lenovo/t530/romstage.c +++ b/src/mainboard/lenovo/t530/romstage.c @@ -109,6 +109,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c index 1e2b72d..01e48e7 100644 --- a/src/mainboard/lenovo/t60/romstage.c +++ b/src/mainboard/lenovo/t60/romstage.c @@ -206,6 +206,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c index a18536a..4dc069a 100644 --- a/src/mainboard/lenovo/x201/romstage.c +++ b/src/mainboard/lenovo/x201/romstage.c @@ -215,6 +215,7 @@ static void set_fsb_frequency(void) smbus_block_write(0x69, 0, 5, block); } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c index 8441db3..03a3017 100644 --- a/src/mainboard/lenovo/x230/romstage.c +++ b/src/mainboard/lenovo/x230/romstage.c @@ -109,6 +109,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c index d1f8f64..68a9b48 100644 --- a/src/mainboard/lenovo/x60/romstage.c +++ b/src/mainboard/lenovo/x60/romstage.c @@ -213,6 +213,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c index 92a3a99..3192e5c 100644 --- a/src/mainboard/lippert/frontrunner/romstage.c +++ b/src/mainboard/lippert/frontrunner/romstage.c @@ -71,6 +71,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_gx2/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = { diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c index 063721b..b3b4498 100644 --- a/src/mainboard/lippert/hurricane-lx/romstage.c +++ b/src/mainboard/lippert/hurricane-lx/romstage.c @@ -110,6 +110,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c index 174620a..2f7bd85 100644 --- a/src/mainboard/lippert/literunner-lx/romstage.c +++ b/src/mainboard/lippert/literunner-lx/romstage.c @@ -152,6 +152,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { int err; diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c index 2642373..18f48f6 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -85,6 +85,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index 9d5539e..c3f1c8a 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -149,6 +149,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { int err; diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c index b337fb2..59e1c6d 100644 --- a/src/mainboard/mitac/6513wu/romstage.c +++ b/src/mainboard/mitac/6513wu/romstage.c @@ -35,6 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c index 813e855..578de61 100644 --- a/src/mainboard/msi/ms6119/romstage.c +++ b/src/mainboard/msi/ms6119/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c index b7f99f5..a6767bc 100644 --- a/src/mainboard/msi/ms6147/romstage.c +++ b/src/mainboard/msi/ms6147/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c index 09713d4..3811cc5 100644 --- a/src/mainboard/msi/ms6156/romstage.c +++ b/src/mainboard/msi/ms6156/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c index fa78a82..4005ac8 100644 --- a/src/mainboard/msi/ms6178/romstage.c +++ b/src/mainboard/msi/ms6178/romstage.c @@ -36,6 +36,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define DUMMY_DEV PNP_DEV(0x2e, 0) +#include <cpu/intel/car.h> void main(unsigned long bist) { w83627hf_set_clksel_48(DUMMY_DEV); diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c index 08a845d..97d0580 100644 --- a/src/mainboard/nec/powermate2000/romstage.c +++ b/src/mainboard/nec/powermate2000/romstage.c @@ -34,6 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c index c04067c..39c75ca 100644 --- a/src/mainboard/nokia/ip530/romstage.c +++ b/src/mainboard/nokia/ip530/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c index 79afae3..b063777 100644 --- a/src/mainboard/packardbell/ms2290/romstage.c +++ b/src/mainboard/packardbell/ms2290/romstage.c @@ -198,6 +198,7 @@ static inline u16 read_acpi16(u32 addr) return inw(DEFAULT_PMBASE | addr); } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index 204f0bd..436edc0 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -107,6 +107,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c index 18453ac..9b272a4 100644 --- a/src/mainboard/pcengines/alix2d/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -130,6 +130,7 @@ static void mb_gpio_init(void) outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 3 disabled */ } +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c index 4db8cbb..7dd4b48 100644 --- a/src/mainboard/rca/rm4100/romstage.c +++ b/src/mainboard/rca/rm4100/romstage.c @@ -94,6 +94,7 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c index 1bea48c..a4f55a8 100644 --- a/src/mainboard/roda/rk886ex/romstage.c +++ b/src/mainboard/roda/rk886ex/romstage.c @@ -251,6 +251,7 @@ static void init_artec_dongle(void) outb(0xf4, 0x88); } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c index 63d55a3..383f5b7 100644 --- a/src/mainboard/roda/rk9/romstage.c +++ b/src/mainboard/roda/rk9/romstage.c @@ -120,6 +120,7 @@ static void default_superio_gpio_setup(void) outb(0x10, 0x600 + 0xb + 4); /* GP40 - GP47 */ } +#include <cpu/intel/car.h> void main(unsigned long bist) { sysinfo_t sysinfo; diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c index 001a1f8..f984af2 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/romstage.c @@ -132,6 +132,7 @@ static void early_pch_init(void) pci_write_config8(PCH_LPC_DEV, 0xa4, reg8); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c index 6ab7007..982c389 100644 --- a/src/mainboard/samsung/stumpy/romstage.c +++ b/src/mainboard/samsung/stumpy/romstage.c @@ -173,6 +173,7 @@ static void setup_sio_gpios(void) it8772f_gpio_setup(6, 0x00, 0x00, 0x00, 0x00, 0x00); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c index 551c060..fccd29a 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c +++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c index c998466..6b10a68 100644 --- a/src/mainboard/supermicro/x6dai_g/romstage.c +++ b/src/mainboard/supermicro/x6dai_g/romstage.c @@ -42,6 +42,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c index b1c3cfa..9a637be 100644 --- a/src/mainboard/supermicro/x6dhe_g/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g/romstage.c @@ -46,6 +46,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c index c6350e8..09f4c57 100644 --- a/src/mainboard/supermicro/x6dhe_g2/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c @@ -43,6 +43,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c index 2dc96c1..3e51b73 100644 --- a/src/mainboard/supermicro/x6dhr_ig/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c @@ -45,6 +45,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c index 0f2a644..868fbdc 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c @@ -45,6 +45,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x7db8/romstage.c b/src/mainboard/supermicro/x7db8/romstage.c index 791028e..a52193f 100644 --- a/src/mainboard/supermicro/x7db8/romstage.c +++ b/src/mainboard/supermicro/x7db8/romstage.c @@ -111,6 +111,7 @@ int mainboard_set_fbd_clock(int speed) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c index 453cecc..64de0c0 100644 --- a/src/mainboard/technologic/ts5300/romstage.c +++ b/src/mainboard/technologic/ts5300/romstage.c @@ -136,6 +136,7 @@ static void hard_reset(void) while (1) ; } +#include <cpu/intel/car.h> static void main(unsigned long bist) { volatile int i; diff --git a/src/mainboard/televideo/tc7020/romstage.c b/src/mainboard/televideo/tc7020/romstage.c index 053da17..e733003 100644 --- a/src/mainboard/televideo/tc7020/romstage.c +++ b/src/mainboard/televideo/tc7020/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c index 77255e7..ed87462 100644 --- a/src/mainboard/thomson/ip1000/romstage.c +++ b/src/mainboard/thomson/ip1000/romstage.c @@ -92,6 +92,7 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c index 36d55a7..115b402 100644 --- a/src/mainboard/traverse/geos/romstage.c +++ b/src/mainboard/traverse/geos/romstage.c @@ -46,6 +46,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c index bbd63ee..78313fc 100644 --- a/src/mainboard/tyan/s1846/romstage.c +++ b/src/mainboard/tyan/s1846/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { pc87309_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/tyan/s2735/romstage.c b/src/mainboard/tyan/s2735/romstage.c index 600d806..1b03982 100644 --- a/src/mainboard/tyan/s2735/romstage.c +++ b/src/mainboard/tyan/s2735/romstage.c @@ -34,6 +34,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/e7501/reset_test.c" #include "lib/generic_sdram.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c index 2d780db..e7e65f2 100644 --- a/src/mainboard/via/epia-cn/romstage.c +++ b/src/mainboard/via/epia-cn/romstage.c @@ -79,6 +79,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c index ebe6a50..b3b515d 100644 --- a/src/mainboard/via/epia-m/romstage.c +++ b/src/mainboard/via/epia-m/romstage.c @@ -66,6 +66,7 @@ static void enable_shadow_ram(void) pci_write_config8(dev, 0x63, shadowreg); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { device_t dev; diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c index e01fd4b..1e52dfa 100644 --- a/src/mainboard/via/epia-m700/romstage.c +++ b/src/mainboard/via/epia-m700/romstage.c @@ -373,6 +373,7 @@ static void EmbedComInit(void) #endif /* cache_as_ram.inc jumps to here. */ +#include <cpu/intel/car.h> void main(unsigned long bist) { u16 boot_mode; diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c index 9368028..939b152 100644 --- a/src/mainboard/via/epia-m850/romstage.c +++ b/src/mainboard/via/epia-m850/romstage.c @@ -42,6 +42,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, F81865F_SP1) /* cache_as_ram.inc jumps to here. */ +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 tolm; diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c index 568dab5..5c1477d 100644 --- a/src/mainboard/via/epia-n/romstage.c +++ b/src/mainboard/via/epia-n/romstage.c @@ -101,6 +101,7 @@ static void enable_shadow_ram(void) pci_write_config8(ctrl.d0f3, 0x82, shadowreg); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { unsigned long x; diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c index b1e6c54..e839541 100644 --- a/src/mainboard/via/epia/romstage.c +++ b/src/mainboard/via/epia/romstage.c @@ -69,6 +69,7 @@ static void enable_shadow_ram(void) pci_write_config8(dev, 0x63, shadowreg); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { if (bist == 0) diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c index b270350..aa7e2de 100644 --- a/src/mainboard/via/pc2500e/romstage.c +++ b/src/mainboard/via/pc2500e/romstage.c @@ -55,6 +55,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, /* TODO: CN700 currently only supports 1 DIMM. */ }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c index e1532be..d3ad0e2 100644 --- a/src/mainboard/via/vt8454c/romstage.c +++ b/src/mainboard/via/vt8454c/romstage.c @@ -83,6 +83,7 @@ static void enable_shadow_ram(const struct mem_controller *ctrl) pci_write_config8(PCI_DEV(0, 0, 3), 0x83, shadowreg); } +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Set statically so it should work with cx700 as well */ diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c index 6a38355..f9b4eec 100644 --- a/src/mainboard/winent/pl6064/romstage.c +++ b/src/mainboard/winent/pl6064/romstage.c @@ -51,6 +51,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c index 9e5dd53..07216d5 100644 --- a/src/mainboard/wyse/s50/romstage.c +++ b/src/mainboard/wyse/s50/romstage.c @@ -49,6 +49,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_gx2/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = {

1 0

New patch to review for coreboot: 859c91c AMD SPI: Optimise for longer writes
by Kyösti Mälkki 30 Jun '14

30 Jun '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6164 -gerrit commit 859c91c4b79477fad797f5bde137ebb90effa8a0 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Jun 30 07:34:36 2014 +0300 AMD SPI: Optimise for longer writes Leave it to the implementation of flash->write() to split the writes to match SPI controller and SPI flash part restrictions. This allows for some optimisation for auto-address-increment (AAI) commands. Kconfig AMD_SB_SPI_TX_LEN can be kept as local. Change-Id: I4a8bc55ab7eb0eeda8f25003a8f5ff2a643ab7a7 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/cpu/amd/agesa/spi.c | 7 +------ src/southbridge/amd/Kconfig | 9 --------- src/southbridge/amd/agesa/hudson/spi.c | 15 +++++++++++++++ src/southbridge/amd/cimx/sb800/spi.c | 16 ++++++++++++++++ 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/cpu/amd/agesa/spi.c b/src/cpu/amd/agesa/spi.c index f4ffa62..78ddf5e 100644 --- a/src/cpu/amd/agesa/spi.c +++ b/src/cpu/amd/agesa/spi.c @@ -40,12 +40,7 @@ void spi_SaveS3info(u32 pos, u32 size, u8 *buf, u32 len) flash->erase(flash, pos, size); flash->write(flash, pos, sizeof(len), &len); - - u32 nvram_pos; - for (nvram_pos = 0; nvram_pos < len - CONFIG_AMD_SB_SPI_TX_LEN; nvram_pos += CONFIG_AMD_SB_SPI_TX_LEN) { - flash->write(flash, nvram_pos + pos + 4, CONFIG_AMD_SB_SPI_TX_LEN, (u8 *)(buf + nvram_pos)); - } - flash->write(flash, nvram_pos + pos + 4, len % CONFIG_AMD_SB_SPI_TX_LEN, (u8 *)(buf + nvram_pos)); + flash->write(flash, pos + sizeof(len), len, buf); flash->spi->rw = SPI_WRITE_FLAG; spi_release_bus(flash->spi); diff --git a/src/southbridge/amd/Kconfig b/src/southbridge/amd/Kconfig index 39aeb09..867afca 100644 --- a/src/southbridge/amd/Kconfig +++ b/src/southbridge/amd/Kconfig @@ -14,12 +14,3 @@ source src/southbridge/amd/sb800/Kconfig source src/southbridge/amd/cimx/Kconfig source src/southbridge/amd/agesa/Kconfig source src/southbridge/amd/sr5650/Kconfig - -if CPU_AMD_AGESA - -config AMD_SB_SPI_TX_LEN - int - default 4 - depends on SPI_FLASH - -endif diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c index cf03246..5492140 100644 --- a/src/southbridge/amd/agesa/hudson/spi.c +++ b/src/southbridge/amd/agesa/hudson/spi.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string.h> #include <arch/io.h> +#include <console/console.h> #include <spi-generic.h> #include <device/device.h> #include <device/pci.h> @@ -42,6 +43,7 @@ static int bus_claimed = 0; #define SPI_REG_CNTRL11 0xd #define CNTRL11_FIFOPTR_MASK 0x07 +#define AMD_SB_SPI_TX_LEN 64 static u32 spibar; @@ -110,6 +112,19 @@ int spi_xfer(struct spi_slave *slave, const void *dout, bytesout = bitsout / 8; bytesin = bitsin / 8; + /* + * Check if this is a write command attempting to transfer more bytes + * than the controller can handle. Iterations for writes are not + * supported here because each SPI write command needs to be preceded + * and followed by other SPI commands, and this sequence is controlled + * by the SPI chip driver. + */ + if (bytesout > AMD_SB_SPI_TX_LEN) { + printk(BIOS_DEBUG, "FCH SPI: Too much to write. Does your SPI chip driver use" + " spi_crop_chunk()?\n"); + return -1; + } + readoffby1 = bytesout ? 0 : 1; #if CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c index 027ca64..512c26d 100644 --- a/src/southbridge/amd/cimx/sb800/spi.c +++ b/src/southbridge/amd/cimx/sb800/spi.c @@ -20,6 +20,7 @@ #include <stdlib.h> #include <string.h> #include <arch/io.h> +#include <console/console.h> #include <spi-generic.h> #include <device/device.h> #include <device/pci.h> @@ -32,6 +33,8 @@ static int bus_claimed = 0; #endif +#define AMD_SB_SPI_TX_LEN 8 + static u32 spibar; static void reset_internal_fifo_pointer(void) @@ -78,6 +81,19 @@ int spi_xfer(struct spi_slave *slave, const void *dout, bytesout = bitsout / 8; bytesin = bitsin / 8; + /* + * Check if this is a write command attempting to transfer more bytes + * than the controller can handle. Iterations for writes are not + * supported here because each SPI write command needs to be preceded + * and followed by other SPI commands, and this sequence is controlled + * by the SPI chip driver. + */ + if (bytesout > AMD_SB_SPI_TX_LEN) { + printk(BIOS_DEBUG, "FCH SPI: Too much to write. Does your SPI chip driver use" + " spi_crop_chunk()?\n"); + return -1; + } + readoffby1 = bytesout ? 0 : 1; readwrite = (bytesin + readoffby1) << 4 | bytesout;

1 0

New patch to review for coreboot: 6cf6b9f SPI: Split writes using spi_crop_chunk()
by Kyösti Mälkki 30 Jun '14

30 Jun '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6163 -gerrit commit 6cf6b9fbf20d407cf4284a2db5e602441bcfdbb0 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jun 29 16:17:33 2014 +0300 SPI: Split writes using spi_crop_chunk() SPI controllers in Intel and AMD bridges have a slightly different restriction on how long transactions they can handle. Change-Id: I3d149d4b7e7e9633482a153d5e380a86c553d871 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/drivers/spi/adesto.c | 4 ++-- src/drivers/spi/amic.c | 4 ++-- src/drivers/spi/gigadevice.c | 4 ++-- src/drivers/spi/macronix.c | 5 ++--- src/drivers/spi/stmicro.c | 4 ++-- src/drivers/spi/winbond.c | 4 ++-- src/include/spi-generic.h | 2 ++ src/include/spi_flash.h | 8 -------- src/soc/intel/baytrail/spi.c | 7 ++++++- src/soc/intel/fsp_baytrail/spi.c | 7 ++++++- src/southbridge/amd/agesa/hudson/spi.c | 8 ++++++++ src/southbridge/amd/cimx/sb800/spi.c | 8 ++++++++ src/southbridge/intel/common/spi.c | 7 ++++++- 13 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index 9dc8e14..50e5883 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -100,7 +100,7 @@ static int adesto_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); - chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); + chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len); cmd[0] = CMD_AT25DF_PP; cmd[1] = (offset >> 16) & 0xff; @@ -118,7 +118,7 @@ static int adesto_write(struct spi_flash *flash, goto out; } - ret = spi_flash_cmd_write(flash->spi, cmd, 4, + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf + actual, chunk_len); if (ret < 0) { printk(BIOS_WARNING, "SF: adesto Page Program failed\n"); diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index 4cccc71..63a68a5 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -82,7 +82,7 @@ static int amic_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); - chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); + chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len); cmd[0] = CMD_A25_PP; cmd[1] = (offset >> 16) & 0xff; @@ -100,7 +100,7 @@ static int amic_write(struct spi_flash *flash, goto out; } - ret = spi_flash_cmd_write(flash->spi, cmd, 4, + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf + actual, chunk_len); if (ret < 0) { printk(BIOS_WARNING, "SF: AMIC Page Program failed\n"); diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index 3fb89c7..783d321 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -141,7 +141,7 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); - chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); + chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len); ret = spi_flash_cmd(flash->spi, CMD_GD25_WREN, NULL, 0); if (ret < 0) { @@ -161,7 +161,7 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); #endif - ret = spi_flash_cmd_write(flash->spi, cmd, 4, + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf + actual, chunk_len); if (ret < 0) { printk(BIOS_WARNING, diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index 3611599..6e910f6 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -144,13 +144,12 @@ static int macronix_write(struct spi_flash *flash, ret = 0; for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); - chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); + chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len); cmd[0] = CMD_MX25XX_PP; cmd[1] = (offset >> 16) & 0xff; cmd[2] = (offset >> 8) & 0xff; cmd[3] = offset & 0xff; - #if CONFIG_DEBUG_SPI_FLASH printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }" " chunk_len = %zu\n", @@ -163,7 +162,7 @@ static int macronix_write(struct spi_flash *flash, break; } - ret = spi_flash_cmd_write(flash->spi, cmd, 4, + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf + actual, chunk_len); if (ret < 0) { printk(BIOS_WARNING, "SF: Macronix Page Program failed\n"); diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index c825bd0..bc7969d 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -155,7 +155,7 @@ static int stmicro_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); - chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); + chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len); cmd[0] = CMD_M25PXX_PP; cmd[1] = (offset >> 16) & 0xff; @@ -173,7 +173,7 @@ static int stmicro_write(struct spi_flash *flash, goto out; } - ret = spi_flash_cmd_write(flash->spi, cmd, 4, + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf + actual, chunk_len); if (ret < 0) { printk(BIOS_WARNING, "SF: STMicro Page Program failed\n"); diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index eb0868e..7ddd312 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -134,7 +134,7 @@ static int winbond_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); - chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); + chunk_len = spi_crop_chunk(sizeof(cmd), chunk_len); cmd[0] = CMD_W25_PP; cmd[1] = (offset >> 16) & 0xff; @@ -152,7 +152,7 @@ static int winbond_write(struct spi_flash *flash, goto out; } - ret = spi_flash_cmd_write(flash->spi, cmd, 4, + ret = spi_flash_cmd_write(flash->spi, cmd, sizeof(cmd), buf + actual, chunk_len); if (ret < 0) { printk(BIOS_WARNING, "SF: Winbond Page Program failed\n"); diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h index 6cdb87a..e92e56c 100644 --- a/src/include/spi-generic.h +++ b/src/include/spi-generic.h @@ -181,6 +181,8 @@ void spi_cs_deactivate(struct spi_slave *slave); */ void spi_set_speed(struct spi_slave *slave, uint32_t hz); +unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len); + /*----------------------------------------------------------------------- * Write 8 bits, then read 8 bits. * slave: The SPI slave we're communicating with diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h index 8e51471..b424b4b 100644 --- a/src/include/spi_flash.h +++ b/src/include/spi_flash.h @@ -39,14 +39,6 @@ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) -#define CONFIG_ICH_SPI -#ifdef CONFIG_ICH_SPI -#define CONTROLLER_PAGE_LIMIT 64 -#else -/* any number larger than 4K would do, actually */ -#define CONTROLLER_PAGE_LIMIT ((int)(~0U>>1)) -#endif - struct spi_flash { struct spi_slave *spi; diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c index 5ac42c2..b66f6dc 100644 --- a/src/soc/intel/baytrail/spi.c +++ b/src/soc/intel/baytrail/spi.c @@ -500,6 +500,11 @@ static int ich_status_poll(u16 bitmask, int wait_til_set) return -1; } +unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) +{ + return min(cntlr.databytes, buf_len); +} + int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout, void *din, unsigned int bitsin) { @@ -594,7 +599,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, */ if (trans.bytesout > cntlr.databytes) { printk(BIOS_DEBUG, "ICH SPI: Too much to write. Does your SPI chip driver use" - " CONTROLLER_PAGE_LIMIT?\n"); + " spi_crop_chunk()?\n"); return -1; } diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c index ddec2e0..c12dd52 100644 --- a/src/soc/intel/fsp_baytrail/spi.c +++ b/src/soc/intel/fsp_baytrail/spi.c @@ -498,6 +498,11 @@ static int ich_status_poll(u16 bitmask, int wait_til_set) return -1; } +unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) +{ + return min(cntlr.databytes, buf_len); +} + int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout, void *din, unsigned int bitsin) { @@ -591,7 +596,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, */ if (trans.bytesout > cntlr.databytes) { printk(BIOS_DEBUG, "ICH SPI: Too much to write. Does your SPI chip driver use" - " CONTROLLER_PAGE_LIMIT?\n"); + " spi_crop_chunk()?\n"); return -1; } diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c index 573dd3d..cf03246 100644 --- a/src/southbridge/amd/agesa/hudson/spi.c +++ b/src/southbridge/amd/agesa/hudson/spi.c @@ -86,6 +86,14 @@ void spi_init(void) spibar = pci_read_config32(dev, 0xA0) & ~0x1F; } +unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) +{ + /* Command byte does not consume buffer space. */ + if (cmd_len) + cmd_len--; + return min(AMD_SB_SPI_TX_LEN - cmd_len, buf_len); +} + int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout, void *din, unsigned int bitsin) { diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c index a1cdf55..027ca64 100644 --- a/src/southbridge/amd/cimx/sb800/spi.c +++ b/src/southbridge/amd/cimx/sb800/spi.c @@ -56,6 +56,14 @@ void spi_init() spibar = pci_read_config32(dev, 0xA0) & ~0x1F; } +unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) +{ + /* Command byte does not consume buffer space. */ + if (cmd_len) + cmd_len--; + return min(AMD_SB_SPI_TX_LEN - cmd_len, buf_len); +} + int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout, void *din, unsigned int bitsin) { diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index 51586cc..8db134a 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -551,6 +551,11 @@ static int spi_is_multichip (void) return !!((cntlr.flmap0 >> 8) & 3); } +unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) +{ + return min(cntlr.databytes, buf_len); +} + int spi_xfer(struct spi_slave *slave, const void *dout, unsigned int bitsout, void *din, unsigned int bitsin) { @@ -645,7 +650,7 @@ int spi_xfer(struct spi_slave *slave, const void *dout, */ if (trans.bytesout > cntlr.databytes) { printk(BIOS_DEBUG, "ICH SPI: Too much to write. Does your SPI chip driver use" - " CONTROLLER_PAGE_LIMIT?\n"); + " spi_crop_chunk()?\n"); return -1; }

1 0

New patch to review for coreboot: 749811e SPI flash: Fix alignment checks in Page Program commands
by Kyösti Mälkki 30 Jun '14

30 Jun '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6162 -gerrit commit 749811e0672cfdb6ce24a45c5604af4fb0228b5f Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Sun Jun 29 16:15:39 2014 +0300 SPI flash: Fix alignment checks in Page Program commands There are two separate restrictions to take into account: Page Program command must not cross address boundaries defined by the flash part's page size. Total number of bytes for any command sent to flash part is restricted by the SPI controller capabilities. Consider CONTROLLER_PAGE_LIMIT=64, page_size=256, offset=62, len=4. This write would be split at offset 64 for no reason. Consider CONTROLLER_PAGE_LIMIT=40, page_size=256, offset=254, len=4. This write would not be split at page boundary as required. We do not really hit the second case. Nevertheless, CONTROLLER_PAGE_LIMIT is a misnomer for the maximum payload length supported by the SPI controller and is removed in a followup. Change-Id: I727f2e7de86a91b6a509460ff1f374acd006a0bc Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/drivers/spi/adesto.c | 3 ++- src/drivers/spi/amic.c | 3 ++- src/drivers/spi/gigadevice.c | 3 ++- src/drivers/spi/macronix.c | 3 ++- src/drivers/spi/stmicro.c | 3 ++- src/drivers/spi/winbond.c | 3 ++- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/drivers/spi/adesto.c b/src/drivers/spi/adesto.c index 83be8b8..9dc8e14 100644 --- a/src/drivers/spi/adesto.c +++ b/src/drivers/spi/adesto.c @@ -88,7 +88,7 @@ static int adesto_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << stm->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -100,6 +100,7 @@ static int adesto_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_AT25DF_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/amic.c b/src/drivers/spi/amic.c index fa17036..4cccc71 100644 --- a/src/drivers/spi/amic.c +++ b/src/drivers/spi/amic.c @@ -70,7 +70,7 @@ static int amic_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(1 << amic->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << amic->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -82,6 +82,7 @@ static int amic_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_A25_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c index 5a8f82f..3fb89c7 100644 --- a/src/drivers/spi/gigadevice.c +++ b/src/drivers/spi/gigadevice.c @@ -128,7 +128,7 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset, int ret; u8 cmd[4]; - page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << stm->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -141,6 +141,7 @@ static int gigadevice_write(struct spi_flash *flash, u32 offset, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); ret = spi_flash_cmd(flash->spi, CMD_GD25_WREN, NULL, 0); if (ret < 0) { diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c index bbc3704..3611599 100644 --- a/src/drivers/spi/macronix.c +++ b/src/drivers/spi/macronix.c @@ -131,7 +131,7 @@ static int macronix_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(mcx->params->page_size, CONTROLLER_PAGE_LIMIT); + page_size = mcx->params->page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -144,6 +144,7 @@ static int macronix_write(struct spi_flash *flash, ret = 0; for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_MX25XX_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c index af23853..c825bd0 100644 --- a/src/drivers/spi/stmicro.c +++ b/src/drivers/spi/stmicro.c @@ -143,7 +143,7 @@ static int stmicro_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(stm->params->page_size, CONTROLLER_PAGE_LIMIT); + page_size = stm->params->page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -155,6 +155,7 @@ static int stmicro_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_M25PXX_PP; cmd[1] = (offset >> 16) & 0xff; diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c index 52c7b61..eb0868e 100644 --- a/src/drivers/spi/winbond.c +++ b/src/drivers/spi/winbond.c @@ -122,7 +122,7 @@ static int winbond_write(struct spi_flash *flash, int ret; u8 cmd[4]; - page_size = min(1 << stm->params->l2_page_size, CONTROLLER_PAGE_LIMIT); + page_size = 1 << stm->params->l2_page_size; byte_addr = offset % page_size; flash->spi->rw = SPI_WRITE_FLAG; @@ -134,6 +134,7 @@ static int winbond_write(struct spi_flash *flash, for (actual = 0; actual < len; actual += chunk_len) { chunk_len = min(len - actual, page_size - byte_addr); + chunk_len = min(chunk_len, CONTROLLER_PAGE_LIMIT); cmd[0] = CMD_W25_PP; cmd[1] = (offset >> 16) & 0xff;

1 0

New patch to review for coreboot: f1a1fcf stdlib: Drop duplicates of min() and max()
by Kyösti Mälkki 30 Jun '14

30 Jun '14

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6161 -gerrit commit f1a1fcff3d83bade0696be8df1f9fd7d63502825 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Mon Jun 30 09:40:19 2014 +0300 stdlib: Drop duplicates of min() and max() Change-Id: Ib2f6fad735e085d237a0d46e0586e123eef6e0e2 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/drivers/ati/ragexl/atyfb.h | 2 -- src/drivers/pc80/tpm.c | 2 -- src/include/spi_flash.h | 2 -- src/include/stdlib.h | 3 +++ src/northbridge/intel/gm45/raminit.c | 2 +- src/northbridge/intel/nehalem/raminit.c | 4 +--- src/southbridge/intel/common/spi.c | 2 -- 7 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/drivers/ati/ragexl/atyfb.h b/src/drivers/ati/ragexl/atyfb.h index 557ead7..94f31fe 100644 --- a/src/drivers/ati/ragexl/atyfb.h +++ b/src/drivers/ati/ragexl/atyfb.h @@ -6,8 +6,6 @@ #define EINVAL -1 -#define max(x,y) (x>=y)?x:y - #if CONFIG_CONSOLE_BTEXT /* * Elements of the hardware specific atyfb_par structure diff --git a/src/drivers/pc80/tpm.c b/src/drivers/pc80/tpm.c index f581ab4..40f1e7b 100644 --- a/src/drivers/pc80/tpm.c +++ b/src/drivers/pc80/tpm.c @@ -50,8 +50,6 @@ TPM_DEBUG("Write reg 0x%x with 0x%x\n", (reg_), (val_)) #define printf(x...) printk(BIOS_ERR, x) -#define min(a,b) MIN(a,b) -#define max(a,b) MAX(a,b) #define readb(_a) (*(volatile unsigned char *) (_a)) #define writeb(_v, _a) (*(volatile unsigned char *) (_a) = (_v)) #define readl(_a) (*(volatile unsigned long *) (_a)) diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h index fe48d3b..8e51471 100644 --- a/src/include/spi_flash.h +++ b/src/include/spi_flash.h @@ -39,8 +39,6 @@ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) -#define min(a, b) ((a)<(b)?(a):(b)) - #define CONFIG_ICH_SPI #ifdef CONFIG_ICH_SPI #define CONTROLLER_PAGE_LIMIT 64 diff --git a/src/include/stdlib.h b/src/include/stdlib.h index cb5a6ca7..44d7c01 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -13,6 +13,9 @@ #define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) +#define min(a,b) MIN((a),(b)) +#define max(a,b) MAX((a),(b)) + #if !defined(__PRE_RAM__) void *memalign(size_t boundary, size_t size); void *malloc(size_t size); diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c index d607f84..0636d9f 100644 --- a/src/northbridge/intel/gm45/raminit.c +++ b/src/northbridge/intel/gm45/raminit.c @@ -20,6 +20,7 @@ */ #include <stdint.h> +#include <stdlib.h> #include <arch/cpu.h> #include <arch/io.h> #include <device/pci_def.h> @@ -361,7 +362,6 @@ static void collect_ddr3(spdinfo_t *const config) } } -#define min(a, b) ((a) < (b))?(a):(b) #define ROUNDUP_DIV(val, by) (((val) + (by) - 1) / (by)) #define ROUNDUP_DIV_THIS(val, by) val = ROUNDUP_DIV(val, by) static fsb_clock_t read_fsb_clock(void) diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c index a2960f6..632abc0 100644 --- a/src/northbridge/intel/nehalem/raminit.c +++ b/src/northbridge/intel/nehalem/raminit.c @@ -25,6 +25,7 @@ #endif #if REAL +#include <stdlib.h> #include <console/console.h> #include <string.h> #include <arch/hlt.h> @@ -571,9 +572,6 @@ static int find_lowest_bit_set32(u32 val) return -1; } -#define max(a,b) (((a) > (b)) ? (a) : (b)) -#define min(a,b) (((a) < (b)) ? (a) : (b)) - enum { DEVICE_TYPE = 2, MODULE_TYPE = 3, diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index b323dbb..51586cc 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -35,8 +35,6 @@ #include <spi-generic.h> -#define min(a, b) ((a)<(b)?(a):(b)) - #define HSFC_FCYCLE_OFF 1 /* 1-2: FLASH Cycle */ #define HSFC_FCYCLE (0x3 << HSFC_FCYCLE_OFF) #define HSFC_FDBC_OFF 8 /* 8-13: Flash Data Byte Count */

1 0

Patch set updated for coreboot: d8d029d mainboard: -ffreestanding so 'main' is not necessarily entry
by Edward O'Callaghan 30 Jun '14

30 Jun '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5836 -gerrit commit d8d029dd17df9215aa9f2daac4105efe75dd7161 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Sat May 24 07:51:34 2014 +1000 mainboard: -ffreestanding so 'main' is not necessarily entry From the C specification in 5.1.2.1 Freestanding environment; "In a freestanding environment (in which C program execution may take place without any benefit of an operating system), the name and type of the function called at program startup are implementation-defined." Clang complains about these being missing as Clang is somewhat more strict about the spec than GNU/GCC is. Change-Id: I33c8c6ae80e54ef318dbf9899b2f32a4ab7d0856 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/a-trend/atc-6220/romstage.c | 1 + src/mainboard/a-trend/atc-6240/romstage.c | 1 + src/mainboard/aaeon/pfm-540i_revb/romstage.c | 1 + src/mainboard/abit/be6-ii_v2_0/romstage.c | 1 + src/mainboard/advantech/pcm-5820/romstage.c | 1 + src/mainboard/amd/db800/romstage.c | 1 + src/mainboard/amd/norwich/romstage.c | 1 + src/mainboard/amd/rumba/romstage.c | 1 + src/mainboard/aopen/dxplplusu/romstage.c | 1 + src/mainboard/artecgroup/dbe61/romstage.c | 1 + src/mainboard/asi/mb_5blgp/romstage.c | 1 + src/mainboard/asi/mb_5blmp/romstage.c | 1 + src/mainboard/asus/dsbf/romstage.c | 1 + src/mainboard/asus/mew-am/romstage.c | 1 + src/mainboard/asus/mew-vm/romstage.c | 1 + src/mainboard/asus/p2b-d/romstage.c | 1 + src/mainboard/asus/p2b-ds/romstage.c | 1 + src/mainboard/asus/p2b-f/romstage.c | 1 + src/mainboard/asus/p2b-ls/romstage.c | 1 + src/mainboard/asus/p2b/romstage.c | 1 + src/mainboard/asus/p3b-f/romstage.c | 1 + src/mainboard/axus/tc320/romstage.c | 1 + src/mainboard/azza/pt-6ibd/romstage.c | 1 + src/mainboard/bachmann/ot200/romstage.c | 1 + src/mainboard/bcom/winnet100/romstage.c | 1 + src/mainboard/bcom/winnetp680/romstage.c | 1 + src/mainboard/biostar/m6tba/romstage.c | 1 + src/mainboard/compaq/deskpro_en_sff_p600/romstage.c | 1 + src/mainboard/digitallogic/adl855pc/romstage.c | 1 + src/mainboard/digitallogic/msm586seg/romstage.c | 1 + src/mainboard/digitallogic/msm800sev/romstage.c | 1 + src/mainboard/dmp/vortex86ex/romstage.c | 1 + src/mainboard/eaglelion/5bcm/romstage.c | 1 + src/mainboard/ecs/p6iwp-fe/romstage.c | 1 + src/mainboard/emulation/qemu-i440fx/romstage.c | 2 +- src/mainboard/emulation/qemu-q35/romstage.c | 1 + src/mainboard/getac/p470/romstage.c | 1 + src/mainboard/gigabyte/ga-6bxc/romstage.c | 1 + src/mainboard/gigabyte/ga-6bxe/romstage.c | 1 + src/mainboard/google/butterfly/romstage.c | 1 + src/mainboard/google/link/romstage.c | 1 + src/mainboard/google/parrot/romstage.c | 1 + src/mainboard/google/stout/romstage.c | 1 + src/mainboard/hp/e_vectra_p2706t/romstage.c | 1 + src/mainboard/ibase/mb899/romstage.c | 1 + src/mainboard/iei/juki-511p/romstage.c | 1 + src/mainboard/iei/nova4899r/romstage.c | 1 + src/mainboard/iei/pcisa-lx-800-r10/romstage.c | 1 + src/mainboard/iei/pm-lx-800-r11/romstage.c | 1 + src/mainboard/iei/pm-lx2-800-r10/romstage.c | 1 + src/mainboard/intel/d810e2cb/romstage.c | 1 + src/mainboard/intel/d945gclf/romstage.c | 1 + src/mainboard/intel/eagleheights/romstage.c | 1 + src/mainboard/intel/emeraldlake2/romstage.c | 1 + src/mainboard/intel/jarrell/romstage.c | 1 + src/mainboard/intel/mtarvon/romstage.c | 1 + src/mainboard/intel/truxton/romstage.c | 1 + src/mainboard/intel/xe7501devkit/romstage.c | 1 + src/mainboard/iwave/iWRainbowG6/romstage.c | 1 + src/mainboard/jetway/j7f2/romstage.c | 1 + src/mainboard/kontron/986lcd-m/romstage.c | 1 + src/mainboard/kontron/ktqm77/romstage.c | 1 + src/mainboard/lanner/em8510/romstage.c | 1 + src/mainboard/lenovo/t520/romstage.c | 1 + src/mainboard/lenovo/t530/romstage.c | 1 + src/mainboard/lenovo/t60/romstage.c | 1 + src/mainboard/lenovo/x201/romstage.c | 1 + src/mainboard/lenovo/x230/romstage.c | 1 + src/mainboard/lenovo/x60/romstage.c | 1 + src/mainboard/lippert/frontrunner/romstage.c | 1 + src/mainboard/lippert/hurricane-lx/romstage.c | 1 + src/mainboard/lippert/literunner-lx/romstage.c | 1 + src/mainboard/lippert/roadrunner-lx/romstage.c | 1 + src/mainboard/lippert/spacerunner-lx/romstage.c | 1 + src/mainboard/mitac/6513wu/romstage.c | 1 + src/mainboard/msi/ms6119/romstage.c | 1 + src/mainboard/msi/ms6147/romstage.c | 1 + src/mainboard/msi/ms6156/romstage.c | 1 + src/mainboard/msi/ms6178/romstage.c | 1 + src/mainboard/nec/powermate2000/romstage.c | 1 + src/mainboard/nokia/ip530/romstage.c | 1 + src/mainboard/packardbell/ms2290/romstage.c | 1 + src/mainboard/pcengines/alix1c/romstage.c | 1 + src/mainboard/pcengines/alix2d/romstage.c | 1 + src/mainboard/rca/rm4100/romstage.c | 1 + src/mainboard/roda/rk886ex/romstage.c | 1 + src/mainboard/roda/rk9/romstage.c | 1 + src/mainboard/samsung/lumpy/romstage.c | 1 + src/mainboard/samsung/stumpy/romstage.c | 1 + src/mainboard/soyo/sy-6ba-plus-iii/romstage.c | 1 + src/mainboard/supermicro/x6dai_g/romstage.c | 1 + src/mainboard/supermicro/x6dhe_g/romstage.c | 1 + src/mainboard/supermicro/x6dhe_g2/romstage.c | 1 + src/mainboard/supermicro/x6dhr_ig/romstage.c | 1 + src/mainboard/supermicro/x6dhr_ig2/romstage.c | 1 + src/mainboard/supermicro/x7db8/romstage.c | 1 + src/mainboard/technologic/ts5300/romstage.c | 1 + src/mainboard/televideo/tc7020/romstage.c | 1 + src/mainboard/thomson/ip1000/romstage.c | 1 + src/mainboard/traverse/geos/romstage.c | 1 + src/mainboard/tyan/s1846/romstage.c | 1 + src/mainboard/tyan/s2735/romstage.c | 1 + src/mainboard/via/epia-cn/romstage.c | 1 + src/mainboard/via/epia-m/romstage.c | 1 + src/mainboard/via/epia-m700/romstage.c | 1 + src/mainboard/via/epia-m850/romstage.c | 1 + src/mainboard/via/epia-n/romstage.c | 1 + src/mainboard/via/epia/romstage.c | 1 + src/mainboard/via/pc2500e/romstage.c | 1 + src/mainboard/via/vt8454c/romstage.c | 1 + src/mainboard/winent/pl6064/romstage.c | 1 + src/mainboard/wyse/s50/romstage.c | 1 + 112 files changed, 112 insertions(+), 1 deletion(-) diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c index 22d3270..3c3f9eb 100644 --- a/src/mainboard/a-trend/atc-6220/romstage.c +++ b/src/mainboard/a-trend/atc-6220/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c index 41d5d2a..a153730 100644 --- a/src/mainboard/a-trend/atc-6240/romstage.c +++ b/src/mainboard/a-trend/atc-6240/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c index f80ef95..7f78dce 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c +++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c @@ -54,6 +54,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c index 510c8ce..a17e68f 100644 --- a/src/mainboard/abit/be6-ii_v2_0/romstage.c +++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c @@ -43,6 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/advantech/pcm-5820/romstage.c b/src/mainboard/advantech/pcm-5820/romstage.c index b710aad..51a713c 100644 --- a/src/mainboard/advantech/pcm-5820/romstage.c +++ b/src/mainboard/advantech/pcm-5820/romstage.c @@ -30,6 +30,7 @@ #define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c index 564380e..f645812 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -49,6 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index 9322508..2daef93 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -45,6 +45,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c index c5a3fc3..9158aad 100644 --- a/src/mainboard/amd/rumba/romstage.c +++ b/src/mainboard/amd/rumba/romstage.c @@ -31,6 +31,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "cpu/amd/geode_gx2/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = { diff --git a/src/mainboard/aopen/dxplplusu/romstage.c b/src/mainboard/aopen/dxplplusu/romstage.c index 94546b1..7ef8a47 100644 --- a/src/mainboard/aopen/dxplplusu/romstage.c +++ b/src/mainboard/aopen/dxplplusu/romstage.c @@ -39,6 +39,7 @@ int spd_read_byte(unsigned device, unsigned address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c index 073d2b8..7f1ee30 100644 --- a/src/mainboard/artecgroup/dbe61/romstage.c +++ b/src/mainboard/artecgroup/dbe61/romstage.c @@ -57,6 +57,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/asi/mb_5blgp/romstage.c b/src/mainboard/asi/mb_5blgp/romstage.c index d661387..c7f3090 100644 --- a/src/mainboard/asi/mb_5blgp/romstage.c +++ b/src/mainboard/asi/mb_5blgp/romstage.c @@ -30,6 +30,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asi/mb_5blmp/romstage.c b/src/mainboard/asi/mb_5blmp/romstage.c index e8befe4..6c18d8f 100644 --- a/src/mainboard/asi/mb_5blmp/romstage.c +++ b/src/mainboard/asi/mb_5blmp/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc87351_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/dsbf/romstage.c b/src/mainboard/asus/dsbf/romstage.c index e013371..6db0866 100644 --- a/src/mainboard/asus/dsbf/romstage.c +++ b/src/mainboard/asus/dsbf/romstage.c @@ -110,6 +110,7 @@ int mainboard_set_fbd_clock(int speed) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c index 2392ac2..9ea6c04 100644 --- a/src/mainboard/asus/mew-am/romstage.c +++ b/src/mainboard/asus/mew-am/romstage.c @@ -34,6 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c index 5962aab..87f8d65 100644 --- a/src/mainboard/asus/mew-vm/romstage.c +++ b/src/mainboard/asus/mew-vm/romstage.c @@ -34,6 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { lpc47b272_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c index b03dfd5..4faae20 100644 --- a/src/mainboard/asus/p2b-d/romstage.c +++ b/src/mainboard/asus/p2b-d/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c index b4dbe32..070b002 100644 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ b/src/mainboard/asus/p2b-ds/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c index b857754..64b4dae 100644 --- a/src/mainboard/asus/p2b-f/romstage.c +++ b/src/mainboard/asus/p2b-f/romstage.c @@ -43,6 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c index d046c4b..8cf2b42 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c index 22d3270..3c3f9eb 100644 --- a/src/mainboard/asus/p2b/romstage.c +++ b/src/mainboard/asus/p2b/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c index e7a7f43..825457e 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -74,6 +74,7 @@ static void disable_spd(void) outb(0x67, PM_IO_BASE + 0x37); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/axus/tc320/romstage.c b/src/mainboard/axus/tc320/romstage.c index 053da17..e733003 100644 --- a/src/mainboard/axus/tc320/romstage.c +++ b/src/mainboard/axus/tc320/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c index b4252a6..7325618 100644 --- a/src/mainboard/azza/pt-6ibd/romstage.c +++ b/src/mainboard/azza/pt-6ibd/romstage.c @@ -43,6 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/bachmann/ot200/romstage.c b/src/mainboard/bachmann/ot200/romstage.c index 39385c7..41a65dd 100644 --- a/src/mainboard/bachmann/ot200/romstage.c +++ b/src/mainboard/bachmann/ot200/romstage.c @@ -46,6 +46,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/bcom/winnet100/romstage.c b/src/mainboard/bcom/winnet100/romstage.c index 053da17..e733003 100644 --- a/src/mainboard/bcom/winnet100/romstage.c +++ b/src/mainboard/bcom/winnet100/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c index a252e00..3676a6d 100644 --- a/src/mainboard/bcom/winnetp680/romstage.c +++ b/src/mainboard/bcom/winnetp680/romstage.c @@ -81,6 +81,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c index dd7684a..43158bd 100644 --- a/src/mainboard/biostar/m6tba/romstage.c +++ b/src/mainboard/biostar/m6tba/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c index 37b28df..8de8a83 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c +++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c @@ -42,6 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { /* FIXME: Should be PC97307! */ diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c index 5935af2..0ae7610 100644 --- a/src/mainboard/digitallogic/adl855pc/romstage.c +++ b/src/mainboard/digitallogic/adl855pc/romstage.c @@ -26,6 +26,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/i855/raminit.c" #include "northbridge/intel/i855/reset_test.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c index e67ec68..b6412e8 100644 --- a/src/mainboard/digitallogic/msm586seg/romstage.c +++ b/src/mainboard/digitallogic/msm586seg/romstage.c @@ -154,6 +154,7 @@ static inline void irqinit(void){ #endif } +#include <cpu/intel/car.h> static void main(unsigned long bist) { volatile int i; diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c index 986e918..6075565 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -30,6 +30,7 @@ int spd_read_byte(unsigned device, unsigned address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c index 8889015..040b937 100644 --- a/src/mainboard/dmp/vortex86ex/romstage.c +++ b/src/mainboard/dmp/vortex86ex/romstage.c @@ -300,6 +300,7 @@ static void enable_l2_cache(void) pci_write_config8(NB1, 0xe8, reg_nb_f1_e8); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { device_t dev; diff --git a/src/mainboard/eaglelion/5bcm/romstage.c b/src/mainboard/eaglelion/5bcm/romstage.c index 2f803aa..cbfe04d 100644 --- a/src/mainboard/eaglelion/5bcm/romstage.c +++ b/src/mainboard/eaglelion/5bcm/romstage.c @@ -12,6 +12,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c index c014c57..7deb730 100644 --- a/src/mainboard/ecs/p6iwp-fe/romstage.c +++ b/src/mainboard/ecs/p6iwp-fe/romstage.c @@ -37,6 +37,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define CLKIN_DEV PNP_DEV(0x2e, IT8712F_GPIO) +#include <cpu/intel/car.h> void main(unsigned long bist) { ite_conf_clkin(CLKIN_DEV, ITE_UART_CLK_PREDIVIDE_24); diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c index bf33dee..8dc61b2 100644 --- a/src/mainboard/emulation/qemu-i440fx/romstage.c +++ b/src/mainboard/emulation/qemu-i440fx/romstage.c @@ -33,7 +33,7 @@ #include "memory.c" -void main(unsigned long bist); +#include <cpu/intel/car.h> void main(unsigned long bist) { int cbmem_was_initted; diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c index 190c775..635a44f 100644 --- a/src/mainboard/emulation/qemu-q35/romstage.c +++ b/src/mainboard/emulation/qemu-q35/romstage.c @@ -34,6 +34,7 @@ #include "../qemu-i440fx/memory.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { int cbmem_was_initted; diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c index b0dd2bc..5ebc451 100644 --- a/src/mainboard/getac/p470/romstage.c +++ b/src/mainboard/getac/p470/romstage.c @@ -265,6 +265,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c index 1b2e29b..d28ac34 100644 --- a/src/mainboard/gigabyte/ga-6bxc/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/gigabyte/ga-6bxe/romstage.c b/src/mainboard/gigabyte/ga-6bxe/romstage.c index c3926f0..cad3694 100644 --- a/src/mainboard/gigabyte/ga-6bxe/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { it8671f_48mhz_clkin(); diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c index d946ea3..1c7b8ba 100644 --- a/src/mainboard/google/butterfly/romstage.c +++ b/src/mainboard/google/butterfly/romstage.c @@ -112,6 +112,7 @@ static void rcba_config(void) RCBA32(FD) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c index 18c833a..25c6529 100644 --- a/src/mainboard/google/link/romstage.c +++ b/src/mainboard/google/link/romstage.c @@ -150,6 +150,7 @@ static void copy_spd(struct pei_data *peid) sizeof(peid->spd_data[0])); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c index 45cf7fe..a4daae5 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -113,6 +113,7 @@ static void rcba_config(void) RCBA32(FD) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c index 0e29b33..008f1f8 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/romstage.c @@ -154,6 +154,7 @@ static void early_ec_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c index 81e1ad2..85660c0 100644 --- a/src/mainboard/hp/e_vectra_p2706t/romstage.c +++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c @@ -37,6 +37,7 @@ /* TODO: It's a PC87364 actually! */ #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { /* TODO: It's a PC87364 actually! */ diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c index 0e74418..eec574d 100644 --- a/src/mainboard/ibase/mb899/romstage.c +++ b/src/mainboard/ibase/mb899/romstage.c @@ -223,6 +223,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/iei/juki-511p/romstage.c b/src/mainboard/iei/juki-511p/romstage.c index 8b26b40..b8daac4 100644 --- a/src/mainboard/iei/juki-511p/romstage.c +++ b/src/mainboard/iei/juki-511p/romstage.c @@ -32,6 +32,7 @@ #define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { w83977f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/iei/nova4899r/romstage.c b/src/mainboard/iei/nova4899r/romstage.c index 174953d..9a89107 100644 --- a/src/mainboard/iei/nova4899r/romstage.c +++ b/src/mainboard/iei/nova4899r/romstage.c @@ -32,6 +32,7 @@ #include "northbridge/amd/gx1/raminit.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { w83977tf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c index a75691c..2af0b2f 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c @@ -49,6 +49,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/iei/pm-lx-800-r11/romstage.c b/src/mainboard/iei/pm-lx-800-r11/romstage.c index bf34e9a..d2e331e 100644 --- a/src/mainboard/iei/pm-lx-800-r11/romstage.c +++ b/src/mainboard/iei/pm-lx-800-r11/romstage.c @@ -53,6 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include <cpu/amd/geode_lx/syspreinit.c> #include <cpu/amd/geode_lx/msrinit.c> +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/iei/pm-lx2-800-r10/romstage.c b/src/mainboard/iei/pm-lx2-800-r10/romstage.c index b34bce4..947b52d 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/romstage.c +++ b/src/mainboard/iei/pm-lx2-800-r10/romstage.c @@ -53,6 +53,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include <cpu/amd/geode_lx/syspreinit.c> #include <cpu/amd/geode_lx/msrinit.c> +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c index 6c277d5..982060c 100644 --- a/src/mainboard/intel/d810e2cb/romstage.c +++ b/src/mainboard/intel/d810e2cb/romstage.c @@ -35,6 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Set southbridge and Super I/O GPIOs. */ diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c index 586e035..0c22990 100644 --- a/src/mainboard/intel/d945gclf/romstage.c +++ b/src/mainboard/intel/d945gclf/romstage.c @@ -184,6 +184,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c index 249fda4..99445b8 100644 --- a/src/mainboard/intel/eagleheights/romstage.c +++ b/src/mainboard/intel/eagleheights/romstage.c @@ -120,6 +120,7 @@ static void early_config(void) pci_write_config8(PCI_DEV(0, 0x1F, 2), SATA_MAP, (SATA_MODE_AHCI << 6) | (0 << 0)); } +#include <cpu/intel/car.h> void main(unsigned long bist) { /* int boot_mode = 0; */ diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c index 5597a2d..12abb54 100644 --- a/src/mainboard/intel/emeraldlake2/romstage.c +++ b/src/mainboard/intel/emeraldlake2/romstage.c @@ -162,6 +162,7 @@ static void setup_sio_gpios(void) outb(0xaa, port); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/intel/jarrell/romstage.c b/src/mainboard/intel/jarrell/romstage.c index bddb34a..a672afa 100644 --- a/src/mainboard/intel/jarrell/romstage.c +++ b/src/mainboard/intel/jarrell/romstage.c @@ -38,6 +38,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "debug.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c index 0cab9bd..2e99be5 100644 --- a/src/mainboard/intel/mtarvon/romstage.c +++ b/src/mainboard/intel/mtarvon/romstage.c @@ -51,6 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address) #include "arch/x86/lib/stages.c" #endif +#include <cpu/intel/car.h> void main(unsigned long bist) { msr_t msr; diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c index 71c5f38..c56b1df 100644 --- a/src/mainboard/intel/truxton/romstage.c +++ b/src/mainboard/intel/truxton/romstage.c @@ -51,6 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address) #define SERIAL_DEV PNP_DEV(0x4e, I3100_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { msr_t msr; diff --git a/src/mainboard/intel/xe7501devkit/romstage.c b/src/mainboard/intel/xe7501devkit/romstage.c index 342e6f1..f35f93b 100644 --- a/src/mainboard/intel/xe7501devkit/romstage.c +++ b/src/mainboard/intel/xe7501devkit/romstage.c @@ -33,6 +33,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" // This function MUST appear last (ROMCC limitation) +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/iwave/iWRainbowG6/romstage.c b/src/mainboard/iwave/iWRainbowG6/romstage.c index 39fce07..b68a4e3 100644 --- a/src/mainboard/iwave/iWRainbowG6/romstage.c +++ b/src/mainboard/iwave/iWRainbowG6/romstage.c @@ -332,6 +332,7 @@ static void poulsbo_setup_Stage2Regs(void) printk(BIOS_DEBUG, " done.\n"); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/jetway/j7f2/romstage.c b/src/mainboard/jetway/j7f2/romstage.c index 8455610..cc207b1 100644 --- a/src/mainboard/jetway/j7f2/romstage.c +++ b/src/mainboard/jetway/j7f2/romstage.c @@ -86,6 +86,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c index 9c76a42..842f7bc 100644 --- a/src/mainboard/kontron/986lcd-m/romstage.c +++ b/src/mainboard/kontron/986lcd-m/romstage.c @@ -329,6 +329,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c index 09fd634..98f1739 100644 --- a/src/mainboard/kontron/ktqm77/romstage.c +++ b/src/mainboard/kontron/ktqm77/romstage.c @@ -150,6 +150,7 @@ static void superio_gpio_config(void) pnp_exit_ext_func_mode(dev); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c index 4ae5c12..186e9fd 100644 --- a/src/mainboard/lanner/em8510/romstage.c +++ b/src/mainboard/lanner/em8510/romstage.c @@ -48,6 +48,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/i855/raminit.c" #include "northbridge/intel/i855/reset_test.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c index 548c040..df46092 100644 --- a/src/mainboard/lenovo/t520/romstage.c +++ b/src/mainboard/lenovo/t520/romstage.c @@ -108,6 +108,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/romstage.c index d65031a..b2cd616 100644 --- a/src/mainboard/lenovo/t530/romstage.c +++ b/src/mainboard/lenovo/t530/romstage.c @@ -109,6 +109,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c index 1e2b72d..01e48e7 100644 --- a/src/mainboard/lenovo/t60/romstage.c +++ b/src/mainboard/lenovo/t60/romstage.c @@ -206,6 +206,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c index a18536a..4dc069a 100644 --- a/src/mainboard/lenovo/x201/romstage.c +++ b/src/mainboard/lenovo/x201/romstage.c @@ -215,6 +215,7 @@ static void set_fsb_frequency(void) smbus_block_write(0x69, 0, 5, block); } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c index 8441db3..03a3017 100644 --- a/src/mainboard/lenovo/x230/romstage.c +++ b/src/mainboard/lenovo/x230/romstage.c @@ -109,6 +109,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c index d1f8f64..68a9b48 100644 --- a/src/mainboard/lenovo/x60/romstage.c +++ b/src/mainboard/lenovo/x60/romstage.c @@ -213,6 +213,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c index 92a3a99..3192e5c 100644 --- a/src/mainboard/lippert/frontrunner/romstage.c +++ b/src/mainboard/lippert/frontrunner/romstage.c @@ -71,6 +71,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_gx2/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = { diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c index 063721b..b3b4498 100644 --- a/src/mainboard/lippert/hurricane-lx/romstage.c +++ b/src/mainboard/lippert/hurricane-lx/romstage.c @@ -110,6 +110,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c index 174620a..2f7bd85 100644 --- a/src/mainboard/lippert/literunner-lx/romstage.c +++ b/src/mainboard/lippert/literunner-lx/romstage.c @@ -152,6 +152,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { int err; diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c index 2642373..18f48f6 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -85,6 +85,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c index 9d5539e..c3f1c8a 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -149,6 +149,7 @@ static void mb_gpio_init(void) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { int err; diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c index b337fb2..59e1c6d 100644 --- a/src/mainboard/mitac/6513wu/romstage.c +++ b/src/mainboard/mitac/6513wu/romstage.c @@ -35,6 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c index 813e855..578de61 100644 --- a/src/mainboard/msi/ms6119/romstage.c +++ b/src/mainboard/msi/ms6119/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c index b7f99f5..a6767bc 100644 --- a/src/mainboard/msi/ms6147/romstage.c +++ b/src/mainboard/msi/ms6147/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c index 09713d4..3811cc5 100644 --- a/src/mainboard/msi/ms6156/romstage.c +++ b/src/mainboard/msi/ms6156/romstage.c @@ -41,6 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { winbond_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c index fa78a82..4005ac8 100644 --- a/src/mainboard/msi/ms6178/romstage.c +++ b/src/mainboard/msi/ms6178/romstage.c @@ -36,6 +36,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define DUMMY_DEV PNP_DEV(0x2e, 0) +#include <cpu/intel/car.h> void main(unsigned long bist) { w83627hf_set_clksel_48(DUMMY_DEV); diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c index 08a845d..97d0580 100644 --- a/src/mainboard/nec/powermate2000/romstage.c +++ b/src/mainboard/nec/powermate2000/romstage.c @@ -34,6 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c index c04067c..39c75ca 100644 --- a/src/mainboard/nokia/ip530/romstage.c +++ b/src/mainboard/nokia/ip530/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { smscsuperio_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c index 79afae3..b063777 100644 --- a/src/mainboard/packardbell/ms2290/romstage.c +++ b/src/mainboard/packardbell/ms2290/romstage.c @@ -198,6 +198,7 @@ static inline u16 read_acpi16(u32 addr) return inw(DEFAULT_PMBASE | addr); } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index 204f0bd..436edc0 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -107,6 +107,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c index 18453ac..9b272a4 100644 --- a/src/mainboard/pcengines/alix2d/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -130,6 +130,7 @@ static void mb_gpio_init(void) outl(1 << 11, GPIO_IO_BASE + GPIOH_OUTPUT_VALUE); /* Led 3 disabled */ } +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c index 4db8cbb..7dd4b48 100644 --- a/src/mainboard/rca/rm4100/romstage.c +++ b/src/mainboard/rca/rm4100/romstage.c @@ -94,6 +94,7 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c index 1bea48c..a4f55a8 100644 --- a/src/mainboard/roda/rk886ex/romstage.c +++ b/src/mainboard/roda/rk886ex/romstage.c @@ -251,6 +251,7 @@ static void init_artec_dongle(void) outb(0xf4, 0x88); } +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 reg32; diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c index 63d55a3..383f5b7 100644 --- a/src/mainboard/roda/rk9/romstage.c +++ b/src/mainboard/roda/rk9/romstage.c @@ -120,6 +120,7 @@ static void default_superio_gpio_setup(void) outb(0x10, 0x600 + 0xb + 4); /* GP40 - GP47 */ } +#include <cpu/intel/car.h> void main(unsigned long bist) { sysinfo_t sysinfo; diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c index 001a1f8..f984af2 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/romstage.c @@ -132,6 +132,7 @@ static void early_pch_init(void) pci_write_config8(PCH_LPC_DEV, 0xa4, reg8); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c index 6ab7007..982c389 100644 --- a/src/mainboard/samsung/stumpy/romstage.c +++ b/src/mainboard/samsung/stumpy/romstage.c @@ -173,6 +173,7 @@ static void setup_sio_gpios(void) it8772f_gpio_setup(6, 0x00, 0x00, 0x00, 0x00, 0x00); } +#include <cpu/intel/car.h> void main(unsigned long bist) { int boot_mode = 0; diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c index 551c060..fccd29a 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c +++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { it8671f_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/supermicro/x6dai_g/romstage.c b/src/mainboard/supermicro/x6dai_g/romstage.c index c998466..6b10a68 100644 --- a/src/mainboard/supermicro/x6dai_g/romstage.c +++ b/src/mainboard/supermicro/x6dai_g/romstage.c @@ -42,6 +42,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhe_g/romstage.c b/src/mainboard/supermicro/x6dhe_g/romstage.c index b1c3cfa..9a637be 100644 --- a/src/mainboard/supermicro/x6dhe_g/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g/romstage.c @@ -46,6 +46,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhe_g2/romstage.c b/src/mainboard/supermicro/x6dhe_g2/romstage.c index c6350e8..09f4c57 100644 --- a/src/mainboard/supermicro/x6dhe_g2/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c @@ -43,6 +43,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhr_ig/romstage.c b/src/mainboard/supermicro/x6dhr_ig/romstage.c index 2dc96c1..3e51b73 100644 --- a/src/mainboard/supermicro/x6dhr_ig/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c @@ -45,6 +45,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x6dhr_ig2/romstage.c b/src/mainboard/supermicro/x6dhr_ig2/romstage.c index 0f2a644..868fbdc 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c @@ -45,6 +45,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "lib/generic_sdram.c" #include "arch/x86/lib/stages.c" +#include <cpu/intel/car.h> static void main(unsigned long bist) { static const struct mem_controller mch[] = { diff --git a/src/mainboard/supermicro/x7db8/romstage.c b/src/mainboard/supermicro/x7db8/romstage.c index 791028e..a52193f 100644 --- a/src/mainboard/supermicro/x7db8/romstage.c +++ b/src/mainboard/supermicro/x7db8/romstage.c @@ -111,6 +111,7 @@ int mainboard_set_fbd_clock(int speed) } } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) diff --git a/src/mainboard/technologic/ts5300/romstage.c b/src/mainboard/technologic/ts5300/romstage.c index 453cecc..64de0c0 100644 --- a/src/mainboard/technologic/ts5300/romstage.c +++ b/src/mainboard/technologic/ts5300/romstage.c @@ -136,6 +136,7 @@ static void hard_reset(void) while (1) ; } +#include <cpu/intel/car.h> static void main(unsigned long bist) { volatile int i; diff --git a/src/mainboard/televideo/tc7020/romstage.c b/src/mainboard/televideo/tc7020/romstage.c index 053da17..e733003 100644 --- a/src/mainboard/televideo/tc7020/romstage.c +++ b/src/mainboard/televideo/tc7020/romstage.c @@ -31,6 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) +#include <cpu/intel/car.h> static void main(unsigned long bist) { pc97317_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c index 77255e7..ed87462 100644 --- a/src/mainboard/thomson/ip1000/romstage.c +++ b/src/mainboard/thomson/ip1000/romstage.c @@ -92,6 +92,7 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } +#include <cpu/intel/car.h> void main(unsigned long bist) { if (bist == 0) { diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c index 36d55a7..115b402 100644 --- a/src/mainboard/traverse/geos/romstage.c +++ b/src/mainboard/traverse/geos/romstage.c @@ -46,6 +46,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c index bbd63ee..78313fc 100644 --- a/src/mainboard/tyan/s1846/romstage.c +++ b/src/mainboard/tyan/s1846/romstage.c @@ -40,6 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } +#include <cpu/intel/car.h> void main(unsigned long bist) { pc87309_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); diff --git a/src/mainboard/tyan/s2735/romstage.c b/src/mainboard/tyan/s2735/romstage.c index 600d806..1b03982 100644 --- a/src/mainboard/tyan/s2735/romstage.c +++ b/src/mainboard/tyan/s2735/romstage.c @@ -34,6 +34,7 @@ static inline int spd_read_byte(unsigned device, unsigned address) #include "northbridge/intel/e7501/reset_test.c" #include "lib/generic_sdram.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl[] = { diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c index 2d780db..e7e65f2 100644 --- a/src/mainboard/via/epia-cn/romstage.c +++ b/src/mainboard/via/epia-cn/romstage.c @@ -79,6 +79,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/via/epia-m/romstage.c b/src/mainboard/via/epia-m/romstage.c index ebe6a50..b3b515d 100644 --- a/src/mainboard/via/epia-m/romstage.c +++ b/src/mainboard/via/epia-m/romstage.c @@ -66,6 +66,7 @@ static void enable_shadow_ram(void) pci_write_config8(dev, 0x63, shadowreg); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { device_t dev; diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c index e01fd4b..1e52dfa 100644 --- a/src/mainboard/via/epia-m700/romstage.c +++ b/src/mainboard/via/epia-m700/romstage.c @@ -373,6 +373,7 @@ static void EmbedComInit(void) #endif /* cache_as_ram.inc jumps to here. */ +#include <cpu/intel/car.h> void main(unsigned long bist) { u16 boot_mode; diff --git a/src/mainboard/via/epia-m850/romstage.c b/src/mainboard/via/epia-m850/romstage.c index 9368028..939b152 100644 --- a/src/mainboard/via/epia-m850/romstage.c +++ b/src/mainboard/via/epia-m850/romstage.c @@ -42,6 +42,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, F81865F_SP1) /* cache_as_ram.inc jumps to here. */ +#include <cpu/intel/car.h> void main(unsigned long bist) { u32 tolm; diff --git a/src/mainboard/via/epia-n/romstage.c b/src/mainboard/via/epia-n/romstage.c index 568dab5..5c1477d 100644 --- a/src/mainboard/via/epia-n/romstage.c +++ b/src/mainboard/via/epia-n/romstage.c @@ -101,6 +101,7 @@ static void enable_shadow_ram(void) pci_write_config8(ctrl.d0f3, 0x82, shadowreg); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { unsigned long x; diff --git a/src/mainboard/via/epia/romstage.c b/src/mainboard/via/epia/romstage.c index b1e6c54..e839541 100644 --- a/src/mainboard/via/epia/romstage.c +++ b/src/mainboard/via/epia/romstage.c @@ -69,6 +69,7 @@ static void enable_shadow_ram(void) pci_write_config8(dev, 0x63, shadowreg); } +#include <cpu/intel/car.h> static void main(unsigned long bist) { if (bist == 0) diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c index b270350..aa7e2de 100644 --- a/src/mainboard/via/pc2500e/romstage.c +++ b/src/mainboard/via/pc2500e/romstage.c @@ -55,6 +55,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, /* TODO: CN700 currently only supports 1 DIMM. */ }; +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Enable multifunction for northbridge. */ diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c index e1532be..d3ad0e2 100644 --- a/src/mainboard/via/vt8454c/romstage.c +++ b/src/mainboard/via/vt8454c/romstage.c @@ -83,6 +83,7 @@ static void enable_shadow_ram(const struct mem_controller *ctrl) pci_write_config8(PCI_DEV(0, 0, 3), 0x83, shadowreg); } +#include <cpu/intel/car.h> void main(unsigned long bist) { /* Set statically so it should work with cx700 as well */ diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c index 6a38355..f9b4eec 100644 --- a/src/mainboard/winent/pl6064/romstage.c +++ b/src/mainboard/winent/pl6064/romstage.c @@ -51,6 +51,7 @@ int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_lx/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c index 9e5dd53..07216d5 100644 --- a/src/mainboard/wyse/s50/romstage.c +++ b/src/mainboard/wyse/s50/romstage.c @@ -49,6 +49,7 @@ static inline int spd_read_byte(unsigned int device, unsigned int address) #include "cpu/amd/geode_gx2/syspreinit.c" #include "cpu/amd/geode_lx/msrinit.c" +#include <cpu/intel/car.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = {

1 0

Patch set updated for coreboot: aaa7050 Intel: Add common header file for CAR setup
by Edward O'Callaghan 30 Jun '14

30 Jun '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5872 -gerrit commit aaa70505b027c4276a2feb7e98a52e1abb0fdb71 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Mon May 26 17:38:23 2014 +1000 Intel: Add common header file for CAR setup When passing '-ffreestanding' the 'main' romstage.c may no longer necessarily be considered the entry point. From the C specification in 5.1.2.1 Freestanding environment; "In a freestanding environment (in which C program execution may take place without any benefit of an operating system), the name and type of the function called at program startup are implementation-defined." Clang complains about these being missing as Clang is somewhat more strict about the spec than GNU/GCC is. An advantage here is that a different entry-point type-signature shall now be warned about at compile time. Change-Id: I467001adabd47958c30c9a15e3248e42ed1151f3 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/include/cpu/intel/car.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/include/cpu/intel/car.h b/src/include/cpu/intel/car.h new file mode 100644 index 0000000..dc89ffc --- /dev/null +++ b/src/include/cpu/intel/car.h @@ -0,0 +1,7 @@ +#ifndef _CPU_INTEL_CAR_H +#define _CPU_INTEL_CAR_H + +/* std signature of entry-point to romstage.c */ +void main(unsigned long bist); + +#endif /* _CPU_INTEL_CAR_H */

1 0

Patch merged into coreboot/master: 2c342f5 Makefile.inc: Detect if a working clang binary exists before set
by gerrit＠coreboot.org 30 Jun '14

30 Jun '14

the following patch was just integrated into master: commit 2c342f508065db05f31ac04a9dee934759d7c039 Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Fri Jun 27 18:22:53 2014 +1000 Makefile.inc: Detect if a working clang binary exists before set Let us not assume the 'clang' binary exists and is working just because the user selected it in .config Change-Id: Iad3cbf4a7cda0e1c4d435fbe426b7247233973ea Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/6141 Tested-by: build bot (Jenkins) Reviewed-by: Idwer Vollering <vidwer(a)gmail.com> See http://review.coreboot.org/6141 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit June 2014