diff options
author | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-07-19 16:38:57 -0400 |
commit | 66669fcf809c1e3ff644b12e04e625d3737ffd8e (patch) | |
tree | 362111f12b9dcf33eb31e165d882957df45fc896 /arch/arm/cpu/armv8/fsl-layerscape/Makefile | |
parent | f60d0603edca472c4458b30956f38c6c1a836d66 (diff) | |
parent | 0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d (diff) | |
download | u-boot-imx-66669fcf809c1e3ff644b12e04e625d3737ffd8e.zip u-boot-imx-66669fcf809c1e3ff644b12e04e625d3737ffd8e.tar.gz u-boot-imx-66669fcf809c1e3ff644b12e04e625d3737ffd8e.tar.bz2 |
Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
arch/arm/cpu/armv8/Makefile
arch/arm/lib/bootm-fdt.c
Diffstat (limited to 'arch/arm/cpu/armv8/fsl-layerscape/Makefile')
-rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Makefile b/arch/arm/cpu/armv8/fsl-layerscape/Makefile index eb2cbc3..bcf6b48 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Makefile +++ b/arch/arm/cpu/armv8/fsl-layerscape/Makefile @@ -10,6 +10,7 @@ obj-y += soc.o obj-$(CONFIG_MP) += mp.o obj-$(CONFIG_OF_LIBFDT) += fdt.o obj-$(CONFIG_SPL) += spl.o +obj-$(CONFIG_FSL_LS_PPA) += ppa.o ifneq ($(CONFIG_FSL_LSCH3),) obj-y += fsl_lsch3_speed.o |