diff options
| author | Arthur Heymans <arthur@aheymans.xyz> | 2023-11-06 15:20:33 +0100 |
|---|---|---|
| committer | Felix Held <felix-coreboot@felixheld.de> | 2023-11-07 17:22:33 +0000 |
| commit | 91e6117c09ad7aaa81344bcc378dc424f574a772 (patch) | |
| tree | dbec2ce0b61d51f0bd25f14335b7ca707b6a9a22 | |
| parent | f9bc2c46995f24909abedf220dc89170d8c0d756 (diff) | |
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>
| -rw-r--r-- | src/drivers/net/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/drivers/net/ne2k.c | 3 | ||||
| -rw-r--r-- | src/include/console/ne2k.h | 2 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 1 |
4 files changed, 4 insertions, 3 deletions
diff --git a/src/drivers/net/Makefile.inc b/src/drivers/net/Makefile.inc index a17547c6e0..9ba459b25a 100644 --- a/src/drivers/net/Makefile.inc +++ b/src/drivers/net/Makefile.inc @@ -1,5 +1,6 @@ ## SPDX-License-Identifier: GPL-2.0-only +bootblock-$(CONFIG_CONSOLE_NE2K) += ne2k.c romstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k.c ramstage-$(CONFIG_REALTEK_8168_RESET) += r8168.c diff --git a/src/drivers/net/ne2k.c b/src/drivers/net/ne2k.c index 589ec4c34f..4479a76742 100644 --- a/src/drivers/net/ne2k.c +++ b/src/drivers/net/ne2k.c @@ -266,8 +266,7 @@ int ne2k_init(unsigned int eth_nic_base) pci_devfn_t dev; unsigned char c; - /* FIXME: This console is not enabled for bootblock. */ - if (!ENV_ROMSTAGE) + if (!ENV_ROMSTAGE_OR_BEFORE) return 0; /* For this to work, mainboard code must have configured diff --git a/src/include/console/ne2k.h b/src/include/console/ne2k.h index ca8d147ed0..220a6321fc 100644 --- a/src/include/console/ne2k.h +++ b/src/include/console/ne2k.h @@ -9,7 +9,7 @@ void ne2k_append_data(unsigned char *d, int len, unsigned int base); int ne2k_init(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) { ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT); diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 53ff2d36cf..0f4600813b 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -116,6 +116,7 @@ ramstage-y += rtc.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c romstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c +bootblock-y += compute_ip_checksum.c romstage-y += compute_ip_checksum.c romstage-y += dimm_info_util.c ifeq ($(CONFIG_COMPILER_GCC),y) |