colibri_imx6: remove legacy sdboot wrapper

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

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 31b6d3e448e83c93c654086d87ae1428532fce66..3b023624984d26a418dc6fdecfb3600a565d6d75 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -1,9 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
  *
  * Configuration settings for the Freescale i.MX7ULP EVK board.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __MX7ULP_EVK_CONFIG_H
@@ -12,15 +11,6 @@
 #include <linux/sizes.h>
 #include <asm/arch/imx-regs.h>
 
-/*Uncomment it to use secure boot*/
-/*#define CONFIG_SECURE_BOOT*/
-
-#ifdef CONFIG_SECURE_BOOT
-#ifndef CONFIG_CSF_SIZE
-#define CONFIG_CSF_SIZE                        0x4000
-#endif
-#endif
-
 #define CONFIG_BOARD_POSTCLK_INIT
 #define CONFIG_SYS_BOOTM_LEN           0x1000000
 
@@ -28,11 +18,6 @@
 #define IRAM_BASE_ADDR                 OCRAM_0_BASE
 #define IOMUXC_BASE_ADDR               IOMUXC1_RBASE
 
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
-#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */
-
 #define CONFIG_SYS_FSL_USDHC_NUM        1
 
 #define CONFIG_SYS_FSL_ESDHC_ADDR       0
@@ -47,7 +32,6 @@
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR                 WDG1_RBASE
 
-#define CONFIG_SYS_ARCH_TIMER
 #define CONFIG_SYS_HZ_CLOCK            1000000 /* Fixed at 1Mhz from TSTMR */
 
 #define CONFIG_INITRD_TAG
@@ -65,7 +49,6 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX              1
 #define CONFIG_BAUDRATE                        115200
 
 #define CONFIG_SYS_CACHELINE_SIZE      64
@@ -77,7 +60,6 @@
 #define CONFIG_SYS_MAXARGS             256
 
 /* Physical Memory Map */
-#define CONFIG_NR_DRAM_BANKS           1
 
 #define PHYS_SDRAM                     0x60000000
 #define PHYS_SDRAM_SIZE                        SZ_1G
@@ -86,7 +68,6 @@
 
 #define CONFIG_LOADADDR             0x60800000
 
-#define CONFIG_CMD_MEMTEST
 #define CONFIG_SYS_MEMTEST_END      0x9E000000
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -175,7 +156,7 @@
 #define CONFIG_SYS_INIT_SP_ADDR \
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
-#ifndef CONFIG_SYS_DCACHE_OFF
+#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF)
 #define CONFIG_CMD_CACHE
 #endif