diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:49:42 +0200 |
| commit | 5034e4eacc136f05747c0d1a2d9e9daef510af6b (patch) | |
| tree | 7d93139589569d5f05da96ca4ad90d9631dfc125 /arch/arm/boards/Makefile | |
| parent | b8c60d554fae08abefa2329ca4fe681508bb0025 (diff) | |
| parent | 30f29e3e1628fce1e09890e32441f08813bc0df2 (diff) | |
| download | barebox-5034e4eacc136f05747c0d1a2d9e9daef510af6b.tar.gz barebox-5034e4eacc136f05747c0d1a2d9e9daef510af6b.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/Makefile
Diffstat (limited to 'arch/arm/boards/Makefile')
| -rw-r--r-- | arch/arm/boards/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 9e1523d62a..4267307fc8 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -36,6 +36,7 @@ obj-$(CONFIG_MACH_FREESCALE_MX51_PDK) += freescale-mx51-pdk/ obj-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += freescale-mx53-loco/ obj-$(CONFIG_MACH_FREESCALE_MX53_SMD) += freescale-mx53-smd/ obj-$(CONFIG_MACH_GE863) += telit-evk-pro3/ +obj-$(CONFIG_MACH_GK802) += gk802/ obj-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += globalscale-guruplug/ obj-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += globalscale-mirabox/ obj-$(CONFIG_MACH_GUF_CUPID) += guf-cupid/ @@ -64,6 +65,7 @@ obj-$(CONFIG_MACH_PCM038) += pcm038/ obj-$(CONFIG_MACH_PCM043) += pcm043/ obj-$(CONFIG_MACH_PCM049) += pcm049/ obj-$(CONFIG_MACH_PCM051) += pcm051/ +obj-$(CONFIG_MACH_PHYTEC_PFLA02) += phytec-pfla02/ obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/ obj-$(CONFIG_MACH_PM9261) += pm9261/ obj-$(CONFIG_MACH_PM9263) += pm9263/ @@ -81,6 +83,7 @@ obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/ obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/ obj-$(CONFIG_MACH_TOSHIBA_AC100) += toshiba-ac100/ obj-$(CONFIG_MACH_TQMA53) += tqma53/ +obj-$(CONFIG_MACH_TQMA6X) += tqma6x/ obj-$(CONFIG_MACH_TX25) += karo-tx25/ obj-$(CONFIG_MACH_TX28) += karo-tx28/ obj-$(CONFIG_MACH_TX51) += karo-tx51/ |