Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / include / configs / omap3_logic.h

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 01360f6cbd6b38843593b253e5229ba9a800105c..b975a6c9a4d74aa1c50f2c19271d668ca469786c 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -33,8 +33,7 @@
 #define CONFIG_OMAP                    /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                        /* which is a 34XX */
 #define CONFIG_OMAP3_LOGIC             /* working with Logic OMAP boards */
-
-#undef CONFIG_USE_IRQ                  /* no support for IRQs */
+#define CONFIG_OMAP_GPIO
 
 #define CONFIG_SYS_TEXT_BASE   0x80400000
 
@@ -122,7 +121,7 @@
 #define CONFIG_CMD_NET      /* bootp, tftpboot, rarpboot    */
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_DHCP
-#define CONFIG_CMD_SETECPR     /* Evaluate expressions         */
+#define CONFIG_CMD_SETEXPR     /* Evaluate expressions         */
 
 #undef CONFIG_CMD_FLASH                /* flinfo, erase, protect       */
 #undef CONFIG_CMD_FPGA         /* FPGA configuration Support   */
@@ -260,7 +259,6 @@
  */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory */
 #define CONFIG_SYS_HUSH_PARSER         /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_SYS_PROMPT              "OMAP Logic # "
 #define CONFIG_SYS_CBSIZE              512     /* Console I/O Buffer Size */
 /* Print Buffer Size */
@@ -286,13 +284,6 @@
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 #define CONFIG_SYS_HZ                  1000
 
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       (128 << 10)     /* regular stack 128 KiB */
-
 /*
  * Physical Memory Map
  */