Commit: 9762fbeea451f4d81ec88788e7680e37a1ee5beb - uboot (git)

Commit MetaInfo

• Revision: 9762fbeea451f4d81ec88788e7680e37a1ee5beb (tree)
• Zeit: 2022-07-25 23:12:00
• Autor: Francesco Dolcini <francesco.dolcini@tora...>
• Commiter: Stefano Babic

Log Message

toradex: common: Remove #ifdef usage for 2nd ethaddr

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 <[e-mail]>

Ändern Zusammenfassung

• modified: board/toradex/common/tdx-common.c

Diff

--- a/board/toradex/common/tdx-common.c
+++ b/board/toradex/common/tdx-common.c
@@ -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;
 }