Remove config_distro_defaults.h

With the contents of config_distro_defaults.h migrated to Kconfig,
we can remove this header file completely

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/doc/README.distro b/doc/README.distro
index 77d5c6d4d56f90f6ba1ed237ca3927901f47d936..2af559009bb58c4a9848587c79cafeedcb453e23 100644 (file)
--- a/doc/README.distro
+++ b/doc/README.distro
@@ -172,7 +172,6 @@ In your board configuration file, include the following:
 
 ------------------------------------------------------------
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 #include <config_distro_bootcmd.h>
 #endif
 ------------------------------------------------------------
@@ -188,7 +187,7 @@ Finally, a few options that are mostly relevant only when using U-Boot-
 specific boot.scr scripts are enabled. This enables distros to generate a
 U-Boot-specific boot.scr script rather than extlinux.conf as the boot
 configuration file. While doing so is fully supported, and
-<config_distro_defaults.h> exposes enough parameterization to boot.scr to
+CONFIG_DISTRO_DEFAULTS exposes enough parameterization to boot.scr to
 allow for board-agnostic boot.scr content, this document recommends that
 distros generate extlinux.conf rather than boot.scr. extlinux.conf is intended
 to work across multiple bootloaders, whereas boot.scr will only work with

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
deleted file mode 100644 (file)
index 35e704e..0000000
--- a/include/config_distro_defaults.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright 2013-2014 Red Hat, Inc.
- *
- * SPDX-License-Identifier:     GPL-2.0+
- */
-
-#ifndef _CONFIG_CMD_DISTRO_DEFAULTS_H
-#define _CONFIG_CMD_DISTRO_DEFAULTS_H
-
-/*
- * List of all commands and options that when defined enables support for
- * features required by distros to support boards in a standardised and
- * consistent manner.
- */
-
-#endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 1cb35782541ccfe96314d54eda6b427ebaacc2e2..d44bc4700417537b55a12d71d63495a63aa30a20 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -30,8 +30,6 @@
 
 #ifndef CONFIG_SPL_BUILD
 
-#include <config_distro_defaults.h>
-
 #define MEM_LAYOUT_ENV_SETTINGS \
        "scriptaddr=0x80000000\0" \
        "pxefile_addr_r=0x80100000\0" \

diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 406e8d8e4be363a624f2b4c38844614b72ecbc1d..7089bc4f157c87dbbd0a6aadddcbf5eaca481aaa 100644 (file)
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -124,7 +124,6 @@
 
 /* Include the common distro boot environment */
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_MMC
 #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)

diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h
index 72610d639783e1ff0fcc748ec879cd383b59beed..4f36930a94118924e985aede6cd8997faa6cb011 100644 (file)
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -13,10 +13,6 @@
 
 #include "mx6_common.h"
 
-#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
-#endif
-
 /* Machine config */
 #define CONFIG_SYS_LITTLE_ENDIAN
 #define CONFIG_MACH_TYPE               4273

diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 98bb665b283e39ad91159f4ae2e152d066942124..1f7fccad3fbce62f5a94c60c4d612fd325d809fe 100644 (file)
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -11,7 +11,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /*

diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h
index dfeea601a004e33e6fabc44fc373fce6b5ece39c..85ed72c40e0bef3aaa65cc7c225a6987d0a0dc1b 100644 (file)
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -42,8 +42,6 @@
 /* Disabled by default as some sub-commands can brick eMMC */
 /*#define CONFIG_SUPPORT_EMMC_BOOT */
 
-#include <config_distro_defaults.h>
-
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 

diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index 5b14bbf54ff060aca2aeb3a8548c4560086143bb..d62c0321b0e1c98bc92481a488049d0c99314ed7 100644 (file)
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -36,7 +36,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 #include <config_distro_bootcmd.h>
 #endif
 

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 89d3dffc9764c8f19af11a04e1491fed14583d64..94e0bdf924bd9b81f93a4ee4c0905efe469667c0 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -11,7 +11,6 @@
 
 #define CONFIG_BOARD_NAME              EL6Q
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_IMX_THERMAL

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 1d9e33a8c9116dc9fe3c3aded2a0a6100eccc6a9..5a9c48f8d098aabdf4cd62725d3eec8f1760f729 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -110,7 +110,6 @@
 #define CONFIG_IMX_HDMI
 #define CONFIG_IMX_VIDEO_SKIP
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt,

diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h
index 1670dac34ec7b7605422ecb73e8bce3604684b49..ec467541168d47eaef3fe788623cc8c4e31289ce 100644 (file)
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -48,6 +48,4 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
-#include <config_distro_defaults.h>
-
 #endif /* __CONFIG_H */

diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 9dc0c6c264af40a5ef5b9baac842d88098480fcf..0aa59bcafde1edb3a5e51996c539ed87c872e48c 100644 (file)
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -7,8 +7,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
-
 #define CONFIG_SYS_DCACHE_OFF
 
 #define CONFIG_SYS_BOOTMAPSZ           (16 << 20)

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index d603641204b509bf5d8a9f436c79651803fbcc9e..6f5b50f76425c2a3d6331126f3f360a30c43cc7a 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -67,8 +67,6 @@
 /* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
 
-#include <config_distro_defaults.h>
-
 /* Initial environment variables */
 
 /*

diff --git a/include/configs/imx6_logic.h b/include/configs/imx6_logic.h
index 95c31ed20184ac160292cf10754c0c75bd52a4f6..1bc7f2ac428ef4785f9e4239fca654efd49487ff 100644 (file)
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -12,7 +12,6 @@
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONSOLE_DEV            "ttymxc0"
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* Size of malloc() pool */

diff --git a/include/configs/kc1.h b/include/configs/kc1.h
index 36387305853d8ebac48eb3b39111e41dc178d064..061303d993589db039ea67bcf847e4ec6ca9e787 100644 (file)
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -163,6 +163,5 @@
  */
 
 #include <config_defaults.h>
-#include <config_distro_defaults.h>
 
 #endif

diff --git a/include/configs/ls1012a_common.h b/include/configs/ls1012a_common.h
index d174782a4151ef325f8952373ab30daa845553ae..46b3566adf8882bc6a69ed77a3af38fa8d1a1cfd 100644 (file)
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -93,7 +93,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
-#include <config_distro_defaults.h>
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
        func(SCSI, scsi, 0) \

diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
index 21b54c5a01765fbbbd3a3c3b415b388bbc67e2d4..8f27d9e6c24fe8e16f8a4368bc473a5a6b4e4cbd 100644 (file)
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -323,7 +323,6 @@
 
 #define CONFIG_FSL_DEVICE_DISABLE
 
-#include <config_distro_defaults.h>
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(USB, usb, 0)

diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index db6bd88f2018ebac6bdfcb2ec5150211492dab47..4c96186289258f3b44a4544c9849ebbb59884994 100644 (file)
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -234,7 +234,6 @@
 #define HWCONFIG_BUFFER_SIZE           128
 
 #ifndef SPL_NO_MISC
-#include <config_distro_defaults.h>
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \

diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h
index 6af6a4ea99de9eaf3f48d6096ed554b05cc1bc73..b5af4b053bd910e5d57c52ac0709c8e3731e103b 100644 (file)
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -202,7 +202,6 @@
 #define CONFIG_HWCONFIG
 #define HWCONFIG_BUFFER_SIZE           128
 
-#include <config_distro_defaults.h>
 #ifndef CONFIG_SPL_BUILD
 #define BOOT_TARGET_DEVICES(func) \
        func(SCSI, scsi, 0) \

diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index a1772aeb86bea63829662ca59c6fc0842a07df9c..897a0497bb7eb3f657b94e858e6407e3f57f5ff8 100644 (file)
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -474,7 +474,6 @@ unsigned long get_board_ddr_clk(void);
 
 #endif
 
-#include <config_distro_defaults.h>
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \

diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index 9f5a32a91ab45f01e024b8b5105238f8f85b9c45..3f2a00820a3e26eeffaab622660f690f3f120a0f 100644 (file)
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -462,7 +462,6 @@
 #endif
 
 #ifndef SPL_NO_ENV
-#include <config_distro_defaults.h>
 
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \

diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h
index aa37c96453f6d6395bfa78eb34562bc451958bb3..3f9794fc6b4d6173fd44cb9ffe21555df41b03d1 100644 (file)
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -331,8 +331,6 @@ unsigned long get_board_sys_clk(void);
 
 #define CONFIG_MISC_INIT_R
 
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(USB, usb, 0) \
        func(MMC, mmc, 0) \

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index ed5f53f59795c8afe2255caa9f5331b2ae000595..8eb248ac89840258afa3cea61698325926482e0e 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -8,7 +8,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #define CONFIG_SPL_LIBCOMMON_SUPPORT

diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h
index 90a19e7d0f3cd7ac6d764a4ec22cab472eab904b..5794bc0d7a679def41f467392cddbeb6aaa6fd66 100644 (file)
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -24,8 +24,6 @@
 #define GICD_BASE                      0xc4301000
 #define GICC_BASE                      0xc4302000
 
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 0) \
        func(MMC, mmc, 1) \

diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 96cd435f618ef8d7fb910622470a46d96c0d353a..52f8c5d711af90b28d9b791f386a3811defe8b79 100644 (file)
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -100,8 +100,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE     (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
                                         CONFIG_SYS_SCSI_MAX_LUN)
 
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(MMC, mmc, 1) \
        func(MMC, mmc, 0) \

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d649172d5fc8b5414ae406d3067acd8e88cce5ab..0e1d18cad8780f40dfb2dd821d0e400115a9f25d 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -8,7 +8,6 @@
 #ifndef __MX6CUBOXI_CONFIG_H
 #define __MX6CUBOXI_CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"

diff --git a/include/configs/novena.h b/include/configs/novena.h
index f82b6a44d2473875a3406b49d830452ab90d3f46..977b2c36438c21bfd5c2337f474272a7a671dd7a 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -13,7 +13,6 @@
 #define CONFIG_MISC_INIT_R
 #define CONFIG_KEYBOARD
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 /* U-Boot Commands */

diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index 1517be645dd6a7e4ffe4696f611c305a76de55ec..1392593b9d52444b2a4bae8ed6cf9227bfe5fdb3 100644 (file)
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -76,8 +76,6 @@
 /* Environment */
 #define CONFIG_PREBOOT                  "usb start"
 
-#include <config_distro_defaults.h>
-
 #define MEM_LAYOUT_ENV_SETTINGS \
        DEFAULT_LINUX_BOOT_ENV
 

diff --git a/include/configs/pcm058.h b/include/configs/pcm058.h
index 3ea04624f93d7edf673787326564c4d4994d017a..0bd19b6657c475c01ae3a9c87fed9c00de89f958 100644 (file)
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -8,8 +8,6 @@
 #ifndef __PCM058_CONFIG_H
 #define __PCM058_CONFIG_H
 
-#include <config_distro_defaults.h>
-
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)

diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index dc20b855a0d275124753aa86823438a2b6425a07..86d875dccf86c4a1de7c826a2facb447b4aecea4 100644 (file)
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -8,8 +8,6 @@
 #ifndef __PCM058_CONFIG_H
 #define __PCM058_CONFIG_H
 
-#include <config_distro_defaults.h>
-
 #ifdef CONFIG_SPL
 #define CONFIG_SPL_SPI_LOAD
 #define CONFIG_SYS_SPI_U_BOOT_OFFS     (64 * 1024)

diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 727cec42f14babc8ab173813134678039bc567ff..9a16eabce3d65d0f9f092b9709f949b6540b909f 100644 (file)
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -40,7 +40,6 @@
                                        func(MMC, mmc, 0)               \
                                        func(DHCP, dhcp, na)
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 #include <config_distro_bootcmd.h>
 #endif
 

diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h
index eb874828154f003ffd43e46b751fc55e28bb845d..c968aa76ac28597b84cee54aac8b0ab816dbd3b0 100644 (file)
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -31,8 +31,6 @@
 /* Environment options */
 #define CONFIG_ENV_SIZE                                SZ_64K
 
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(SCSI, scsi, 0)
 

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index f465d35330bc1e0b87e8a858e6bdc404968b5e36..26d41b50759d89bb3e8871997861a6730515dafa 100644 (file)
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -9,7 +9,6 @@
 #include <linux/sizes.h>
 
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 /* First try to boot from SD (index 0), then eMMC (index 1) */
 #if CONFIG_IS_ENABLED(CMD_MMC)

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 6b4b5f44bf473224d5462bd142e25cdb32c8fc10..17cdecd1c342999657f7b4ec46eabada92ece8b2 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -85,8 +85,6 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
 
-#include <config_distro_defaults.h>
-
 /* Environment */
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 #define ENV_DEVICE_SETTINGS \

diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 92c6956e9f3f73c21d873ffa12858aad22fe6730..4dc098b828fef73b57f2ef04db65c6beb10842cc 100644 (file)
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -9,10 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
-#endif
-
 #include <asm/arch/imx-regs.h>
 
 #define CONFIG_S32V234

diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index 2a42a642264d7eacbb93f06a89748d58aac850b5..2b902310f5c3ebfba124eec0ce727771f1aee0d8 100644 (file)
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -61,9 +61,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
-/* include default commands */
-#include <config_distro_defaults.h>
-
 #define BOOT_TARGET_DEVICES(func) \
        func(HOST, host, 1) \
        func(HOST, host, 0)

diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index c635e9f1b5dfc06443239e6ca02f95c8381aa570..3c3007734096d20533295039e321561b38738c50 100644 (file)
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -8,8 +8,6 @@
 #ifndef __SKSIMX6_CONFIG_H
 #define __SKSIMX6_CONFIG_H
 
-#include <config_distro_defaults.h>
-
 #include "mx6_common.h"
 #include "imx6_spl.h"
 

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 834d723bb7bab18961ed70eeafa42d8e6a0bde9c..2322326d064313b84d550fd696f35458f62ecbdf 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -157,6 +157,5 @@
  */
 
 #include <config_defaults.h>
-#include <config_distro_defaults.h>
 
 #endif

diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
index ba78e0c674544519dd7e57d9ffda395b8405c07d..6644ef66c12ad1d1c6b8ad694000b76343a42dd7 100644 (file)
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -288,7 +288,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
 
 /* Extra Environment */
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_CMD_DHCP
 #define BOOT_TARGET_DEVICES_DHCP(func) func(DHCP, dhcp, na)

diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 38ca83c589f0848f5025028a2eecb74d0536b24a..23a66bb7b7ff9fdc1dc5a28a418a2262594394dd 100644 (file)
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -17,7 +17,6 @@
 
 #define CONFIG_SYS_HZ_CLOCK            1000000000      /* 1 GHz */
 
-#include <config_distro_defaults.h>
 /* Environment */
 
 #define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 15cafcf0f4567b0b6ddfffeb243c92ddc991a85e..e4e7c2277843df21c95514b95da2506caff94869 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -314,7 +314,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_MISC_INIT_R
 
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_ARM64
 /*

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 9c0c6b9ed36e5f9108c6e63d510b96a469bc83e7..3ead2e43c7064c66cbd3d38e7690fdaa2da662d4 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -94,8 +94,4 @@
 /* Misc utility code */
 #define CONFIG_BOUNCE_BUFFER
 
-#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
-#endif
-
 #endif /* _TEGRA_COMMON_H_ */

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index d54831c7df2a2c540a8d0548e9d38cd72fd95323..4771e749405b5c99cccf4734a91c4b7f88d4ae3e 100644 (file)
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -226,6 +226,4 @@
 #define NETARGS ""
 #endif
 
-#include <config_distro_defaults.h>
-
 #endif /* __CONFIG_TI_ARMV7_COMMON_H__ */

diff --git a/include/configs/turris_omnia.h b/include/configs/turris_omnia.h
index 6633540a10dc01040cb1cfb2d22ec9f6e92dd274..94a3be63fe34f81d937a4166531717b4bb85653c 100644 (file)
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -122,7 +122,6 @@
 
 /* Include the common distro boot environment */
 #ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_MMC
 #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index 3e46a42c71f94c8fd4702a72452d7da0f11677d1..35a6eca9f60093737f01112de9bec352f6aeea8b 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -11,7 +11,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"

diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
index cb98f989d0517a2ab26cce0e0d7debfda5d9f3fe..836dbb7d55443003dd80740fd4404efd935a91d6 100644 (file)
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -15,8 +15,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#include <config_distro_defaults.h>
-
 /* U-Boot environment */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE                (8 * 1024)

diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 70fdbe452aba8ab88232c69e79c250cbc2ee6a1c..6a10edba8174efbe0cdc475c43e7be36f38c4513 100644 (file)
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -168,8 +168,6 @@
                                         GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_GBL_DATA_OFFSET
 
-#include <config_distro_defaults.h>
-
 /* Basic environment settings */
 #define BOOT_TARGET_DEVICES(func) \
         func(MMC, mmc, 1) \

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index e42bfc51f8432111ebe091c9b6d7ff97618977af..487cb1f5df64f5b6c15b297834297e68f3b8e3ab 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -9,7 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <config_distro_defaults.h>
 #include "mx6_common.h"
 
 #include "imx6_spl.h"

diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h
index 66f6fe574c635f4a3e84b10ec0aa7ac14148ded7..52baa42a2f11aed8861053c63898ca04e557888f 100644 (file)
--- a/include/configs/xilinx_zynqmp.h
+++ b/include/configs/xilinx_zynqmp.h
@@ -54,8 +54,6 @@
 #define CONFIG_BOOTP_BOOTFILESIZE
 #define CONFIG_BOOTP_MAY_FAIL
 
-/* Diff from config_distro_defaults.h */
-
 #if defined(CONFIG_MMC_SDHCI_ZYNQ)
 # define CONFIG_SUPPORT_EMMC_BOOT
 # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index a5f7b0288b97179ae06a1e68f1e68d382629606e..ac9663dea6ed260fec31cf8a47b29bfe778b138b 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -160,7 +160,6 @@
 #ifdef CONFIG_SPL_BUILD
 #define BOOTENV
 #else
-#include <config_distro_defaults.h>
 
 #ifdef CONFIG_CMD_MMC
 #define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0)