configs: Re-sync HUSH options

[platform/kernel/u-boot.git] / include / configs / colibri_pxa270.h

diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h
index f2fa85e..edd0329 100644 (file)
--- a/include/configs/colibri_pxa270.h
+++ b/include/configs/colibri_pxa270.h
@@ -14,7 +14,6 @@
  * High Level Board Configuration Options
  */
 #define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
-#define CONFIG_SYS_GENERIC_BOARD
 #define        CONFIG_SYS_TEXT_BASE            0x0
 /* Avoid overwriting factory configuration block */
 #define CONFIG_BOARD_SIZE_LIMIT                0x40000
@@ -42,7 +41,6 @@
 #define        CONFIG_CMDLINE_TAG
 #define        CONFIG_SETUP_MEMORY_TAGS
 #define        CONFIG_LZMA                     /* LZMA compression support */
-#define        CONFIG_OF_LIBFDT
 
 /*
  * Serial Console Configuration
@@ -59,6 +57,15 @@
 #define        CONFIG_CMD_MMC
 #define        CONFIG_CMD_USB
 
+/* I2C support */
+#ifdef CONFIG_SYS_I2C
+#define CONFIG_CMD_I2C
+#define CONFIG_SYS_I2C_PXA
+#define CONFIG_PXA_STD_I2C
+#define CONFIG_PXA_PWR_I2C
+#define CONFIG_SYS_I2C_SPEED           100000
+#endif
+
 /* LCD support */
 #ifdef CONFIG_LCD
 #define CONFIG_PXA_LCD
@@ -88,14 +95,9 @@
 #define        CONFIG_BOOTP_HOSTNAME
 #endif
 
-/*
- * HUSH Shell Configuration
- */
-#define        CONFIG_SYS_HUSH_PARSER          1
-
 #undef CONFIG_SYS_LONGHELP             /* Saves 10 KB */
 #undef CONFIG_SYS_PROMPT
-#ifdef CONFIG_SYS_HUSH_PARSER
+#ifdef CONFIG_HUSH_PARSER
 #define        CONFIG_SYS_PROMPT               "$ "
 #else
 #endif