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 <maxim.uvarov@linaro.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Peter Robinson <pbrobinson@gmail.com>
This commit is contained in:
Maxim Uvarov 2023-12-26 21:46:17 +06:00 committed by Tom Rini
parent 9c77cffabd
commit 0c6d645d3f

View file

@ -45,11 +45,11 @@
#define PCIE_ARGS "pcie_args=pci=pcie_bus_safe pcie_ports=native vfio_pci.disable_idle_d3=1\0" #define PCIE_ARGS "pcie_args=pci=pcie_bus_safe pcie_ports=native vfio_pci.disable_idle_d3=1\0"
#ifdef CONFIG_BCM_SF2_ETH #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} " \ #define NET_ARGS "bgmac_platform.ethaddr=${ethaddr} " \
"ip=${ipaddr}::${gatewayip}:${netmask}::${ethif}:off" "ip=${ipaddr}::${gatewayip}:${netmask}::${ethif}:off"
#else #else
#define ETH_ADDR #define BMC_ETH_ADDR
#define NET_ARGS #define NET_ARGS
#endif #endif
@ -749,7 +749,7 @@
OS_LOG_LEVEL \ OS_LOG_LEVEL \
EXTRA_ARGS \ EXTRA_ARGS \
PCIE_ARGS \ PCIE_ARGS \
ETH_ADDR \ BMC_ETH_ADDR \
RESERVED_MEM \ RESERVED_MEM \
SETBOOTARGS \ SETBOOTARGS \
UPDATEME_FLASH_PARAMS \ UPDATEME_FLASH_PARAMS \