diff options
author | Wolfgang Denk <wd@denx.de> | 2011-11-23 20:23:45 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-11-23 20:23:45 (GMT) |
commit | fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3 (patch) | |
tree | 98c39a0594ef02e08d5842cfff1f1d6bcc5a8eda /common | |
parent | bd0f5ca806c73f9e1ef4a2a0416233ab7e257df9 (diff) | |
parent | d780e74fc3abe6a8b9a01357720c15d974d83dae (diff) | |
download | u-boot-fsl-qoriq-fdbe8b9a2d1858ba35dd6214315563ad44d4a0e3.tar.xz |
Merge branch 'hs@denx.de' of git://git.denx.de/u-boot-staging
* 'hs@denx.de' of git://git.denx.de/u-boot-staging:
drivers/net/dnet.c: Fix GCC 4.6 warnings
board/xaeniax/flash.c: Fix GCC 4.6 warnings
net/bootp.c: Fix GCC 4.6 warning
common/cmd_bootm.c: Fix GCC 4.6 warnings
board/mx1ads/mx1ads.c: Fix GCC 4.6 warning
board/mx1ads/syncflash.c: Fix GCC 4.6 warnings
board/lubbock/flash.c: Fix GCC 4.6 warnings
drivers/net/cs8900.c: Fix GCC 4.6 warning
arch/arm/cpu/arm926ejs/omap/cpuinfo.c: Fix GCC 4.6 warnings
drivers/net/lan91c96.c: Fix GCC 4.6 warning
board/ronetix/pm9263/pm9263.c: Fix GCC 4.6 warning
drivers/mtd/onenand/samsung.c: Fix GCC 4.6 warning
drivers/usb/musb/musb_hcd.c: Fix GCC 4.6 warning
Diffstat (limited to 'common')
-rw-r--r-- | common/cmd_bootm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index d301332..b073f09 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -36,6 +36,7 @@ #include <lmb.h> #include <linux/ctype.h> #include <asm/byteorder.h> +#include <linux/compiler.h> #if defined(CONFIG_CMD_USB) #include <usb.h> @@ -312,7 +313,7 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) ulong blob_end = os.end; ulong image_start = os.image_start; ulong image_len = os.image_len; - uint unc_len = CONFIG_SYS_BOOTM_LEN; + __maybe_unused uint unc_len = CONFIG_SYS_BOOTM_LEN; #if defined(CONFIG_LZMA) || defined(CONFIG_LZO) int ret; #endif /* defined(CONFIG_LZMA) || defined(CONFIG_LZO) */ |