Remove config_distro_defaults.h
Subsystems (9)
PATCH v2 2/2 Remove config_distro_defaults.h
With the contents of config_distro_defaults.h migrated to Kconfig, we can remove this header file completely
--- include/config_distro_defaults.h | 16 ---------------- include/configs/am335x_sl50.h | 2 +- include/configs/clearfog.h | 2 +- include/configs/cm_fx6.h | 2 +- include/configs/dh_imx6.h | 2 +- include/configs/dragonboard410c.h | 2 +- include/configs/dragonboard820c.h | 2 +- include/configs/el6x_common.h | 2 +- include/configs/embestmx6boards.h | 2 +- include/configs/exynos-common.h | 2 +- include/configs/highbank.h | 2 +- include/configs/hikey.h | 2 +- include/configs/imx6_logic.h | 2 +- include/configs/kc1.h | 2 +- include/configs/ls1012a_common.h | 2 +- include/configs/ls1021atwr.h | 2 +- include/configs/ls1043a_common.h | 2 +- include/configs/ls1046a_common.h | 2 +- include/configs/ls1088aqds.h | 2 +- include/configs/ls1088ardb.h | 2 +- include/configs/ls2080ardb.h | 2 +- include/configs/mccmon6.h | 2 +- include/configs/meson-gxbb-common.h | 2 +- include/configs/mvebu_armada-37xx.h | 2 +- include/configs/mx6cuboxi.h | 2 +- include/configs/novena.h | 2 +- include/configs/omap3_evm.h | 2 +- include/configs/pcm058.h | 2 +- include/configs/pfla02.h | 2 +- include/configs/poplar.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- include/configs/s32v234evb.h | 2 +- include/configs/sandbox.h | 2 +- include/configs/sksimx6.h | 2 +- include/configs/sniper.h | 2 +- include/configs/socfpga_common.h | 2 +- include/configs/stih410-b2260.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/tegra-common.h | 2 +- include/configs/ti_armv7_common.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/udoo_neo.h | 2 +- include/configs/usbarmory.h | 2 +- include/configs/vexpress_common.h | 2 +- include/configs/wandboard.h | 2 +- include/configs/zynq-common.h | 2 +- 48 files changed, 47 insertions(+), 63 deletions(-)
include/config_distro_defaults.h deleted +0 -16
@@ -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 */
include/configs/am335x_sl50.h +1 -1
@@ -30,7 +30,7 @@#ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> +#define MEM_LAYOUT_ENV_SETTINGS \ "scriptaddr=0x80000000\0" \
include/configs/clearfog.h +1 -1
@@ -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)
include/configs/cm_fx6.h +1 -1
@@ -14,7 +14,7 @@#include "mx6_common.h" #ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> +#endif /* Machine config */
include/configs/dh_imx6.h +1 -1
@@ -11,7 +11,7 @@#include <asm/arch/imx-regs.h> -#include <config_distro_defaults.h> +#include "mx6_common.h" /*
include/configs/dragonboard410c.h +1 -1
@@ -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
include/configs/dragonboard820c.h +1 -1
@@ -40,7 +40,7 @@#define CONFIG_BOOTP_BOOTFILESIZE #ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> +#include <config_distro_bootcmd.h> #endif
include/configs/el6x_common.h +1 -1
@@ -11,7 +11,7 @@#define CONFIG_BOARD_NAME EL6Q -#include <config_distro_defaults.h> +#include "mx6_common.h" #define CONFIG_IMX_THERMAL
include/configs/embestmx6boards.h +1 -1
@@ -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,
include/configs/exynos-common.h +1 -1
@@ -48,6 +48,6 @@/* Boot Argument Buffer Size */ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -#include <config_distro_defaults.h> +#endif /* __CONFIG_H */
include/configs/highbank.h +1 -1
@@ -7,7 +7,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <config_distro_defaults.h> +#define CONFIG_SYS_DCACHE_OFF
include/configs/hikey.h +1 -1
@@ -68,7 +68,7 @@/* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE -#include <config_distro_defaults.h> +/* Initial environment variables */
include/configs/imx6_logic.h +1 -1
@@ -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 */
include/configs/kc1.h +1 -1
@@ -166,6 +166,6 @@*/ #include <config_defaults.h> -#include <config_distro_defaults.h> +#endif
include/configs/ls1012a_common.h +1 -1
@@ -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) \
include/configs/ls1021atwr.h +1 -1
@@ -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)
include/configs/ls1043a_common.h +1 -1
@@ -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) \
include/configs/ls1046a_common.h +1 -1
@@ -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) \
include/configs/ls1088aqds.h +1 -1
@@ -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) \
include/configs/ls1088ardb.h +1 -1
@@ -462,7 +462,7 @@#endif #ifndef SPL_NO_ENV -#include <config_distro_defaults.h> +#define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 0) \
include/configs/ls2080ardb.h +1 -1
@@ -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) \
include/configs/mccmon6.h +1 -1
@@ -8,7 +8,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <config_distro_defaults.h> +#include "mx6_common.h" #define CONFIG_SPL_LIBCOMMON_SUPPORT
include/configs/meson-gxbb-common.h +1 -1
@@ -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) \
include/configs/mvebu_armada-37xx.h +1 -1
@@ -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) \
include/configs/mx6cuboxi.h +1 -1
@@ -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"
include/configs/novena.h +1 -1
@@ -13,7 +13,7 @@#define CONFIG_MISC_INIT_R #define CONFIG_KEYBOARD -#include <config_distro_defaults.h> +#include "mx6_common.h" /* U-Boot Commands */
include/configs/omap3_evm.h +1 -1
@@ -81,7 +81,7 @@/* Environment */ #define CONFIG_PREBOOT "usb start" -#include <config_distro_defaults.h> +#define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV
include/configs/pcm058.h +1 -1
@@ -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
include/configs/pfla02.h +1 -1
@@ -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
include/configs/poplar.h +1 -1
@@ -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
include/configs/qemu-arm.h +1 -1
@@ -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)
include/configs/rockchip-common.h +1 -1
@@ -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 )
include/configs/rpi.h +1 -1
@@ -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
include/configs/s32v234evb.h +1 -1
@@ -10,7 +10,7 @@#define __CONFIG_H#ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> +#endif #include <asm/arch/imx-regs.h>
include/configs/sandbox.h +1 -1
@@ -63,7 +63,7 @@ 115200}/* include default commands */ -#include <config_distro_defaults.h> +#define BOOT_TARGET_DEVICES (func) \ func(HOST, host, 1) \
include/configs/sksimx6.h +1 -1
@@ -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"
include/configs/sniper.h +1 -1
@@ -160,6 +160,6 @@*/ #include <config_defaults.h> -#include <config_distro_defaults.h> +#endif
include/configs/socfpga_common.h +1 -1
@@ -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)
include/configs/stih410-b2260.h +1 -1
@@ -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
include/configs/sunxi-common.h +1 -1
@@ -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 /*
include/configs/tegra-common.h +1 -1
@@ -96,7 +96,7 @@#define CONFIG_BOUNCE_BUFFER #ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> +#endif #endif /* _TEGRA_COMMON_H_ */
include/configs/ti_armv7_common.h +1 -1
@@ -230,6 +230,6 @@#define NETARGS ""#endif -#include <config_distro_defaults.h> +#endif /* __CONFIG_TI_ARMV7_COMMON_H__ */
include/configs/turris_omnia.h +1 -1
@@ -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)
include/configs/udoo_neo.h +1 -1
@@ -11,7 +11,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <config_distro_defaults.h> +#include "mx6_common.h" #include "imx6_spl.h"
include/configs/usbarmory.h +1 -1
@@ -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)
include/configs/vexpress_common.h +1 -1
@@ -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) \
include/configs/wandboard.h +1 -1
@@ -9,7 +9,7 @@#ifndef __CONFIG_H#define __CONFIG_H -#include <config_distro_defaults.h> +#include "mx6_common.h" #include "imx6_spl.h"
include/configs/zynq-common.h +1 -1
@@ -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)
Signature · 1 line
2.7.4
PATCH v2 2/2 Remove config_distro_defaults.h
Eddy Petrișor
Pe 6 feb. 2018 15:49, "Adam Ford" <[email protected]> a scris:
With the contents of config_distro_defaults.h migrated to Kconfig, we can remove this header file completely
include/configs/cm_fx6.h +1 -1
@@ -14,7 +14,7 @@#include "mx6_common.h" #ifndef CONFIG_SPL_BUILD -#include <config_distro_defaults.h> +#endif
I'd say this kind of empty left overs shouldbe also removed. There are several affected files which have this kind of empty #ifndef block after the modification.
Eddy
PATCH v2 2/2 Remove config_distro_defaults.h
In reply to Adam FordQuoted 4 lines · Adam Ford
With the contents of
config_distro_defaults.hmigrated toKconfig, we can remove this header file completelySigned-off-by Adam Ford <[email protected]>
With a few tweaks:
- Re-did the deletion with sed and cleaned up empty #ifndef/#endif lines.
- Did a little related whitespace cleanup.
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180224/bfe39c6e/attachment.sig>