Commit dfa15b02 authored by Paul Mackerras's avatar Paul Mackerras

Merge bk://ppc@ppc.bkbits.net/for-linus-ppc

into samba.org:/home/paulus/kernel/for-linus-ppc
parents 03e4e085 9649a17c
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
# get_mem_size(), which is memory controller dependent. Add in the correct # get_mem_size(), which is memory controller dependent. Add in the correct
# XXX_memory.o file for this to work, as well as editing the $(MISC) file. # XXX_memory.o file for this to work, as well as editing the $(MISC) file.
boot: zImage
boot := arch/ppc/boot boot := arch/ppc/boot
common := $(boot)/common common := $(boot)/common
...@@ -32,86 +31,90 @@ images := $(boot)/images ...@@ -32,86 +31,90 @@ images := $(boot)/images
# Normally, we use the 'misc.c' file for decompress_kernel and # Normally, we use the 'misc.c' file for decompress_kernel and
# whatnot. Sometimes we need to override this however. # whatnot. Sometimes we need to override this however.
MISC := misc.o misc-y := misc.o
ifeq ($(CONFIG_IBM_OPENBIOS),y)
ZIMAGE := zImage-TREE #
ZIMAGEINITRD := zImage.initrd-TREE # See arch/ppc/kconfig and arch/ppc/platforms/Kconfig
END := treeboot # for definition of what platform each config option refer to.
TFTPIMAGE := /tftpboot/zImage.$(END) #----------------------------------------------------------------------------
MISC := misc-embedded.o zimage-$(CONFIG_IBM_OPENBIOS) := zImage-TREE
endif zimageinitrd-$(CONFIG_IBM_OPENBIOS) := zImage.initrd-TREE
ifeq ($(CONFIG_EMBEDDEDBOOT),y) end-$(CONFIG_IBM_OPENBIOS) := treeboot
TFTPIMAGE := /tftpboot/zImage.embedded tftpimage-$(CONFIG_IBM_OPENBIOS) := /tftpboot/zImage.$(end-y)
MISC := misc-embedded.o misc-$(CONFIG_IBM_OPENBIOS) := misc-embedded.o
endif
ifeq ($(CONFIG_EBONY),y) tftpimage-$(CONFIG_EMBEDDEDBOOT) := /tftpboot/zImage.embedded
ZIMAGE := zImage-TREE misc-$(CONFIG_EMBEDDEDBOOT) := misc-embedded.o
ZIMAGEINITRD := zImage.initrd-TREE
END := ebony zimage-$(CONFIG_EBONY) := zImage-TREE
ENTRYPOINT := 0x01000000 zimageinitrd-$(CONFIG_EBONY) := zImage.initrd-TREE
TFTPIMAGE := /tftpboot/zImage.$(END) extra.o-$(CONFIG_EBONY) := direct.o
endif end-$(CONFIG_EBONY) := ebony
ifeq ($(CONFIG_EV64260),y) entrypoint-$(CONFIG_EBONY) := 0x01000000
EXTRA := misc-ev64260.o tftpimage-$(CONFIG_EBONY) := /tftpboot/zImage.$(end-y)
TFTPIMAGE := /tftpboot/zImage.ev64260
endif extra.o-$(CONFIG_EV64260) := direct.o misc-ev64260.o
ifeq ($(CONFIG_GEMINI),y) tftpimage-$(CONFIG_EV64260) := /tftpboot/zImage.ev64260
ZIMAGE := zImage-STRIPELF
ZIMAGEINITRD := zImage.initrd-STRIPELF zimage-$(CONFIG_GEMINI) := zImage-STRIPELF
END := gemini zimageinitrd-$(CONFIG_GEMINI) := zImage.initrd-STRIPELF
TFTPIMAGE := /tftpboot/zImage.$(END) end-$(CONFIG_GEMINI) := gemini
endif tftpimage-$(CONFIG_GEMINI) := /tftpboot/zImage.$(end-y)
ifeq ($(CONFIG_K2),y)
EXTRA := legacy.o extra.o-$(CONFIG_K2) := legacy.o
TFTPIMAGE := /tftpboot/zImage.k2 tftpimage-$(CONFIG_K2) := /tftpboot/zImage.k2
endif
# kbuild-2.4 'feature', only one of these will ever by 'y' at a time. # kconfig 'feature', only one of these will ever by 'y' at a time.
# The rest will be unset. # The rest will be unset.
ifeq ($(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750)$(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS),y) multi := $(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
ZIMAGE := zImage-PPLUS $(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS)
ZIMAGEINITRD := zImage.initrd-PPLUS zimage-$(multi) := zImage-PPLUS
TFTPIMAGE := /tftpboot/zImage.pplus zimageinitrd-$(multi) := zImage.initrd-PPLUS
ZNETBOOT := zImage.pplus tftpimage-$(multi) := /tftpboot/zImage.pplus
ZNETBOOTRD := zImage.initrd.pplus znetboot-$(multi) := zImage.pplus
endif znetbootrd-$(multi) := zImage.initrd.pplus
ifeq ($(CONFIG_PPLUS),y)
EXTRA := legacy.o # Overrides previous assingment
endif extra.o-$(CONFIG_PPLUS) := legacy.o
ifeq ($(CONFIG_PCORE)$(CONFIG_POWERPMC250),y)
ZIMAGE := zImage-STRIPELF zimage-$(CONFIG_PCORE) := zImage-STRIPELF
ZIMAGEINITRD := zImage.initrd-STRIPELF zimageinitrd-$(CONFIG_PCORE) := zImage.initrd-STRIPELF
EXTRA := chrpmap.o extra.o-$(CONFIG_PCORE) := chrpmap.o
END := pcore end-$(CONFIG_PCORE) := pcore
TFTPIMAGE := /tftpboot/zImage.$(END) tftpimage-$(CONFIG_PCORE) := /tftpboot/zImage.$(end-y)
endif
ifeq ($(CONFIG_SANDPOINT),y) zimage-$(CONFIG_POWERPMC250) := zImage-STRIPELF
TFTPIMAGE := /tftpboot/zImage.sandpoint zimageinitrd-$(CONFIG_POWERPMC250) := zImage.initrd-STRIPELF
endif extra.o-$(CONFIG_POWERPMC250) := chrpmap.o
ifeq ($(CONFIG_SPRUCE),y) end-$(CONFIG_POWERPMC250) := pcore
ZIMAGE := zImage-TREE tftpimage-$(CONFIG_POWERPMC250) := /tftpboot/zImage.$(end-y)
ZIMAGEINITRD := zImage.initrd-TREE
END := spruce tftpimage-$(CONFIG_SANDPOINT) := /tftpboot/zImage.sandpoint
ENTRYPOINT := 0x00800000
MISC := misc-spruce.o zimage-$(CONFIG_SPRUCE) := zImage-TREE
TFTPIMAGE := /tftpboot/zImage.$(END) zimageinitrd-$(CONFIG_SPRUCE) := zImage.initrd-TREE
endif end-$(CONFIG_SPRUCE) := spruce
ifeq ($(CONFIG_SMP),y) entrypoint-$(CONFIG_SPRUCE) := 0x00800000
TFTPIMAGE += .smp misc-$(CONFIG_SPRUCE) := misc-spruce.o
endif tftpimage-$(CONFIG_SPRUCE) := /tftpboot/zImage.$(end-y)
ifeq ($(CONFIG_REDWOOD_4),y)
# tftp image is prefixed with .smp if compiled for SMP
tftpimage-$(CONFIG_SMP) += .smp
# This is a treeboot that needs init functions until the # This is a treeboot that needs init functions until the
# boot rom is sorted out (i.e. this is short lived) # boot rom is sorted out (i.e. this is short lived)
EXTRA_AFLAGS := -Wa,-m405 extra-aflags-$(CONFIG_REDWOOD_4) := -Wa,-m405
EXTRA := rw4/rw4_init.o rw4/rw4_init_brd.o extra.o-$(CONFIG_REDWOOD_4) := rw4/rw4_init.o rw4/rw4_init_brd.o
endif EXTRA_AFLAGS := $(extra-aflags-y)
# Linker args. This specifies where the image will be run at. # Linker args. This specifies where the image will be run at.
LD_ARGS = -T $(boot)/ld.script \ LD_ARGS := -T $(boot)/ld.script \
-Ttext $(CONFIG_BOOT_LOAD) -Bstatic -Ttext $(CONFIG_BOOT_LOAD) -Bstatic
OBJCOPY_ARGS := -O elf32-powerpc OBJCOPY_ARGS := -O elf32-powerpc
# head.o and relocate.o must be at the start. # head.o and relocate.o must be at the start.
boot-y := head.o relocate.o $(EXTRA) $(MISC) boot-y := head.o relocate.o $(extra.o-y) $(misc-y)
boot-$(CONFIG_40x) += embed_config.o boot-$(CONFIG_40x) += embed_config.o
boot-$(CONFIG_8xx) += embed_config.o boot-$(CONFIG_8xx) += embed_config.o
boot-$(CONFIG_8260) += embed_config.o boot-$(CONFIG_8260) += embed_config.o
...@@ -160,40 +163,40 @@ $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(boot)/ld.script \ ...@@ -160,40 +163,40 @@ $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(boot)/ld.script \
-R .stabstr -R .sysmap -R .stabstr -R .sysmap
# Sort-of dummy rules, that let us format the image we want. # Sort-of dummy rules, that let us format the image we want.
zImage: $(images)/$(ZIMAGE) $(obj)/zvmlinux zImage: $(images)/$(zimage-y) $(obj)/zvmlinux
cp -f $(obj)/zvmlinux $(images)/zImage.elf cp -f $(obj)/zvmlinux $(images)/zImage.elf
rm -f $(obj)/zvmlinux rm -f $(obj)/zvmlinux
zImage.initrd: $(images)/$(ZIMAGEINITRD) $(obj)/zvmlinux.initrd zImage.initrd: $(images)/$(zimageinitrd-y) $(obj)/zvmlinux.initrd
cp -f $(obj)/zvmlinux.initrd $(images)/zImage.initrd.elf cp -f $(obj)/zvmlinux.initrd $(images)/zImage.initrd.elf
rm -f $(obj)/zvmlinux.initrd rm -f $(obj)/zvmlinux.initrd
znetboot: zImage znetboot: zImage
ifneq ($(ZNETBOOT),) ifneq ($(ZNETBOOT),)
cp $(images)/$(ZNETBOOT) $(TFTPIMAGE) cp $(images)/$(ZNETBOOT) $(tftpimage-y)
else else
cp $(images)/zImage.* $(TFTPIMAGE) cp $(images)/zImage.* $(tftpimage-y)
endif endif
znetboot.initrd: zImage.initrd znetboot.initrd: zImage.initrd
ifneq ($(ZNETBOOTRD),) ifneq ($(znetbootrd-y),)
cp $(images)/$(ZNETBOOTRD) $(TFTPIMAGE) cp $(images)/$(znetbootrd-y) $(tftpimage-y)
else else
cp $(images)/zImage.* $(TFTPIMAGE) cp $(images)/zImage.* $(tftpimage-y)
endif endif
$(images)/zImage-STRIPELF: $(obj)/zvmlinux $(images)/zImage-STRIPELF: $(obj)/zvmlinux
dd if=$(obj)/zvmlinux of=$(images)/zImage.$(END) skip=64 bs=1k dd if=$(obj)/zvmlinux of=$(images)/zImage.$(end-y) skip=64 bs=1k
$(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd
dd if=$(obj)/zvmlinux.initrd of=$(images)/zImage.initrd.$(END) \ dd if=$(obj)/zvmlinux.initrd of=$(images)/zImage.initrd.$(end-y) \
skip=64 bs=1k skip=64 bs=1k
$(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE) $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE)
$(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(END) $(ENTRYPOINT) $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT)
$(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE) $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
$(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(END) \ $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
$(ENTRYPOINT) $(ENTRYPOINT)
$(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT) $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
......
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