diff options
author | Tom Rini <trini@ti.com> | 2015-02-16 14:55:50 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-17 06:27:44 -0500 |
commit | a851604ca36493e8319a7d3a17594b7224d546fe (patch) | |
tree | dff68fbdd1b098e334d0da031de250dc8852c3b9 /arch/arm/cpu/armv7/sunxi/config.mk | |
parent | 0ce3f1f90ae6168805f20e473a9ed7fab5fb13a8 (diff) | |
parent | 840fe95c3bcff7692c51b90ebc0d350792597ff0 (diff) | |
download | u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.zip u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.tar.gz u-boot-imx-a851604ca36493e8319a7d3a17594b7224d546fe.tar.bz2 |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/cpu/armv7/sunxi/config.mk')
-rw-r--r-- | arch/arm/cpu/armv7/sunxi/config.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/config.mk b/arch/arm/cpu/armv7/sunxi/config.mk index 00f5ffc..76ffec9 100644 --- a/arch/arm/cpu/armv7/sunxi/config.mk +++ b/arch/arm/cpu/armv7/sunxi/config.mk @@ -1,8 +1,6 @@ # Build a combined spl + u-boot image ifdef CONFIG_SPL ifndef CONFIG_SPL_BUILD -ifndef CONFIG_SPL_FEL ALL-y += u-boot-sunxi-with-spl.bin endif endif -endif |