patch-2.4.22 linux-2.4.22/arch/arm/boot/compressed/Makefile
Next file: linux-2.4.22/arch/arm/boot/compressed/head-at91rm9200.S
Previous file: linux-2.4.22/arch/arm/boot/bootp/init.S
Back to the patch index
Back to the overall index
- Lines: 71
- Date:
2003-08-25 04:44:39.000000000 -0700
- Orig file:
linux-2.4.21/arch/arm/boot/compressed/Makefile
- Orig date:
2002-08-02 17:39:42.000000000 -0700
diff -urN linux-2.4.21/arch/arm/boot/compressed/Makefile linux-2.4.22/arch/arm/boot/compressed/Makefile
@@ -9,7 +9,7 @@
HEAD = head.o
OBJS = misc.o
-CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS $(CFLAGS_BOOT)
+CFLAGS = $(CPPFLAGS) -O2 -DSTDC_HEADERS $(CFLAGS_BOOT) -fpic -Uarm
FONTC = $(TOPDIR)/drivers/video/font_acorn_8x8.c
ZLDFLAGS = -p -X -T vmlinux.lds
@@ -18,7 +18,12 @@
#
ifeq ($(CONFIG_ARCH_ACORN),y)
OBJS += ll_char_wr.o font.o
-ZLDFLAGS += -defsym params=$(PARAMS_PHYS)
+CFLAGS += -DPARAMS_PHYS=$(PARAMS_PHYS)
+endif
+
+ifeq ($(CONFIG_ARCH_RISCSTATION),y)
+OBJS += ll_char_wr.o font.o
+CFLAGS += -DPARAMS_PHYS=$(PARAMS_PHYS)
endif
ifeq ($(CONFIG_ARCH_NETWINDER),y)
@@ -33,6 +38,10 @@
OBJS += head-integrator.o
endif
+ifeq ($(CONFIG_ARCH_AT91RM9200),y)
+OBJS += head-at91rm9200.o
+endif
+
ifeq ($(CONFIG_ARCH_MX1ADS),y)
OBJS += head-mx1ads.o
endif
@@ -60,18 +69,9 @@
ifeq ($(CONFIG_ARCH_SA1100),y)
OBJS += head-sa1100.o
-ifeq ($(CONFIG_SA1100_NANOENGINE),y)
- OBJS += hw-bse.o
-endif
endif
-SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/LOAD_ADDR/$(ZRELADDR)/;
-
-ifneq ($(ZBSSADDR),)
-SEDFLAGS += s/BSS_START/$(ZBSSADDR)/
-else
-SEDFLAGS += s/BSS_START/ALIGN(4)/
-endif
+SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/LOAD_ADDR/$(ZRELADDR)/;s/BSS_START/$(ZBSSADDR)/
LIBGCC := $(shell $(CC) $(CFLAGS) --print-libgcc-file-name)
@@ -80,11 +80,14 @@
vmlinux: $(HEAD) $(OBJS) piggy.o vmlinux.lds
$(LD) $(ZLDFLAGS) $(HEAD) $(OBJS) piggy.o $(LIBGCC) -o vmlinux
-$(HEAD): $(HEAD:.o=.S)
+$(HEAD): $(HEAD:.o=.S) \
+ $(wildcard $(TOPDIR)/include/config/zboot/rom.h) \
+ $(wildcard $(TOPDIR)/include/config/cpu/32.h) \
+ $(wildcard $(TOPDIR)/include/config/cpu/26.h)
$(CC) $(AFLAGS) -traditional -c $(HEAD:.o=.S)
piggy.o: $(SYSTEM)
- $(OBJCOPY) -O binary -R .note -R .comment -S $(SYSTEM) piggy
+ $(OBJCOPY) $(OBJCOPYFLAGS) $(SYSTEM) piggy
gzip $(GZFLAGS) < piggy > piggy.gz
$(LD) -r -o $@ -b binary piggy.gz
rm -f piggy piggy.gz
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)