diff options
| author | Wolfgang Denk <[email protected]> | 2012-09-02 00:44:09 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2012-09-02 00:44:09 +0200 |
| commit | 6e2fbdea1b26d75314d87c380a36b0015bf824cf (patch) | |
| tree | 921a60d936848d731eb7b6875788bac2ad98009c /tools | |
| parent | df95321ca1b06a6271c3959b371848c10019e165 (diff) | |
| parent | 72739219a12bf02820d29a89cb2b7fdc4d0e840f (diff) | |
Merge branch '[email protected]' of git://git.denx.de/u-boot-staging
* '[email protected]' of git://git.denx.de/u-boot-staging:
tx25: Use generic gpio_* calls
config: Always use GNU ld
tools: add kwboot binary to .gitignore file
fdt: Include arch specific gpio.h instead of asm-generic/gpio.h
serial: CONSOLE macro is not used
Conflicts:
board/karo/tx25/tx25.c
Signed-off-by: Wolfgang Denk <[email protected]>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/.gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/.gitignore b/tools/.gitignore index 3557a75b9e1..3088f4de986 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -2,6 +2,7 @@ /envcrc /gen_eth_addr /img2srec +/kwboot /mkenvimage /mkimage /mpc86x_clk |