projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sh
/
boot
/
compressed
/
Makefile
diff --git
a/arch/sh/boot/compressed/Makefile
b/arch/sh/boot/compressed/Makefile
index 013504ae112295c8aea032df4eb962cbd84aa7d6..9531bf1b7c2f878b632f154f5e9a4bd06717758b 100644
(file)
--- a/
arch/sh/boot/compressed/Makefile
+++ b/
arch/sh/boot/compressed/Makefile
@@
-4,10
+4,10
@@
# create a compressed vmlinux image from the original vmlinux
#
# create a compressed vmlinux image from the original vmlinux
#
-targets := vmlinux vmlinux.bin vmlinux.bin.gz
head.o misc.o piggy.o
-EXTRA_AFLAGS := -traditional
+targets := vmlinux vmlinux.bin vmlinux.bin.gz
\
+ head_$(BITS).o misc_$(BITS).o piggy.o
-OBJECTS = $(obj)/head
.o $(obj)/misc
.o
+OBJECTS = $(obj)/head
_$(BITS).o $(obj)/misc_$(BITS).o $(obj)/cache
.o
ifdef CONFIG_SH_STANDARD_BIOS
OBJECTS += $(obj)/../../kernel/sh_bios.o
ifdef CONFIG_SH_STANDARD_BIOS
OBJECTS += $(obj)/../../kernel/sh_bios.o
@@
-18,13
+18,18
@@
endif
#
IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \
$$[$(CONFIG_PAGE_OFFSET) + \
#
IMAGE_OFFSET := $(shell /bin/bash -c 'printf "0x%08x" \
$$[$(CONFIG_PAGE_OFFSET) + \
- $(
CONFIG_MEMORY_START
) + \
+ $(
KERNEL_MEMORY
) + \
$(CONFIG_BOOT_LINK_OFFSET)]')
$(CONFIG_BOOT_LINK_OFFSET)]')
-LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
+LIBGCC := $(shell $(CC) $(
KBUILD_
CFLAGS) -print-libgcc-file-name)
-LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup -T $(obj)/../../kernel/vmlinux.lds
+ifeq ($(CONFIG_FUNCTION_TRACER),y)
+ORIG_CFLAGS := $(KBUILD_CFLAGS)
+KBUILD_CFLAGS = $(subst -pg, , $(ORIG_CFLAGS))
+endif
+LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \
+ -T $(obj)/../../kernel/vmlinux.lds
$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
$(call if_changed,ld)
$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
$(call if_changed,ld)
@@
-36,8
+41,7
@@
$(obj)/vmlinux.bin: vmlinux FORCE
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
$(call if_changed,gzip)
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
$(call if_changed,gzip)
-LDFLAGS_piggy.o := -r --format binary --oformat elf32-sh-linux -T
OBJCOPYFLAGS += -R .empty_zero_page
OBJCOPYFLAGS += -R .empty_zero_page
-$(obj)/piggy.o: $(obj)/
vmlinux.scr
$(obj)/vmlinux.bin.gz FORCE
- $(call if_changed,
ld
)
+$(obj)/piggy.o: $(obj)/
piggy.S
$(obj)/vmlinux.bin.gz FORCE
+ $(call if_changed,
as_o_S
)