diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 13:16:05 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-02-20 13:16:05 +0100 |
| commit | 3e11350255d9c5d4bd03c2a65769da84c05d3294 (patch) | |
| tree | 2ebc3d0fa0592479020d2d9dc7228b4d15ed2eaa /arch/arm/cpu/arm926ejs/omap | |
| parent | e7538fee991308c16f76f7eca2517089f2a30ff4 (diff) | |
| parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff) | |
| download | u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.zip u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.gz u-boot-imx-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts:
Makefile
drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
Diffstat (limited to 'arch/arm/cpu/arm926ejs/omap')
| -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 bd0a2fb..add9232 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 02332ee..587d99a 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) */ |