Merge tag 'u-boot-imx-20200502' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

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

diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h
index e5e801508e13788d7dab5088e2509b917c9a21f9..2632d48cc9cbb82c1de97a2221635f2e4e4e753c 100644 (file)
--- a/include/configs/pxa-common.h
+++ b/include/configs/pxa-common.h
@@ -1,34 +1,25 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Toradex Colibri PXA270 configuration file
  *
  * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+ 
  */
 
 #ifndef        __CONFIG_PXA_COMMON_H__
 #define        __CONFIG_PXA_COMMON_H__
 
-#define        CONFIG_DISPLAY_CPUINFO
-
 /*
  * KGDB
  */
 #ifdef CONFIG_CMD_KGDB
 #define        CONFIG_KGDB_BAUDRATE            230400
-#define        CONFIG_KGDB_SER_INDEX           2
 #endif
 
 /*
  * MMC Card Configuration
  */
 #ifdef CONFIG_CMD_MMC
-#define        CONFIG_MMC
-#define        CONFIG_GENERIC_MMC
 #define        CONFIG_PXA_MMC_GENERIC
-#define        CONFIG_CMD_FAT
-#define        CONFIG_CMD_EXT2
-#define        CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -38,10 +29,13 @@
 #define        CONFIG_USB_OHCI_NEW
 #define        CONFIG_SYS_USB_OHCI_CPU_INIT
 #define        CONFIG_SYS_USB_OHCI_BOARD_INIT
+#ifdef CONFIG_CPU_PXA27X
+#define        CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS      3
+#else
 #define        CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS      2
+#endif
 #define        CONFIG_SYS_USB_OHCI_REGS_BASE           0x4c000000
 #define        CONFIG_SYS_USB_OHCI_SLOT_NAME           "pxa-ohci"
-#define        CONFIG_USB_STORAGE
 #endif
 
 #endif /* __CONFIG_PXA_COMMON_H__ */