karo: tx6: increase SYS_BOOTM_LEN to 32MiB

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

diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index 9950e44f5207becddeec97519af1f93b02c88241..4752b072a1032a3844ef621082e5bd4a77d2cdb7 100644 (file)
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -72,26 +72,19 @@
  * Then use the dedicated card IP + 1 for the board
  * http://docs.blackfin.uclinux.org/doku.php?id=setting_up_the_network
  */
-#define CONFIG_NET_MULTI
-
 #define CONFIG_DRIVER_AX88180  1
 #define AX88180_BASE           0x2c000000
 #define CONFIG_CMD_MII         /* enable probing PHY */
 
-#ifdef CONFIG_NET_MULTI                /* also used as the network enabler */
-# define CONFIG_HOSTNAME       blackvme        /* Bfin board  */
-# define CONFIG_IPADDR         169.254.144.145 /* Bfin board  */
-# define CONFIG_GATEWAYIP      169.254.144.144 /* dedic card  */
-# define CONFIG_SERVERIP       169.254.144.144 /* tftp server */
-# define CONFIG_NETMASK                255.255.255.0
-# define CONFIG_ROOTPATH       /export/uClinux-dist/romfs      /*NFS*/
-# define CFG_AUTOLOAD          "no"
-# define CONFIG_CMD_DHCP
-# define CONFIG_CMD_PING
-# define CONFIG_ENV_OVERWRITE  1       /* enable changing MAC at runtime */
-/* Comment out hardcoded MAC to enable MAC storage in EEPROM */
-/* # define CONFIG_ETHADDR     ff:ee:dd:cc:bb:aa */
-#endif
+#define CONFIG_HOSTNAME        blackvme        /* Bfin board  */
+#define CONFIG_IPADDR          169.254.144.145 /* Bfin board  */
+#define CONFIG_GATEWAYIP       169.254.144.144 /* dedic card  */
+#define CONFIG_SERVERIP        169.254.144.144 /* tftp server */
+#define CONFIG_NETMASK         255.255.255.0
+#define CONFIG_ROOTPATH                "/export/uClinux-dist/romfs"    /*NFS*/
+#define CFG_AUTOLOAD           "no"
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
 
 /*
  * SDRAM settings & memory map
@@ -149,7 +142,6 @@
 
 #define CONFIG_ENV_SPI_MAX_HZ  15000000
 #define CONFIG_SF_DEFAULT_SPEED        15000000
-#define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_STMICRO
 
 /*
@@ -160,8 +152,6 @@
 #define CONFIG_CMDLINE_EDITING 1
 #define CONFIG_AUTO_COMPLETE   1
 
-#include <config_cmd_default.h>
-
 #define CONFIG_CMD_BOOTLDR
 #define CONFIG_CMD_CACHE
 #define CONFIG_CMD_CPLBINFO
@@ -181,6 +171,7 @@
 #define CONFIG_BAUDRATE                57600
 #define CONFIG_LOADS_ECHO      1
 #define CONFIG_UART_CONSOLE    0
+#define CONFIG_BFIN_SERIAL
 
 /*
  * U-Boot environment variables. Use "printenv" to examine.
@@ -188,10 +179,10 @@
  */
 #define CONFIG_BOOTARGS \
        "root=/dev/mtdblock0 rw " \
-       "clkin_hz=" MK_STR(CONFIG_CLKIN_HZ) " " \
+       "clkin_hz=" __stringify(CONFIG_CLKIN_HZ) " " \
        "earlyprintk=serial,uart0," \
-       MK_STR(CONFIG_BAUDRATE) " " \
-       "console=ttyBF0," MK_STR(CONFIG_BAUDRATE) " "
+       __stringify(CONFIG_BAUDRATE) " " \
+       "console=ttyBF0," __stringify(CONFIG_BAUDRATE) " "
 
 /* Convenience env variables & commands.
  * Reserve kernstart = 0x20000  = 128 kB for U-Boot.
@@ -228,7 +219,7 @@
  * Soft I2C settings (BF561 does not have hard I2C)
  * PF12,13 on SPI connector 0.
  */
-#ifdef CONFIG_SOFT_I2C
+#ifdef CONFIG_SYS_I2C_SOFT
 # define CONFIG_CMD_I2C
 # define CONFIG_SOFT_I2C_GPIO_SCL      GPIO_PF12
 # define CONFIG_SOFT_I2C_GPIO_SDA      GPIO_PF13
@@ -240,8 +231,6 @@
  * No Parallel Flash on this board
  */
 #define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_JFFS2
-#undef CONFIG_CMD_FLASH
 
 #endif