diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-09-09 06:26:21 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-10-02 07:55:02 -0400 |
| commit | a4954fd7724c0f55361eb56005856b0da0c99b00 (patch) | |
| tree | 784f74cb9e1aa3053ebd14aa269b27e72f6308b0 /scripts | |
| parent | ac84eb47cc199d9df7eeb7b32630fc09295a030b (diff) | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 4 | ||||
| -rw-r--r-- | scripts/Makefile.clean | 4 | ||||
| -rw-r--r-- | scripts/Makefile.fwinst | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 5b09d3637855..649ce6844033 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build | |||
| @@ -79,11 +79,11 @@ endif | |||
| 79 | 79 | ||
| 80 | # =========================================================================== | 80 | # =========================================================================== |
| 81 | 81 | ||
| 82 | ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),) | 82 | ifneq ($(strip $(lib-y) $(lib-m) $(lib-)),) |
| 83 | lib-target := $(obj)/lib.a | 83 | lib-target := $(obj)/lib.a |
| 84 | endif | 84 | endif |
| 85 | 85 | ||
| 86 | ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),) | 86 | ifneq ($(strip $(obj-y) $(obj-m) $(obj-) $(subdir-m) $(lib-target)),) |
| 87 | builtin-target := $(obj)/built-in.o | 87 | builtin-target := $(obj)/built-in.o |
| 88 | endif | 88 | endif |
| 89 | 89 | ||
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean index a651cee84f2a..c630ab52fa42 100644 --- a/scripts/Makefile.clean +++ b/scripts/Makefile.clean | |||
| @@ -23,15 +23,13 @@ __subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y))) | |||
| 23 | subdir-y += $(__subdir-y) | 23 | subdir-y += $(__subdir-y) |
| 24 | __subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m))) | 24 | __subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m))) |
| 25 | subdir-m += $(__subdir-m) | 25 | subdir-m += $(__subdir-m) |
| 26 | __subdir-n := $(patsubst %/,%,$(filter %/, $(obj-n))) | ||
| 27 | subdir-n += $(__subdir-n) | ||
| 28 | __subdir- := $(patsubst %/,%,$(filter %/, $(obj-))) | 26 | __subdir- := $(patsubst %/,%,$(filter %/, $(obj-))) |
| 29 | subdir- += $(__subdir-) | 27 | subdir- += $(__subdir-) |
| 30 | 28 | ||
| 31 | # Subdirectories we need to descend into | 29 | # Subdirectories we need to descend into |
| 32 | 30 | ||
| 33 | subdir-ym := $(sort $(subdir-y) $(subdir-m)) | 31 | subdir-ym := $(sort $(subdir-y) $(subdir-m)) |
| 34 | subdir-ymn := $(sort $(subdir-ym) $(subdir-n) $(subdir-)) | 32 | subdir-ymn := $(sort $(subdir-ym) $(subdir-)) |
| 35 | 33 | ||
| 36 | # Add subdir path | 34 | # Add subdir path |
| 37 | 35 | ||
diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst index d8e335eed226..5b698add4f31 100644 --- a/scripts/Makefile.fwinst +++ b/scripts/Makefile.fwinst | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | # Installing firmware | 2 | # Installing firmware |
| 3 | # | 3 | # |
| 4 | # We don't include the .config, so all firmware files are in $(fw-shipped-) | 4 | # We don't include the .config, so all firmware files are in $(fw-shipped-) |
| 5 | # rather than in $(fw-shipped-y) or $(fw-shipped-n). | 5 | # rather than in $(fw-shipped-y) or $(fw-shipped-m). |
| 6 | # ========================================================================== | 6 | # ========================================================================== |
| 7 | 7 | ||
| 8 | INSTALL := install | 8 | INSTALL := install |
