diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-10-07 08:02:24 +0200 |
| commit | 904298deb07d532a76de153a42c6f678d2e4c740 (patch) | |
| tree | 613d135d183962bf4dee1f5aef9449fbaceb0acd /arch/arm/Makefile | |
| parent | ebf9022f2eee564fc4b0e4b37a8267319923d808 (diff) | |
| parent | fe4ecd1dbfc44d0fe420e8b28a984738d74f3b69 (diff) | |
| download | barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.gz barebox-904298deb07d532a76de153a42c6f678d2e4c740.tar.xz | |
Merge branch 'for-next/socfpga'
Conflicts:
scripts/Makefile
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 7787cfed7d..fbc648001b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -64,6 +64,7 @@ machine-$(CONFIG_ARCH_NETX) := netx machine-$(CONFIG_ARCH_OMAP) := omap machine-$(CONFIG_ARCH_PXA) := pxa machine-$(CONFIG_ARCH_SAMSUNG) := samsung +machine-$(CONFIG_ARCH_SOCFPGA) := socfpga machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_VEXPRESS) := vexpress machine-$(CONFIG_ARCH_TEGRA) := tegra |