diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-02-13 18:30:27 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-19 11:10:05 -0500 |
| commit | ca53735a4cd6cc8159e1a9515446e81230dc5b27 (patch) | |
| tree | ba1b466a043da80a329899b2283147b29c73d3ee /arch/arm/cpu/arm926ejs | |
| parent | 365475e6d14bc1ea9d218c0fd1fe96878a9db94e (diff) | |
| download | blackbird-obmc-uboot-ca53735a4cd6cc8159e1a9515446e81230dc5b27.tar.gz blackbird-obmc-uboot-ca53735a4cd6cc8159e1a9515446e81230dc5b27.zip | |
Move CONFIG_DISPLAY_CPUINFO to Makefile
If the whole code is surrounded by #ifdef(CONFIG_ ) .. #endif,
it should be moved to Makefile.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/omap/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/omap/cpuinfo.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/cpu/arm926ejs/omap/Makefile b/arch/arm/cpu/arm926ejs/omap/Makefile index bd0a2fbe92..add923276c 100644 --- a/arch/arm/cpu/arm926ejs/omap/Makefile +++ b/arch/arm/cpu/arm926ejs/omap/Makefile @@ -5,5 +5,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y = timer.o cpuinfo.o +obj-y = timer.o +obj-$(CONFIG_DISPLAY_CPUINFO) += cpuinfo.o obj-y += reset.o diff --git a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c index 02332eee0e..587d99a2bb 100644 --- a/arch/arm/cpu/arm926ejs/omap/cpuinfo.c +++ b/arch/arm/cpu/arm926ejs/omap/cpuinfo.c @@ -13,7 +13,7 @@ #include <command.h> #include <linux/compiler.h> -#if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) +#if defined(CONFIG_OMAP) #define omap_readw(x) *(volatile unsigned short *)(x) #define omap_readl(x) *(volatile unsigned long *)(x) @@ -239,4 +239,4 @@ int print_cpuinfo (void) return 0; } -#endif /* #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) */ +#endif /* #if defined(CONFIG_OMAP) */ |
