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

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);

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,

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

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