Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / include / configs / omap3_evm_quick_mmc.h

diff --git a/include/configs/omap3_evm_quick_mmc.h b/include/configs/omap3_evm_quick_mmc.h
index 912da7d07471317bdfb55a4aa7806a7f152327e2..b7d8765db5c8f7e1b83dc92bf92731084209c8c4 100644 (file)
--- a/include/configs/omap3_evm_quick_mmc.h
+++ b/include/configs/omap3_evm_quick_mmc.h
@@ -6,29 +6,19 @@
  * Author :
  *     Sanjeev Premi <premi@ti.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __OMAP3_EVM_QUICK_MMC_H
 #define __OMAP3_EVM_QUICK_MMC_H
 
 #include <asm/arch/cpu.h>
-#include <asm/arch/omap3.h>
+#include <asm/arch/omap.h>
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot commands
+ * Supported U-Boot commands
  * ----------------------------------------------------------------------------
  */
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_FAT
 
 /*
  * Board revision is detected by probing the Ethernet chip.
@@ -36,10 +26,9 @@
  * When revision is statically configured via CONFIG_STATIC_BOARD_REV,
  * this option can be removed. Generated binary is leaner by ~16Kbytes.
  */
-#define CONFIG_CMD_NET
 
 /* ----------------------------------------------------------------------------
- * Supported U-boot features
+ * Supported U-Boot features
  * ----------------------------------------------------------------------------
  */
 #define CONFIG_SILENT_CONSOLE
@@ -66,7 +55,6 @@
  * Default environment
  * -----------------------------------------------------------------------------
  */
-#define CONFIG_BOOTDELAY       0
 
 #define CONFIG_EXTRA_ENV_SETTINGS      \
        "verify=no\0"                   \
@@ -95,7 +83,7 @@
 #define CONFIG_SPL_FAT_SUPPORT
 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR        0x300 /* address 0x60000 */
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x200 /* 256 KB */
-#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION   1
-#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME       "u-boot.img"
+#define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION     1
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
 
 #endif /* __OMAP3_EVM_QUICK_MMC_H */