mb/intel/emeraldlake2: Revise early init
Move UART initialization to bootblock_mainboard_early_init() and don't override the generic LPC decode settings. Change-Id: Icdab36ae0324175d3d51a050784b94a53d4b3b7c Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36893 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
This commit is contained in:
parent
9f2eca50ea
commit
052e3ef334
|
@ -29,26 +29,13 @@
|
||||||
|
|
||||||
#define SIO_PORT 0x164e
|
#define SIO_PORT 0x164e
|
||||||
|
|
||||||
void mainboard_pch_lpc_setup(void)
|
|
||||||
{
|
|
||||||
pci_devfn_t dev = PCH_LPC_DEV;
|
|
||||||
|
|
||||||
/* Enable SuperIO + PS/2 Keyboard/Mouse */
|
|
||||||
u16 lpc_config = CNF1_LPC_EN | CNF2_LPC_EN | KBC_LPC_EN;
|
|
||||||
pci_write_config16(dev, LPC_EN, lpc_config);
|
|
||||||
|
|
||||||
/* Enable COM1 */
|
|
||||||
if (sio1007_enable_uart_at(SIO_PORT)) {
|
|
||||||
pci_write_config16(dev, LPC_EN,
|
|
||||||
lpc_config | COMA_LPC_EN);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void bootblock_mainboard_early_init(void)
|
void bootblock_mainboard_early_init(void)
|
||||||
{
|
{
|
||||||
const u16 port = SIO_PORT;
|
const u16 port = SIO_PORT;
|
||||||
const u16 runtime_port = 0x180;
|
const u16 runtime_port = 0x180;
|
||||||
|
|
||||||
|
sio1007_enable_uart_at(port);
|
||||||
|
|
||||||
/* Turn on configuration mode. */
|
/* Turn on configuration mode. */
|
||||||
outb(0x55, port);
|
outb(0x55, port);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue