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

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

diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h
index 4116234..72dc8ba 100644 (file)
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -46,7 +46,6 @@
 #endif
 
 /* High Level Configuration Options */
-#define CONFIG_FSL_CAAM                        /* Enable SEC/CAAM */
 
 #define CONFIG_TSEC_ENET
 #define CONFIG_ENV_OVERWRITE
@@ -147,7 +146,6 @@ extern unsigned long get_sdram_size(void);
 /*
  * IFC Definitions
  */
-#define CONFIG_SYS_NO_FLASH
 
 /* NAND Flash on IFC */
 #define CONFIG_SYS_NAND_BASE           0xff800000
@@ -336,9 +334,7 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SHA_HW_ACCEL
 #endif
 
-#define CONFIG_USB_EHCI
-
-#ifdef CONFIG_USB_EHCI
+#ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_HAS_FSL_DR_USB
@@ -367,8 +363,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_UBOOTPATH       "u-boot.bin" /* U-Boot image on TFTP server */
 
-#define CONFIG_BAUDRATE                115200
-
 #define        CONFIG_EXTRA_ENV_SETTINGS                               \
        "netdev=eth0\0"                                         \
        "uboot=" CONFIG_UBOOTPATH "\0"                          \