diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:03:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-04 21:03:36 +0200 |
| commit | 6331e58a2c99009587eeb2252d0c6ac9de882c1c (patch) | |
| tree | 8e0765c965faf098151107a7374cd3b554811868 /arch/arm/mach-at91 | |
| parent | 4c37b77af4759b65058c3aee5eed4d809ac96d84 (diff) | |
| parent | ae6d0b9b26dd0a28b93a227bcdc15053a99c7a88 (diff) | |
| download | barebox-6331e58a2c99009587eeb2252d0c6ac9de882c1c.tar.gz barebox-6331e58a2c99009587eeb2252d0c6ac9de882c1c.tar.xz | |
Merge branch 'for-next/misc'
Conflicts:
commands/devinfo.c
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index 298ee3f722..826917e12c 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig @@ -461,6 +461,11 @@ config MACH_SAMA5D3XEK help Select this if you are using Atmel's SAMA5D3X-EK Evaluation Kit. +config MACH_SAMA5D3_XPLAINED + bool "Atmel SAMA5D3_XPLAINED Evaluation Kit" + help + Select this if you are using Atmel's SAMA5D3_XPLAINED Evaluation Kit. + endchoice endif |