diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:42 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:00:42 +0100 |
| commit | ee69df5a108a4ed09e113a9d0b17a73c2be268a5 (patch) | |
| tree | 78a6cae034c7972f1c47fea755f0f5b726a8e2cd /arch/arm/Makefile | |
| parent | daac8bf5d3bd5e157c66d753eac0d5efb47aa145 (diff) | |
| parent | 27794047ff7e6744ce71875cae6d1747ce1346c0 (diff) | |
| download | barebox-ee69df5a108a4ed09e113a9d0b17a73c2be268a5.tar.gz barebox-ee69df5a108a4ed09e113a9d0b17a73c2be268a5.tar.xz | |
Merge branch 'for-next/clps711x'
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 5e8f5099f5..4b630ab4cb 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -53,6 +53,7 @@ AFLAGS += -include asm/unified.h -msoft-float $(AFLAGS_THUMB2) # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) := at91 machine-$(CONFIG_ARCH_BCM2835) := bcm2835 +machine-$(CONFIG_ARCH_CLPS711X) := clps711x machine-$(CONFIG_ARCH_EP93XX) := ep93xx machine-$(CONFIG_ARCH_IMX) := imx machine-$(CONFIG_ARCH_MXS) := mxs @@ -76,6 +77,7 @@ board-$(CONFIG_MACH_AT91SAM9G10EK) := at91sam9261ek board-$(CONFIG_MACH_AT91SAM9G20EK) := at91sam9260ek board-$(CONFIG_MACH_AT91SAM9X5EK) := at91sam9x5ek board-$(CONFIG_MACH_AT91SAM9M10G45EK) := at91sam9m10g45ek +board-$(CONFIG_MACH_CLEP7212) := clep7212 board-$(CONFIG_MACH_DSS11) := dss11 board-$(CONFIG_MACH_EDB9301) := edb93xx board-$(CONFIG_MACH_EDB9302) := edb93xx |