GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/net/ne2k: Make it work for bootblock 

This code was written in a romcc bootblock time. There is no reason why
it would not work in bootblock now.

Untested but expected to work.

Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Change-Id: I708e8a3b503eb3a7fdf6063803d666529096f651
Reviewed-on: https://review.coreboot.org/c/coreboot/+/78934
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
This commit is contained in:
Arthur Heymans 2023-11-06 15:20:33 +01:00 committed by Felix Held
parent f9bc2c4699
commit 91e6117c09
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/net/Makefile.inc
View File

@ -1,5 +1,6 @@
## SPDX-License-Identifier: GPL-2.0-only ## SPDX-License-Identifier: GPL-2.0-only
bootblock-$(CONFIG_CONSOLE_NE2K) += ne2k.c
romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c
ramstage-$(CONFIG_REALTEK_8168_RESET) += r8168.c ramstage-$(CONFIG_REALTEK_8168_RESET) += r8168.c

3
src/drivers/net/ne2k.c
View File

@ -266,8 +266,7 @@ int ne2k_init(unsigned int eth_nic_base)
pci_devfn_t dev; pci_devfn_t dev;
unsigned char c; unsigned char c;
/* FIXME: This console is not enabled for bootblock. */ if (!ENV_ROMSTAGE_OR_BEFORE)
if (!ENV_ROMSTAGE)
return 0; return 0;
/* For this to work, mainboard code must have configured /* For this to work, mainboard code must have configured

2
src/include/console/ne2k.h
View File

@ -9,7 +9,7 @@ void ne2k_append_data(unsigned char *d, int len, unsigned int base);
int ne2k_init(unsigned int eth_nic_base); int ne2k_init(unsigned int eth_nic_base);
void ne2k_transmit(unsigned int eth_nic_base); void ne2k_transmit(unsigned int eth_nic_base);
#if CONFIG(CONSOLE_NE2K) && (ENV_ROMSTAGE || ENV_RAMSTAGE) #if CONFIG(CONSOLE_NE2K) && (ENV_ROMSTAGE_OR_BEFORE || ENV_RAMSTAGE)
static inline void __ne2k_init(void) static inline void __ne2k_init(void)
{ {
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT); ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);

1
src/lib/Makefile.inc
View File

@ -116,6 +116,7 @@ ramstage-y += rtc.c
romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
bootblock-y += compute_ip_checksum.c
romstage-y += compute_ip_checksum.c romstage-y += compute_ip_checksum.c
romstage-y += dimm_info_util.c romstage-y += dimm_info_util.c
ifeq ($(CONFIG_COMPILER_GCC),y) ifeq ($(CONFIG_COMPILER_GCC),y)