diff options
114 files changed, 119 insertions, 119 deletions
diff --git a/src/include/cpu/intel/car.h b/src/include/cpu/intel/car.h deleted file mode 100644 index dc89ffc204..0000000000 --- a/src/include/cpu/intel/car.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/include/cpu/intel/romstage.h b/src/include/cpu/intel/romstage.h new file mode 100644 index 0000000000..0ebb91266b --- /dev/null +++ b/src/include/cpu/intel/romstage.h @@ -0,0 +1,7 @@ +#ifndef _CPU_INTEL_ROMSTAGE_H +#define _CPU_INTEL_ROMSTAGE_H + +/* std signature of entry-point to romstage.c */ +void main(unsigned long bist); + +#endif /* _CPU_INTEL_ROMSTAGE_H */ diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c index 3c3f9eb32f..70bc5d8be2 100644 --- a/src/mainboard/a-trend/atc-6220/romstage.c +++ b/src/mainboard/a-trend/atc-6220/romstage.c @@ -42,7 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 a153730a85..392f40fd7a 100644 --- a/src/mainboard/a-trend/atc-6240/romstage.c +++ b/src/mainboard/a-trend/atc-6240/romstage.c @@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 7f78dce1a6..c4bf462b06 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c +++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c @@ -54,7 +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> +#include <cpu/intel/romstage.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 a17e68ff67..41a09daab3 100644 --- a/src/mainboard/abit/be6-ii_v2_0/romstage.c +++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c @@ -43,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 51a713c8a4..a6b856e4d3 100644 --- a/src/mainboard/advantech/pcm-5820/romstage.c +++ b/src/mainboard/advantech/pcm-5820/romstage.c @@ -30,7 +30,7 @@ #define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 f645812794..3df26c66f6 100644 --- a/src/mainboard/amd/db800/romstage.c +++ b/src/mainboard/amd/db800/romstage.c @@ -49,7 +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> +#include <cpu/intel/romstage.h> void main(unsigned long bist) { diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c index 2daef93fcc..1b8a303f03 100644 --- a/src/mainboard/amd/norwich/romstage.c +++ b/src/mainboard/amd/norwich/romstage.c @@ -45,7 +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> +#include <cpu/intel/romstage.h> void main(unsigned long bist) { diff --git a/src/mainboard/amd/rumba/romstage.c b/src/mainboard/amd/rumba/romstage.c index 9158aadd81..2d43fff9f7 100644 --- a/src/mainboard/amd/rumba/romstage.c +++ b/src/mainboard/amd/rumba/romstage.c @@ -31,7 +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> +#include <cpu/intel/romstage.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 7ef8a47b63..86470b3257 100644 --- a/src/mainboard/aopen/dxplplusu/romstage.c +++ b/src/mainboard/aopen/dxplplusu/romstage.c @@ -39,7 +39,7 @@ int spd_read_byte(unsigned device, unsigned address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 23e537fc44..343351f6c4 100644 --- a/src/mainboard/artecgroup/dbe61/romstage.c +++ b/src/mainboard/artecgroup/dbe61/romstage.c @@ -57,7 +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> +#include <cpu/intel/romstage.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 c7f3090f23..43c5cf79f3 100644 --- a/src/mainboard/asi/mb_5blgp/romstage.c +++ b/src/mainboard/asi/mb_5blgp/romstage.c @@ -30,7 +30,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 6c18d8f3c1..1fb3378132 100644 --- a/src/mainboard/asi/mb_5blmp/romstage.c +++ b/src/mainboard/asi/mb_5blmp/romstage.c @@ -31,7 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC87351_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 6db086693a..fbd0848f9b 100644 --- a/src/mainboard/asus/dsbf/romstage.c +++ b/src/mainboard/asus/dsbf/romstage.c @@ -110,7 +110,7 @@ int mainboard_set_fbd_clock(int speed) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 9ea6c04960..7a79e8518d 100644 --- a/src/mainboard/asus/mew-am/romstage.c +++ b/src/mainboard/asus/mew-am/romstage.c @@ -34,7 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 87f8d658a1..04bbd869e8 100644 --- a/src/mainboard/asus/mew-vm/romstage.c +++ b/src/mainboard/asus/mew-vm/romstage.c @@ -34,7 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, LPC47B272_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 4faae202b2..d41afc8890 100644 --- a/src/mainboard/asus/p2b-d/romstage.c +++ b/src/mainboard/asus/p2b-d/romstage.c @@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 070b002ba1..494a3f030d 100644 --- a/src/mainboard/asus/p2b-ds/romstage.c +++ b/src/mainboard/asus/p2b-ds/romstage.c @@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 64b4dae172..1b905e45c3 100644 --- a/src/mainboard/asus/p2b-f/romstage.c +++ b/src/mainboard/asus/p2b-f/romstage.c @@ -43,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 8cf2b42dea..09b9a4e00a 100644 --- a/src/mainboard/asus/p2b-ls/romstage.c +++ b/src/mainboard/asus/p2b-ls/romstage.c @@ -42,7 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 3c3f9eb32f..70bc5d8be2 100644 --- a/src/mainboard/asus/p2b/romstage.c +++ b/src/mainboard/asus/p2b/romstage.c @@ -42,7 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 825457e9a9..78c76292b8 100644 --- a/src/mainboard/asus/p3b-f/romstage.c +++ b/src/mainboard/asus/p3b-f/romstage.c @@ -74,7 +74,7 @@ static void disable_spd(void) outb(0x67, PM_IO_BASE + 0x37); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 e733003b5c..15362e3b28 100644 --- a/src/mainboard/axus/tc320/romstage.c +++ b/src/mainboard/axus/tc320/romstage.c @@ -31,7 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 7325618726..b31be70b0d 100644 --- a/src/mainboard/azza/pt-6ibd/romstage.c +++ b/src/mainboard/azza/pt-6ibd/romstage.c @@ -43,7 +43,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 41a65dda19..849479c828 100644 --- a/src/mainboard/bachmann/ot200/romstage.c +++ b/src/mainboard/bachmann/ot200/romstage.c @@ -46,7 +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> +#include <cpu/intel/romstage.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 e733003b5c..15362e3b28 100644 --- a/src/mainboard/bcom/winnet100/romstage.c +++ b/src/mainboard/bcom/winnet100/romstage.c @@ -31,7 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 3676a6d145..898ad1a402 100644 --- a/src/mainboard/bcom/winnetp680/romstage.c +++ b/src/mainboard/bcom/winnetp680/romstage.c @@ -81,7 +81,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 43158bdbc7..921aa52c63 100644 --- a/src/mainboard/biostar/m6tba/romstage.c +++ b/src/mainboard/biostar/m6tba/romstage.c @@ -40,7 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 8de8a83228..70f820aeca 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c +++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c @@ -42,7 +42,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 0ae7610c2e..093c60be6b 100644 --- a/src/mainboard/digitallogic/adl855pc/romstage.c +++ b/src/mainboard/digitallogic/adl855pc/romstage.c @@ -26,7 +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> +#include <cpu/intel/romstage.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 b6412e874d..ab944a4233 100644 --- a/src/mainboard/digitallogic/msm586seg/romstage.c +++ b/src/mainboard/digitallogic/msm586seg/romstage.c @@ -154,7 +154,7 @@ static inline void irqinit(void){ #endif } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 6075565afc..8bfe8e581c 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -30,7 +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> +#include <cpu/intel/romstage.h> void main(unsigned long bist) { diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c index 040b937320..a7b31caa73 100644 --- a/src/mainboard/dmp/vortex86ex/romstage.c +++ b/src/mainboard/dmp/vortex86ex/romstage.c @@ -300,7 +300,7 @@ static void enable_l2_cache(void) pci_write_config8(NB1, 0xe8, reg_nb_f1_e8); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 cbfe04d8f1..28ddcc5668 100644 --- a/src/mainboard/eaglelion/5bcm/romstage.c +++ b/src/mainboard/eaglelion/5bcm/romstage.c @@ -12,7 +12,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 7deb730b05..9d5f2cd0cf 100644 --- a/src/mainboard/ecs/p6iwp-fe/romstage.c +++ b/src/mainboard/ecs/p6iwp-fe/romstage.c @@ -37,7 +37,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, IT8712F_SP1) #define CLKIN_DEV PNP_DEV(0x2e, IT8712F_GPIO) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 8dc61b200f..6c17645cdb 100644 --- a/src/mainboard/emulation/qemu-i440fx/romstage.c +++ b/src/mainboard/emulation/qemu-i440fx/romstage.c @@ -33,7 +33,7 @@ #include "memory.c" -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 635a44f77e..dd86701cb0 100644 --- a/src/mainboard/emulation/qemu-q35/romstage.c +++ b/src/mainboard/emulation/qemu-q35/romstage.c @@ -34,7 +34,7 @@ #include "../qemu-i440fx/memory.c" -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 5ebc4518f3..3dab527275 100644 --- a/src/mainboard/getac/p470/romstage.c +++ b/src/mainboard/getac/p470/romstage.c @@ -265,7 +265,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 d28ac34a6f..e0a248b441 100644 --- a/src/mainboard/gigabyte/ga-6bxc/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c @@ -40,7 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 cad36944b0..5d69510675 100644 --- a/src/mainboard/gigabyte/ga-6bxe/romstage.c +++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c @@ -40,7 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 1c7b8baf28..083abe1df4 100644 --- a/src/mainboard/google/butterfly/romstage.c +++ b/src/mainboard/google/butterfly/romstage.c @@ -112,7 +112,7 @@ static void rcba_config(void) RCBA32(FD) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 25c65298a9..6d819b4d27 100644 --- a/src/mainboard/google/link/romstage.c +++ b/src/mainboard/google/link/romstage.c @@ -150,7 +150,7 @@ static void copy_spd(struct pei_data *peid) sizeof(peid->spd_data[0])); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 a4daae5ab6..6c3ec79ae9 100644 --- a/src/mainboard/google/parrot/romstage.c +++ b/src/mainboard/google/parrot/romstage.c @@ -113,7 +113,7 @@ static void rcba_config(void) RCBA32(FD) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 008f1f8361..05caa3ecc8 100644 --- a/src/mainboard/google/stout/romstage.c +++ b/src/mainboard/google/stout/romstage.c @@ -154,7 +154,7 @@ static void early_ec_init(void) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 85660c00f4..c34801e121 100644 --- a/src/mainboard/hp/e_vectra_p2706t/romstage.c +++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c @@ -37,7 +37,7 @@ /* TODO: It's a PC87364 actually! */ #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 eec574d139..322907b1b6 100644 --- a/src/mainboard/ibase/mb899/romstage.c +++ b/src/mainboard/ibase/mb899/romstage.c @@ -223,7 +223,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 b8daac4676..1b8e952fc7 100644 --- a/src/mainboard/iei/juki-511p/romstage.c +++ b/src/mainboard/iei/juki-511p/romstage.c @@ -32,7 +32,7 @@ #define SERIAL_DEV PNP_DEV(0x3f0, W83977F_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 9a89107cdb..2b6caf3a17 100644 --- a/src/mainboard/iei/nova4899r/romstage.c +++ b/src/mainboard/iei/nova4899r/romstage.c @@ -32,7 +32,7 @@ #include "northbridge/amd/gx1/raminit.c" -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 2af0b2f7aa..9f4223217c 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c +++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c @@ -49,7 +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> +#include <cpu/intel/romstage.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 d2e331eac8..ac68b1d31e 100644 --- a/src/mainboard/iei/pm-lx-800-r11/romstage.c +++ b/src/mainboard/iei/pm-lx-800-r11/romstage.c @@ -53,7 +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> +#include <cpu/intel/romstage.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 947b52dab1..a83bf7ecc0 100644 --- a/src/mainboard/iei/pm-lx2-800-r10/romstage.c +++ b/src/mainboard/iei/pm-lx2-800-r10/romstage.c @@ -53,7 +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> +#include <cpu/intel/romstage.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 982060c3b3..8b74b17d9f 100644 --- a/src/mainboard/intel/d810e2cb/romstage.c +++ b/src/mainboard/intel/d810e2cb/romstage.c @@ -35,7 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 94b66104ab..0c48247bda 100644 --- a/src/mainboard/intel/d945gclf/romstage.c +++ b/src/mainboard/intel/d945gclf/romstage.c @@ -156,7 +156,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 99445b88e5..e35140bfad 100644 --- a/src/mainboard/intel/eagleheights/romstage.c +++ b/src/mainboard/intel/eagleheights/romstage.c @@ -120,7 +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> +#include <cpu/intel/romstage.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 12abb548b5..e10e7b62a3 100644 --- a/src/mainboard/intel/emeraldlake2/romstage.c +++ b/src/mainboard/intel/emeraldlake2/romstage.c @@ -162,7 +162,7 @@ static void setup_sio_gpios(void) outb(0xaa, port); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 a672afa5b1..f1cf4c3e1f 100644 --- a/src/mainboard/intel/jarrell/romstage.c +++ b/src/mainboard/intel/jarrell/romstage.c @@ -38,7 +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> +#include <cpu/intel/romstage.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 2e99be558b..c1ee9bb058 100644 --- a/src/mainboard/intel/mtarvon/romstage.c +++ b/src/mainboard/intel/mtarvon/romstage.c @@ -51,7 +51,7 @@ static inline int spd_read_byte(u16 device, u8 address) #include "arch/x86/lib/stages.c" #endif -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 c56b1dfe31..cd4996758d 100644 --- a/src/mainboard/intel/truxton/romstage.c +++ b/src/mainboard/intel/truxton/romstage.c @@ -51,7 +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> +#include <cpu/intel/romstage.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 f35f93ba20..e1a5807f28 100644 --- a/src/mainboard/intel/xe7501devkit/romstage.c +++ b/src/mainboard/intel/xe7501devkit/romstage.c @@ -33,7 +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> +#include <cpu/intel/romstage.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 5ede2f9ed6..00d4a38c5a 100644 --- a/src/mainboard/iwave/iWRainbowG6/romstage.c +++ b/src/mainboard/iwave/iWRainbowG6/romstage.c @@ -332,7 +332,7 @@ static void poulsbo_setup_Stage2Regs(void) printk(BIOS_DEBUG, " done.\n"); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 cc207b1245..a9c71c3062 100644 --- a/src/mainboard/jetway/j7f2/romstage.c +++ b/src/mainboard/jetway/j7f2/romstage.c @@ -86,7 +86,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 842f7bcf4e..2c12c5d1fb 100644 --- a/src/mainboard/kontron/986lcd-m/romstage.c +++ b/src/mainboard/kontron/986lcd-m/romstage.c @@ -329,7 +329,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 98f5f10b29..211bfb5f0b 100644 --- a/src/mainboard/kontron/ktqm77/romstage.c +++ b/src/mainboard/kontron/ktqm77/romstage.c @@ -159,7 +159,7 @@ static void superio_gpio_config(void) pnp_exit_ext_func_mode(dev); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 186e9fd634..c51ee35098 100644 --- a/src/mainboard/lanner/em8510/romstage.c +++ b/src/mainboard/lanner/em8510/romstage.c @@ -48,7 +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> +#include <cpu/intel/romstage.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 df460922f2..62bf1d9895 100644 --- a/src/mainboard/lenovo/t520/romstage.c +++ b/src/mainboard/lenovo/t520/romstage.c @@ -108,7 +108,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 b2cd6163c4..8880e30e95 100644 --- a/src/mainboard/lenovo/t530/romstage.c +++ b/src/mainboard/lenovo/t530/romstage.c @@ -109,7 +109,7 @@ static void rcba_config(void) RCBA32(BUC) = 0; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 01e48e7042..f11b33e9ca 100644 --- a/src/mainboard/lenovo/t60/romstage.c +++ b/src/mainboard/lenovo/t60/romstage.c @@ -206,7 +206,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 5f8e291692..2c3dfd1bcc 100644 --- a/src/mainboard/lenovo/x201/romstage.c +++ b/src/mainboard/lenovo/x201/romstage.c @@ -215,7 +215,7 @@ static void set_fsb_frequency(void) smbus_block_write(0x69, 0, 5, block); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 1705003454..94fa5cf9a2 100644 --- a/src/mainboard/lenovo/x230/romstage.c +++ b/src/mainboard/lenovo/x230/romstage.c @@ -148,7 +148,7 @@ init_usb (void) outw (0x0000, DEFAULT_PMBASE | 0x003c); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.h> void main(unsigned long bist) { int s3resume = 0; diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c index 68a9b48937..943143a506 100644 --- a/src/mainboard/lenovo/x60/romstage.c +++ b/src/mainboard/lenovo/x60/romstage.c @@ -213,7 +213,7 @@ static void early_ich7_init(void) RCBA32(0x2034) = reg32; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 3192e5c1b2..81642a11d2 100644 --- a/src/mainboard/lippert/frontrunner/romstage.c +++ b/src/mainboard/lippert/frontrunner/romstage.c @@ -71,7 +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> +#include <cpu/intel/romstage.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 b3b449862b..d8e9cd9589 100644 --- a/src/mainboard/lippert/hurricane-lx/romstage.c +++ b/src/mainboard/lippert/hurricane-lx/romstage.c @@ -110,7 +110,7 @@ static void mb_gpio_init(void) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 2f7bd8580a..68393323ea 100644 --- a/src/mainboard/lippert/literunner-lx/romstage.c +++ b/src/mainboard/lippert/literunner-lx/romstage.c @@ -152,7 +152,7 @@ static void mb_gpio_init(void) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 18f48f6791..ef3f7d2d08 100644 --- a/src/mainboard/lippert/roadrunner-lx/romstage.c +++ b/src/mainboard/lippert/roadrunner-lx/romstage.c @@ -85,7 +85,7 @@ static void mb_gpio_init(void) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 c3f1c8a201..f397e37d74 100644 --- a/src/mainboard/lippert/spacerunner-lx/romstage.c +++ b/src/mainboard/lippert/spacerunner-lx/romstage.c @@ -149,7 +149,7 @@ static void mb_gpio_init(void) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 59e1c6d8ef..e29423eb45 100644 --- a/src/mainboard/mitac/6513wu/romstage.c +++ b/src/mainboard/mitac/6513wu/romstage.c @@ -35,7 +35,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, SMSCSUPERIO_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 578de61370..be273f3601 100644 --- a/src/mainboard/msi/ms6119/romstage.c +++ b/src/mainboard/msi/ms6119/romstage.c @@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 a6767bc9a8..c3a755749e 100644 --- a/src/mainboard/msi/ms6147/romstage.c +++ b/src/mainboard/msi/ms6147/romstage.c @@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 3811cc53e5..ff888bcbea 100644 --- a/src/mainboard/msi/ms6156/romstage.c +++ b/src/mainboard/msi/ms6156/romstage.c @@ -41,7 +41,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 4005ac8ff1..ae789902e2 100644 --- a/src/mainboard/msi/ms6178/romstage.c +++ b/src/mainboard/msi/ms6178/romstage.c @@ -36,7 +36,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) #define DUMMY_DEV PNP_DEV(0x2e, 0) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 97d05807c5..d4a2d8f7af 100644 --- a/src/mainboard/nec/powermate2000/romstage.c +++ b/src/mainboard/nec/powermate2000/romstage.c @@ -34,7 +34,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, SMSCSUPERIO_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 39c75caa36..5c878675c1 100644 --- a/src/mainboard/nokia/ip530/romstage.c +++ b/src/mainboard/nokia/ip530/romstage.c @@ -40,7 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 93dd7c278b..c4a278e04d 100644 --- a/src/mainboard/packardbell/ms2290/romstage.c +++ b/src/mainboard/packardbell/ms2290/romstage.c @@ -198,7 +198,7 @@ static inline u16 read_acpi16(u32 addr) return inw(DEFAULT_PMBASE | addr); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 436edc0d63..4f80550713 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -107,7 +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> +#include <cpu/intel/romstage.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 9b272a4a65..52c5310c1a 100644 --- a/src/mainboard/pcengines/alix2d/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -130,7 +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> +#include <cpu/intel/romstage.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 7dd4b4811f..af91bde514 100644 --- a/src/mainboard/rca/rm4100/romstage.c +++ b/src/mainboard/rca/rm4100/romstage.c @@ -94,7 +94,7 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 a4f55a8bec..7cc1a1d8b1 100644 --- a/src/mainboard/roda/rk886ex/romstage.c +++ b/src/mainboard/roda/rk886ex/romstage.c @@ -251,7 +251,7 @@ static void init_artec_dongle(void) outb(0xf4, 0x88); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 01389368a1..405d75e848 100644 --- a/src/mainboard/roda/rk9/romstage.c +++ b/src/mainboard/roda/rk9/romstage.c @@ -120,7 +120,7 @@ static void default_superio_gpio_setup(void) outb(0x10, 0x600 + 0xb + 4); /* GP40 - GP47 */ } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 f984af2baa..32f1ec5fcd 100644 --- a/src/mainboard/samsung/lumpy/romstage.c +++ b/src/mainboard/samsung/lumpy/romstage.c @@ -132,7 +132,7 @@ static void early_pch_init(void) pci_write_config8(PCH_LPC_DEV, 0xa4, reg8); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 3abea10f14..a3905aba90 100644 --- a/src/mainboard/samsung/stumpy/romstage.c +++ b/src/mainboard/samsung/stumpy/romstage.c @@ -172,7 +172,7 @@ static void setup_sio_gpios(void) it8772f_gpio_setup(DUMMY_DEV, 6, 0x00, 0x00, 0x00, 0x00, 0x00); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 fccd29adf2..82ac56fa42 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c +++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c @@ -40,7 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 6b10a68eb5..0385cad725 100644 --- a/src/mainboard/supermicro/x6dai_g/romstage.c +++ b/src/mainboard/supermicro/x6dai_g/romstage.c @@ -42,7 +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> +#include <cpu/intel/romstage.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 9a637be7ab..405a2bc3e2 100644 --- a/src/mainboard/supermicro/x6dhe_g/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g/romstage.c @@ -46,7 +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> +#include <cpu/intel/romstage.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 09f4c57de1..48945ebb16 100644 --- a/src/mainboard/supermicro/x6dhe_g2/romstage.c +++ b/src/mainboard/supermicro/x6dhe_g2/romstage.c @@ -43,7 +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> +#include <cpu/intel/romstage.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 3e51b732a4..08b0ccdec4 100644 --- a/src/mainboard/supermicro/x6dhr_ig/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig/romstage.c @@ -45,7 +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> +#include <cpu/intel/romstage.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 868fbdc929..dfe0da2bd6 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/romstage.c +++ b/src/mainboard/supermicro/x6dhr_ig2/romstage.c @@ -45,7 +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> +#include <cpu/intel/romstage.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 a52193f4a0..83e34b5342 100644 --- a/src/mainboard/supermicro/x7db8/romstage.c +++ b/src/mainboard/supermicro/x7db8/romstage.c @@ -111,7 +111,7 @@ int mainboard_set_fbd_clock(int speed) } } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 64de0c036d..5d33baee25 100644 --- a/src/mainboard/technologic/ts5300/romstage.c +++ b/src/mainboard/technologic/ts5300/romstage.c @@ -136,7 +136,7 @@ static void hard_reset(void) while (1) ; } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 e733003b5c..15362e3b28 100644 --- a/src/mainboard/televideo/tc7020/romstage.c +++ b/src/mainboard/televideo/tc7020/romstage.c @@ -31,7 +31,7 @@ #define SERIAL_DEV PNP_DEV(0x2e, PC97317_SP1) -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 ed87462d80..bb8d15cc7a 100644 --- a/src/mainboard/thomson/ip1000/romstage.c +++ b/src/mainboard/thomson/ip1000/romstage.c @@ -92,7 +92,7 @@ static void mb_early_setup(void) pci_write_config8(PCI_DEV(0, 0x1f, 0), ACPI_CNTL, 0x10); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 115b402c08..b3358b5f5d 100644 --- a/src/mainboard/traverse/geos/romstage.c +++ b/src/mainboard/traverse/geos/romstage.c @@ -46,7 +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> +#include <cpu/intel/romstage.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 78313fcc03..0c81e8e890 100644 --- a/src/mainboard/tyan/s1846/romstage.c +++ b/src/mainboard/tyan/s1846/romstage.c @@ -40,7 +40,7 @@ int spd_read_byte(unsigned int device, unsigned int address) return smbus_read_byte(device, address); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 1b03982fd0..5d4fd0e780 100644 --- a/src/mainboard/tyan/s2735/romstage.c +++ b/src/mainboard/tyan/s2735/romstage.c @@ -34,7 +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> +#include <cpu/intel/romstage.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 e7e65f2d44..20f99cb624 100644 --- a/src/mainboard/via/epia-cn/romstage.c +++ b/src/mainboard/via/epia-cn/romstage.c @@ -79,7 +79,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, }; -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 b3b515df2b..3f2a0c4084 100644 --- a/src/mainboard/via/epia-m/romstage.c +++ b/src/mainboard/via/epia-m/romstage.c @@ -66,7 +66,7 @@ static void enable_shadow_ram(void) pci_write_config8(dev, 0x63, shadowreg); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 c33acbe24b..b00ece1a3a 100644 --- a/src/mainboard/via/epia-m700/romstage.c +++ b/src/mainboard/via/epia-m700/romstage.c @@ -373,7 +373,7 @@ static void EmbedComInit(void) #endif /* cache_as_ram.inc jumps to here. */ -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 969e2b6aec..7b62d86105 100644 --- a/src/mainboard/via/epia-m850/romstage.c +++ b/src/mainboard/via/epia-m850/romstage.c @@ -42,7 +42,7 @@ #define SERIAL_DEV PNP_DEV(0x4e, F81865F_SP1) /* cache_as_ram.inc jumps to here. */ -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 5c1477d3a9..2ede8d87cb 100644 --- a/src/mainboard/via/epia-n/romstage.c +++ b/src/mainboard/via/epia-n/romstage.c @@ -101,7 +101,7 @@ static void enable_shadow_ram(void) pci_write_config8(ctrl.d0f3, 0x82, shadowreg); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 e839541a27..1d312d7267 100644 --- a/src/mainboard/via/epia/romstage.c +++ b/src/mainboard/via/epia/romstage.c @@ -69,7 +69,7 @@ static void enable_shadow_ram(void) pci_write_config8(dev, 0x63, shadowreg); } -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 aa7e2de6ec..0b1aeb4761 100644 --- a/src/mainboard/via/pc2500e/romstage.c +++ b/src/mainboard/via/pc2500e/romstage.c @@ -55,7 +55,7 @@ static const struct mem_controller ctrl = { .channel0 = { DIMM0 }, /* TODO: CN700 currently only supports 1 DIMM. */ }; -#include <cpu/intel/car.h> +#include <cpu/intel/romstage.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 d3ad0e2964..f6d58c8e70 100644 --- a/src/mainboard/via/vt8454c/romstage.c +++ b/src/mainboard/via/vt8454c/romstage.c @@ -83,7 +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> +#include <cpu/intel/romstage.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 f9b4eecd50..47ea7222f5 100644 --- a/src/mainboard/winent/pl6064/romstage.c +++ b/src/mainboard/winent/pl6064/romstage.c @@ -51,7 +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> +#include <cpu/intel/romstage.h> void main(unsigned long bist) { diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c index 07216d5d47..b9de16c184 100644 --- a/src/mainboard/wyse/s50/romstage.c +++ b/src/mainboard/wyse/s50/romstage.c @@ -49,7 +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> +#include <cpu/intel/romstage.h> void main(unsigned long bist) { static const struct mem_controller memctrl [] = { |