New subject: [U-Boot] [U-Boot,V2,2/2] Remove config_distro_defaults.h

6 Feb 2018

diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
deleted file mode 100644
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 b1c7ede..24406c1 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -30,7 +30,7 @@
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
#define MEM_LAYOUT_ENV_SETTINGS \
    "scriptaddr=0x80000000\0" \
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index 512c463..ba6f025 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -126,7 +126,7 @@
/* 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 da870b9..377732c 100644
--- a/include/configs/cm_fx6.h
+++ b/include/configs/cm_fx6.h
@@ -14,7 +14,7 @@
 #include "mx6_common.h"
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
 #endif
/* Machine config */
diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h
index 7a9b0f7..fcf754e 100644
--- a/include/configs/dh_imx6.h
+++ b/include/configs/dh_imx6.h
@@ -11,7 +11,7 @@
#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 6b5a295..0cabe42 100644
--- a/include/configs/dragonboard410c.h
+++ b/include/configs/dragonboard410c.h
@@ -46,7 +46,7 @@
 /* Partition table support */
 #define HAVE_BLOCK_DEVICE /* Needed for partition commands */
-#include <config_distro_defaults.h>
+
/* BOOTP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
diff --git a/include/configs/dragonboard820c.h b/include/configs/dragonboard820c.h
index 4bc36b7..f3929ae 100644
--- a/include/configs/dragonboard820c.h
+++ b/include/configs/dragonboard820c.h
@@ -40,7 +40,7 @@
 #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 909981c..cccfd83 100644
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -11,7 +11,7 @@
#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 08a2922..53cd53d 100644
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -111,7 +111,7 @@
 #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 1670dac..48e443e 100644
--- a/include/configs/exynos-common.h
+++ b/include/configs/exynos-common.h
@@ -48,6 +48,6 @@
 /* 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 726ae8a..dc5e562 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -7,7 +7,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
-#include <config_distro_defaults.h>
+
#define CONFIG_SYS_DCACHE_OFF
diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index c82ad93..d267804 100644
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -68,7 +68,7 @@
 /* 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 f0ff5b2..70d7641 100644
--- a/include/configs/imx6_logic.h
+++ b/include/configs/imx6_logic.h
@@ -12,7 +12,7 @@
 #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 f332c31..a5d4693 100644
--- a/include/configs/kc1.h
+++ b/include/configs/kc1.h
@@ -166,6 +166,6 @@
  */
#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 03e415d..1a58b3c 100644
--- a/include/configs/ls1012a_common.h
+++ b/include/configs/ls1012a_common.h
@@ -95,7 +95,7 @@
 #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 98bd277..b5d10d0 100644
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -333,7 +333,7 @@
#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 fbf951f..4a00c00 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -236,7 +236,7 @@
 #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 fc5e107..da1ed6e 100644
--- a/include/configs/ls1046a_common.h
+++ b/include/configs/ls1046a_common.h
@@ -204,7 +204,7 @@
 #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 a1772ae..58a0bb6 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -474,7 +474,7 @@ 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 9f5a32a..8f12b3d 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -462,7 +462,7 @@
 #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 aa37c96..b705fa8 100644
--- a/include/configs/ls2080ardb.h
+++ b/include/configs/ls2080ardb.h
@@ -331,7 +331,7 @@ 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) \
diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 0cb8b17..740067a 100644
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -8,7 +8,7 @@
 #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 9216d7b..3b006de 100644
--- a/include/configs/meson-gxbb-common.h
+++ b/include/configs/meson-gxbb-common.h
@@ -25,7 +25,7 @@
 #define GICD_BASE			0xc4301000
 #define GICC_BASE			0xc4302000
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
    func(MMC, mmc, 0) \
diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h
index 5c53dd3..13509c8 100644
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -102,7 +102,7 @@
 #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) \
diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index d649172..828d9a2 100644
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -8,7 +8,7 @@
 #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 f82b6a4..3e00170 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -13,7 +13,7 @@
 #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 71d49e3..84eadcc 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -81,7 +81,7 @@
 /* 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 3067fc6..55c54ad 100644
--- a/include/configs/pcm058.h
+++ b/include/configs/pcm058.h
@@ -8,7 +8,7 @@
 #ifndef __PCM058_CONFIG_H
 #define __PCM058_CONFIG_H
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_SPL
 #define CONFIG_SPL_SPI_LOAD
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index ae03310..7eca03d 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -8,7 +8,7 @@
 #ifndef __PCM058_CONFIG_H
 #define __PCM058_CONFIG_H
-#include <config_distro_defaults.h>
+
#ifdef CONFIG_SPL
 #define CONFIG_SPL_SPI_LOAD
diff --git a/include/configs/poplar.h b/include/configs/poplar.h
index 76c70bf..25af0ac 100644
--- a/include/configs/poplar.h
+++ b/include/configs/poplar.h
@@ -41,7 +41,7 @@
    				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 c8ba78d..a83b83a 100644
--- a/include/configs/qemu-arm.h
+++ b/include/configs/qemu-arm.h
@@ -32,7 +32,7 @@
 /* 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 f465d35..3f06f2a 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -9,7 +9,7 @@
 #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 1712846..d7ced41 100644
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -90,7 +90,7 @@
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
-#include <config_distro_defaults.h>
+
/* Environment */
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h
index 8ffaee4..e124cd4 100644
--- a/include/configs/s32v234evb.h
+++ b/include/configs/s32v234evb.h
@@ -10,7 +10,7 @@
 #define __CONFIG_H
#ifndef CONFIG_SPL_BUILD
-#include <config_distro_defaults.h>
+
 #endif
#include <asm/arch/imx-regs.h>
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index e023efa..de1c8a2 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -63,7 +63,7 @@
    				115200}
/* include default commands */
-#include <config_distro_defaults.h>
+
#define BOOT_TARGET_DEVICES(func) \
    func(HOST, host, 1) \
diff --git a/include/configs/sksimx6.h b/include/configs/sksimx6.h
index c635e9f..3a4350d 100644
--- a/include/configs/sksimx6.h
+++ b/include/configs/sksimx6.h
@@ -8,7 +8,7 @@
 #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 a18a3bd..4d802ba 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -160,6 +160,6 @@
  */
#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 1d542e5..84e7fc5 100644
--- a/include/configs/socfpga_common.h
+++ b/include/configs/socfpga_common.h
@@ -294,7 +294,7 @@ 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 ea2d7c1..c8306bb 100644
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -18,7 +18,7 @@
#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 542f7f5..ee5466d 100644
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -322,7 +322,7 @@ 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 bfc2831..48bad59 100644
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -96,7 +96,7 @@
 #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 45ed0ff..f630b7b 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -230,6 +230,6 @@
 #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 40d94a2..abb73e3 100644
--- a/include/configs/turris_omnia.h
+++ b/include/configs/turris_omnia.h
@@ -124,7 +124,7 @@
/* 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 3e46a42..ad01ec0 100644
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -11,7 +11,7 @@
 #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 4bebc59..f198cf5 100644
--- a/include/configs/usbarmory.h
+++ b/include/configs/usbarmory.h
@@ -16,7 +16,7 @@
#include <asm/arch/imx-regs.h>
-#include <config_distro_defaults.h>
+
/* U-Boot environment */
 #define CONFIG_ENV_OFFSET	(6 * 64 * 1024)
diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h
index 7f734f3..937a15e 100644
--- a/include/configs/vexpress_common.h
+++ b/include/configs/vexpress_common.h
@@ -170,7 +170,7 @@
    				 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) \
diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index e42bfc5..ac4401d 100644
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
-#include <config_distro_defaults.h>
+
 #include "mx6_common.h"
#include "imx6_spl.h"
diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 7ebd7f7..f0d8165 100644
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -160,7 +160,7 @@
 #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)
-- 
2.7.4


    

[U-Boot] [PATCH V2 2/2] Remove config_distro_defaults.h

Adam Ford

Eddy Petrișor

Tom Rini

tags (0)

participants (3)