Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagn...@jcrosoft.com>
---
Makefile | 14 +++++++++++++-
include/configs/at91rm9200ek.h | 4 +++-
2 files changed, 16 insertions(+), 2 deletions(-)
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.
--
1.5.6.5
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
