bcm_ns3: use device specific naming for variables

Use device specific naming for variables so as to not overlap
with common function names.

Signed-off-by: Maxim Uvarov <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
Reviewed-by: Peter Robinson <[email protected]>

diff --git a/include/configs/bcm_ns3.h b/include/configs/bcm_ns3.h
index 47de4bc201360e264cb1e44a9f8c53fe6afc26ab..7c6e0725a6c37f11a1e3697de2157d43ca96b9f1 100644 (file)
--- a/include/configs/bcm_ns3.h
+++ b/include/configs/bcm_ns3.h
@@ -45,11 +45,11 @@
 #define PCIE_ARGS "pcie_args=pci=pcie_bus_safe pcie_ports=native vfio_pci.disable_idle_d3=1\0"
 
 #ifdef CONFIG_BCM_SF2_ETH
-#define ETH_ADDR "ethaddr=00:0A:F7:95:65:A4\0"
+#define BCM_ETH_ADDR "ethaddr=00:0A:F7:95:65:A4\0"
 #define NET_ARGS "bgmac_platform.ethaddr=${ethaddr} " \
        "ip=${ipaddr}::${gatewayip}:${netmask}::${ethif}:off"
 #else
-#define ETH_ADDR
+#define BMC_ETH_ADDR
 #define NET_ARGS
 #endif
 
@@ -749,7 +749,7 @@
        OS_LOG_LEVEL \
        EXTRA_ARGS \
        PCIE_ARGS \
-       ETH_ADDR \
+       BMC_ETH_ADDR \
        RESERVED_MEM \
        SETBOOTARGS \
        UPDATEME_FLASH_PARAMS \