diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -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 | ||||
| -rw-r--r-- | board/matrix_vision/common/mv_common.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/spi/spi_flash.c | 3 | ||||
| -rw-r--r-- | include/configs/gr_cpci_ax2000.h | 2 | ||||
| -rw-r--r-- | include/configs/gr_ep2s60.h | 2 | ||||
| -rw-r--r-- | include/configs/gr_xc3s_1500.h | 2 | ||||
| -rw-r--r-- | include/configs/grsim.h | 2 | ||||
| -rw-r--r-- | include/configs/grsim_leon2.h | 2 |
11 files changed, 9 insertions, 15 deletions
@@ -751,7 +751,7 @@ clean: $(obj)tools/envcrc \ $(obj)tools/gdb/{astest,gdbcont,gdbsend} \ $(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 @rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image} \ $(obj)board/matrix_vision/*/bootscript.img \ 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; diff --git a/board/matrix_vision/common/mv_common.c b/board/matrix_vision/common/mv_common.c index 404c8b4..acb72c5 100644 --- a/board/matrix_vision/common/mv_common.c +++ b/board/matrix_vision/common/mv_common.c @@ -29,6 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; +#ifndef CONFIG_ENV_IS_NOWHERE static char* entries_to_keep[] = { "serial#", "ethaddr", "eth1addr", "model_info", "sensor_cnt", "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_KEEP_ENTRIES ARRAY_SIZE(entries_to_keep) -#ifndef CONFIG_ENV_IS_NOWHERE void mv_reset_environment(void) { int i; diff --git a/drivers/mtd/spi/spi_flash.c b/drivers/mtd/spi/spi_flash.c index ced4c94..f689cc4 100644 --- a/drivers/mtd/spi/spi_flash.c +++ b/drivers/mtd/spi/spi_flash.c @@ -233,8 +233,7 @@ int spi_flash_cmd_erase(struct spi_flash *flash, u8 erase_cmd, goto out; } - debug("SF: Successfully erased %zu bytes @ %#x\n", - len * erase_size, start); + debug("SF: Successfully erased %zu bytes @ %#x\n", len, start); out: spi_release_bus(flash->spi); diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index e837f40..dd6c41d 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -108,7 +108,7 @@ "bootm ${kernel_addr}\0" \ "flash_self=run ramargs addip;" \ "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" #if CONFIG_LEON_RAM_SELECT == CONFIG_LEON_RAM_SRAM diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 0cddeee..7068ff8 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -115,7 +115,7 @@ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\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" \ "" diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 7e8e6f5..5006322 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -91,7 +91,7 @@ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\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" \ "" diff --git a/include/configs/grsim.h b/include/configs/grsim.h index c14749b..f3639dd 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -113,7 +113,7 @@ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "rootpath=/export/roofs\0" \ "scratch=40000000\0" \ - "getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ + "getkernel=tftpboot $(scratch) $(bootfile)\0" \ "ethaddr=00:00:7A:CC:00:12\0" \ "bootargs=console=ttyS0,38400" \ "" diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 88d2aad..fb9a3f9 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -110,7 +110,7 @@ "net_nfs=tftp 40000000 ${bootfile};run nfsargs addip;bootm\0" \ "rootpath=/export/roofs\0" \ "scratch=40000000\0" \ - "getkernel=tftpboot \$\(scratch\)\ \$\(bootfile\)\0" \ + "getkernel=tftpboot $(scratch) $(bootfile)\0" \ "ethaddr=00:00:7A:CC:00:12\0" \ "bootargs=console=ttyS0,38400" \ "" |