From 916223ef3544452bee57b08f9593aa9da66212a5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sun, 9 Jan 2011 22:37:37 -0800 Subject: usrp2: eth addrs, wrong type, should be bool --- firmware/zpu/CMakeLists.txt | 3 ++- firmware/zpu/lib/eth_addrs.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'firmware') diff --git a/firmware/zpu/CMakeLists.txt b/firmware/zpu/CMakeLists.txt index 484335992..f79e48f8a 100644 --- a/firmware/zpu/CMakeLists.txt +++ b/firmware/zpu/CMakeLists.txt @@ -46,7 +46,8 @@ MACRO(ADD_LINKER_FLAGS flags) SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${flags}") ENDMACRO(ADD_LINKER_FLAGS) -ADD_LINKER_FLAGS("-Wl,--relax -Wl,--gc-sections") +ADD_LINKER_FLAGS("-Wl,--gc-sections") +ADD_LINKER_FLAGS("-Wl,--relax") ######################################################################## # define for the hal io (FIXME move?) diff --git a/firmware/zpu/lib/eth_addrs.c b/firmware/zpu/lib/eth_addrs.c index ff5d04f4d..0c40e2dca 100644 --- a/firmware/zpu/lib/eth_addrs.c +++ b/firmware/zpu/lib/eth_addrs.c @@ -45,7 +45,7 @@ unprogrammed(const void *t, size_t len) //////////////////// MAC Addr Stuff /////////////////////// -static int8_t src_mac_addr_initialized = false; +static bool src_mac_addr_initialized = false; static const eth_mac_addr_t default_mac_addr = {{ 0x00, 0x50, 0xC2, 0x85, 0x3f, 0xff @@ -98,7 +98,7 @@ ethernet_set_mac_addr(const eth_mac_addr_t *t) //////////////////// IP Addr Stuff /////////////////////// -static int8_t src_ip_addr_initialized = false; +static bool src_ip_addr_initialized = false; static const struct ip_addr default_ip_addr = { (192 << 24 | 168 << 16 | 10 << 8 | 2 << 0) -- cgit v1.2.3