From fa5d0f835b1f3bb8907e616913cbf7b91d09ef26 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Tue, 12 Nov 2019 19:11:50 +0100 Subject: nb/intel/sandybridge: Set up console in bootblock Change-Id: Ia041b63201b2a4a2fe6ab11e3497c460f88061d1 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/36784 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/mainboard/msi/ms7707/Makefile.inc | 2 ++ src/mainboard/msi/ms7707/early_init.c | 52 ++++++++++++++++++++++++++++++++ src/mainboard/msi/ms7707/romstage.c | 56 ----------------------------------- 3 files changed, 54 insertions(+), 56 deletions(-) create mode 100644 src/mainboard/msi/ms7707/early_init.c delete mode 100644 src/mainboard/msi/ms7707/romstage.c (limited to 'src/mainboard/msi') diff --git a/src/mainboard/msi/ms7707/Makefile.inc b/src/mainboard/msi/ms7707/Makefile.inc index 0ec849f5b5..2fa05da9ac 100644 --- a/src/mainboard/msi/ms7707/Makefile.inc +++ b/src/mainboard/msi/ms7707/Makefile.inc @@ -1,2 +1,4 @@ bootblock-y += gpio.c romstage-y += gpio.c +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/msi/ms7707/early_init.c b/src/mainboard/msi/ms7707/early_init.c new file mode 100644 index 0000000000..480e196e90 --- /dev/null +++ b/src/mainboard/msi/ms7707/early_init.c @@ -0,0 +1,52 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2008-2009 coresystems GmbH + * Copyright (C) 2014 Vladimir Serbinenko + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; version 2 of + * the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include +#include +#include +#include + +void mainboard_pch_lpc_setup(void) +{ + u16 reg16; + reg16 = pci_read_config16(PCI_DEV(0, 0x1f, 0), 0xa4); + reg16 |= (1 << 13); // WOL Enable Override (WOL_EN_OVRD) + pci_write_config16(PCI_DEV(0, 0x1f, 0), 0xa4, reg16); +} + +const struct southbridge_usb_port mainboard_usb_ports[] = { + {1, 0, 0}, + {1, 0, 0}, + {1, 0, 1}, + {1, 0, 1}, + {1, 0, 2}, + {1, 0, 2}, + {1, 0, 3}, + {1, 0, 3}, + {1, 0, 4}, + {1, 0, 4}, + {1, 0, 6}, + {1, 0, 5}, + {1, 0, 5}, + {1, 0, 6}, +}; + +void mainboard_get_spd(spd_raw_data *spd, bool id_only) +{ + read_spd(&spd[0], 0x50, id_only); + read_spd(&spd[2], 0x52, id_only); +} diff --git a/src/mainboard/msi/ms7707/romstage.c b/src/mainboard/msi/ms7707/romstage.c deleted file mode 100644 index 1dd3fd06a8..0000000000 --- a/src/mainboard/msi/ms7707/romstage.c +++ /dev/null @@ -1,56 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008-2009 coresystems GmbH - * Copyright (C) 2014 Vladimir Serbinenko - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#include -#include -#include -#include - -void mainboard_pch_lpc_setup(void) -{ - u16 reg16; - reg16 = pci_read_config16(PCI_DEV(0, 0x1f, 0), 0xa4); - reg16 |= (1 << 13); // WOL Enable Override (WOL_EN_OVRD) - pci_write_config16(PCI_DEV(0, 0x1f, 0), 0xa4, reg16); -} - -const struct southbridge_usb_port mainboard_usb_ports[] = { - {1, 0, 0}, - {1, 0, 0}, - {1, 0, 1}, - {1, 0, 1}, - {1, 0, 2}, - {1, 0, 2}, - {1, 0, 3}, - {1, 0, 3}, - {1, 0, 4}, - {1, 0, 4}, - {1, 0, 6}, - {1, 0, 5}, - {1, 0, 5}, - {1, 0, 6}, -}; - -void mainboard_config_superio(void) -{ -} - -void mainboard_get_spd(spd_raw_data *spd, bool id_only) -{ - read_spd(&spd[0], 0x50, id_only); - read_spd(&spd[2], 0x52, id_only); -} -- cgit v1.2.3