diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:41 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-10-02 08:54:41 +0200 |
commit | 2a2a8b9052cf572ab13bcc3d8798addb2ed3470c (patch) | |
tree | d0f489ced378ddd10dbb8f0c21c8ddb4aa042793 /arch/arm/boards/Makefile | |
parent | d0064495d3325cb630bc79550d60a4f4eef57e31 (diff) | |
parent | 8b8ffecb640bc378a80d35fe79a265b5cfa77e56 (diff) | |
download | barebox-2a2a8b9052cf572ab13bcc3d8798addb2ed3470c.tar.gz barebox-2a2a8b9052cf572ab13bcc3d8798addb2ed3470c.tar.xz |
Merge branch 'for-next/imx'
Diffstat (limited to 'arch/arm/boards/Makefile')
-rw-r--r-- | arch/arm/boards/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 5418c06db9..c80b9c920a 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -49,6 +49,7 @@ obj-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += globalscale-mirabox/ obj-$(CONFIG_MACH_GUF_CUPID) += guf-cupid/ obj-$(CONFIG_MACH_GUF_SANTARO) += guf-santaro/ obj-$(CONFIG_MACH_GUF_VINCELL) += guf-vincell/ +obj-$(CONFIG_MACH_GW_VENTANA) += gateworks-ventana/ obj-$(CONFIG_MACH_HIGHBANK) += highbank/ obj-$(CONFIG_MACH_IMX21ADS) += freescale-mx21-ads/ obj-$(CONFIG_MACH_IMX233_OLINUXINO) += imx233-olinuxino/ @@ -110,6 +111,7 @@ obj-$(CONFIG_MACH_TX25) += karo-tx25/ obj-$(CONFIG_MACH_TX28) += karo-tx28/ obj-$(CONFIG_MACH_TX51) += karo-tx51/ obj-$(CONFIG_MACH_TX53) += karo-tx53/ +obj-$(CONFIG_MACH_TX6X) += karo-tx6x/ obj-$(CONFIG_MACH_UDOO) += udoo/ obj-$(CONFIG_MACH_USB_A9260) += usb-a926x/ obj-$(CONFIG_MACH_USB_A9263) += usb-a926x/ |