diff options
| author | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-01-20 14:21:38 -0500 |
| commit | 0b9b01517f0b1398ec27dbb47faf3645b719e02c (patch) | |
| tree | fac11441ba4056e75d3b59811da3b0a91d1cfcf5 /drivers/net/octeon/octeon_eth.c | |
| parent | 8bd3c0a7e17ee17c771cabc0e548a1a436ac021d (diff) | |
| parent | 6333acb961b6fcaa60c6e5b623d676b332481cfa (diff) | |
Merge branch '2023-01-20-finish-CONFIG-migration-work'
- Merge in the final batch of CONFIG to Kconfig/CFG migration work. This
includes a fix for a number of ns16550 or similar UARTs due to a
migration bug. We also pull in a revert for enabling CONFIG_VIDEO on
tools-only_defconfig.
Diffstat (limited to 'drivers/net/octeon/octeon_eth.c')
| -rw-r--r-- | drivers/net/octeon/octeon_eth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/octeon/octeon_eth.c b/drivers/net/octeon/octeon_eth.c index fbb1afc08ab..659ba51ecb4 100644 --- a/drivers/net/octeon/octeon_eth.c +++ b/drivers/net/octeon/octeon_eth.c @@ -58,7 +58,7 @@ #include <mach/cvmx-mdio.h> /** Maximum receive packet size (hardware default is 1536) */ -#define CONFIG_OCTEON_NETWORK_MRU 1536 +#define CFG_OCTEON_NETWORK_MRU 1536 #define OCTEON_BOOTLOADER_NAMED_BLOCK_TMP_PREFIX "__tmp" @@ -199,7 +199,7 @@ static void cvm_oct_fill_hw_memory(u64 pool, u64 size, u64 elements) */ static void cvm_oct_configure_common_hw(void) { - int mru = env_get_ulong("octeon_mru", 0, CONFIG_OCTEON_NETWORK_MRU); + int mru = env_get_ulong("octeon_mru", 0, CFG_OCTEON_NETWORK_MRU); int packet_pool_size = CVMX_FPA_PACKET_POOL_SIZE; if (mru > packet_pool_size) @@ -224,7 +224,7 @@ static void cvm_oct_configure_common_hw(void) cvmx_helper_initialize_packet_io_local(); /* The MRU defaults to 1536 bytes by the hardware. Setting - * CONFIG_OCTEON_NETWORK_MRU allows this to be overridden. + * CFG_OCTEON_NETWORK_MRU allows this to be overridden. */ if (octeon_has_feature(OCTEON_FEATURE_PKI)) { struct cvmx_pki_global_config gbl_cfg; |