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 /board/ti/omap3evm/evm.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 'board/ti/omap3evm/evm.c')
| -rw-r--r-- | board/ti/omap3evm/evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/ti/omap3evm/evm.c b/board/ti/omap3evm/evm.c index a7f9a7eca1..a4d6a0138d 100644 --- a/board/ti/omap3evm/evm.c +++ b/board/ti/omap3evm/evm.c @@ -33,7 +33,7 @@ #define OMAP3EVM_GPIO_ETH_RST_GEN1 64 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7 -#define CONFIG_SMC911X_BASE 0x2C000000 +#define CFG_SMC911X_BASE 0x2C000000 DECLARE_GLOBAL_DATA_PTR; @@ -54,7 +54,7 @@ static void omap3_evm_get_revision(void) unsigned int smsc_id; /* Ethernet PHY ID is stored at ID_REV register */ - smsc_id = readl(CONFIG_SMC911X_BASE + 0x50) & 0xFFFF0000; + smsc_id = readl(CFG_SMC911X_BASE + 0x50) & 0xFFFF0000; printf("Read back SMSC id 0x%x\n", smsc_id); switch (smsc_id) { |