Commit 2f35d5a7 authored by Sam Ravnborg's avatar Sam Ravnborg

kbuild/all archs: Replace HEAD with head-y

Replace done for all archs except mips* and cris.
These architectures are lacking too much behind that it made sense
parent 50c71fe5
...@@ -90,7 +90,7 @@ endif ...@@ -90,7 +90,7 @@ endif
# BWX is most important, but we don't really want any emulation ever. # BWX is most important, but we don't really want any emulation ever.
CFLAGS += $(cflags-y) -Wa,-mev6 CFLAGS += $(cflags-y) -Wa,-mev6
HEAD := arch/alpha/kernel/head.o head-y := arch/alpha/kernel/head.o
core-y += arch/alpha/kernel/ arch/alpha/mm/ core-y += arch/alpha/kernel/ arch/alpha/mm/
core-$(CONFIG_MATHEMU) += arch/alpha/math-emu/ core-$(CONFIG_MATHEMU) += arch/alpha/math-emu/
......
...@@ -61,7 +61,7 @@ DATAADDR := . ...@@ -61,7 +61,7 @@ DATAADDR := .
ifeq ($(CONFIG_CPU_26),y) ifeq ($(CONFIG_CPU_26),y)
PROCESSOR := armo PROCESSOR := armo
HEAD := arch/arm/mach-arc/head.o arch/arm/kernel/init_task.o head-y := arch/arm/mach-arc/head.o arch/arm/kernel/init_task.o
LDFLAGS_BLOB += --oformat elf26-littlearm LDFLAGS_BLOB += --oformat elf26-littlearm
ifeq ($(CONFIG_ROM_KERNEL),y) ifeq ($(CONFIG_ROM_KERNEL),y)
DATAADDR := 0x02080000 DATAADDR := 0x02080000
...@@ -73,7 +73,7 @@ endif ...@@ -73,7 +73,7 @@ endif
ifeq ($(CONFIG_CPU_32),y) ifeq ($(CONFIG_CPU_32),y)
PROCESSOR := armv PROCESSOR := armv
HEAD := arch/arm/kernel/head.o arch/arm/kernel/init_task.o head-y := arch/arm/kernel/head.o arch/arm/kernel/init_task.o
LDFLAGS_BLOB += --oformat elf32-littlearm LDFLAGS_BLOB += --oformat elf32-littlearm
textaddr-y := 0xC0008000 textaddr-y := 0xC0008000
endif endif
......
...@@ -31,7 +31,7 @@ cflags-$(CONFIG_ITANIUM_BSTEP_SPECIFIC) += -mb-step ...@@ -31,7 +31,7 @@ cflags-$(CONFIG_ITANIUM_BSTEP_SPECIFIC) += -mb-step
cflags-$(CONFIG_IA64_SGI_SN) += -DBRINGUP cflags-$(CONFIG_IA64_SGI_SN) += -DBRINGUP
CFLAGS += $(cflags-y) CFLAGS += $(cflags-y)
HEAD := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o
libs-y += arch/ia64/lib/ libs-y += arch/ia64/lib/
core-y += arch/ia64/kernel/ arch/ia64/mm/ core-y += arch/ia64/kernel/ arch/ia64/mm/
......
...@@ -54,9 +54,9 @@ CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g ...@@ -54,9 +54,9 @@ CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) -g
endif endif
ifndef CONFIG_SUN3 ifndef CONFIG_SUN3
HEAD := arch/m68k/kernel/head.o head-y := arch/m68k/kernel/head.o
else else
HEAD := arch/m68k/kernel/sun3-head.o head-y := arch/m68k/kernel/sun3-head.o
endif endif
core-y += arch/m68k/kernel/ arch/m68k/mm/ core-y += arch/m68k/kernel/ arch/m68k/mm/
......
...@@ -84,7 +84,7 @@ CFLAGS += -DUTS_SYSNAME=\"uClinux\" ...@@ -84,7 +84,7 @@ CFLAGS += -DUTS_SYSNAME=\"uClinux\"
LDFLAGS_BLOB := --format binary --oformat elf32-m68k LDFLAGS_BLOB := --format binary --oformat elf32-m68k
HEAD := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o head-y := arch/m68knommu/platform/$(platform-y)/$(board-y)/crt0_$(model-y).o
CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h.tmp \ CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h.tmp \
include/asm-$(ARCH)/asm-offsets.h \ include/asm-$(ARCH)/asm-offsets.h \
......
...@@ -256,7 +256,7 @@ endif ...@@ -256,7 +256,7 @@ endif
AFLAGS_vmlinux.lds.o := -DLOADADDR=$(LOADADDR) AFLAGS_vmlinux.lds.o := -DLOADADDR=$(LOADADDR)
HEAD := arch/mips/kernel/head.o arch/mips/kernel/init_task.o head-y := arch/mips/kernel/head.o arch/mips/kernel/init_task.o
SUBDIRS := arch/mips/tools SUBDIRS := arch/mips/tools
......
...@@ -128,7 +128,7 @@ endif ...@@ -128,7 +128,7 @@ endif
LDFLAGS_vmlinux += -Ttext $(LOADADDR) LDFLAGS_vmlinux += -Ttext $(LOADADDR)
HEAD := arch/mips64/kernel/head.o arch/mips64/kernel/init_task.o head-y := arch/mips64/kernel/head.o arch/mips64/kernel/init_task.o
SUBDIRS := arch/mips64/tools $(SUBDIRS) SUBDIRS := arch/mips64/tools $(SUBDIRS)
core-y += arch/mips64/kernel/ arch/mips64/mm/ core-y += arch/mips64/kernel/ arch/mips64/mm/
......
...@@ -56,7 +56,6 @@ head-y := arch/parisc/kernel/head.o ...@@ -56,7 +56,6 @@ head-y := arch/parisc/kernel/head.o
head-$(CONFIG_PARISC64) := arch/parisc/kernel/head64.o head-$(CONFIG_PARISC64) := arch/parisc/kernel/head64.o
CFLAGS += $(cflags-y) CFLAGS += $(cflags-y)
HEAD := $(head-y)
core-y += $(addprefix arch/parisc/, kernel/pdc_cons.o kernel/process.o \ core-y += $(addprefix arch/parisc/, kernel/pdc_cons.o kernel/process.o \
mm/ kernel/ hpux/ math-emu/ kernel/init_task.o ) mm/ kernel/ hpux/ math-emu/ kernel/init_task.o )
......
...@@ -36,15 +36,12 @@ ifdef CONFIG_MORE_COMPILE_OPTIONS ...@@ -36,15 +36,12 @@ ifdef CONFIG_MORE_COMPILE_OPTIONS
CFLAGS += $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g') CFLAGS += $(shell echo $(CONFIG_COMPILE_OPTIONS) | sed -e 's/"//g')
endif endif
head-y := head.o head-y := arch/ppc/kernel/head.o
head-$(CONFIG_8xx) := head_8xx.o head-$(CONFIG_8xx) := arch/ppc/kernel/head_8xx.o
head-$(CONFIG_4xx) := head_4xx.o head-$(CONFIG_4xx) := arch/ppc/kernel/head_4xx.o
head-$(CONFIG_440) := head_44x.o head-$(CONFIG_440) := arch/ppc/kernel/head_44x.o
HEAD := arch/ppc/kernel/$(head-y) head-$(CONFIG_6xx) += arch/ppc/kernel/idle_6xx.o
ifdef CONFIG_6xx
HEAD += arch/ppc/kernel/idle_6xx.o
endif
core-y += arch/ppc/kernel/ arch/ppc/platforms/ \ core-y += arch/ppc/kernel/ arch/ppc/platforms/ \
arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/ arch/ppc/mm/ arch/ppc/lib/ arch/ppc/syslib/
......
...@@ -22,7 +22,7 @@ CFLAGS += -msoft-float -pipe \ ...@@ -22,7 +22,7 @@ CFLAGS += -msoft-float -pipe \
-Wno-uninitialized -mminimal-toc -mtraceback=full \ -Wno-uninitialized -mminimal-toc -mtraceback=full \
-finline-limit-2000 -mcpu=power4 -finline-limit-2000 -mcpu=power4
HEAD := arch/ppc64/kernel/head.o head-y := arch/ppc64/kernel/head.o
libs-y += arch/ppc64/lib/ libs-y += arch/ppc64/lib/
core-y += arch/ppc64/kernel/ core-y += arch/ppc64/kernel/
......
...@@ -20,7 +20,7 @@ LDFLAGS_BLOB := --format binary --oformat elf32-s390 ...@@ -20,7 +20,7 @@ LDFLAGS_BLOB := --format binary --oformat elf32-s390
CFLAGS += -pipe -fno-strength-reduce CFLAGS += -pipe -fno-strength-reduce
HEAD := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/
libs-y += arch/$(ARCH)/lib/ libs-y += arch/$(ARCH)/lib/
......
...@@ -21,7 +21,7 @@ LDFLAGS_BLOB := --format binary --oformat elf64-s390 ...@@ -21,7 +21,7 @@ LDFLAGS_BLOB := --format binary --oformat elf64-s390
CFLAGS += -pipe -fno-strength-reduce CFLAGS += -pipe -fno-strength-reduce
HEAD := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o head-y := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ core-y += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/
libs-y += arch/$(ARCH)/lib/ libs-y += arch/$(ARCH)/lib/
......
...@@ -53,7 +53,7 @@ endif ...@@ -53,7 +53,7 @@ endif
# #
CFLAGS += -pipe CFLAGS += -pipe
HEAD := arch/sh/kernel/head.o arch/sh/kernel/init_task.o head-y := arch/sh/kernel/head.o arch/sh/kernel/init_task.o
LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)
......
...@@ -37,7 +37,8 @@ endif ...@@ -37,7 +37,8 @@ endif
# Actual linking is done with "make image". # Actual linking is done with "make image".
LDFLAGS_vmlinux = -r LDFLAGS_vmlinux = -r
HEAD := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o head-y := arch/sparc/kernel/head.o arch/sparc/kernel/init_task.o
HEAD := $(head-y)
core-y += arch/sparc/kernel/ arch/sparc/mm/ arch/sparc/math-emu/ core-y += arch/sparc/kernel/ arch/sparc/mm/ arch/sparc/math-emu/
libs-y += arch/sparc/prom/ arch/sparc/lib/ libs-y += arch/sparc/prom/ arch/sparc/lib/
......
...@@ -61,7 +61,7 @@ ifeq ($(CONFIG_MCOUNT),y) ...@@ -61,7 +61,7 @@ ifeq ($(CONFIG_MCOUNT),y)
CFLAGS := $(CFLAGS) -pg CFLAGS := $(CFLAGS) -pg
endif endif
HEAD := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o head-y := arch/sparc64/kernel/head.o arch/sparc64/kernel/init_task.o
core-y += arch/sparc64/kernel/ arch/sparc64/mm/ core-y += arch/sparc64/kernel/ arch/sparc64/mm/
core-$(CONFIG_SOLARIS_EMUL) += arch/sparc64/solaris/ core-$(CONFIG_SOLARIS_EMUL) += arch/sparc64/solaris/
......
...@@ -31,7 +31,7 @@ LDFLAGS_BLOB := -b binary --oformat elf32-little ...@@ -31,7 +31,7 @@ LDFLAGS_BLOB := -b binary --oformat elf32-little
OBJCOPY_FLAGS_BLOB := -I binary -O elf32-little -B v850e OBJCOPY_FLAGS_BLOB := -I binary -O elf32-little -B v850e
HEAD := $(arch_dir)/kernel/head.o $(arch_dir)/kernel/init_task.o head-y := $(arch_dir)/kernel/head.o $(arch_dir)/kernel/init_task.o
core-y += $(arch_dir)/kernel/ core-y += $(arch_dir)/kernel/
libs-y += $(arch_dir)/lib/ libs-y += $(arch_dir)/lib/
......
...@@ -48,7 +48,7 @@ CFLAGS += -fno-reorder-blocks ...@@ -48,7 +48,7 @@ CFLAGS += -fno-reorder-blocks
CFLAGS += -finline-limit=2000 CFLAGS += -finline-limit=2000
#CFLAGS += -g #CFLAGS += -g
HEAD := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o
libs-y += arch/x86_64/lib/ libs-y += arch/x86_64/lib/
core-y += arch/x86_64/kernel/ arch/x86_64/mm/ core-y += arch/x86_64/kernel/ arch/x86_64/mm/
......
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