diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-05 23:33:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-05 23:33:48 +0100 |
| commit | d194837fc3042d943ba088fcc221d534330b2872 (patch) | |
| tree | 4ab6098374e2c02fb99f3672a23c271fd5ade89f /arch | |
| parent | 2157497615696c41512d857478158f8546942d70 (diff) | |
| parent | 7717fe10bd61e16790d4605505100a2f8f632f02 (diff) | |
| download | u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.zip u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.tar.gz u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
Makefile: add tools/mkenvimage to target 'clean'
mv_common.c: get rid of 'defined but not used' warning
m68k: fix ambiguous bit testing
sparc: fix unknown escape sequence warnings
sparc: fix unused variable warnings
sf: fix erase debug output
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/cpu/mcf52x2/cpu_init.c | 2 | ||||
| -rw-r--r-- | arch/sparc/lib/board.c | 3 | ||||
| -rw-r--r-- | arch/sparc/lib/bootm.c | 2 |
3 files changed, 1 insertions, 6 deletions
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 170bbfc..a98a926 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -284,7 +284,7 @@ void cpu_init_f(void) mbar_writeLong(MCF_FMPLL_SYNCR, MCF_FMPLL_SYNCR_MFD(0) | MCF_FMPLL_SYNCR_RFD(0)); #endif - while (!mbar_readByte(MCF_FMPLL_SYNSR) & MCF_FMPLL_SYNSR_LOCK) ; + while (!(mbar_readByte(MCF_FMPLL_SYNSR) & MCF_FMPLL_SYNSR_LOCK)) ; } /* diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c index 69b5ca4..519a4fb 100644 --- a/arch/sparc/lib/board.c +++ b/arch/sparc/lib/board.c @@ -165,13 +165,10 @@ char *str_init_seq_done = "\n\rInit sequence done...\r\n\r\n"; void board_init_f(ulong bootflag) { - cmd_tbl_t *cmdtp; bd_t *bd; unsigned char *s; init_fnc_t **init_fnc_ptr; int j; - int i; - char *e; #ifndef CONFIG_SYS_NO_FLASH ulong flash_size; diff --git a/arch/sparc/lib/bootm.c b/arch/sparc/lib/bootm.c index 4c226a3..e5b933d 100644 --- a/arch/sparc/lib/bootm.c +++ b/arch/sparc/lib/bootm.c @@ -97,8 +97,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t * im char *bootargs; ulong initrd_start, initrd_end; ulong rd_len; - unsigned int data, len, checksum; - unsigned int initrd_addr, kernend; void (*kernel) (struct linux_romvec *, void *); struct lmb *lmb = &images->lmb; int ret; |