diff mbox

[U-Boot,8/9] at91sam9263ek add dcc support with at91sam9263ek_dcc_config

Message ID 1236089265-24598-8-git-send-email-plagnioj@jcrosoft.com
State Accepted
Delegated to: Reinhard Meyer
Headers show

Commit Message

Jean-Christophe PLAGNIOL-VILLARD March 3, 2009, 2:07 p.m. UTC 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 Makefile                        |   11 +++++++++++
 include/configs/at91sam9263ek.h |    2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 784af52..50ce78e 100644
--- a/Makefile
+++ b/Makefile
@@ -2687,6 +2687,8 @@  at91sam9261ek_config	:	unconfig
 at91sam9263ek_nandflash_config \
 at91sam9263ek_dataflash_config \
 at91sam9263ek_dataflash_cs0_config \
+at91sam9263ek_dcc_multi_config \
+at91sam9263ek_dcc_config \
 at91sam9263ek_wdt_config \
 at91sam9263ek_config	:	unconfig
 	@mkdir -p $(obj)include
@@ -2701,6 +2703,15 @@  at91sam9263ek_config	:	unconfig
 		echo "#define CONFIG_AT91SAM9_WATCHDOG" >> $(obj)include/config.h ; \
 		$(XECHO) "... configured with watchdog active"; \
 	fi
+	@if [ "$(findstring _dcc_mutli, $@)" ] ; then \
+		echo "#define CONFIG_ARM_DCC" >> $(obj)include/config.h ; \
+		echo "#define CONFIG_ARM_DCC_MUTLI" >> $(obj)include/config.h ; \
+		echo "#define CONFIG_CONSOLE_MUX" >> $(obj)include/config.h ; \
+		$(XECHO) "... configured with dcc as multi serial"; \
+	elif [ "$(findstring _dcc_, $@)" ] ; then \
+		echo "#define CONFIG_ARM_DCC" >> $(obj)include/config.h ; \
+		$(XECHO) "... configured with dcc as serial"; \
+	fi
 	@$(MKCONFIG) -a at91sam9263ek arm arm926ejs at91sam9263ek atmel at91
 
 at91sam9rlek_nandflash_config \
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index 9087fc3..b193497 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -52,11 +52,13 @@ 
 /*
  * Hardware drivers
  */
+#if !defined(CONFIG_ARM_DCC) || defined(CONFIG_ARM_DCC_MULTI)
 #define CONFIG_ATMEL_USART	1
 #undef CONFIG_USART0
 #undef CONFIG_USART1
 #undef CONFIG_USART2
 #define CONFIG_USART3		1	/* USART 3 is DBGU */
+#endif
 
 /* LCD */
 #define CONFIG_LCD			1