CONFIGS: peach-pit: Enable display for peach_pit board

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

diff --git a/include/configs/blackvme.h b/include/configs/blackvme.h
index e4688a27b4a81c791fec1bbc7e9e7e313bdd6736..6e5774c6ba5fc29abcf309a0771c7ea8940d11b5 100644 (file)
--- a/include/configs/blackvme.h
+++ b/include/configs/blackvme.h
@@ -23,7 +23,8 @@
 #define CONFIG_PANIC_HANG 0
 
 /* CPU Options */
-#define CONFIG_BFIN_BOOT_MODE  BFIN_BOOT_SPI_MASTER
+#define CONFIG_BFIN_CPU        bf561-0.5
+#define CONFIG_BFIN_BOOT_MODE  BFIN_BOOT_SPI_MASTER
 
 /*
  *             CLOCK SETTINGS CAVEAT
@@ -71,26 +72,22 @@
  * 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 */
+#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
 
 /*
  * SDRAM settings & memory map
@@ -180,6 +177,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.
@@ -187,10 +185,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.
@@ -227,7 +225,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