Commit ba8bf948 authored by Adam Ford's avatar Adam Ford Committed by Tom Rini
Browse files

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: default avatarAdam Ford <aford173@gmail.com>
parent d021e942
......@@ -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
......
/*
* 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 */
......@@ -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" \
......
......@@ -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)
......
......@@ -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
......
......@@ -11,7 +11,6 @@
#include <asm/arch/imx-regs.h>
#include <config_distro_defaults.h>
#include "mx6_common.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
......
......@@ -36,7 +36,6 @@
#define CONFIG_BOOTP_BOOTFILESIZE
#ifndef CONFIG_SPL_BUILD
#include <config_distro_defaults.h>
#include <config_distro_bootcmd.h>
#endif
......
......@@ -11,7 +11,6 @@
#define CONFIG_BOARD_NAME EL6Q
#include <config_distro_defaults.h>
#include "mx6_common.h"
#define CONFIG_IMX_THERMAL
......
......@@ -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,
......
......@@ -48,6 +48,4 @@
/* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#include <config_distro_defaults.h>
#endif /* __CONFIG_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)
......
......@@ -67,8 +67,6 @@
/* BOOTP options */
#define CONFIG_BOOTP_BOOTFILESIZE
#include <config_distro_defaults.h>
/* Initial environment variables */
/*
......
......@@ -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 */
......
......@@ -163,6 +163,5 @@
*/
#include <config_defaults.h>
#include <config_distro_defaults.h>
#endif
......@@ -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) \
......
......@@ -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)
......
......@@ -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) \
......
......@@ -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) \
......
......@@ -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) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment