Merge branch 'master' of git://git.denx.de/u-boot-nios

[oweals/u-boot.git] / include / configs / kb9202.h

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 55cda329ee9e9495cfe024100408133cc8062c80..7dd81e69cb91c1aa77e96b4e9818ca6961cd1514 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -51,6 +51,8 @@
 #define CONFIG_INITRD_TAG      1
 
 #define        CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_RELOCATE_UBOOT     /* undef this for direct boot from */
+                                                                       /* NOR flash without preloader */
 
 #define        CONFIG_SYS_LONGHELP
 
@@ -70,6 +72,7 @@
  */
 
 /* define one of these to choose the DBGU, USART0  or USART1 as console */
+#define CONFIG_AT91RM9200_USART
 #define CONFIG_DBGU
 #undef CONFIG_USART0
 #undef CONFIG_USART1