Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

[platform/kernel/u-boot.git] / include / configs / pr1.h

diff --git a/include/configs/pr1.h b/include/configs/pr1.h
index 03d4269..1af9ef7 100644 (file)
--- a/include/configs/pr1.h
+++ b/include/configs/pr1.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for PR1 Appliance
+ * U-Boot - Configuration file for PR1 Appliance
  *
  * based on bf537-stamp.h
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
@@ -69,8 +69,6 @@
 #endif
 #define CONFIG_HOSTNAME                pr1
 #define CONFIG_TFTP_BLOCKSIZE  4404
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
 
 
 /*
@@ -85,8 +83,6 @@
 #define CONFIG_BFIN_SPI
 #define CONFIG_ENV_SPI_MAX_HZ  30000000
 #define CONFIG_SF_DEFAULT_SPEED        30000000
-#define CONFIG_SPI_FLASH
-#define CONFIG_SPI_FLASH_STMICRO
 
 
 /*
@@ -102,8 +98,8 @@
 /*
  * I2C Settings
  */
-#define CONFIG_BFIN_TWI_I2C
-#define CONFIG_HARD_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
 
 
 /*
@@ -131,12 +127,10 @@
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
-#define CONFIG_SYS_PROMPT      "pr1>"
 #define CONFIG_BOOTCOMMAND     "run nandboot"
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_LOADADDR                0x2000000
 
-
 /*
  * Pull in common ADI header for remaining command/environment setup
  */