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>

48 files changed, 0 insertions, 77 deletions

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 1cb3578254..d44bc47004 100644
--- 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 406e8d8e4b..7089bc4f15 100644
--- 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 72610d6397..4f36930a94 100644
--- 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 98bb665b28..1f7fccad3f 100644
--- 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 dfeea601a0..85ed72c40e 100644
--- 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 5b14bbf54f..d62c0321b0 100644
--- 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 89d3dffc97..94e0bdf924 100644
--- 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 1d9e33a8c9..5a9c48f8d0 100644
--- 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 1670dac34e..ec46754116 100644
--- 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 9dc0c6c264..0aa59bcafd 100644
--- 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 d603641204..6f5b50f764 100644
--- 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 95c31ed201..1bc7f2ac42 100644
--- 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 3638730585..061303d993 100644
--- 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 d174782a41..46b3566adf 100644
--- 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 21b54c5a01..8f27d9e6c2 100644
--- 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 db6bd88f20..4c96186289 100644
--- 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 6af6a4ea99..b5af4b053b 100644
--- 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 a1772aeb86..897a0497bb 100644
--- 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 9f5a32a91a..3f2a00820a 100644
--- 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 aa37c96453..3f9794fc6b 100644
--- 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 ed5f53f597..8eb248ac89 100644
--- 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 90a19e7d0f..5794bc0d7a 100644
--- 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 96cd435f61..52f8c5d711 100644
--- 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 d649172d5f..0e1d18cad8 100644
--- 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 f82b6a44d2..977b2c3643 100644
--- 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 1517be645d..1392593b9d 100644
--- 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 3ea04624f9..0bd19b6657 100644
--- 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 dc20b855a0..86d875dccf 100644
--- 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 727cec42f1..9a16eabce3 100644
--- 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 eb87482815..c968aa76ac 100644
--- 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 f465d35330..26d41b5075 100644
--- 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 6b4b5f44bf..17cdecd1c3 100644
--- 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 92c6956e9f..4dc098b828 100644
--- 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 2a42a64226..2b902310f5 100644
--- 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 c635e9f1b5..3c30077340 100644
--- 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 834d723bb7..2322326d06 100644
--- 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 ba78e0c674..6644ef66c1 100644
--- 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 38ca83c589..23a66bb7b7 100644
--- 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 15cafcf0f4..e4e7c22778 100644
--- 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 9c0c6b9ed3..3ead2e43c7 100644
--- 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 d54831c7df..4771e74940 100644
--- 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 6633540a10..94a3be63fe 100644
--- 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 3e46a42c71..35a6eca9f6 100644
--- 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 cb98f989d0..836dbb7d55 100644
--- 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 70fdbe452a..6a10edba81 100644
--- 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 e42bfc51f8..487cb1f5df 100644
--- 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 66f6fe574c..52baa42a2f 100644
--- 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 a5f7b0288b..ac9663dea6 100644
--- 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)