UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
Masahiro Yamada 2014-09-09 19:26:21 +09:00 committed by Michal Marek
parent ac84eb47cc
commit a4954fd772
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/Makefile
View File

@ -232,6 +232,6 @@ targets := $(fw-shipped-) $(patsubst $(obj)/%,%, \
# Without this, built-in.o won't be created when it's empty, and the # Without this, built-in.o won't be created when it's empty, and the
# final vmlinux link will fail. # final vmlinux link will fail.
obj-n := dummy obj- := dummy
hostprogs-y := ihex2fw hostprogs-y := ihex2fw

4
scripts/Makefile.build
View File

@ -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 lib-target := $(obj)/lib.a
endif 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 builtin-target := $(obj)/built-in.o
endif endif

4
scripts/Makefile.clean
View File

@ -23,15 +23,13 @@ __subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))
subdir-y += $(__subdir-y) subdir-y += $(__subdir-y)
__subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m))) __subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m)))
subdir-m += $(__subdir-m) subdir-m += $(__subdir-m)
__subdir-n := $(patsubst %/,%,$(filter %/, $(obj-n)))
subdir-n += $(__subdir-n)
__subdir- := $(patsubst %/,%,$(filter %/, $(obj-))) __subdir- := $(patsubst %/,%,$(filter %/, $(obj-)))
subdir- += $(__subdir-) subdir- += $(__subdir-)
# Subdirectories we need to descend into # Subdirectories we need to descend into
subdir-ym := $(sort $(subdir-y) $(subdir-m)) subdir-ym := $(sort $(subdir-y) $(subdir-m))
subdir-ymn := $(sort $(subdir-ym) $(subdir-n) $(subdir-)) subdir-ymn := $(sort $(subdir-ym) $(subdir-))
# Add subdir path # Add subdir path

2
scripts/Makefile.fwinst
View File

@ -2,7 +2,7 @@
# Installing firmware # Installing firmware
# #
# We don't include the .config, so all firmware files are in $(fw-shipped-) # 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 INSTALL := install