common: Drop linux/stringify.h from common header

[platform/kernel/u-boot.git] / include / configs / mx7_common.h

diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h
index 0645228..cc07e85 100644 (file)
--- a/include/configs/mx7_common.h
+++ b/include/configs/mx7_common.h
@@ -1,17 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Freescale Semiconductor, Inc.
  *
  * Configuration settings for the Freescale i.MX7.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __MX7_COMMON_H
 #define __MX7_COMMON_H
 
 #include <linux/sizes.h>
+#include <linux/stringify.h>
 #include <asm/arch/imx-regs.h>
-#include <asm/imx-common/gpio.h>
+#include <asm/mach-imx/gpio.h>
 
 #ifndef CONFIG_MX7
 #define CONFIG_MX7
@@ -19,9 +19,8 @@
 
 /* Timer settings */
 #define CONFIG_MXC_GPT_HCLK
-#define CONFIG_SYSCOUNTER_TIMER
 #define CONFIG_SC_TIMER_CLK 8000000 /* 8Mhz */
-#define CONFIG_TIMER_CLK_FREQ CONFIG_SC_TIMER_CLK
+#define COUNTER_FREQUENCY CONFIG_SC_TIMER_CLK
 #define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_SYS_BOOTM_LEN   0x1000000
@@ -29,56 +28,37 @@
 /* Enable iomux-lpsr support */
 #define CONFIG_IOMUX_LPSR
 
-#define CONFIG_ARCH_MISC_INIT
-
 #define CONFIG_LOADADDR                 0x80800000
-#define CONFIG_SYS_TEXT_BASE            0x87800000
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_CONS_INDEX               1
-#define CONFIG_BAUDRATE                 115200
-
-/* Filesystems and image support */
-#define CONFIG_DOS_PARTITION
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE              512
 #define CONFIG_SYS_MAXARGS             32
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
-
-#ifndef CONFIG_SYS_DCACHE_OFF
-#endif
-
-/* GPIO */
-#define CONFIG_MXC_GPIO
 
 /* UART */
 #define CONFIG_MXC_UART
 
 /* MMC */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_BOUNCE_BUFFER
-#define CONFIG_FSL_ESDHC
-#define CONFIG_FSL_USDHC
-
-/* Fuses */
-#define CONFIG_CMD_FUSE
-#define CONFIG_MXC_OCOTP
 
 #define CONFIG_ARMV7_SECURE_BASE       0x00900000
 
-/* Secure boot (HAB) support */
-#ifdef CONFIG_SECURE_BOOT
-#define CONFIG_CSF_SIZE                        0x2000
-#define CONFIG_SYS_FSL_SEC_COMPAT      4
-#define CONFIG_FSL_CAAM
-#define CONFIG_CMD_DEKBLOB
-#define CONFIG_SYS_FSL_SEC_LE
+#define CONFIG_ARMV7_PSCI_1_0
+
+#ifdef CONFIG_SPL_BUILD
+#define CONFIG_SPL_DRIVERS_MISC_SUPPORT
+#endif
+
+/*
+ * If we have defined the OPTEE ram size and not OPTEE it means that we were
+ * launched by OPTEE, because of that we shall skip all the low level
+ * initialization since it was already done by ATF or OPTEE
+ */
+#if (CONFIG_OPTEE_TZDRAM_SIZE != 0)
+#ifndef CONFIG_OPTEE
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#endif
 #endif
 
 #endif