diff options
Diffstat (limited to 'arch/arm/boot/compressed/Makefile')
-rw-r--r-- | arch/arm/boot/compressed/Makefile | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index adddc7131685..a1f1691b67fe 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile | |||
@@ -6,15 +6,13 @@ | |||
6 | 6 | ||
7 | HEAD = head.o | 7 | HEAD = head.o |
8 | OBJS = misc.o | 8 | OBJS = misc.o |
9 | FONTC = drivers/video/console/font_acorn_8x8.c | 9 | FONTC = $(srctree)/drivers/video/console/font_acorn_8x8.c |
10 | |||
11 | FONT = $(addprefix ../../../../drivers/video/console/, font_acorn_8x8.o) | ||
12 | 10 | ||
13 | # | 11 | # |
14 | # Architecture dependencies | 12 | # Architecture dependencies |
15 | # | 13 | # |
16 | ifeq ($(CONFIG_ARCH_ACORN),y) | 14 | ifeq ($(CONFIG_ARCH_ACORN),y) |
17 | OBJS += ll_char_wr.o $(FONT) | 15 | OBJS += ll_char_wr.o font.o |
18 | endif | 16 | endif |
19 | 17 | ||
20 | ifeq ($(CONFIG_ARCH_SHARK),y) | 18 | ifeq ($(CONFIG_ARCH_SHARK),y) |
@@ -73,7 +71,7 @@ endif | |||
73 | 71 | ||
74 | SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ | 72 | SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/ |
75 | 73 | ||
76 | targets := vmlinux vmlinux.lds piggy.gz piggy.o $(FONT) \ | 74 | targets := vmlinux vmlinux.lds piggy.gz piggy.o font.o font.c \ |
77 | head.o misc.o $(OBJS) | 75 | head.o misc.o $(OBJS) |
78 | EXTRA_CFLAGS := -fpic | 76 | EXTRA_CFLAGS := -fpic |
79 | EXTRA_AFLAGS := | 77 | EXTRA_AFLAGS := |
@@ -105,7 +103,10 @@ $(obj)/piggy.gz: $(obj)/../Image FORCE | |||
105 | 103 | ||
106 | $(obj)/piggy.o: $(obj)/piggy.gz FORCE | 104 | $(obj)/piggy.o: $(obj)/piggy.gz FORCE |
107 | 105 | ||
108 | CFLAGS_font_acorn_8x8.o := -Dstatic= | 106 | CFLAGS_font.o := -Dstatic= |
107 | |||
108 | $(obj)/font.c: $(FONTC) | ||
109 | $(call cmd,shipped) | ||
109 | 110 | ||
110 | $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config | 111 | $(obj)/vmlinux.lds: $(obj)/vmlinux.lds.in arch/arm/boot/Makefile .config |
111 | @sed "$(SEDFLAGS)" < $< > $@ | 112 | @sed "$(SEDFLAGS)" < $< > $@ |