at91sam9260ek: move board id setup to config header

[karo-tx-uboot.git] / include / configs / xilinx-ppc.h

diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index e7daa0771ecf4b6ad0292f2958f4773b0d303333..2bdaa0560b442daa47b790c70bf9c5bacee4aa0b 100644 (file)
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -28,7 +28,7 @@
 
 /*Mem Map*/
 #define CONFIG_SYS_SDRAM_BASE          0x0
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_LEN         (192 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (CONFIG_ENV_SIZE + 128 * 1024)
 
@@ -41,7 +41,7 @@
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_REGINFO
 #undef CONFIG_CMD_JFFS2
-#undef CONFIG_JFFS2_CMDLINE
+#undef CONFIG_CMD_MTDPARTS
 #undef CONFIG_CMD_SPI
 #undef CONFIG_CMD_I2C
 #undef CONFIG_CMD_DTT
@@ -50,6 +50,7 @@
 #undef CONFIG_CMD_DHCP
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IMLS
+#undef CONFIG_CMD_NFS
 
 /*Misc*/
 #define CONFIG_BOOTDELAY               5/* autoboot after 5 seconds     */
@@ -83,7 +84,6 @@
 #define CONFIG_VERSION_VARIABLE                /* include version env variable */
 #define CONFIG_SYS_CONSOLE_INFO_QUIET  /* don't print console @ startup */
 #define CONFIG_SYS_HUSH_PARSER         /* Use the HUSH parser          */
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 #define CONFIG_LOADS_ECHO              /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE   /* allow baudrate change        */
 #define CONFIG_SYS_BOOTMAPSZ           (8 << 20)
@@ -91,10 +91,9 @@
 
 /*Stack*/
 #define CONFIG_SYS_INIT_RAM_ADDR       0x800000/* Initial RAM address    */
-#define CONFIG_SYS_INIT_RAM_END                0x2000  /* End of used area in RAM  */
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* num bytes initial data   */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END \
-                               - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE               0x2000  /* Size of used area in RAM  */
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE \
+                               - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 /*Speed*/
 #define CONFIG_SYS_CLK_FREQ    XPAR_CORE_CLOCK_FREQ_HZ
@@ -108,7 +107,9 @@
 #define        CONFIG_SYS_MAX_FLASH_BANKS      1
 #define        CONFIG_SYS_FLASH_PROTECTION
 #define CONFIG_CMD_JFFS2
-#define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
+#define CONFIG_FLASH_CFI_MTD
 #else
 #define CONFIG_ENV_IS_NOWHERE
 #define CONFIG_SYS_NO_FLASH
@@ -117,7 +118,7 @@
 /* serial communication */
 #ifdef XPAR_UARTLITE_0_BASEADDR
 #define CONFIG_XILINX_UARTLITE
-#define CONFIG_SERIAL_BASE             XPAR_UARTLITE_0_BASEADDR
+#define XILINX_UARTLITE_BASEADDR       XPAR_UARTLITE_0_BASEADDR
 #define CONFIG_BAUDRATE                        XPAR_UARTLITE_0_BAUDRATE
 #define CONFIG_SYS_BAUDRATE_TABLE      { CONFIG_BAUDRATE }
 #else