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

global: Migrate CONFIG_EXTRA_ENV_SETTINGS to CFG 

Perform a simple rename of CONFIG_EXTRA_ENV_SETTINGS to CFG_EXTRA_ENV_SETTINGS

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-04 10:03:50 -05:00
parent fb55ac2cfe
commit 0613c36a7a
378 changed files with 441 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -1124,7 +1124,7 @@ The following options need to be configured:
symbols.
- Default Environment:
CONFIG_EXTRA_ENV_SETTINGS
CFG_EXTRA_ENV_SETTINGS
Define this to contain any number of null terminated
strings (variable = value pairs) that will be part of
@ -1133,7 +1133,7 @@ The following options need to be configured:
For example, place something like this in your
board's config file:
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"myvar1=value1\0" \
"myvar2=value2\0"

4
doc/README.fsl-ddr
View File

@ -56,8 +56,8 @@ Table of 2-way interleaving modes supported in cpu/8xxx/ddr/
The ways to configure the ddr interleaving mode
==============================================
1. In board header file(e.g.MPC8572DS.h), add default interleaving setting
under "CONFIG_EXTRA_ENV_SETTINGS", like:
#define CONFIG_EXTRA_ENV_SETTINGS \
under "CFG_EXTRA_ENV_SETTINGS", like:
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ctlr_intlv=bank" \
......

2
doc/README.link-local
View File

@ -51,7 +51,7 @@ by env variables. It depends on CONFIG_CMD_LINK_LOCAL, CONFIG_CMD_DHCP,
and CONFIG_BOOTP_MAY_FAIL.
If both fail or are disabled, static settings are used.
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"ipconfigcmd=if test \\\"$dhcpenabled\\\" -ne 0;" \
"then " \
"dhcpfail=0;dhcp || dhcpfail=1;" \

4
doc/arch/x86.rst
View File

@ -355,8 +355,8 @@ environment variables if you add this to minnowmax.h:
"ext2load scsi 0:2 04000000 /boot/initrd.img-3.13.0-58-generic; " \
"run boot"
#undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"
#undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS "boot=zboot 03000000 0 04000000 ${filesize}"
and change CONFIG_BOOTARGS value in configs/minnowmax_defconfig to::

2
doc/develop/devicetree/control.rst
View File

@ -135,7 +135,7 @@ control the boot process of Linux with bootm/bootz commands.
To use this, put something like this in your board header file::
#define CONFIG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0"
#define CFG_EXTRA_ENV_SETTINGS "fdtcontroladdr=10000\0"
Build:

2
doc/develop/distro.rst
View File

@ -214,7 +214,7 @@ Required Environment Variables
The U-Boot "syslinux" and "pxe boot" commands require a number of environment
variables be set. Default values for these variables are often hard-coded into
CONFIG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that
CFG_EXTRA_ENV_SETTINGS in the board's U-Boot configuration file, so that
the user doesn't have to configure them.
fdt_addr:

2
doc/usage/environment.rst
View File

@ -89,7 +89,7 @@ Old-style C environment
Traditionally, the default environment is created in `include/env_default.h`,
and can be augmented by various `CONFIG` defines. See that file for details. In
particular you can define `CONFIG_EXTRA_ENV_SETTINGS` in your board file
particular you can define `CFG_EXTRA_ENV_SETTINGS` in your board file
to add environment variables.
Board maintainers are encouraged to migrate to the text-based environment as it

4
env/Kconfig vendored
View File

@ -19,7 +19,7 @@ config ENV_SOURCE_FILE
If this CONFIG is empty, U-Boot uses CONFIG SYS_BOARD as a default, if
the file board/<vendor>/<board>/<SYS_BOARD>.env exists. Otherwise the
environment is assumed to come from the ad-hoc
CONFIG_EXTRA_ENV_SETTINGS #define
CFG_EXTRA_ENV_SETTINGS #define
config SAVEENV
def_bool y if CMD_SAVEENV
@ -657,7 +657,7 @@ config USE_DEFAULT_ENV_FILE
help
Normally, the default environment is automatically generated
based on the settings of various CONFIG_* options, as well
as the CONFIG_EXTRA_ENV_SETTINGS. By selecting this option,
as the CFG_EXTRA_ENV_SETTINGS. By selecting this option,
you can instead define the entire default environment in an
external file.

2
include/configs/M5208EVBE.h
View File

@ -17,7 +17,7 @@
/* I2C */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=40010000\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/M5235EVB.h
View File

@ -27,7 +27,7 @@
/* this must be included AFTER the definition of CONFIG COMMANDS (if any) */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=10000\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/M5253DEMO.h
View File

@ -20,7 +20,7 @@
env/embedded.o(.text*);
#ifdef CONFIG_DRIVER_DM9000
# define CONFIG_EXTRA_ENV_SETTINGS \
# define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"inpclk=" __stringify(CONFIG_SYS_INPUT_CLKSRC) "\0" \
"loadaddr=10000\0" \

2
include/configs/M5272C3.h
View File

@ -27,7 +27,7 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text);
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=10000\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/M5275EVB.h
View File

@ -38,7 +38,7 @@
#define CFG_SYS_I2C_PINMUX_CLR (0xFFF0)
#define CFG_SYS_I2C_PINMUX_SET (0x000F)
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=10000\0" \
"uboot=u-boot.bin\0" \

2
include/configs/M5282EVB.h
View File

@ -27,7 +27,7 @@
. = DEFINED(env_offset) ? env_offset : .; \
env/embedded.o(.text*);
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=10000\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/M53017EVB.h
View File

@ -30,7 +30,7 @@
/* I2C */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=40010000\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/M5329EVB.h
View File

@ -22,7 +22,7 @@
/* I2C */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=40010000\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/M5373EVB.h
View File

@ -24,7 +24,7 @@
/* I2C */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth0\0" \
"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/MCR3000.h
View File

@ -9,7 +9,7 @@
/* High Level Configuration Options */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"sdram_type=SDRAM\0" \
"flash_type=AM29LV160DB\0" \
"loadaddr=0x400000\0" \

2
include/configs/MPC837XERDB.h
View File

@ -195,7 +195,7 @@
#define FDTFILE "mpc8379_rdb.dtb"
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth1\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \
"tftpflash=tftp $loadaddr $uboot;" \

2
include/configs/MPC8548CDS.h
View File

@ -291,7 +291,7 @@
* Environment Configuration
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ecc=off\0" \
"netdev=eth0\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \

2
include/configs/P1010RDB.h
View File

@ -371,7 +371,7 @@ extern unsigned long get_sdram_size(void);
* Environment Configuration
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=" __stringify(CONFIG_DEF_HWCONFIG) "\0" \
"netdev=eth0\0" \
"uboot=" CONFIG_UBOOTPATH "\0" \

2
include/configs/P2041RDB.h
View File

@ -304,7 +304,7 @@
#define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \
"bank_intlv=cs0_cs1\0" \
"netdev=eth0\0" \

2
include/configs/T102xRDB.h
View File

@ -430,7 +430,7 @@
"fdtfile=t1023rdb/t1023rdb.dtb\0"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
ARCH_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:ctlr_intlv=cacheline," \
"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0" \

2
include/configs/T104xRDB.h
View File

@ -370,7 +370,7 @@
#define FDTFILE "t1042rdb/t1042d4rdb.dtb"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:bank_intlv=cs0_cs1;" \
"usb1:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) ";"\
"usb2:dr_mode=host,phy_type=" __stringify(__USB_PHY_TYPE) "\0"\

2
include/configs/T208xQDS.h
View File

@ -413,7 +413,7 @@
#define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:" \
"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \
"bank_intlv=auto;" \

2
include/configs/T208xRDB.h
View File

@ -379,7 +379,7 @@
#define __USB_PHY_TYPE utmi
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:" \
"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \
"bank_intlv=auto;" \

2
include/configs/T4240RDB.h
View File

@ -368,7 +368,7 @@
#define CTRL_INTLV_PREFERED cacheline
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hwconfig=fsl_ddr:" \
"ctlr_intlv=" __stringify(CTRL_INTLV_PREFERED) "," \
"bank_intlv=auto;" \

2
include/configs/alt.h
View File

@ -30,7 +30,7 @@
/* Board Clock */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"bootm_size=0x10000000\0" \
"usb_pgood_delay=2000\0"

2
include/configs/am335x_evm.h
View File

@ -78,7 +78,7 @@
#ifndef CONFIG_SPL_BUILD
#include <environment/ti/dfu.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
"fdtfile=undefined\0" \
"finduuid=part uuid mmc 0:2 uuid\0" \

2
include/configs/am335x_guardian.h
View File

@ -45,7 +45,7 @@
"main_pcba_aux_3=0\0" \
"main_pcba_aux_4=0\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
AM335XX_BOARD_FDTFILE \
MEM_LAYOUT_ENV_SETTINGS \
BOOTENV \

2
include/configs/am335x_igep003x.h
View File

@ -20,7 +20,7 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
"bootdir=/boot\0" \
"bootfile=zImage\0" \

2
include/configs/am335x_shc.h
View File

@ -21,7 +21,7 @@
#define V_SCLK (V_OSCK)
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
"kloadaddr=0x84000000\0" \
"fdtaddr=0x85000000\0" \

2
include/configs/am335x_sl50.h
View File

@ -30,7 +30,7 @@
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
AM335XX_BOARD_FDTFILE \
MEM_LAYOUT_ENV_SETTINGS \
BOOTENV

2
include/configs/am3517_evm.h
View File

@ -38,7 +38,7 @@
#endif /* CONFIG_MTD_RAW_NAND */
/* Environment information */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
"console=ttyS2,115200n8\0" \
"fdtfile=am3517-evm.dtb\0" \

2
include/configs/am43xx_evm.h
View File

@ -66,7 +66,7 @@
#ifndef CONFIG_SPL_BUILD
#include <environment/ti/dfu.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
"fdtfile=undefined\0" \
"finduuid=part uuid mmc 0:2 uuid\0" \

2
include/configs/am62ax_evm.h
View File

@ -56,7 +56,7 @@
"partitions=" PARTS_DEFAULT
/* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
EXTRA_ENV_AM62A7_BOARD_SETTINGS \

2
include/configs/am62x_evm.h
View File

@ -55,7 +55,7 @@
"partitions=" PARTS_DEFAULT
/* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
EXTRA_ENV_AM625_BOARD_SETTINGS \

2
include/configs/am64x_evm.h
View File

@ -95,7 +95,7 @@
DFU_ALT_INFO_OSPI
/* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
EXTRA_ENV_AM642_BOARD_SETTINGS \

2
include/configs/am65x_evm.h
View File

@ -88,7 +88,7 @@
#endif
/* Incorporate settings into the U-Boot environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
DEFAULT_FIT_TI_ARGS \

2
include/configs/amcore.h
View File

@ -10,7 +10,7 @@
#define CFG_SYS_UART_PORT 0
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"upgrade_uboot=loady; " \
"protect off 0xffc00000 0xffc1ffff; " \
"erase 0xffc00000 0xffc1ffff; " \

2
include/configs/apalis-imx8.h
View File

@ -31,7 +31,7 @@
#define BOOTENV_RUN_NET_USB_START ""
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
"boot_file=Image\0" \

2
include/configs/apalis_imx6.h
View File

@ -62,7 +62,7 @@
"ramdisk_addr_r=0x18400000\0" \
"scriptaddr=0x18280000\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BOOTENV \
"boot_file=zImage\0" \
"boot_script_dhcp=boot.scr\0" \

2
include/configs/apple.h
View File

@ -27,7 +27,7 @@
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
ENV_DEVICE_SETTINGS \
BOOTENV

2
include/configs/arbel.h
View File

@ -12,7 +12,7 @@
#define CFG_SYS_INIT_RAM_SIZE 0x8000
/* Default environemnt variables */
#define CONFIG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \
#define CFG_EXTRA_ENV_SETTINGS "uimage_flash_addr=80200000\0" \
"stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0" \

2
include/configs/aristainetos2.h
View File

@ -94,7 +94,7 @@
"done\0"
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"disable_giga=yes\0" \
"usb_pgood_delay=2000\0" \
"nor_bootdelay=-2\0" \

2
include/configs/astro_mcf5373l.h
View File

@ -71,7 +71,7 @@
* u-boot: 'set' command
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"loaderversion=11\0" \
"card_id="__stringify(ASTRO_ID)"\0" \
"alterafile=0\0" \

2
include/configs/at91sam9263ek.h
View File

@ -36,7 +36,7 @@
/* Address and size of Primary Environment Sector */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"monitor_base=" __stringify(CONFIG_SYS_MONITOR_BASE) "\0" \
"update=" \
"protect off ${monitor_base} +${filesize};" \

2
include/configs/at91sam9n12ek.h
View File

@ -28,7 +28,7 @@
#define CFG_SYS_NAND_READY_PIN GPIO_PIN_PD(5)
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"bootargs_nand=rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw\0"\
"bootargs_mmc=root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait\0"

2
include/configs/ax25-ae350.h
View File

@ -82,7 +82,7 @@
func(RAM, ram, na)
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"kernel_addr_r=0x00080000\0" \
"pxefile_addr_r=0x01f00000\0" \
"scriptaddr=0x01f00000\0" \

2
include/configs/axs10x.h
View File

@ -39,7 +39,7 @@
/*
* Environment settings
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"upgrade=if mmc rescan && " \
"fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \
"iminfo ${loadaddr} && source ${loadaddr}; then; else echo " \

2
include/configs/baltos.h
View File

@ -49,7 +49,7 @@
#define NANDARGS ""
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
"boot_fdt=try\0" \
"bootpart=0:2\0" \

2
include/configs/bcm_ns3.h
View File

@ -793,7 +793,7 @@
QSPI_FLASH \
FLASH_IMAGES
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
ARCH_ENV_SETTINGS
#endif /* __BCM_NS3_H */

2
include/configs/bcmstb.h
View File

@ -131,7 +131,7 @@ extern phys_addr_t prior_stage_fdt_address;
/*
* Enable in-place RFS with this initrd_high setting.
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdtsaveaddr=" __stringify(CONFIG_SYS_FDT_SAVE_ADDRESS) "\0" \
"initrd_high=0xffffffff\0" \
"fdt_high=0xffffffff\0"

4
include/configs/beacon-rzg2m.h
View File

@ -8,9 +8,9 @@
#include "rcar-gen3-common.h"
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CFG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"usb_pgood_delay=2000\0" \
"script=boot.scr\0" \
"image=Image\0" \

2
include/configs/bitmain_antminer_s9.h
View File

@ -9,7 +9,7 @@
#define CFG_SYS_SDRAM_BASE 0x00000000
#define CFG_SYS_SDRAM_SIZE 0x40000000
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"pxefile_addr_r=0x2000000\0" \
"scriptaddr=0x3000000\0" \
"kernel_addr_r=0x2000000\0" \

2
include/configs/bk4r1.h
View File

@ -57,7 +57,7 @@
/* boot command, including the target-defined one if any */
/* Extra env settings (including the target-defined ones if any) */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BK4_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \

2
include/configs/brppt1.h
View File

@ -67,7 +67,7 @@ MMC_TGTS \
#define LOAD_OFFSET(x) 0x8##x
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \
"verify=no\0" \
"scraddr=" __stringify(LOAD_OFFSET(0000000)) "\0" \

2
include/configs/brppt2.h
View File

@ -24,7 +24,7 @@
/* Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \
"cfgaddr=0x106F0000\0" \
"scraddr=0x10700000\0" \

2
include/configs/brsmarc1.h
View File

@ -24,7 +24,7 @@
#define V_SCLK (V_OSCK)
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \
"scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"cfgscr=mw ${dtbaddr} 0;" \

2
include/configs/brxre1.h
View File

@ -20,7 +20,7 @@
#define V_SCLK (V_OSCK)
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BUR_COMMON_ENV \
"scradr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"bootaddr=0x80001100\0" \

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

@ -67,7 +67,7 @@
"emmc_dev=0\0"
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \
M4_BOOT_ENV \
AHAB_ENV \

2
include/configs/cgtqmx8.h
View File

@ -55,7 +55,7 @@
"bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \
M4_BOOT_ENV \
"script=boot.scr\0" \

2
include/configs/chiliboard.h
View File

@ -25,7 +25,7 @@
"nand read ${loadaddr} NAND.kernel; " \
"bootz ${loadaddr} - ${fdt_addr}\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=0x82000000\0" \
"fdt_addr=0x87800000\0" \
"boot_fdt=try\0" \

4
include/configs/cl-som-imx7.h
View File

@ -24,9 +24,9 @@
#define CFG_SYS_I2C_PCA953X_ADDR 0x20
#define CFG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} }
#undef CONFIG_EXTRA_ENV_SETTINGS
#undef CFG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"script=boot.scr\0" \
"loadscript=load ${storagetype} ${storagedev} ${loadaddr} ${script};\0" \
"loadkernel=load ${storagetype} ${storagedev} ${loadaddr} ${kernel};\0" \

2
include/configs/clearfog.h
View File

@ -110,7 +110,7 @@
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
RELOCATION_LIMITS_ENV_SETTINGS \
LOAD_ADDRESS_ENV_SETTINGS \
"console=ttyS0,115200\0" \

2
include/configs/cm_fx6.h
View File

@ -30,7 +30,7 @@
/* Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \
"initrd_high=0xffffffff\0" \
"fdt_addr_r=0x18000000\0" \

2
include/configs/cm_t43.h
View File

@ -41,7 +41,7 @@
#define V_OSCK 24000000 /* Clock output from T2 */
#define V_SCLK (V_OSCK)
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \
"fdtaddr=0x81200000\0" \
"bootm_size=0x8000000\0" \

2
include/configs/colibri-imx6ull.h
View File

@ -79,7 +79,7 @@
#endif
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
UBI_BOOTCMD \

2
include/configs/colibri-imx8x.h
View File

@ -56,7 +56,7 @@
"${fdt_addr};\0" \
/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
AHAB_ENV \
BOOTENV \
CONFIG_MFG_ENV_SETTINGS \

2
include/configs/colibri_imx6.h
View File

@ -56,7 +56,7 @@
"ramdisk_addr_r=0x18400000\0" \
"scriptaddr=0x18280000\0"
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BOOTENV \
"boot_file=zImage\0" \
"boot_script_dhcp=boot.scr\0" \

2
include/configs/colibri_imx7.h
View File

@ -119,7 +119,7 @@
#endif
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
MODULE_EXTRA_ENV_SETTINGS \

2
include/configs/colibri_vf.h
View File

@ -47,7 +47,7 @@
#define DFU_ALT_NAND_INFO "vf-bcb part 0,1;u-boot part 0,2;ubi part 0,4"
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
BOOTENV \
MEM_LAYOUT_ENV_SETTINGS \
UBI_BOOTCMD \

4
include/configs/conga-qeval20-qa3-e3845.h
View File

@ -18,8 +18,8 @@
#define VIDEO_IO_OFFSET 0
#undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
#undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \
"kernel-ver=4.4.0-22\0" \
"boot=zboot 03000000 0 04000000 ${filesize}\0" \
"upd_uboot=tftp 100000 conga/u-boot.rom;" \

2
include/configs/controlcenterdc.h
View File

@ -21,7 +21,7 @@
* Environment Configuration
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"netdev=eth1\0" \
"consoledev=ttyS1\0" \
"u-boot=u-boot.bin\0" \

2
include/configs/crs3xx-98dx3236.h
View File

@ -13,7 +13,7 @@
/* Environment in SPI NOR flash */
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"

2
include/configs/da850evm.h
View File

@ -145,7 +145,7 @@
#include <environment/ti/mmc.h>
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
DEFAULT_MMC_TI_ARGS \
"bootpart=0:2\0" \

2
include/configs/dart_6ul.h
View File

@ -68,7 +68,7 @@
"mmc_mmc_fit=run mmcloadfit;run mmcargs addcon; bootm ${fit_addr}\0" \
/* Default environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdt_high=0xffffffff\0" \
"console=ttymxc0,115200n8\0" \
"addcon=setenv bootargs ${bootargs} console=${console},${baudrate}\0" \

2
include/configs/db-88f6820-amc.h
View File

@ -17,7 +17,7 @@
/* NAND */
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"

2
include/configs/db-88f6820-gp.h
View File

@ -18,7 +18,7 @@
#define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"

2
include/configs/db-xc3-24g4xg.h
View File

@ -11,7 +11,7 @@
/* NAND */
/* Keep device tree and initrd in lower memory so the kernel can access them */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"fdt_high=0x10000000\0" \
"initrd_high=0x10000000\0"

2
include/configs/devkit3250.h
View File

@ -67,7 +67,7 @@
* Environment
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"ethaddr=00:01:90:00:C0:81\0" \
"dtbaddr=0x81000000\0" \
"nfsroot=/opt/projects/images/vladimir/oe/devkit3250/rootfs\0" \

2
include/configs/devkit8000.h
View File

@ -22,7 +22,7 @@
DEFAULT_LINUX_BOOT_ENV
/* Environment information */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
"console=ttyO2,115200n8\0" \
"mmcdev=0\0" \

4
include/configs/dfi-bt700.h
View File

@ -22,8 +22,8 @@
#define VIDEO_IO_OFFSET 0
#undef CONFIG_EXTRA_ENV_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
#undef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \
"kernel-ver=4.4.0-24\0" \
"boot=zboot 03000000 0 04000000 ${filesize}\0" \
"upd_uboot=usb reset;tftp 100000 dfi/u-boot.rom;" \

2
include/configs/dh_imx6.h
View File

@ -41,7 +41,7 @@
#endif
#endif
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"console=ttymxc0,115200\0" \
"fdt_addr=0x18000000\0" \
"fdt_high=0xffffffff\0" \

2
include/configs/display5.h
View File

@ -164,7 +164,7 @@
"sf write ${loadaddr} 0x0 ${filesize};" \
"fi\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
PARTS_DEFAULT \
"gpio_recovery=93\0" \
"check_em_pad=gpio input ${gpio_recovery};test $? -eq 0;\0" \

2
include/configs/dns325.h
View File

@ -28,7 +28,7 @@
* Default environment variables
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"stdin=serial\0" \
"stdout=serial\0" \
"stderr=serial\0" \

2
include/configs/dockstar.h
View File

@ -22,7 +22,7 @@
* Default environment variables
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"kernel=/boot/uImage\0" \
"initrd=/boot/uInitrd\0" \

2
include/configs/draco.h
View File

@ -28,7 +28,7 @@
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hostname=draco\0" \
"ubi_off=2048\0"\
"nand_img_size=0x400000\0" \

2
include/configs/dragonboard410c.h
View File

@ -28,6 +28,6 @@
#include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
#define CFG_EXTRA_ENV_SETTINGS BOOTENV
#endif

2
include/configs/dragonboard820c.h
View File

@ -26,7 +26,7 @@
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0)
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"loadaddr=0x95000000\0" \
"fdt_high=0xffffffffffffffff\0" \
"initrd_high=0xffffffffffffffff\0" \

2
include/configs/dragonboard845c.h
View File

@ -13,7 +13,7 @@
#define CFG_SYS_BAUDRATE_TABLE { 115200, 230400, 460800, 921600 }
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"bootm_size=0x5000000\0" \
"bootm_low=0x80000000\0" \
"bootcmd=bootm $prevbl_initrd_start_addr\0"

2
include/configs/dreamplug.h
View File

@ -17,7 +17,7 @@
* Default environment variables
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"x_bootcmd_ethernet=ping 192.168.2.1\0" \
"x_bootcmd_usb=usb start\0" \
"x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \

2
include/configs/ds109.h
View File

@ -26,7 +26,7 @@
* Default environment variables
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"x_bootcmd_ethernet=ping 192.168.1.2\0" \
"x_bootcmd_usb=usb start\0" \
"x_bootcmd_kernel=fatload usb 0 0x6400000 uImage\0" \

2
include/configs/ds414.h
View File

@ -43,7 +43,7 @@
/* Default Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"initrd_high=0xffffffff\0" \
"ramdisk_addr_r=0x8000000\0" \
"usb0Mode=host\0usb1Mode=host\0usb2Mode=device\0" \

2
include/configs/durian.h
View File

@ -15,7 +15,7 @@
/* BOOT */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"load_kernel=ext4load scsi 0:1 0x90100000 uImage-2004\0" \
"load_fdt=ext4load scsi 0:1 0x95000000 ft2004-pci-64.dtb\0"\
"boot_fdt=bootm 0x90100000 -:- 0x95000000\0" \

2
include/configs/el6x_common.h
View File

@ -23,7 +23,7 @@
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"board=EL6Q\0" \
"cma_size="__stringify(EL6Q_CMA_SIZE)"\0" \
"chp_size="__stringify(EL6Q_COHERENT_POOL_SIZE)"\0" \

2
include/configs/embestmx6boards.h
View File

@ -76,7 +76,7 @@
CONSOLE_STDIN_SETTINGS \
CONSOLE_STDOUT_SETTINGS
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
CONSOLE_ENV_SETTINGS \
MEM_LAYOUT_ENV_SETTINGS \
"fdtfile=" FDTFILE "\0" \

2
include/configs/emsdp.h
View File

@ -15,7 +15,7 @@
* Environment
*/
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"upgrade_image=u-boot.bin\0" \
"upgrade=emsdp rom unlock && " \
"fatload mmc 0 ${loadaddr} ${upgrade_image} && " \

2
include/configs/etamin.h
View File

@ -128,7 +128,7 @@
COMMON_ENV_NAND_CMDS
/* Default env settings */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
"hostname=etamin\0" \
"ubi_off=4096\0"\
"nand_img_size=0x400000\0" \

2
include/configs/evb_ast2500.h
View File

@ -14,7 +14,7 @@
#define CFG_SYS_UBOOT_BASE CONFIG_TEXT_BASE
/* Misc */
#define CONFIG_EXTRA_ENV_SETTINGS \
#define CFG_EXTRA_ENV_SETTINGS \
""
#endif /* __CONFIG_H */

Some files were not shown because too many files have changed in this diff Show More