aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 19:53:11 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-25 19:53:11 -0400
commite0e170bd7ded2ec16e2813d63c0faff43193fde8 (patch)
tree2f06008b61ef2eedf8f77d1326e286a64e426ef6 /arch/microblaze/Makefile
parentb20f9e5bddddb5ef0d743d6e0d409ffc8cf9fc56 (diff)
parentb843e4ec01991a386a9e0e9030703524446e03da (diff)
Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze
* 'next' of git://git.monstr.eu/linux-2.6-microblaze: (42 commits) microblaze: Fix build with make 3.82 fbdev/xilinxfb: Microblaze driver support microblaze: Support C optimized lib functions for little-endian microblaze: Separate library optimized functions microblaze: Support timer on AXI lite microblaze: Add support for little-endian Microblaze microblaze: KGDB little endian support microblaze: Add PVR for endians plus detection net: emaclite: Add support for little-endian platforms microblaze: trivial: Add comment for AXI pvr microblaze: pci-common cleanup microblaze: Support early console on uart16550 microblaze: Do not compile early console support for uartlite if is disabled microblaze: Setup early console dynamically microblaze: Rename all uartlite early printk functions microblaze: remove early printk uarlite console dependency from header microblaze: Remove additional compatible properties microblaze: Remove hardcoded asm instraction for PVR loading microblaze: Use static const char * const where possible microblaze: Define VMALLOC_START/END ...
Diffstat (limited to 'arch/microblaze/Makefile')
-rw-r--r--arch/microblaze/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 592c7079de88..15f1f1d1840d 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -42,11 +42,8 @@ KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-1) $(CPUFLAGS-2)
42LDFLAGS := 42LDFLAGS :=
43LDFLAGS_vmlinux := 43LDFLAGS_vmlinux :=
44 44
45LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
46
47head-y := arch/microblaze/kernel/head.o 45head-y := arch/microblaze/kernel/head.o
48libs-y += arch/microblaze/lib/ 46libs-y += arch/microblaze/lib/
49libs-y += $(LIBGCC)
50core-y += arch/microblaze/kernel/ 47core-y += arch/microblaze/kernel/
51core-y += arch/microblaze/mm/ 48core-y += arch/microblaze/mm/
52core-y += arch/microblaze/platform/ 49core-y += arch/microblaze/platform/
@@ -72,12 +69,16 @@ export MMU DTB
72 69
73all: linux.bin 70all: linux.bin
74 71
75BOOT_TARGETS = linux.bin linux.bin.gz simpleImage.% 72# With make 3.82 we cannot mix normal and wildcard targets
73BOOT_TARGETS1 = linux.bin linux.bin.gz
74BOOT_TARGETS2 = simpleImage.%
76 75
77archclean: 76archclean:
78 $(Q)$(MAKE) $(clean)=$(boot) 77 $(Q)$(MAKE) $(clean)=$(boot)
79 78
80$(BOOT_TARGETS): vmlinux 79$(BOOT_TARGETS1): vmlinux
80 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
81$(BOOT_TARGETS2): vmlinux
81 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 82 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
82 83
83define archhelp 84define archhelp