Merge git://git.denx.de/u-boot-marvell

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

diff --git a/include/configs/br4.h b/include/configs/br4.h
index a44c18c..85f31a4 100644 (file)
--- a/include/configs/br4.h
+++ b/include/configs/br4.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for BR4 Appliance
+ * U-Boot - Configuration file for BR4 Appliance
  *
  * based on bf537-stamp.h
  * Copyright (c) Switchfin Org. <dpn@switchfin.org>
@@ -82,8 +82,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
 
 
 /*
@@ -128,7 +126,6 @@
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_RTC_BFIN
 #define CONFIG_UART_CONSOLE    0
-#define CONFIG_SYS_PROMPT      "br4>"
 #define CONFIG_BOOTCOMMAND     "run nandboot"
 #define CONFIG_BOOTDELAY       2
 #define CONFIG_LOADADDR                0x2000000