Convert CONFIG_BZIP2 et al to Kconfig

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

diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h
index 5bd63929735ebfa82383ff23e0a6f96fd10f449c..9216b0948c0f204ee3324ee945460133fe9898df 100644 (file)
--- a/include/configs/mx7ulp_evk.h
+++ b/include/configs/mx7ulp_evk.h
@@ -11,35 +11,14 @@
 #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
 
-#define SRC_BASE_ADDR                  CMC1_RBASE
-#define IRAM_BASE_ADDR                 OCRAM_0_BASE
-#define IOMUXC_BASE_ADDR               IOMUXC1_RBASE
-
-#define CONFIG_FSL_USDHC
-
-#define CONFIG_SYS_FSL_USDHC_NUM        1
-
-#define CONFIG_SYS_FSL_ESDHC_ADDR       0
 #define CONFIG_SYS_MMC_ENV_DEV          0      /* USDHC1 */
 #define CONFIG_SYS_MMC_ENV_PART         0      /* user area */
 #define CONFIG_MMCROOT                  "/dev/mmcblk0p2"  /* USDHC1 */
 #define CONFIG_SYS_MMC_IMG_LOAD_PART    1
 
-#define CONFIG_ENV_OFFSET              (12 * SZ_64K)
-#define CONFIG_ENV_SIZE                        SZ_8K
-
 /* Using ULP WDOG for reset */
 #define WDOG_BASE_ADDR                 WDG1_RBASE
 
@@ -74,13 +53,10 @@
 
 #define PHYS_SDRAM                     0x60000000
 #define PHYS_SDRAM_SIZE                        SZ_1G
-#define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM
 #define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM
 
 #define CONFIG_LOADADDR             0x60800000
 
-#define CONFIG_SYS_MEMTEST_END      0x9E000000
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
        "image=zImage\0" \
@@ -167,7 +143,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