Commit 512af14f authored by Kai Germaschewski's avatar Kai Germaschewski

kbuild: Always make an L_TARGET "lib.a"

As we have a standard O_TARGET ("built-in.o"), use a standard L_TARGET
as well ("lib.a"), which is what was used in the majority cases already,
anyway.
parent cf09d32e
...@@ -112,7 +112,7 @@ endif ...@@ -112,7 +112,7 @@ endif
ifdef CONFIG_DECSTATION ifdef CONFIG_DECSTATION
CORE_FILES += arch/mips/dec/dec.o CORE_FILES += arch/mips/dec/dec.o
SUBDIRS += arch/mips/dec arch/mips/dec/prom SUBDIRS += arch/mips/dec arch/mips/dec/prom
LIBS += arch/mips/dec/prom/rexlib.a LIBS += arch/mips/dec/prom/lib.a
LOADADDR += 0x80040000 LOADADDR += 0x80040000
endif endif
...@@ -134,20 +134,20 @@ endif ...@@ -134,20 +134,20 @@ endif
ifdef CONFIG_MIPS_JAZZ ifdef CONFIG_MIPS_JAZZ
CORE_FILES += arch/mips/jazz/jazz.o CORE_FILES += arch/mips/jazz/jazz.o
SUBDIRS += arch/mips/jazz arch/mips/arc SUBDIRS += arch/mips/jazz arch/mips/arc
LIBS += arch/mips/arc/arclib.a LIBS += arch/mips/arc/lib.a
LOADADDR += 0x80080000 LOADADDR += 0x80080000
endif endif
ifdef CONFIG_SNI_RM200_PCI ifdef CONFIG_SNI_RM200_PCI
CORE_FILES += arch/mips/sni/sni.o CORE_FILES += arch/mips/sni/sni.o
SUBDIRS += arch/mips/sni arch/mips/arc SUBDIRS += arch/mips/sni arch/mips/arc
LIBS += arch/mips/arc/arclib.a LIBS += arch/mips/arc/lib.a
LOADADDR += 0x80080000 LOADADDR += 0x80080000
endif endif
ifdef CONFIG_SGI_IP22 ifdef CONFIG_SGI_IP22
CORE_FILES += arch/mips/sgi/kernel/ip22-kern.o CORE_FILES += arch/mips/sgi/kernel/ip22-kern.o
LIBS += arch/mips/arc/arclib.a LIBS += arch/mips/arc/lib.a
SUBDIRS += arch/mips/sgi/kernel arch/mips/arc SUBDIRS += arch/mips/sgi/kernel arch/mips/arc
# #
# Set LOADADDR to >= 0x88069000 if you want to leave space for symmon, # Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
...@@ -162,7 +162,7 @@ endif ...@@ -162,7 +162,7 @@ endif
# #
ifdef CONFIG_BAGET_MIPS ifdef CONFIG_BAGET_MIPS
SUBDIRS += arch/mips/baget arch/mips/baget/prom SUBDIRS += arch/mips/baget arch/mips/baget/prom
LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/bagetlib.a LIBS += arch/mips/baget/baget.a arch/mips/baget/prom/lib.a
LOADADDR += 0x80001000 LOADADDR += 0x80001000
endif endif
......
...@@ -2,13 +2,8 @@ ...@@ -2,13 +2,8 @@
# Makefile for the SGI arcs prom monitor library routines # Makefile for the SGI arcs prom monitor library routines
# under Linux. # under Linux.
# #
# 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 definitions are now in the main makefile...
L_TARGET = arclib.a L_TARGET = lib.a
obj-y += console.o init.o memory.o tree.o env.o cmdline.o misc.o \ obj-y += console.o init.o memory.o tree.o env.o cmdline.o misc.o \
time.o file.o identify.o time.o file.o identify.o
......
# #
# Makefile for the Baget/MIPS prom emulator library routines. # Makefile for the Baget/MIPS prom emulator library routines.
# #
# 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 definitions are now in the main makefile...
L_TARGET := bagetlib.a L_TARGET := lib.a
obj-y := init.o obj-y := init.o
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# under Linux. # under Linux.
# #
L_TARGET := rexlib.a L_TARGET := lib.a
obj-y := init.o memory.o cmdline.o identify.o locore.o obj-y := init.o memory.o cmdline.o identify.o locore.o
......
...@@ -72,7 +72,7 @@ endif ...@@ -72,7 +72,7 @@ endif
# Board-dependent options and extra files # Board-dependent options and extra files
# #
ifdef CONFIG_SGI_IP22 ifdef CONFIG_SGI_IP22
LIBS += arch/mips64/sgi-ip22/ip22.a arch/mips64/arc/arclib.a LIBS += arch/mips64/sgi-ip22/lib.a arch/mips64/arc/lib.a
SUBDIRS += arch/mips64/sgi-ip22 arch/mips64/arc SUBDIRS += arch/mips64/sgi-ip22 arch/mips64/arc
# #
# Set LOADADDR to >= 0x88069000 if you want to leave space for symmon, # Set LOADADDR to >= 0x88069000 if you want to leave space for symmon,
...@@ -84,7 +84,7 @@ endif ...@@ -84,7 +84,7 @@ endif
ifdef CONFIG_SGI_IP27 ifdef CONFIG_SGI_IP27
CORE_FILES += arch/mips64/sgi-ip27/ip27.o CORE_FILES += arch/mips64/sgi-ip27/ip27.o
LIBS += arch/mips64/arc/arclib.a LIBS += arch/mips64/arc/lib.a
SUBDIRS += arch/mips64/sgi-ip27 arch/mips64/arc SUBDIRS += arch/mips64/sgi-ip27 arch/mips64/arc
# #
# Set LOADADDR to >= 0xc000000000300000 if you want to leave space for # Set LOADADDR to >= 0xc000000000300000 if you want to leave space for
...@@ -100,7 +100,7 @@ endif ...@@ -100,7 +100,7 @@ endif
endif endif
ifdef CONFIG_SGI_IP32 ifdef CONFIG_SGI_IP32
LIBS += arch/mips64/sgi-ip32/ip32-kern.a arch/mips64/arc/arclib.a LIBS += arch/mips64/sgi-ip32/ip32-kern.a arch/mips64/arc/lib.a
SUBDIRS += arch/mips64/sgi-ip32 arch/mips64/arc SUBDIRS += arch/mips64/sgi-ip32 arch/mips64/arc
# #
# Set LOADADDR to >= 0x????????? if you want to leave space for symmon, # Set LOADADDR to >= 0x????????? if you want to leave space for symmon,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for the ARC prom monitor library routines under Linux. # Makefile for the ARC prom monitor library routines under Linux.
# #
L_TARGET = arclib.a L_TARGET = lib.a
obj-y := console.o init.o identify.o tree.o env.o cmdline.o misc.o time.o \ obj-y := console.o init.o identify.o tree.o env.o cmdline.o misc.o time.o \
file.o file.o
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
EXTRA_AFLAGS := $(CFLAGS) EXTRA_AFLAGS := $(CFLAGS)
L_TARGET = ip22.a L_TARGET = lib.a
obj-y += ip22-berr.o ip22-mc.o ip22-sc.o ip22-hpc.o ip22-int.o ip22-rtc.o \ obj-y += ip22-berr.o ip22-mc.o ip22-sc.o ip22-hpc.o ip22-int.o ip22-rtc.o \
ip22-setup.o system.o ip22-timer.o ip22-irq.o ip22-reset.o time.o ip22-setup.o system.o ip22-timer.o ip22-irq.o ip22-reset.o time.o
......
...@@ -19,7 +19,7 @@ OBJCOPY_ARGS = -O elf32-powerpc ...@@ -19,7 +19,7 @@ OBJCOPY_ARGS = -O elf32-powerpc
MKIMAGE := ./utils/mkimage.wrapper MKIMAGE := ./utils/mkimage.wrapper
lib/zlib.a: lib/zlib.c lib/lib.a: lib/zlib.c
$(MAKE) -C lib $(MAKE) -C lib
images/vmlinux.gz: $(TOPDIR)/vmlinux images/vmlinux.gz: $(TOPDIR)/vmlinux
...@@ -55,7 +55,7 @@ maketools: ...@@ -55,7 +55,7 @@ maketools:
# The targets all boards support for boot images. # The targets all boards support for boot images.
BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd
$(BOOT_TARGETS): vmapus lib/zlib.a images/vmlinux.gz maketools $(BOOT_TARGETS): vmapus lib/lib.a images/vmlinux.gz maketools
ifneq ($(BOOTDIRS),) ifneq ($(BOOTDIRS),)
for d in $(BOOTDIRS); do $(MAKE) -C $$d $@; done for d in $(BOOTDIRS); do $(MAKE) -C $$d $@; done
endif endif
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Makefile for some libs needed by zImage. # Makefile for some libs needed by zImage.
# #
L_TARGET := zlib.a L_TARGET := lib.a
obj-y := zlib.o obj-y := zlib.o
......
...@@ -40,7 +40,7 @@ SUBDIRS += arch/sparc/kernel arch/sparc/lib arch/sparc/prom \ ...@@ -40,7 +40,7 @@ SUBDIRS += arch/sparc/kernel arch/sparc/lib arch/sparc/prom \
CORE_FILES := arch/sparc/kernel/kernel.o arch/sparc/mm/mm.o $(CORE_FILES) \ CORE_FILES := arch/sparc/kernel/kernel.o arch/sparc/mm/mm.o $(CORE_FILES) \
arch/sparc/math-emu/math-emu.o arch/sparc/math-emu/math-emu.o
LIBS := $(LIBS) arch/sparc/prom/promlib.a arch/sparc/lib/lib.a LIBS := $(LIBS) arch/sparc/prom/lib.a arch/sparc/lib/lib.a
# This one has to come last # This one has to come last
SUBDIRS += arch/sparc/boot SUBDIRS += arch/sparc/boot
......
...@@ -2,13 +2,8 @@ ...@@ -2,13 +2,8 @@
# Makefile for the Sun Boot PROM interface library under # Makefile for the Sun Boot PROM interface library under
# Linux. # Linux.
# #
# 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 definitions are now in the main makefile...
L_TARGET = promlib.a L_TARGET = lib.a
obj-y := bootstr.o devmap.o devops.o init.o memory.o misc.o mp.o \ obj-y := bootstr.o devmap.o devops.o init.o memory.o misc.o mp.o \
palloc.o ranges.o segment.o console.o printf.o tree.o palloc.o ranges.o segment.o console.o printf.o tree.o
......
...@@ -72,7 +72,7 @@ endif ...@@ -72,7 +72,7 @@ endif
CORE_FILES += arch/sparc64/math-emu/math-emu.o CORE_FILES += arch/sparc64/math-emu/math-emu.o
LIBS := $(TOPDIR)/lib/lib.a $(LIBS) $(TOPDIR)/arch/sparc64/prom/promlib.a \ LIBS := $(TOPDIR)/lib/lib.a $(LIBS) $(TOPDIR)/arch/sparc64/prom/lib.a \
$(TOPDIR)/arch/sparc64/lib/lib.a $(TOPDIR)/arch/sparc64/lib/lib.a
vmlinux.aout: vmlinux vmlinux.aout: vmlinux
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
EXTRA_AFLAGS := -ansi EXTRA_AFLAGS := -ansi
L_TARGET = promlib.a L_TARGET = lib.a
obj-y := bootstr.o devops.o init.o memory.o misc.o \ obj-y := bootstr.o devops.o init.o memory.o misc.o \
tree.o console.o printf.o p1275.o map.o tree.o console.o printf.o p1275.o map.o
......
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