]> git.baikalelectronics.ru Git - uboot.git/commitdiff
toradex: common: Remove #ifdef usage for 2nd ethaddr
authorFrancesco Dolcini <francesco.dolcini@toradex.com>
Thu, 21 Jul 2022 13:17:36 +0000 (15:17 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 25 Jul 2022 14:12:00 +0000 (16:12 +0200)
Fix checkpatch warn, use `IS_ENABLED(CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR)`
instead of `#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR`.

Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
board/toradex/common/tdx-common.c

index 3643ebbb16328d76804ab0778e31a326032300db..2284fcddb510089615ef8e9e398cf44d6a258239 100644 (file)
@@ -151,8 +151,8 @@ int show_board_info(void)
        if (!eth_env_get_enetaddr("ethaddr", ethaddr))
                eth_env_set_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
 
-#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR
-       if (!eth_env_get_enetaddr("eth1addr", ethaddr)) {
+       if (IS_ENABLED(CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR) &&
+           !eth_env_get_enetaddr("eth1addr", ethaddr)) {
                /*
                 * Secondary MAC address is allocated from block
                 * 0x100000 higher then the first MAC address
@@ -161,7 +161,6 @@ int show_board_info(void)
                ethaddr[3] += 0x10;
                eth_env_set_enetaddr("eth1addr", ethaddr);
        }
-#endif
 
        return 0;
 }