[ARM] riscpc: fix decompressor font file handling
font_acorn_8x8.o was being built in drivers/video/console/ twice during a build _in the same location_ - once for the kernel proper, and once for the decompressor. The result is when you came to run an install target, the kernel was always rebuilt due to this file apparantly having been built with different compiler arguments. Solve this by making a local copy at build time in the decompressor's directory. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Родитель
7dcca30a32
Коммит
4486b86368
|
@ -1 +1,2 @@
|
|||
piggy.gz
|
||||
font.c
|
||||
|
|
|
@ -6,15 +6,13 @@
|
|||
|
||||
HEAD = head.o
|
||||
OBJS = misc.o
|
||||
FONTC = drivers/video/console/font_acorn_8x8.c
|
||||
|
||||
FONT = $(addprefix ../../../../drivers/video/console/, font_acorn_8x8.o)
|
||||
FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c
|
||||
|
||||
#
|
||||
# Architecture dependencies
|
||||
#
|
||||
ifeq ($(CONFIG_ARCH_ACORN),y)
|
||||
OBJS += ll_char_wr.o $(FONT)
|
||||
OBJS += ll_char_wr.o font.o
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_ARCH_SHARK),y)
|
||||
|
@ -73,7 +71,7 @@ endif
|
|||
|
||||
SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
|
||||
|
||||
targets := vmlinux vmlinux.lds piggy.gz piggy.o $(FONT) \
|
||||
targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \
|
||||
head.o misc.o $(OBJS)
|
||||
EXTRA_CFLAGS := -fpic
|
||||
EXTRA_AFLAGS :=
|
||||
|
@ -105,7 +103,10 @@ $(obj)/piggy.gz: $(obj)/../Image FORCE
|
|||
|
||||
$(obj)/piggy.o: $(obj)/piggy.gz FORCE
|
||||
|
||||
CFLAGS_font_acorn_8x8.o := -Dstatic=
|
||||
CFLAGS_font.o := -Dstatic=
|
||||
|
||||
$(obj)/font.c: $(FONTC)
|
||||
$(call cmd,shipped)
|
||||
|
||||
$(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config
|
||||
@sed "$(SEDFLAGS)" < $< > $@
|
||||
|
|
Загрузка…
Ссылка в новой задаче