diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 21:15:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-30 21:15:43 -0400 |
commit | 923f79743c76583ed4684e2c80c8da51a7268af3 (patch) | |
tree | e523a04c6b4cdddf70cf4adec25fa4fbbdbc5f5a /arch/blackfin | |
parent | a7697b945e6e5025f184d6762e7285f1c498411d (diff) | |
parent | 7f3bd6c9cb8e9fa2b57bfa860cd3e734a28f48ed (diff) |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
- Unification of cmd_uimage among archs that use it
- make headers_check tries harder before reporting a missing
<linux/types.h> include
- kbuild portability fix for shells that do not support echo -e
- make clean descends into samples/
- setlocalversion grep fix
- modpost typo fix
- dtc warnings fix
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
setlocalversion: Use "grep -q" instead of piping output to "read dummy"
modpost: fix ALL_INIT_DATA_SECTIONS
Kbuild: centralize MKIMAGE and cmd_uimage definitions
headers_check: recursively search for linux/types.h inclusion
scripts/Kbuild.include: Fix portability problem of "echo -e"
scripts: dtc: fix compile warnings
kbuild: clean up samples directory
kbuild: disable -Wmissing-field-initializers for W=1
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/boot/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/arch/blackfin/boot/Makefile b/arch/blackfin/boot/Makefile index 0a49279e342..f7d27d50d02 100644 --- a/arch/blackfin/boot/Makefile +++ b/arch/blackfin/boot/Makefile | |||
@@ -6,20 +6,17 @@ | |||
6 | # for more details. | 6 | # for more details. |
7 | # | 7 | # |
8 | 8 | ||
9 | MKIMAGE := $(srctree)/scripts/mkuboot.sh | ||
10 | |||
11 | targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.lzo vmImage.xip | 9 | targets := vmImage vmImage.bin vmImage.bz2 vmImage.gz vmImage.lzma vmImage.lzo vmImage.xip |
12 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.xip | 10 | extra-y += vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.xip |
13 | 11 | ||
14 | UIMAGE_OPTS-y := | 12 | ifeq ($(CONFIG_RAMKERNEL),y) |
15 | UIMAGE_OPTS-$(CONFIG_RAMKERNEL) += -a $(CONFIG_BOOT_LOAD) | 13 | UIMAGE_LOADADDR = $(CONFIG_BOOT_LOAD) |
16 | UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -a $(CONFIG_ROM_BASE) -x | 14 | else # CONFIG_ROMKERNEL must be set |
17 | 15 | UIMAGE_LOADADDR = $(CONFIG_ROM_BASE) | |
18 | quiet_cmd_uimage = UIMAGE $@ | 16 | endif |
19 | cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(ARCH) -O linux -T kernel \ | 17 | UIMAGE_ENTRYADDR = $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') |
20 | -C $(2) -n '$(CPU_REV)-$(KERNELRELEASE)' \ | 18 | UIMAGE_NAME = '$(CPU_REV)-$(KERNELRELEASE)' |
21 | -e $(shell $(NM) vmlinux | awk '$$NF == "__start" {print $$1}') \ | 19 | UIMAGE_OPTS-$(CONFIG_ROMKERNEL) += -x |
22 | $(UIMAGE_OPTS-y) -d $< $@ | ||
23 | 20 | ||
24 | $(obj)/vmlinux.bin: vmlinux FORCE | 21 | $(obj)/vmlinux.bin: vmlinux FORCE |
25 | $(call if_changed,objcopy) | 22 | $(call if_changed,objcopy) |