pm9261: remove CONFIG_CMD_AUTOSCRIPT

[karo-tx-uboot.git] / include / configs / microblaze-generic.h

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index ac18c8776dd68695bad2c93fc01f55a0f19dca95..9b1569a6d47c87d02f60018dff8d083d844b6132 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -58,10 +58,7 @@
 /*#define      CONFIG_SYS_RESET_ADDRESS        TEXT_BASE*/
 
 /* ethernet */
-#ifdef XILINX_EMAC_BASEADDR
-       #define CONFIG_XILINX_EMAC      1
-       #define CONFIG_SYS_ENET
-#elif XILINX_EMACLITE_BASEADDR
+#ifdef XILINX_EMACLITE_BASEADDR
        #define CONFIG_XILINX_EMACLITE  1
        #define CONFIG_SYS_ENET
 #elif XILINX_LLTEMAC_BASEADDR
@@ -136,20 +133,20 @@
 #define        CONFIG_SYS_MEMTEST_END          (CONFIG_SYS_SDRAM_BASE + 0x1000)
 
 /* global pointer */
-#define        CONFIG_SYS_GBL_DATA_SIZE        0x1000  /* size of global data */
+#define        CONFIG_SYS_GBL_DATA_SIZE        128 /* size of global data */
 /* start of global data */
 #define        CONFIG_SYS_GBL_DATA_OFFSET      (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
 
 /* monitor code */
 #define        SIZE                    0x40000
-#define        CONFIG_SYS_MONITOR_LEN          SIZE
+#define        CONFIG_SYS_MONITOR_LEN          (SIZE - CONFIG_SYS_GBL_DATA_SIZE)
 #define        CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN)
 #define        CONFIG_SYS_MONITOR_END          (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
 #define        CONFIG_SYS_MALLOC_LEN           SIZE
 #define        CONFIG_SYS_MALLOC_BASE          (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
 
 /* stack */
-#define        CONFIG_SYS_INIT_SP_OFFSET       CONFIG_SYS_MONITOR_BASE
+#define        CONFIG_SYS_INIT_SP_OFFSET       CONFIG_SYS_MALLOC_BASE
 
 /*#define      RAMENV */
 #define        FLASH
@@ -259,7 +256,9 @@
 
 #if defined(CONFIG_CMD_JFFS2)
 /* JFFS2 partitions */
-#define CONFIG_JFFS2_CMDLINE   /* mtdparts command line support */
+#define CONFIG_CMD_MTDPARTS    /* mtdparts command line support */
+#define CONFIG_MTD_DEVICE      /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #define MTDIDS_DEFAULT         "nor0=ml401-0"
 
 /* default mtd partition table */
@@ -289,7 +288,7 @@
 #define        CONFIG_SYS_USR_EXCEP    /* user exception */
 #define CONFIG_SYS_HZ  1000
 
-#define        CONFIG_PREBOOT          "echo U-BOOT for $(hostname);setenv preboot;echo"
+#define        CONFIG_PREBOOT  "echo U-BOOT for ${hostname};setenv preboot;echo"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS       "unlock=yes\0" /* hardware flash protection */\
                                        "nor0=ml401-0\0"\
@@ -299,4 +298,10 @@
 
 #define CONFIG_CMDLINE_EDITING
 
+/* Use the HUSH parser */
+#define CONFIG_SYS_HUSH_PARSER
+#ifdef CONFIG_SYS_HUSH_PARSER
+#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
+#endif
+
 #endif /* __CONFIG_H */