diff options
| author | Tom Rini <trini@konsulko.com> | 2015-09-03 14:57:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-09-03 14:57:09 -0400 |
| commit | c9feb427aba860ebc79f9851a1bb49cc456a2d48 (patch) | |
| tree | 6a80def1806386e2854d57f740264c6744d96e1d /arch/arm/lib | |
| parent | da9d8580ff9ce17452ef931072e5799a9df8807f (diff) | |
| parent | f2acc55e3d28e96a6fcc060a7081eb4e2ad96350 (diff) | |
| download | talos-obmc-uboot-c9feb427aba860ebc79f9851a1bb49cc456a2d48.tar.gz talos-obmc-uboot-c9feb427aba860ebc79f9851a1bb49cc456a2d48.zip | |
Merge git://git.denx.de/u-boot-rockchip
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 51497cc289..f717103526 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -48,7 +48,9 @@ obj-y += interrupts_64.o else obj-y += interrupts.o endif +ifndef CONFIG_RESET obj-y += reset.o +endif obj-y += cache.o ifndef CONFIG_ARM64 |
