beagle: fix termination of buddy env setting

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

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 2129dfd804c90418140f17cb9dc2c640240b33c0..f632a2c8ea3b44717e6222c1011899376177f4e6 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -31,20 +31,22 @@
 #define CONFIG_MIPS32          1       /* MIPS 4Kc CPU core    */
 #define CONFIG_INCA_IP         1       /* on a INCA-IP Board   */
 
-#ifndef        CPU_CLOCK_RATE
-/* allowed values: 100000000, 133000000, and 150000000 */
-#define CPU_CLOCK_RATE 150000000       /* default: 150 MHz clock for the MIPS core */
+#define CONFIG_XWAY_SWAP_BYTES
+
+/*
+ * Clock for the MIPS core (MHz)
+ * allowed values: 100000000, 133000000, and 150000000 (default)
+ */
+#ifndef CONFIG_CPU_CLOCK_RATE
+#define CONFIG_CPU_CLOCK_RATE  150000000
 #endif
 
-#define INFINEON_EBU_BOOTCFG   0x40C4  /* CMULT = 8 */
+#define CONFIG_SYS_XWAY_EBU_BOOTCFG    0x40C4  /* CMULT = 8 */
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
 #define CONFIG_BAUDRATE                115200
 
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
-
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
 #define CONFIG_PREBOOT "echo;" \
@@ -139,7 +141,7 @@
 #define PHYS_FLASH_2           0xb0800000 /* Flash Bank #2 */
 
 /* The following #defines are needed to get flash environment right */
-#define        CONFIG_SYS_MONITOR_BASE TEXT_BASE
+#define        CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
 #define        CONFIG_SYS_MONITOR_LEN          (192 << 10)
 
 #define CONFIG_SYS_INIT_SP_OFFSET      0x400000
@@ -161,7 +163,6 @@
 #define CONFIG_NR_DRAM_BANKS   1
 
 #define CONFIG_INCA_IP_SWITCH
-#define CONFIG_NET_MULTI
 #define CONFIG_INCA_IP_SWITCH_AMDIX
 
 /*