[PATCH 12/17] imx6/imx7: Remove now empty imx6_spl.h and imx7_spl.h
Tom Rini
trini at konsulko.com
Wed Nov 16 19:10:36 CET 2022
There are now no flags being set in these files, so remove them.
Signed-off-by: Tom Rini <trini at konsulko.com>
---
include/configs/apalis_imx6.h | 4 ----
include/configs/brppt2.h | 5 -----
include/configs/cl-som-imx7.h | 3 ---
include/configs/cm_fx6.h | 3 ---
include/configs/colibri_imx6.h | 4 ----
include/configs/dart_6ul.h | 3 ---
include/configs/dh_imx6.h | 3 ---
include/configs/display5.h | 2 --
include/configs/el6x_common.h | 4 ----
include/configs/embestmx6boards.h | 6 ------
include/configs/ge_b1x5v2.h | 2 --
include/configs/gw_ventana.h | 1 -
include/configs/imx6-engicam.h | 5 -----
include/configs/imx6_logic.h | 4 ----
include/configs/imx6_spl.h | 15 ---------------
include/configs/imx6dl-mamoj.h | 3 ---
include/configs/imx6q-bosch-acc.h | 1 -
include/configs/imx6ulz_smm_m2.h | 3 ---
include/configs/imx7-cm.h | 3 ---
include/configs/imx7_spl.h | 19 -------------------
include/configs/kontron-sl-mx6ul.h | 3 ---
include/configs/kp_imx6q_tpc.h | 3 ---
include/configs/liteboard.h | 3 ---
include/configs/mccmon6.h | 2 --
include/configs/mx6cuboxi.h | 2 --
include/configs/mx6memcal.h | 1 -
include/configs/mx6sabreauto.h | 4 ----
include/configs/mx6sabresd.h | 4 ----
include/configs/mx6slevk.h | 4 ----
include/configs/mx6sxsabresd.h | 4 ----
include/configs/mx6ul_14x14_evk.h | 3 ---
include/configs/mys_6ulx.h | 3 ---
include/configs/novena.h | 3 ---
include/configs/npi_imx6ull.h | 3 ---
include/configs/opos6uldev.h | 4 ----
include/configs/pcl063.h | 3 ---
include/configs/pcl063_ull.h | 3 ---
include/configs/pcm058.h | 4 ----
include/configs/pico-imx6.h | 8 --------
include/configs/pico-imx6ul.h | 7 -------
include/configs/pico-imx7d.h | 8 --------
include/configs/somlabs_visionsom_6ull.h | 4 ----
include/configs/tqma6.h | 7 -------
include/configs/udoo.h | 2 --
include/configs/udoo_neo.h | 2 --
include/configs/vining_2000.h | 4 ----
include/configs/wandboard.h | 2 --
include/configs/xpress.h | 3 ---
48 files changed, 196 deletions(-)
delete mode 100644 include/configs/imx6_spl.h
delete mode 100644 include/configs/imx7_spl.h
diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 192c9cf0c30c..30d32d27e3dc 100644
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -15,10 +15,6 @@
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h
index 0c7fe5f3abba..bdedf7ea2d78 100644
--- a/include/configs/brppt2.h
+++ b/include/configs/brppt2.h
@@ -86,9 +86,4 @@ BUR_COMMON_ENV \
/* USB Configs */
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
-/* SPL */
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-
-#endif /* CONFIG_SPL */
#endif /* __CONFIG_BRPP2_IMX6_H */
diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index cbf85341a64d..fc45e597f6d1 100644
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -101,7 +101,4 @@
#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
#define CONFIG_MXC_USB_FLAGS 0
-/* SPL */
-#include "imx7_spl.h"
-
#endif /* __CONFIG_H */
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 2cb09fa30da2..25443629e208 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -143,9 +143,6 @@
/* misc */
-/* SPL */
-#include "imx6_spl.h"
-
/* Display */
#define CONFIG_IMX_HDMI
diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index 14fdf5b50e66..68d923c1ae19 100644
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -15,10 +15,6 @@
#include <asm/arch/imx-regs.h>
#include <asm/mach-imx/gpio.h>
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
diff --git a/include/configs/dart_6ul.h b/include/configs/dart_6ul.h
index 6079596caec0..b944d50663ce 100644
--- a/include/configs/dart_6ul.h
+++ b/include/configs/dart_6ul.h
@@ -10,9 +10,6 @@
#include <linux/stringify.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
/* NAND pin conflicts with usdhc2 */
#ifdef CONFIG_CMD_NAND
#define CFG_SYS_FSL_USDHC_NUM 1
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 54b2192b4a83..e694dd7551ae 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -21,9 +21,6 @@
* 0x12_0000-0x1f_ffff ... UNUSED
*/
-/* SPL */
-#include "imx6_spl.h" /* common IMX6 SPL configuration */
-
/* Miscellaneous configurable options */
/* MMC Configs */
diff --git a/include/configs/display5.h b/include/configs/display5.h
index eb65f17cbe48..0e5ecab9feb2 100644
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -34,8 +34,6 @@
#define CONFIG_SYS_SPI_ARGS_OFFS 0x140000
#define CONFIG_SYS_SPI_ARGS_SIZE 0x10000
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART5_BASE
/* I2C Configs */
diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index affe20a10198..16d2648e11f3 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -12,10 +12,6 @@
#include "mx6_common.h"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR 0
#define CFG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 555239b8e813..a4891ddbc4ff 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -49,12 +49,6 @@
#include "mx6_common.h"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-/* RiOTboard */
-
-#endif
-
/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
* 1M script, 1M pxe and the ramdisk at the end */
#define MEM_LAYOUT_ENV_SETTINGS \
diff --git a/include/configs/ge_b1x5v2.h b/include/configs/ge_b1x5v2.h
index 176f80bb09b7..c862f15ee2b4 100644
--- a/include/configs/ge_b1x5v2.h
+++ b/include/configs/ge_b1x5v2.h
@@ -12,8 +12,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
/* PWM */
#define CONFIG_IMX6_PWM_PER_CLK 66000000
diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index a9ef35ebeb6c..645ca162a35a 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -13,7 +13,6 @@
/* Falcon Mode - MMC support: args at 1MB kernel at 2MB */
-#include "imx6_spl.h" /* common IMX6 SPL configuration */
#include "mx6_common.h"
/* Serial */
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index e430efad42e3..b8eb5c82cf7e 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -142,9 +142,4 @@
# define CONFIG_IMX_VIDEO_SKIP
#endif
-/* SPL */
-#ifdef CONFIG_SPL
-# include "imx6_spl.h"
-#endif
-
#endif /* __IMX6_ENGICAM_CONFIG_H */
diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 7760c8c418a1..6b822e725058 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -11,10 +11,6 @@
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONSOLE_DEV "ttymxc0"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#include "mx6_common.h"
/* MMC Configs */
diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
deleted file mode 100644
index f34988fdd74c..000000000000
--- a/include/configs/imx6_spl.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Copyright (C) 2014 Gateworks Corporation
- * Author: Tim Harvey <tharvey at gateworks.com>
- */
-#ifndef __IMX6_SPL_CONFIG_H
-#define __IMX6_SPL_CONFIG_H
-
-#ifdef CONFIG_SPL
-
-/* MMC support */
-
-#endif
-
-#endif
diff --git a/include/configs/imx6dl-mamoj.h b/include/configs/imx6dl-mamoj.h
index 909453cd66f4..f7f8f33ed898 100644
--- a/include/configs/imx6dl-mamoj.h
+++ b/include/configs/imx6dl-mamoj.h
@@ -59,7 +59,4 @@
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
-/* SPL */
-#include "imx6_spl.h"
-
#endif /* __IMX6DL_MAMOJ_CONFIG_H */
diff --git a/include/configs/imx6q-bosch-acc.h b/include/configs/imx6q-bosch-acc.h
index 5025ad9d9f2e..15171d7ad67b 100644
--- a/include/configs/imx6q-bosch-acc.h
+++ b/include/configs/imx6q-bosch-acc.h
@@ -91,7 +91,6 @@
/* SPL */
#ifdef CONFIG_SPL
-#include "imx6_spl.h"
#ifdef CONFIG_SPL_BUILD
#define CFG_SYS_FSL_USDHC_NUM 2
diff --git a/include/configs/imx6ulz_smm_m2.h b/include/configs/imx6ulz_smm_m2.h
index d42eb750d01b..70b4b84215d3 100644
--- a/include/configs/imx6ulz_smm_m2.h
+++ b/include/configs/imx6ulz_smm_m2.h
@@ -12,9 +12,6 @@
#include <linux/sizes.h>
#include <linux/stringify.h>
-/* SPL options */
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART4_BASE
#ifndef CONFIG_SPL_BUILD
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index caa6a11d4077..c6db5e943eea 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -83,7 +83,4 @@
#define CONFIG_USBD_HS
-/* SPL */
-#include "imx7_spl.h"
-
#endif /* __CONFIG_H */
diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h
deleted file mode 100644
index 362b98075f05..000000000000
--- a/include/configs/imx7_spl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * SPL definitions for the i.MX7 SPL
- *
- * (C) Copyright 2017 CompuLab, Ltd. http://www.compulab.com
- *
- * Author: Uri Mashiach <uri.mashiach at compulab.co.il>
- */
-
-#ifndef __IMX7_SPL_CONFIG_H
-#define __IMX7_SPL_CONFIG_H
-
-#ifdef CONFIG_SPL
-
-/* MMC support */
-
-#endif /* CONFIG_SPL */
-
-#endif /* __IMX7_SPL_CONFIG_H */
diff --git a/include/configs/kontron-sl-mx6ul.h b/include/configs/kontron-sl-mx6ul.h
index d3447a80ca56..b3e1fc2a864e 100644
--- a/include/configs/kontron-sl-mx6ul.h
+++ b/include/configs/kontron-sl-mx6ul.h
@@ -11,9 +11,6 @@
#include <linux/sizes.h>
#include "mx6_common.h"
-#ifdef CONFIG_SPL_BUILD
-#include "imx6_spl.h"
-#endif
/* RAM */
#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h
index 1823a7939882..b0e49ad6df07 100644
--- a/include/configs/kp_imx6q_tpc.h
+++ b/include/configs/kp_imx6q_tpc.h
@@ -12,9 +12,6 @@
#include "mx6_common.h"
-/* SPL */
-#include "imx6_spl.h" /* common IMX6 SPL configuration */
-
/* Miscellaneous configurable options */
/* FEC ethernet */
diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index a784002158b0..1d51b87b68b3 100644
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -13,9 +13,6 @@
#include <linux/stringify.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 69ca7c527534..f9f0825f6f81 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -9,8 +9,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000)
/*
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index bc90b9563ade..1db4d6c01b17 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -11,8 +11,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
/* MMC Configs */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
diff --git a/include/configs/mx6memcal.h b/include/configs/mx6memcal.h
index ad53f17d6716..a6cefab5508a 100644
--- a/include/configs/mx6memcal.h
+++ b/include/configs/mx6memcal.h
@@ -11,7 +11,6 @@
/* SPL */
#include "mx6_common.h"
-#include "imx6_spl.h"
#ifdef CONFIG_SERIAL_CONSOLE_UART1
#if defined(CONFIG_MX6SL)
diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index 8176566f3f61..3fdf829e9686 100644
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -8,10 +8,6 @@
#ifndef __MX6SABREAUTO_CONFIG_H
#define __MX6SABREAUTO_CONFIG_H
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define CONFIG_MXC_UART_BASE UART4_BASE
#define CONSOLE_DEV "ttymxc3"
diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 49cd1512dc58..0d06b6dc4671 100644
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -8,10 +8,6 @@
#ifndef __MX6SABRESD_CONFIG_H
#define __MX6SABRESD_CONFIG_H
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define CONFIG_MXC_UART_BASE UART1_BASE
#define CONSOLE_DEV "ttymxc0"
diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index 26b97bd3f2e4..ca1d077437b7 100644
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -10,10 +10,6 @@
#include "mx6_common.h"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR
/* MMC Configs */
diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index 83779f09bfc6..c655671ee1bd 100644
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -12,10 +12,6 @@
#include "mx6_common.h"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define CONFIG_MXC_UART_BASE UART1_BASE
#ifdef CONFIG_IMX_BOOTAUX
diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index d0e3d3f02849..65f0a5c99662 100644
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -15,9 +15,6 @@
#define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK)
-/* SPL options */
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configs */
diff --git a/include/configs/mys_6ulx.h b/include/configs/mys_6ulx.h
index e18d16cc99c7..273f938554de 100644
--- a/include/configs/mys_6ulx.h
+++ b/include/configs/mys_6ulx.h
@@ -10,9 +10,6 @@
#include <linux/sizes.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
diff --git a/include/configs/novena.h b/include/configs/novena.h
index f2a04ca61854..9dc05d80ec2c 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -34,9 +34,6 @@
#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
-/* SPL */
-#include "imx6_spl.h" /* common IMX6 SPL configuration */
-
/* I2C */
#define CONFIG_I2C_MULTI_BUS
diff --git a/include/configs/npi_imx6ull.h b/include/configs/npi_imx6ull.h
index 2a5288508299..ea407c9f6f1a 100644
--- a/include/configs/npi_imx6ull.h
+++ b/include/configs/npi_imx6ull.h
@@ -10,9 +10,6 @@
#include <linux/sizes.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
#define CFG_SYS_FSL_USDHC_NUM 1
/* Console configs */
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 3e551e13aa67..b3cdd2f1ebe3 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -10,10 +10,6 @@
#include "mx6_common.h"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
/* Miscellaneous configurable options */
#define CONFIG_STANDALONE_LOAD_ADDR CONFIG_SYS_LOAD_ADDR
diff --git a/include/configs/pcl063.h b/include/configs/pcl063.h
index bc04c5082188..6267dc729ab6 100644
--- a/include/configs/pcl063.h
+++ b/include/configs/pcl063.h
@@ -11,9 +11,6 @@
#include <linux/sizes.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
/*
* There is a bug in some i.MX6UL processors that results in the initial
* portion of OCRAM being unavailable when booting from (at least) an SD
diff --git a/include/configs/pcl063_ull.h b/include/configs/pcl063_ull.h
index 817fabfb97ce..e13b5df0fabd 100644
--- a/include/configs/pcl063_ull.h
+++ b/include/configs/pcl063_ull.h
@@ -13,9 +13,6 @@
#include <linux/stringify.h>
#include "mx6_common.h"
-/* SPL options */
-#include "imx6_spl.h"
-
#define CFG_SYS_FSL_USDHC_NUM 2
/* Environment settings */
diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 01190904cf6f..14cbfde28bfe 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -6,10 +6,6 @@
#ifndef __PCM058_CONFIG_H
#define __PCM058_CONFIG_H
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#include "mx6_common.h"
#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024)
diff --git a/include/configs/pico-imx6.h b/include/configs/pico-imx6.h
index 687133b9bdda..f95beeb214a9 100644
--- a/include/configs/pico-imx6.h
+++ b/include/configs/pico-imx6.h
@@ -10,14 +10,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
-#ifdef CONFIG_SPL_OS_BOOT
-/* Falcon Mode */
-
-/* Falcon Mode - MMC support: args at 1MB kernel at 2MB */
-#endif
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configuration */
diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index d4f58b6a7b04..85772ba6e838 100644
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -12,13 +12,6 @@
#include <linux/sizes.h>
#include "mx6_common.h"
#include <asm/mach-imx/gpio.h>
-#include "imx6_spl.h"
-
-#ifdef CONFIG_SPL_OS_BOOT
-/* Falcon Mode */
-
-/* Falcon Mode - MMC support: args at 1MB kernel at 2MB */
-#endif
/* Network support */
diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 159bf4c68ca5..b3a38d8a940a 100644
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -10,14 +10,6 @@
#include "mx7_common.h"
-#include "imx7_spl.h"
-
-#ifdef CONFIG_SPL_OS_BOOT
-/* Falcon Mode */
-
-/* Falcon Mode - MMC support: args at 1MB kernel at 2MB */
-#endif
-
#define CONFIG_MXC_UART_BASE UART5_IPS_BASE_ADDR
/* MMC Config */
diff --git a/include/configs/somlabs_visionsom_6ull.h b/include/configs/somlabs_visionsom_6ull.h
index 49672dfe7c3f..dcb88a3a730a 100644
--- a/include/configs/somlabs_visionsom_6ull.h
+++ b/include/configs/somlabs_visionsom_6ull.h
@@ -13,10 +13,6 @@
#include "mx6_common.h"
#include <asm/mach-imx/gpio.h>
-/* SPL options */
-#include "imx6_spl.h"
-
-
/* MMC Configs */
#ifdef CONFIG_FSL_USDHC
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 2c5891589525..a65ebfb4deab 100644
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -11,13 +11,6 @@
#include <linux/kconfig.h>
#include <linux/stringify.h>
-/* SPL */
-/* #if defined(CONFIG_SPL_BUILD) */
-/* common IMX6 SPL configuration */
-#include "imx6_spl.h"
-
-/* #endif */
-
/* place code in last 4 MiB of RAM */
#include "mx6_common.h"
diff --git a/include/configs/udoo.h b/include/configs/udoo.h
index 8af5151c503d..268c737e7eb7 100644
--- a/include/configs/udoo.h
+++ b/include/configs/udoo.h
@@ -10,8 +10,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART2_BASE
/* MMC Configuration */
diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 093e2e8dae7c..147224806fcc 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -12,8 +12,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
/* MMC Configuration */
#define CFG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR
diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index a4484fd3f8ca..a0846b3f7c96 100644
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -10,10 +10,6 @@
#include "mx6_common.h"
-#ifdef CONFIG_SPL
-#include "imx6_spl.h"
-#endif
-
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \
func(MMC, mmc, 1) \
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 91c1f4b3b514..b4c757fd9217 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -10,8 +10,6 @@
#include "mx6_common.h"
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE UART1_BASE
/* MMC Configuration */
diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index fc8ec3204b1b..7d0402feead5 100644
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -10,9 +10,6 @@
#include "mx6_common.h"
#include <asm/mach-imx/gpio.h>
-/* SPL options */
-#include "imx6_spl.h"
-
#define CONFIG_MXC_UART_BASE MX6UL_UART7_BASE_ADDR
/* MMC Configs */
--
2.25.1
More information about the U-Boot
mailing list