Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4954fd7 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Michal Marek
Browse files

kbuild: remove obj-n and lib-n handling 



Kconfig never defines CONFIG_* as 'n'.
Now obj-n is only used in firmware/Makefile and it can be
replaced with obj-.  No makefile uses lib-n.

Let's rip off obj-n and lib-n.

Signed-off-by: default avatarMasahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: default avatarPeter Foley <pefoley2@pefoley.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent ac84eb47

firmware/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -232,6 +232,6 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \ 


# Without this, built-in.o won't be created when it's empty, and the

# final vmlinux link will fail.

obj-n := dummy

obj- := dummy



hostprogs-y := ihex2fw

scripts/Makefile.build

+2 −2
Original line number Diff line number Diff line
@@ -79,11 +79,11 @@ endif 


# ===========================================================================



ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)

ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),)

lib-target := $(obj)/lib.a

endif



ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),)

ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),)

builtin-target := $(obj)/built-in.o

endif

scripts/Makefile.clean

+1 −3
Original line number Diff line number Diff line
@@ -23,15 +23,13 @@ __subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y))) 
subdir-y	+= $(__subdir-y)

__subdir-m	:= $(patsubst %/,%,$(filter %/, $(obj-m)))

subdir-m	+= $(__subdir-m)

__subdir-n	:= $(patsubst %/,%,$(filter %/, $(obj-n)))

subdir-n	+= $(__subdir-n)

__subdir-	:= $(patsubst %/,%,$(filter %/, $(obj-)))

subdir-		+= $(__subdir-)



# Subdirectories we need to descend into



subdir-ym	:= $(sort $(subdir-y) $(subdir-m))

subdir-ymn      := $(sort $(subdir-ym) $(subdir-n) $(subdir-))

subdir-ymn      := $(sort $(subdir-ym) $(subdir-))



# Add subdir path

scripts/Makefile.fwinst

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Installing firmware

#

# We don't include the .config, so all firmware files are in $(fw-shipped-)

# rather than in $(fw-shipped-y) or $(fw-shipped-n).

# rather than in $(fw-shipped-y) or $(fw-shipped-m).

# ==========================================================================



INSTALL := install