diff mbox

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

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

Commit Message

Wenyou Yang June 7, 2016, 7:24 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>
---

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(+)

Comments

Simon Glass June 10, 2016, 12:35 a.m. UTC | #1
On 7 June 2016 at 01:24, Wenyou Yang <wenyou.yang@atmel.com> wrote:
> 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>
> ---
>
> 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(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
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