diff options
author | Tom Rini <trini@konsulko.com> | 2015-03-01 21:07:53 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-03-01 21:07:53 -0500 |
commit | 1da7ce4155d0839d9d56525379493bb0f80b5330 (patch) | |
tree | a29a93170e68b30d1a5b73a8210ddb92b5aaa3c7 /arch/arm/Makefile | |
parent | fc834100950ab630f442aece500d8c9ccfa2b992 (diff) | |
parent | 105a9e705efaeeac63e795e2a184b0a18db0ac5a (diff) | |
download | u-boot-imx-1da7ce4155d0839d9d56525379493bb0f80b5330.zip u-boot-imx-1da7ce4155d0839d9d56525379493bb0f80b5330.tar.gz u-boot-imx-1da7ce4155d0839d9d56525379493bb0f80b5330.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
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 878ae26..08946de 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -15,6 +15,7 @@ machine-$(CONFIG_ARCH_NOMADIK) += nomadik # TODO: rename CONFIG_ORION5X -> CONFIG_ARCH_ORION5X machine-$(CONFIG_ORION5X) += orion5x machine-$(CONFIG_TEGRA) += tegra +machine-$(CONFIG_ARCH_UNIPHIER) += uniphier machine-$(CONFIG_ARCH_VERSATILE) += versatile machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y)) |