diff mbox

[U-Boot,v6,5/5] configs: sama5d2_xplained: Add #ifndef before CONFIG_ATMEL_PIO4

Message ID 1466995748-16557-6-git-send-email-wenyou.yang@atmel.com
State Superseded
Delegated to: Andreas Bießmann
Headers show

Commit Message

Wenyou Yang June 27, 2016, 2:49 a.m. UTC 
Since CONFIG_ATMEL_PIO4 options is added to Kconfig, to avoid
compilation warnings when the option is enabled,
add #ifndef CONFIG_DM_GPIO before #define CONFIG_ATMEL_PIO4
to avoid compilation warnings.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v6: None
Changes in v5:
 - Collect Reviewed-by tags.

Changes in v4: None
Changes in v3: None
Changes in v2:
 - integrate the gpio rework patch into this patch series.
 - add the new patch to move the PIO4 definitions to head file
   and rephrase them.
 - add the new patch to add #ifndef before CONFIG_ATMEL_PIO4
   in configs/sama5d2_xplained.h

 include/configs/sama5d2_xplained.h | 2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
index f9a8f6f..d477ff8 100644
--- a/include/configs/sama5d2_xplained.h
+++ b/include/configs/sama5d2_xplained.h
@@ -34,8 +34,10 @@ 
 
 #define CONFIG_SYS_LOAD_ADDR		0x22000000 /* load address */
 
+#ifndef CONFIG_DM_GPIO
 #undef CONFIG_AT91_GPIO
 #define CONFIG_ATMEL_PIO4
+#endif
 
 /* SerialFlash */
 #ifdef CONFIG_CMD_SF