Skip to content

Commit

Permalink
[ARM] riscpc: fix decompressor font file handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King authored and Russell King committed Jul 12, 2007
1 parent 7dcca30 commit 4486b86
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
1 change: 1 addition & 0 deletions arch/arm/boot/compressed/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
piggy.gz
font.c
13 changes: 7 additions & 6 deletions arch/arm/boot/compressed/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 :=
Expand Down Expand Up @@ -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)" < $< > $@
Expand Down

0 comments on commit 4486b86

Please sign in to comment.