imx6/imx7: Remove now empty imx6_spl.h and imx7_spl.h

There are now no flags being set in these files, so remove them.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index 192c9cf0c30caa29b076fa72ccb948398e5ef8b0..30d32d27e3dc39801da56359023027bbbec1140e 100644 (file)
--- 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 0c7fe5f3abbab7f70a96a00ade02746bbe436279..bdedf7ea2d78a751cefb7d4a9fa27aa9c2e73c3f 100644 (file)
--- 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 cbf85341a64dc8ec6d55683c94dbf34a3838e73e..fc45e597f6d1705e646f7378722c4a61fbed0848 100644 (file)
--- 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 2cb09fa30da250eca3f34fec50020d7b316cc172..25443629e208fee0efe0e0c86a338031b0d031a4 100644 (file)
--- 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 14fdf5b50e6673274560ef1d4862cd729a49c9c7..68d923c1ae194bbbc0ad71bf1ea3d38939de09c1 100644 (file)
--- 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 6079596caec0c0d63ac56babed56b9b35d809c0f..b944d50663ceb9f3351db84519126dedc75eca38 100644 (file)
--- 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 54b2192b4a8314b8b8098fa74237a97cb576137b..e694dd7551ae5665190c9ad5fd58217463ae9abc 100644 (file)
--- 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 eb65f17cbe480058c2021221a1b820066a62504d..0e5ecab9feb25b80838b047fba519ebf6067394f 100644 (file)
--- 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 affe20a10198a1b7d3164b5295405ba1e4966642..16d2648e11f30f018a77c658a2ba3eb1e69f817b 100644 (file)
--- 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 555239b8e813e126748dfeb40c809c25fccabcdb..a4891ddbc4ff8710d936e685fc5c2ac4e096e58e 100644 (file)
--- 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 176f80bb09b779c97114b5bd5519a390d37b5189..c862f15ee2b4d010672785cd3866fa3321d0d650 100644 (file)
--- 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 a9ef35ebeb6c8e1c9cba647d3c6a81669976e404..645ca162a35a537d25a655f2b94f7a41c0224d4d 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -13,7 +13,6 @@
 
 /* Falcon Mode - MMC support: args@1MB kernel@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 e430efad42e310271e1beabcf03cee2bc1a945db..b8eb5c82cf7eb84ca94f1b0edc6b243c0e3b44e4 100644 (file)
--- 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 7760c8c418a171e9bb3402d6b02b1cf53252152b..6b822e725058e6d1f35828d020cd9011baa5ddf4 100644 (file)
--- 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 (file)
index f34988f..0000000
--- 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@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 909453cd66f416ee2530f36f4946a1a9626f8b83..f7f8f33ed8986ae4e12027504072661d044d0a29 100644 (file)
--- 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 5025ad9d9f2e6cea4e38abbdfab150dd570100ff..15171d7ad67b91e0be325ead299dba8ca9a0f847 100644 (file)
--- 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 d42eb750d01b159beb62a8c4630e39b9d3d98326..70b4b84215d3be9c72828eb93c357435346fbbf1 100644 (file)
--- 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 caa6a11d40772fc469e03064be2b280804ec5019..c6db5e943eea5851f15a5614bdaa4ecfec6dcb7f 100644 (file)
--- 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 (file)
index 362b980..0000000
--- 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@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 d3447a80ca56baf89c4b7e47f55cff80c648195a..b3e1fc2a864e68fefe2c07a34d8751479aaeb400 100644 (file)
--- 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 1823a7939882d774c382a2ef1258d977efa9a63f..b0e49ad6df0768a73a24bf904e274c67d080612b 100644 (file)
--- 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 a784002158b0f3bfd8f9774c3978414f7530bc4b..1d51b87b68b31707e3dc9291f956ad0867c34f9b 100644 (file)
--- 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 69ca7c527534b5bed27638b90679fe75134cb02b..f9f0825f6f81d62e650cccc258e10f8106053c8d 100644 (file)
--- 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 bc90b9563adede3ec4f6ef14c3af3c5ac7c08fc5..1db4d6c01b173d21271c6d2dab8799c884d751b4 100644 (file)
--- 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 ad53f17d671610b6988406643202a4d5572aedce..a6cefab5508ab38c90877ecab833b560109b9d36 100644 (file)
--- 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 8176566f3f61ea314796f98d26ee6ebc886ffa9a..3fdf829e968633a4fa7888952107599a2948c684 100644 (file)
--- 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 49cd1512dc58dfecb55c61e63bede48b019565c9..0d06b6dc467132477dccb7d28bc8e296312bf51b 100644 (file)
--- 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 26b97bd3f2e4a50b3b64c8d7c67e4071a9d80de5..ca1d077437b736b2b5460962fd43e21cbd98757b 100644 (file)
--- 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 83779f09bfc613b3a8e2007fbc7b9ef326df2568..c655671ee1bdd022f17350aa4b499f6c03311adc 100644 (file)
--- 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 d0e3d3f02849ffd3f60c88db2a8ecb11f57da136..65f0a5c996626718655434bb9dafbc543fb754f0 100644 (file)
--- 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 e18d16cc99c7003fb9b8851d17c15d30e85dab6d..273f938554defd524467c54925f29a9ddcb950a8 100644 (file)
--- 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 f2a04ca618547db46f8b683e0001197bc718d756..9dc05d80ec2ccebfb48792663e858bb601f03465 100644 (file)
--- 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 2a5288508299c73c6d8e52c865f6c366c7abaca1..ea407c9f6f1a19c147dfe1f11c9621d830f4dbcf 100644 (file)
--- 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 3e551e13aa67f880e3a2d68eb35540bb847f077f..b3cdd2f1ebe3f2e0b4d4622871eea98a00f1e05a 100644 (file)
--- 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 bc04c508218864e738008f288a7012eda4cdf07c..6267dc729ab607c590500b571dca672ca38c41e6 100644 (file)
--- 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 817fabfb97ce3b8697d7650d376582f62e77e778..e13b5df0fabdac1d2d965f552b9270a5ac4c3016 100644 (file)
--- 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 01190904cf6f71663126a0f64a016a34d486fa23..14cbfde28bfe7209c5a397111660890829566492 100644 (file)
--- 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 687133b9bddaff1c647797cea4f9d6977f67918b..f95beeb214a92c13dea458a63b17c96aec45ee97 100644 (file)
--- 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@1MB kernel@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 d4f58b6a7b0476dfacff58c1c1797a2ecdc4e91b..85772ba6e838c8a21105ea32d5a5e47388fff9e3 100644 (file)
--- 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@1MB kernel@2MB */
-#endif
 
 /* Network support */
 

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index 159bf4c68ca5ee8bf303aaab6d7a1d6ebb69a821..b3a38d8a940a6aacae35bd055522ad7cb8d96e18 100644 (file)
--- 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@1MB kernel@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 49672dfe7c3f81d712b1476ac4ed886551c52a1a..dcb88a3a730a6043abe0b305a3ce78534bddf722 100644 (file)
--- 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 2c5891589525b73de579279fc74c7489d5680c9a..a65ebfb4deab7832e3be165b2632ca1a391c8c8f 100644 (file)
--- 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 8af5151c503d65ce6bd00e523b8cf8249693700d..268c737e7eb7fcc19db4bfa61727d19735b0bcc8 100644 (file)
--- 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 093e2e8dae7c0e2bec88bcd08014a9e244cd5c95..147224806fcc442d75ddb9b99706a45116defef2 100644 (file)
--- 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 a4484fd3f8ca5827f603c43ea36c9210784ac60b..a0846b3f7c96adcaa254930b69c1832c9506680e 100644 (file)
--- 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 91c1f4b3b514c2d9b1a3e5d935e0534a0bdb79e7..b4c757fd9217354c335123ed3fa56d776155c07b 100644 (file)
--- 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 fc8ec3204b1b29d9437b232361343586ff21dc7d..7d0402feead57c4ebb3827c2b35638db047a1194 100644 (file)
--- 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 */