leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

Browse Source 
* '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
This commit is contained in:
Wolfgang Denk 2011-12-05 23:33:48 +01:00
commit d194837fc3
11 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -751,7 +751,7 @@ clean:
$(obj)tools/envcrc \ $(obj)tools/envcrc \
$(obj)tools/gdb/{astest,gdbcont,gdbsend} \ $(obj)tools/gdb/{astest,gdbcont,gdbsend} \
$(obj)tools/gen_eth_addr $(obj)tools/img2srec \ $(obj)tools/gen_eth_addr $(obj)tools/img2srec \
$(obj)tools/mkimage $(obj)tools/mpc86x_clk \ $(obj)tools/mk{env,}image $(obj)tools/mpc86x_clk \
$(obj)tools/ncb $(obj)tools/ubsha1 $(obj)tools/ncb $(obj)tools/ubsha1
@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \
$(obj)board/matrix_vision/*/bootscript.img \ $(obj)board/matrix_vision/*/bootscript.img \

2
arch/m68k/cpu/mcf52x2/cpu_init.c
View File

@ -284,7 +284,7 @@ void cpu_init_f(void)
mbar_writeLong(MCF_FMPLL_SYNCR, mbar_writeLong(MCF_FMPLL_SYNCR,
MCF_FMPLL_SYNCR_MFD(0) | MCF_FMPLL_SYNCR_RFD(0)); MCF_FMPLL_SYNCR_MFD(0) | MCF_FMPLL_SYNCR_RFD(0));
#endif #endif
while (!mbar_readByte(MCF_FMPLL_SYNSR) & MCF_FMPLL_SYNSR_LOCK) ; while (!(mbar_readByte(MCF_FMPLL_SYNSR) & MCF_FMPLL_SYNSR_LOCK)) ;
} }
/* /*

3
arch/sparc/lib/board.c
View File

@ -165,13 +165,10 @@ char *str_init_seq_done = "\n\rInit sequence done...\r\n\r\n";
void board_init_f(ulong bootflag) void board_init_f(ulong bootflag)
{ {
cmd_tbl_t *cmdtp;
bd_t *bd; bd_t *bd;
unsigned char *s; unsigned char *s;
init_fnc_t **init_fnc_ptr; init_fnc_t **init_fnc_ptr;
int j; int j;
int i;
char *e;
#ifndef CONFIG_SYS_NO_FLASH #ifndef CONFIG_SYS_NO_FLASH
ulong flash_size; ulong flash_size;

2
arch/sparc/lib/bootm.c
View File

@ -97,8 +97,6 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t * im
char *bootargs; char *bootargs;
ulong initrd_start, initrd_end; ulong initrd_start, initrd_end;
ulong rd_len; ulong rd_len;
unsigned int data, len, checksum;
unsigned int initrd_addr, kernend;
void (*kernel) (struct linux_romvec *, void *); void (*kernel) (struct linux_romvec *, void *);
struct lmb *lmb = &images->lmb; struct lmb *lmb = &images->lmb;
int ret; int ret;

2
board/matrix_vision/common/mv_common.c
View File

@ -29,6 +29,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifndef CONFIG_ENV_IS_NOWHERE
static char* entries_to_keep[] = { static char* entries_to_keep[] = {
"serial#", "ethaddr", "eth1addr", "model_info", "sensor_cnt", "serial#", "ethaddr", "eth1addr", "model_info", "sensor_cnt",
"fpgadatasize", "ddr_size", "use_dhcp", "use_static_ipaddr", "fpgadatasize", "ddr_size", "use_dhcp", "use_static_ipaddr",
@ -38,7 +39,6 @@ static char* entries_to_keep[] = {
#define MV_MAX_ENV_ENTRY_LENGTH 64 #define MV_MAX_ENV_ENTRY_LENGTH 64
#define MV_KEEP_ENTRIES ARRAY_SIZE(entries_to_keep) #define MV_KEEP_ENTRIES ARRAY_SIZE(entries_to_keep)
#ifndef CONFIG_ENV_IS_NOWHERE
void mv_reset_environment(void) void mv_reset_environment(void)
{ {
int i; int i;

3
drivers/mtd/spi/spi_flash.c
View File

@ -233,8 +233,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u8 erase_cmd,
goto out; goto out;
} }
debug("SF: Successfully erased %zu bytes @ %#x\n", debug("SF: Successfully erased %zu bytes @ %#x\n", len, start);
len * erase_size, start);
out: out:
spi_release_bus(flash->spi); spi_release_bus(flash->spi);

2
include/configs/gr_cpci_ax2000.h
View File

@ -108,7 +108,7 @@
"bootm ${kernel_addr}\0" \ "bootm ${kernel_addr}\0" \
"flash_self=run ramargs addip;" \ "flash_self=run ramargs addip;" \
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.206:192.168.0.20:192.168.0.1:255.255.255.0:ax2000:eth0\0" "bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.206:192.168.0.20:192.168.0.1:255.255.255.0:ax2000:eth0\0"
#if CONFIG_LEON_RAM_SELECT == CONFIG_LEON_RAM_SRAM #if CONFIG_LEON_RAM_SELECT == CONFIG_LEON_RAM_SRAM

2
include/configs/gr_ep2s60.h
View File

@ -115,7 +115,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"scratch=40800000\0" \ "scratch=40800000\0" \
"getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.207:192.168.0.20:192.168.0.1:255.255.255.0:ml401:eth0\0" \ "bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.207:192.168.0.20:192.168.0.1:255.255.255.0:ml401:eth0\0" \
"" ""

2
include/configs/gr_xc3s_1500.h
View File

@ -91,7 +91,7 @@
"bootm ${kernel_addr} ${ramdisk_addr}\0" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"scratch=40200000\0" \ "scratch=40200000\0" \
"getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.206:192.168.0.20:192.168.0.1:255.255.255.0:grxc3s1500_daniel:eth0\0" \ "bootargs=console=ttyS0,38400 root=/dev/nfs rw nfsroot=192.168.0.20:/export/rootfs ip=192.168.0.206:192.168.0.20:192.168.0.1:255.255.255.0:grxc3s1500_daniel:eth0\0" \
"" ""

2
include/configs/grsim.h
View File

@ -113,7 +113,7 @@
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"rootpath=/export/roofs\0" \ "rootpath=/export/roofs\0" \
"scratch=40000000\0" \ "scratch=40000000\0" \
"getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"ethaddr=00:00:7A:CC:00:12\0" \ "ethaddr=00:00:7A:CC:00:12\0" \
"bootargs=console=ttyS0,38400" \ "bootargs=console=ttyS0,38400" \
"" ""

2
include/configs/grsim_leon2.h
View File

@ -110,7 +110,7 @@
"net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \
"rootpath=/export/roofs\0" \ "rootpath=/export/roofs\0" \
"scratch=40000000\0" \ "scratch=40000000\0" \
"getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ "getkernel=tftpboot $(scratch) $(bootfile)\0" \
"ethaddr=00:00:7A:CC:00:12\0" \ "ethaddr=00:00:7A:CC:00:12\0" \
"bootargs=console=ttyS0,38400" \ "bootargs=console=ttyS0,38400" \
"" ""