diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-05 21:32:42 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-05 21:32:42 +0100 |
| commit | 163b29469d27452a3461e0b5947030a2abfe6169 (patch) | |
| tree | 6fac0698730e1d5df87c22ce86c75fa708e736e0 | |
| parent | 6d1d5cf96ef9d7756a741709071c9c23b8490a0c (diff) | |
| parent | 6f26185435fa196ab6ca605575fc880d2d0b3e27 (diff) | |
Merge branch 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging
* 'marek.vasut@gmail.com' of git://git.denx.de/u-boot-staging:
tools/os_support: add OS X Lion support
board/esd/dasa_sim/flash.c: Fix GCC 4.6 warning
board/esd/common/xilinx_jtag_micro.c: Fix GCC 4.6 warning
| -rw-r--r-- | board/esd/common/xilinx_jtag/micro.c | 2 | ||||
| -rw-r--r-- | board/esd/dasa_sim/flash.c | 3 | ||||
| -rw-r--r-- | tools/os_support.c | 2 | ||||
| -rw-r--r-- | tools/os_support.h | 2 |
4 files changed, 2 insertions, 7 deletions
diff --git a/board/esd/common/xilinx_jtag/micro.c b/board/esd/common/xilinx_jtag/micro.c index 9823e5e8a7..cba33b8123 100644 --- a/board/esd/common/xilinx_jtag/micro.c +++ b/board/esd/common/xilinx_jtag/micro.c @@ -1831,7 +1831,6 @@ int xsvfExecute(void) int do_cpld(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { int iErrorCode; - char* pzXsvfFileName; unsigned long duration; unsigned long long startClock, endClock; @@ -1847,7 +1846,6 @@ int do_cpld(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } iErrorCode = XSVF_ERRORCODE( XSVF_ERROR_NONE ); - pzXsvfFileName = 0; xsvf_iDebugLevel = 0; printf("XSVF Player v%s, Xilinx, Inc.\n", XSVF_VERSION); diff --git a/board/esd/dasa_sim/flash.c b/board/esd/dasa_sim/flash.c index d6a7737975..e2f2aac7dc 100644 --- a/board/esd/dasa_sim/flash.c +++ b/board/esd/dasa_sim/flash.c @@ -44,7 +44,6 @@ unsigned long flash_init (void) { unsigned long size_b0; int i; - unsigned long base_b0; /* Init: no FLASHes known */ for (i=0; i<CONFIG_SYS_MAX_FLASH_BANKS; ++i) { @@ -63,8 +62,6 @@ unsigned long flash_init (void) /* Setup offsets */ flash_get_offsets (-size_b0, &flash_info[0]); - base_b0 = -size_b0; - /* Monitor protection ON by default */ (void)flash_protect(FLAG_PROTECT_SET, -monitor_flash_len, diff --git a/tools/os_support.c b/tools/os_support.c index 1ed89e6c85..319c0fe2a2 100644 --- a/tools/os_support.c +++ b/tools/os_support.c @@ -23,6 +23,6 @@ #ifdef __MINGW32__ #include "mingw_support.c" #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L #include "getline.c" #endif diff --git a/tools/os_support.h b/tools/os_support.h index 7dcbee4b3e..5bf7add39c 100644 --- a/tools/os_support.h +++ b/tools/os_support.h @@ -28,7 +28,7 @@ #include "mingw_support.h" #endif -#ifdef __APPLE__ +#if defined(__APPLE__) && __DARWIN_C_LEVEL < 200809L #include "getline.h" #endif |