configs: Resync with savedefconfig
Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
		
							parent
							
								
									10431c4eaa
								
							
						
					
					
						commit
						d6b241bcd7
					
				| 
						 | 
					@ -13,9 +13,9 @@ CONFIG_FIT=y
 | 
				
			||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,IMX_NAND"
 | 
					CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,IMX_NAND"
 | 
				
			||||||
CONFIG_BOOTDELAY=1
 | 
					CONFIG_BOOTDELAY=1
 | 
				
			||||||
# CONFIG_USE_BOOTCOMMAND is not set
 | 
					# CONFIG_USE_BOOTCOMMAND is not set
 | 
				
			||||||
# CONFIG_CONSOLE_MUX is not set
 | 
					 | 
				
			||||||
CONFIG_USE_PREBOOT=y
 | 
					CONFIG_USE_PREBOOT=y
 | 
				
			||||||
CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
 | 
					CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
 | 
				
			||||||
 | 
					# CONFIG_CONSOLE_MUX is not set
 | 
				
			||||||
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 | 
					CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 | 
				
			||||||
CONFIG_VERSION_VARIABLE=y
 | 
					CONFIG_VERSION_VARIABLE=y
 | 
				
			||||||
# CONFIG_DISPLAY_BOARDINFO is not set
 | 
					# CONFIG_DISPLAY_BOARDINFO is not set
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,10 +12,10 @@ CONFIG_IMX_HAB=y
 | 
				
			||||||
CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
 | 
					CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
 | 
				
			||||||
CONFIG_DISTRO_DEFAULTS=y
 | 
					CONFIG_DISTRO_DEFAULTS=y
 | 
				
			||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 | 
					CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 | 
				
			||||||
CONFIG_USE_PREBOOT=y
 | 
					 | 
				
			||||||
CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb "
 | 
					 | 
				
			||||||
CONFIG_BOOTDELAY=1
 | 
					CONFIG_BOOTDELAY=1
 | 
				
			||||||
# CONFIG_USE_BOOTCOMMAND is not set
 | 
					# CONFIG_USE_BOOTCOMMAND is not set
 | 
				
			||||||
 | 
					CONFIG_USE_PREBOOT=y
 | 
				
			||||||
 | 
					CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb "
 | 
				
			||||||
# CONFIG_CONSOLE_MUX is not set
 | 
					# CONFIG_CONSOLE_MUX is not set
 | 
				
			||||||
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 | 
					CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 | 
				
			||||||
CONFIG_BOARD_LATE_INIT=y
 | 
					CONFIG_BOARD_LATE_INIT=y
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,10 +14,10 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc"
 | 
				
			||||||
CONFIG_DISTRO_DEFAULTS=y
 | 
					CONFIG_DISTRO_DEFAULTS=y
 | 
				
			||||||
CONFIG_FIT=y
 | 
					CONFIG_FIT=y
 | 
				
			||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 | 
					CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
 | 
				
			||||||
CONFIG_USE_PREBOOT=y
 | 
					 | 
				
			||||||
CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb"
 | 
					 | 
				
			||||||
CONFIG_BOOTDELAY=1
 | 
					CONFIG_BOOTDELAY=1
 | 
				
			||||||
# CONFIG_USE_BOOTCOMMAND is not set
 | 
					# CONFIG_USE_BOOTCOMMAND is not set
 | 
				
			||||||
 | 
					CONFIG_USE_PREBOOT=y
 | 
				
			||||||
 | 
					CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb"
 | 
				
			||||||
# CONFIG_CONSOLE_MUX is not set
 | 
					# CONFIG_CONSOLE_MUX is not set
 | 
				
			||||||
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 | 
					CONFIG_SYS_CONSOLE_IS_IN_ENV=y
 | 
				
			||||||
CONFIG_BOARD_LATE_INIT=y
 | 
					CONFIG_BOARD_LATE_INIT=y
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -11,9 +11,9 @@ CONFIG_TARGET_COLIBRI_VF=y
 | 
				
			||||||
CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 | 
					CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
 | 
				
			||||||
CONFIG_ENV_VARS_UBOOT_CONFIG=y
 | 
					CONFIG_ENV_VARS_UBOOT_CONFIG=y
 | 
				
			||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND"
 | 
					CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,IMX_NAND"
 | 
				
			||||||
 | 
					CONFIG_BOOTDELAY=1
 | 
				
			||||||
CONFIG_USE_PREBOOT=y
 | 
					CONFIG_USE_PREBOOT=y
 | 
				
			||||||
CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
 | 
					CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb"
 | 
				
			||||||
CONFIG_BOOTDELAY=1
 | 
					 | 
				
			||||||
CONFIG_LOGLEVEL=3
 | 
					CONFIG_LOGLEVEL=3
 | 
				
			||||||
CONFIG_VERSION_VARIABLE=y
 | 
					CONFIG_VERSION_VARIABLE=y
 | 
				
			||||||
# CONFIG_DISPLAY_BOARDINFO is not set
 | 
					# CONFIG_DISPLAY_BOARDINFO is not set
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue