From: Wenyou Yang <wenyou.yang@atmel.com>
Date: Thu, 13 Apr 2017 02:31:15 +0000 (+0800)
Subject: configs: at91-sama5_common: fix for CONFIG_AT91_GPIO
X-Git-Tag: v2017.05-rc2~8^2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=fc977b94a4988bd83e079c54c59c0754f8301b7f;p=oweals%2Fu-boot.git

configs: at91-sama5_common: fix for CONFIG_AT91_GPIO

Add #ifndef CONFIG_DM_GPIO for CONFIG_AT91_GPIO define to avoid
the redefine compilation error.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bießmann <andreas@biessmann.org>
---

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 3e979482f6..dbd4d843eb 100644
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -27,7 +27,9 @@
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 
 /* general purpose I/O */
+#ifndef CONFIG_DM_GPIO
 #define CONFIG_AT91_GPIO
+#endif
 
 
 /*