Commit 23febe37 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: merge init-y into core-y 



No arch Makefile specifies init-y.

Merge init-y into core-y. This does not change the link order.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent f3908ab3

Makefile

+4 −6
Original line number Diff line number Diff line
@@ -643,12 +643,11 @@ endif 


ifeq ($(KBUILD_EXTMOD),)

# Objects we will link into vmlinux / subdirs we need to visit

init-y		:= init/

core-y		:= init/ usr/

drivers-y	:= drivers/ sound/

drivers-$(CONFIG_SAMPLES) += samples/

net-y		:= net/

libs-y		:= lib/

core-y		:= usr/

virt-y		:= virt/

endif # KBUILD_EXTMOD
@@ -1060,18 +1059,17 @@ export MODULES_NSDEPS := $(extmod-prefix)modules.nsdeps 
ifeq ($(KBUILD_EXTMOD),)

core-y		+= kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/



vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \

vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, \

		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \

		     $(net-y) $(net-m) $(libs-y) $(libs-m) $(virt-y)))



vmlinux-alldirs	:= $(sort $(vmlinux-dirs) Documentation \

		     $(patsubst %/,%,$(filter %/, $(init-) $(core-) \

		     $(patsubst %/,%,$(filter %/, $(core-) \

			$(drivers-) $(net-) $(libs-) $(virt-))))



build-dirs	:= $(vmlinux-dirs)

clean-dirs	:= $(vmlinux-alldirs)



init-y		:= $(patsubst %/, %/built-in.a, $(init-y))

core-y		:= $(patsubst %/, %/built-in.a, $(core-y))

drivers-y	:= $(patsubst %/, %/built-in.a, $(drivers-y))

net-y		:= $(patsubst %/, %/built-in.a, $(net-y))
@@ -1085,7 +1083,7 @@ endif 
virt-y		:= $(patsubst %/, %/built-in.a, $(virt-y))



# Externally visible symbols (used by link-vmlinux.sh)

export KBUILD_VMLINUX_OBJS := $(head-y) $(init-y) $(core-y) $(libs-y2) \

export KBUILD_VMLINUX_OBJS := $(head-y) $(core-y) $(libs-y2) \

			      $(drivers-y) $(net-y) $(virt-y)

export KBUILD_VMLINUX_LIBS := $(libs-y1)

export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds