Patchwork [U-Boot,9/9] at91rm9200ek: add dcc support with at91rm9200ek_dcc_config

login
register
mail settings
Submitter Jean-Christophe PLAGNIOL-VILLARD
Date March 3, 2009, 2:07 p.m.
Message ID <1236089265-24598-9-git-send-email-plagnioj@jcrosoft.com>
Download mbox | patch
Permalink /patch/71656/
State Accepted
Delegated to: Reinhard Meyer
Headers show

Comments

Jean-Christophe PLAGNIOL-VILLARD - March 3, 2009, 2:07 p.m.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
 Makefile                       |   14 +++++++++++++-
 include/configs/at91rm9200ek.h |    4 +++-
 2 files changed, 16 insertions(+), 2 deletions(-)

Patch

diff --git a/Makefile b/Makefile
index 50ce78e..c24115d 100644
--- a/Makefile
+++ b/Makefile
@@ -2605,8 +2605,20 @@  shannon_config	:	unconfig
 at91rm9200dk_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200dk atmel at91rm9200
 
+at91rm9200ek_dcc_multi_config	\
+at91rm9200ek_dcc_config		\
 at91rm9200ek_config	:	unconfig
-	@$(MKCONFIG) $(@:_config=) arm arm920t at91rm9200ek atmel at91rm9200
+	@mkdir -p $(obj)include
+	@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) "... with dcc as serial" ; \
+	fi;
+	@$(MKCONFIG) -a at91rm9200ek arm arm920t at91rm9200ek atmel at91rm9200
 
 cmc_pu2_config	:	unconfig
 	@$(MKCONFIG) $(@:_config=) arm arm920t cmc_pu2 NULL at91rm9200
diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h
index 2fc4faf..1face05 100644
--- a/include/configs/at91rm9200ek.h
+++ b/include/configs/at91rm9200ek.h
@@ -112,6 +112,7 @@ 
  * define one of these to choose the DBGU,
  * USART0 or USART1 as console
  */
+#if !defined(CONFIG_ARM_DCC) || defined(CONFIG_ARM_DCC_MULTI)
 #define CONFIG_AT91RM9200_USART
 #define CONFIG_DBGU
 #undef CONFIG_USART0
@@ -121,8 +122,9 @@ 
 /* disable modem initialization stuff */
 #undef	CONFIG_MODEM_SUPPORT
 
-#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 #define CONFIG_BAUDRATE			115200
+#endif
+#define CONFIG_SYS_BAUDRATE_TABLE	{115200 , 19200, 38400, 57600, 9600 }
 
 /*
  * Command line configuration.