leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove config_distro_defaults.h

Browse Source 
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>
This commit is contained in:
Adam Ford 2018-02-06 07:49:32 -06:00 committed by Tom Rini
parent d021e94210
commit ba8bf9481b
50 changed files with 1 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/README.distro
View File

@ -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

16
include/config_distro_defaults.h
View File

@ -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 */

2
include/configs/am335x_sl50.h
View File

@ -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" \

1
include/configs/clearfog.h
View File

@ -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)

4
include/configs/cm_fx6.h
View File

@ -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

1
include/configs/dh_imx6.h
View File

@ -11,7 +11,6 @@
#include <asm/arch/imx-regs.h>
#include <config_distro_defaults.h>
#include "mx6_common.h"
/*

2
include/configs/dragonboard410c.h
View File

@ -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

1
include/configs/dragonboard820c.h
View File

@ -36,7 +36,6 @@
#define CONFIG_BOOTP_BOOTFILESIZE
#ifndef CONFIG_SPL_BUILD
#include <config_distro_defaults.h>
#include <config_distro_bootcmd.h>
#endif

1
include/configs/el6x_common.h
View File

@ -11,7 +11,6 @@
#define CONFIG_BOARD_NAME EL6Q
#include <config_distro_defaults.h>
#include "mx6_common.h"
#define CONFIG_IMX_THERMAL

1
include/configs/embestmx6boards.h
View File

@ -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,

2
include/configs/exynos-common.h
View File

@ -48,6 +48,4 @@
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#include <config_distro_defaults.h>
#endif /* __CONFIG_H */

2
include/configs/highbank.h
View File

@ -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)

2
include/configs/hikey.h
View File

@ -67,8 +67,6 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#include <config_distro_defaults.h>
/* Initial environment variables */
/*

1
include/configs/imx6_logic.h
View File

@ -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 */

1
include/configs/kc1.h
View File

@ -163,6 +163,5 @@
*/
#include <config_defaults.h>
#include <config_distro_defaults.h>
#endif

1
include/configs/ls1012a_common.h
View File

@ -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) \

1
include/configs/ls1021atwr.h
View File

@ -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)

1
include/configs/ls1043a_common.h
View File

@ -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) \

1
include/configs/ls1046a_common.h
View File

@ -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) \

1
include/configs/ls1088aqds.h
View File

@ -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) \

1
include/configs/ls1088ardb.h
View File

@ -462,7 +462,6 @@
#endif
#ifndef SPL_NO_ENV
#include <config_distro_defaults.h>
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \

2
include/configs/ls2080ardb.h
View File

@ -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) \

1
include/configs/mccmon6.h
View File

@ -8,7 +8,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#include <config_distro_defaults.h>
#include "mx6_common.h"
#define CONFIG_SPL_LIBCOMMON_SUPPORT

2
include/configs/meson-gxbb-common.h
View File

@ -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) \

2
include/configs/mvebu_armada-37xx.h
View File

@ -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) \

1
include/configs/mx6cuboxi.h
View File

@ -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"

1
include/configs/novena.h
View File

@ -13,7 +13,6 @@
#define CONFIG_MISC_INIT_R
#define CONFIG_KEYBOARD
#include <config_distro_defaults.h>
#include "mx6_common.h"
/* U-Boot Commands */

2
include/configs/omap3_evm.h
View File

@ -76,8 +76,6 @@
/* Environment */
#define CONFIG_PREBOOT "usb start"
#include <config_distro_defaults.h>
#define MEM_LAYOUT_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV

2
include/configs/pcm058.h
View File

@ -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)

2
include/configs/pfla02.h
View File

@ -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)

1
include/configs/poplar.h
View File

@ -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

2
include/configs/qemu-arm.h
View File

@ -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)

1
include/configs/rockchip-common.h
View File

@ -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)

2
include/configs/rpi.h
View File

@ -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 \

4
include/configs/s32v234evb.h
View File

@ -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

3
include/configs/sandbox.h
View File

@ -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)

2
include/configs/sksimx6.h
View File

@ -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"

1
include/configs/sniper.h
View File

@ -157,6 +157,5 @@
*/
#include <config_defaults.h>
#include <config_distro_defaults.h>
#endif

1
include/configs/socfpga_common.h
View File

@ -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)

1
include/configs/stih410-b2260.h
View File

@ -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

1
include/configs/sunxi-common.h
View File

@ -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
/*

4
include/configs/tegra-common.h
View File

@ -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_ */

2
include/configs/ti_armv7_common.h
View File

@ -226,6 +226,4 @@
#define NETARGS ""
#endif
#include <config_distro_defaults.h>
#endif /* __CONFIG_TI_ARMV7_COMMON_H__ */

1
include/configs/turris_omnia.h
View File

@ -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)

1
include/configs/udoo_neo.h
View File

@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#include <config_distro_defaults.h>
#include "mx6_common.h"
#include "imx6_spl.h"

2
include/configs/usbarmory.h
View File

@ -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)

2
include/configs/vexpress_common.h
View File

@ -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) \

1
include/configs/wandboard.h
View File

@ -9,7 +9,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#include <config_distro_defaults.h>
#include "mx6_common.h"
#include "imx6_spl.h"

2
include/configs/xilinx_zynqmp.h
View File

@ -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

1
include/configs/zynq-common.h
View File

@ -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)