diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-01-29 04:48:30 -0500 |
| commit | 617677295b53a40d0e54aac4cbbc216ffbc755dd (patch) | |
| tree | 51b9e87213243ed5efff252c8e8d8fec4eebc588 /arch/xtensa/boot/boot-uboot | |
| parent | 5c8d1b68e01a144813e38795fe6dbe7ebb506131 (diff) | |
| parent | 6abb7c25775b7fb2225ad0508236d63ca710e65f (diff) | |
Merge branch 'master' into for-next
Conflicts:
drivers/devfreq/exynos4_bus.c
Sync with Linus' tree to be able to apply patches that are
against newer code (mvneta).
Diffstat (limited to 'arch/xtensa/boot/boot-uboot')
| -rw-r--r-- | arch/xtensa/boot/boot-uboot/Makefile | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/xtensa/boot/boot-uboot/Makefile b/arch/xtensa/boot/boot-uboot/Makefile new file mode 100644 index 000000000000..bfbf8af582f1 --- /dev/null +++ b/arch/xtensa/boot/boot-uboot/Makefile | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | # | ||
| 2 | # This file is subject to the terms and conditions of the GNU General Public | ||
| 3 | # License. See the file "COPYING" in the main directory of this archive | ||
| 4 | # for more details. | ||
| 5 | # | ||
| 6 | |||
| 7 | UIMAGE_LOADADDR = 0xd0001000 | ||
| 8 | UIMAGE_COMPRESSION = gzip | ||
| 9 | |||
| 10 | $(obj)/../uImage: vmlinux.bin.gz FORCE | ||
| 11 | $(call if_changed,uimage) | ||
| 12 | $(Q)$(kecho) ' Kernel: $@ is ready' | ||
| 13 | |||
| 14 | zImage: $(obj)/../uImage | ||