diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:31 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-02 16:28:31 +0200 |
| commit | 08f2dda59fbf1be33f45e307cdd5c98e2a4ed3c2 (patch) | |
| tree | 879ec3b00c6e7efd0c7777a1bbbc0e6c2be5863e /arch/mips/boot/Makefile | |
| parent | 8f9044927dd3c0cf9abe6c1254d76886291becbb (diff) | |
| parent | 68d80258efd94515bd3927187d2dd4f2e188ae20 (diff) | |
| download | barebox-08f2dda59fbf1be33f45e307cdd5c98e2a4ed3c2.tar.gz barebox-08f2dda59fbf1be33f45e307cdd5c98e2a4ed3c2.tar.xz | |
Merge branch 'for-next/mips'
Conflicts:
include/of.h
Diffstat (limited to 'arch/mips/boot/Makefile')
| -rw-r--r-- | arch/mips/boot/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile index 6b093f1e0e..b865b10f8b 100644 --- a/arch/mips/boot/Makefile +++ b/arch/mips/boot/Makefile @@ -1,4 +1,6 @@ obj-y += start.o obj-y += main_entry.o +obj-$(CONFIG_BUILTIN_DTB) += dtb.o + pbl-y += start-pbl.o main_entry-pbl.o |