diff options
| author | Markus Klotzbuecher <[email protected]> | 2008-07-21 12:37:56 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <[email protected]> | 2008-07-21 12:37:56 +0200 |
| commit | ab06bddb04ed4be50a8f9ad5f94fa23953a734e3 (patch) | |
| tree | 5df2528b42f073dd5bbb34b14f288a1811073729 /tools | |
| parent | 262423955895ba4599fa11d7c49dcffb65af0afd (diff) | |
| parent | 1953d128fd07f07d1c3810a28c0863ea64dae1b6 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/.gitignore | 3 | ||||
| -rw-r--r-- | tools/gdb/Makefile | 2 | ||||
| -rw-r--r-- | tools/updater/cmd_flash.c | 4 | ||||
| -rw-r--r-- | tools/updater/flash.c | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/tools/.gitignore b/tools/.gitignore index df3500d9653..157b6790e1a 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -6,8 +6,11 @@ /img2srec /md5.c /mkimage +/mpc86x_clk +/ncp /sha1.c /ubsha1 +/inca-swap-bytes /image.c /fdt.c /fdt_ro.c diff --git a/tools/gdb/Makefile b/tools/gdb/Makefile index 632103d4538..c44cc8a555f 100644 --- a/tools/gdb/Makefile +++ b/tools/gdb/Makefile @@ -47,7 +47,7 @@ HOSTOS := $(shell uname -s | sed -e 's/\([Cc][Yy][Gg][Ww][Ii][Nn]\).*/cygwin/') ifeq ($(HOSTOS),cygwin) all: -.depend: +$(obj).depend: else # ! CYGWIN diff --git a/tools/updater/cmd_flash.c b/tools/updater/cmd_flash.c index a976e0da610..0f6f62b9444 100644 --- a/tools/updater/cmd_flash.c +++ b/tools/updater/cmd_flash.c @@ -187,7 +187,7 @@ int flash_sect_erase (ulong addr_first, ulong addr_last) erased = 0; - for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) { + for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) { ulong b_end; int sect; @@ -366,7 +366,7 @@ int flash_sect_protect (int p, ulong addr_first, ulong addr_last) protected = 0; - for (bank=0,info=&flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) { + for (bank=0,info = &flash_info[0]; bank < CFG_MAX_FLASH_BANKS; ++bank, ++info) { ulong b_end; int sect; diff --git a/tools/updater/flash.c b/tools/updater/flash.c index 1ed77b1b181..a73159ff9bf 100644 --- a/tools/updater/flash.c +++ b/tools/updater/flash.c @@ -93,7 +93,7 @@ addr2info (ulong addr) flash_info_t *info; int i; - for (i=0, info=&flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) { + for (i=0, info = &flash_info[0]; i<CFG_MAX_FLASH_BANKS; ++i, ++info) { if (info->flash_id != FLASH_UNKNOWN && addr >= info->start[0] && /* WARNING - The '- 1' is needed if the flash |