Commit f1731ed8 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David Mosberger

[PATCH] ia64: arch makefiles update

Second try ready.
Other architectures does not practice this, but I added a rule to
copy vmlinux.gz + bootloader to root of kernel-tree.

bootloader is build when needed, therefore the boot: target has not been
re-introduced.

Complete summary of changes:
o Copy vmlinux-gz + bootloader to root of kernel-tree
o Fix make
parent 2c5db17f
...@@ -8,20 +8,31 @@ ...@@ -8,20 +8,31 @@
# Copyright (C) 1998 by David Mosberger-Tang <davidm@hpl.hp.com> # Copyright (C) 1998 by David Mosberger-Tang <davidm@hpl.hp.com>
# #
LINKFLAGS = -static -T $(src)/bootloader.lds EXTRA_TARGETS := vmlinux.bin vmlinux.gz
OBJS = $(obj)/bootloader.o targets-$(CONFIG_IA64_HP_SIM) += bootloader
targets-$(CONFIG_IA64_GENERIC) += bootloader
EXTRA_TARGETS += $(sort $(targets-y))
targets-$(CONFIG_IA64_HP_SIM) += bootloader quiet_cmd_cptotop = CP $@
targets-$(CONFIG_IA64_GENERIC) += bootloader cmd_cptotop = cp $< $@
CFLAGS := $(CFLAGS) $(CFLAGS_KERNEL) vmlinux.gz: $(obj)/vmlinux.gz $(targets-y)
$(call cmd,cptotop)
@echo ' Kernel: $@ is ready'
all: $(targets-y) bootloader: $(obj)/bootloader
$(call cmd,cptotop)
bootloader: $(OBJS) $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE
$(LD) $(LINKFLAGS) $(OBJS) $(TOPDIR)/lib/lib.a $(TOPDIR)/arch/$(ARCH)/lib/lib.a \ $(call if_changed,gzip)
-o bootloader
clean: $(obj)/vmlinux.bin: vmlinux FORCE
rm -f $(TARGETS) $(call if_changed,objcopy)
LDFLAGS_bootloader = -static -T
$(obj)/bootloader: $(src)/bootloader.lds $(obj)/bootloader.o \
lib/lib.a arch/ia64/lib/lib.a FORCE
$(call if_changed,ld)
...@@ -7,5 +7,3 @@ ...@@ -7,5 +7,3 @@
obj-y := setup.o obj-y := setup.o
obj-$(CONFIG_IA64_GENERIC) += machvec.o obj-$(CONFIG_IA64_GENERIC) += machvec.o
include $(TOPDIR)/Rules.make
...@@ -8,5 +8,3 @@ ...@@ -8,5 +8,3 @@
export-objs := sba_iommu.o export-objs := sba_iommu.o
obj-y := sba_iommu.o obj-y := sba_iommu.o
include $(TOPDIR)/Rules.make
...@@ -13,5 +13,3 @@ obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o ...@@ -13,5 +13,3 @@ obj-$(CONFIG_IA64_GENERIC) += hpsim_machvec.o
obj-$(CONFIG_HP_SIMETH) += simeth.o obj-$(CONFIG_HP_SIMETH) += simeth.o
obj-$(CONFIG_HP_SIMSERIAL) += simserial.o obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
obj-$(CONFIG_HP_SIMSCSI) += simscsi.o obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
include $(TOPDIR)/Rules.make
...@@ -7,5 +7,3 @@ ...@@ -7,5 +7,3 @@
obj-y := hpzx1_misc.o obj-y := hpzx1_misc.o
obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
include $(TOPDIR)/Rules.make
...@@ -2,7 +2,5 @@ ...@@ -2,7 +2,5 @@
# Makefile for the ia32 kernel emulation subsystem. # Makefile for the ia32 kernel emulation subsystem.
# #
obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o ia32_support.o ia32_traps.o \ obj-y := ia32_entry.o sys_ia32.o ia32_ioctl.o ia32_signal.o \
binfmt_elf32.o ia32_ldt.o ia32_support.o ia32_traps.o binfmt_elf32.o ia32_ldt.o
include $(TOPDIR)/Rules.make
...@@ -6,14 +6,15 @@ EXTRA_TARGETS := head.o init_task.o ...@@ -6,14 +6,15 @@ EXTRA_TARGETS := head.o init_task.o
export-objs := ia64_ksyms.o export-objs := ia64_ksyms.o
obj-y := acpi.o entry.o gate.o efi.o efi_stub.o ia64_ksyms.o irq.o irq_ia64.o irq_lsapic.o ivt.o \ obj-y := acpi.o entry.o gate.o efi.o efi_stub.o ia64_ksyms.o \
machvec.o pal.o process.o perfmon.o ptrace.o sal.o semaphore.o setup.o \ irq.o irq_ia64.o irq_lsapic.o ivt.o \
machvec.o pal.o process.o perfmon.o ptrace.o sal.o \
semaphore.o setup.o \
signal.o sys_ia64.o traps.o time.o unaligned.o unwind.o signal.o sys_ia64.o traps.o time.o unaligned.o unwind.o
obj-$(CONFIG_IOSAPIC) += iosapic.o obj-$(CONFIG_IOSAPIC) += iosapic.o
obj-$(CONFIG_IA64_PALINFO) += palinfo.o obj-$(CONFIG_IA64_PALINFO) += palinfo.o
obj-$(CONFIG_EFI_VARS) += efivars.o obj-$(CONFIG_EFI_VARS) += efivars.o
obj-$(CONFIG_SMP) += smp.o smpboot.o obj-$(CONFIG_SMP) += smp.o smpboot.o
obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
include $(TOPDIR)/Rules.make
# #
# Makefile for the ia64-specific parts of the memory manager. # Makefile for the ia64-specific parts of the memory manager.
# #
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now in the main makefile...
obj-y := init.o fault.o tlb.o extable.o obj-y := init.o fault.o tlb.o extable.o
obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
obj-$(CONFIG_NUMA) += numa.o obj-$(CONFIG_NUMA) += numa.o
obj-$(CONFIG_DISCONTIGMEM) += discontig.o obj-$(CONFIG_DISCONTIGMEM) += discontig.o
include $(TOPDIR)/Rules.make
#
# Makefile for the ia64-specific parts of the pci bus
#
obj-y := pci.o obj-y := pci.o
include $(TOPDIR)/Rules.make
...@@ -18,7 +18,3 @@ fprom: $(OBJ) ...@@ -18,7 +18,3 @@ fprom: $(OBJ)
clean: clean:
rm -f *.o fprom rm -f *.o fprom
include $(TOPDIR)/Rules.make
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment