Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ca53735a4cd6cc8159e1a9515446e81230dc5b27

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 365475e6d1
Exists in master and in 49 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

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>

Showing 4 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/arm/cpu/arm926ejs/omap/Makefile
Diff comments   View file @ ca53735
... ... @@ -5,6 +5,7 @@
5 5 # SPDX-License-Identifier: GPL-2.0+
6 6 #
7 7  
8   -obj-y = timer.o cpuinfo.o
  8 +obj-y = timer.o
  9 +obj-$(CONFIG_DISPLAY_CPUINFO) += cpuinfo.o
9 10 obj-y += reset.o
arch/arm/cpu/arm926ejs/omap/cpuinfo.c
Diff comments   View file @ ca53735
... ... @@ -13,7 +13,7 @@
13 13 #include <command.h>
14 14 #include <linux/compiler.h>
15 15  
16   -#if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP)
  16 +#if defined(CONFIG_OMAP)
17 17  
18 18 #define omap_readw(x) *(volatile unsigned short *)(x)
19 19 #define omap_readl(x) *(volatile unsigned long *)(x)
... ... @@ -239,5 +239,5 @@
239 239 return 0;
240 240 }
241 241  
242   -#endif /* #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) */
  242 +#endif /* #if defined(CONFIG_OMAP) */
arch/arm/cpu/tegra-common/Makefile
Diff comments   View file @ ca53735
... ... @@ -8,5 +8,6 @@
8 8 #
9 9  
10 10 obj-y += lowlevel_init.o
11   -obj-y += ap.o board.o sys_info.o clock.o cache.o
  11 +obj-y += ap.o board.o clock.o cache.o
  12 +obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o
arch/arm/cpu/tegra-common/sys_info.c
Diff comments   View file @ ca53735
... ... @@ -8,7 +8,6 @@
8 8 #include <common.h>
9 9 #include <linux/ctype.h>
10 10  
11   -#ifdef CONFIG_DISPLAY_CPUINFO
12 11 void upstring(char *s)
13 12 {
14 13 while (*s) {
... ... @@ -30,5 +29,4 @@
30 29 /* TBD: Add printf of major/minor rev info, stepping, etc. */
31 30 return 0;
32 31 }
33   -#endif /* CONFIG_DISPLAY_CPUINFO */