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/davinci/config.mk | |
parent | e7538fee991308c16f76f7eca2517089f2a30ff4 (diff) | |
parent | 0a8e823ad0c5a602c93c2e8a54caf622ade6d3fb (diff) | |
download | talos-obmc-uboot-3e11350255d9c5d4bd03c2a65769da84c05d3294.tar.gz talos-obmc-uboot-3e11350255d9c5d4bd03c2a65769da84c05d3294.zip |
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/davinci/config.mk')
-rw-r--r-- | arch/arm/cpu/arm926ejs/davinci/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/davinci/config.mk b/arch/arm/cpu/arm926ejs/davinci/config.mk index d5c978b446..69e9d5ab21 100644 --- a/arch/arm/cpu/arm926ejs/davinci/config.mk +++ b/arch/arm/cpu/arm926ejs/davinci/config.mk @@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0+ # ifndef CONFIG_SPL_BUILD -ALL-$(CONFIG_SPL_FRAMEWORK) += $(obj)u-boot.ais +ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.ais endif |