Merge tag 'u-boot-amlogic-20190423' of git://git.denx.de/u-boot-amlogic

[oweals/u-boot.git] / include / configs / bav335x.h

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index df5d5bdc4a91017b9eaf567de28d5909c288d570..3d4d08aa70e10645fde27682a703e2f03ab7344c 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -387,7 +387,6 @@ DEFAULT_LINUX_BOOT_ENV \
  * add mass storage support and for gadget we add both RNDIS ethernet
  * and DFU.
  */
-#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE        MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
@@ -453,7 +452,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     0x20000
 
 #define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-#define CONFIG_ENV_SPI_MAX_HZ          CONFIG_SF_DEFAULT_SPEED
 #define CONFIG_ENV_SECT_SIZE           (4 << 10) /* 4 KB sectors */
 #define CONFIG_ENV_OFFSET              (768 << 10) /* 768 KiB in */
 #define CONFIG_ENV_OFFSET_REDUND       (896 << 10) /* 896 KiB in */
@@ -466,7 +464,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #endif
 
 /* SPI flash. */
-#define CONFIG_SF_DEFAULT_SPEED                24000000
 
 /* Network. */
 #define CONFIG_PHY_SMSC