diff options
| -rw-r--r-- | include/configs/imx8mm_evk.h | 16 | ||||
| -rw-r--r-- | include/configs/imx8qxp_mek.h | 16 | ||||
| -rw-r--r-- | include/configs/imx_env.h | 18 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
4 files changed, 30 insertions, 21 deletions
diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h index 64677671c0..cbcfc1c246 100644 --- a/include/configs/imx8mm_evk.h +++ b/include/configs/imx8mm_evk.h @@ -10,6 +10,8 @@ #include <linux/sizes.h> #include <asm/arch/imx-regs.h> +#include "imx_env.h" + #ifdef CONFIG_SECURE_BOOT #define CONFIG_CSF_SIZE 0x2000 /* 8K region */ #endif @@ -100,18 +102,12 @@ #endif #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - "clk_ignore_unused "\ - "\0" \ + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffff\0" \ - "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ - "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ - "else echo \"Run fastboot ...\"; fastboot 0; fi\0" \ + "emmc_dev=1\0"\ + "sd_dev=0\0" \ + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index bfd6a42d27..5b86a3192b 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -10,6 +10,8 @@ #include <linux/sizes.h> #include <asm/arch/imx-regs.h> +#include "imx_env.h" + #define CONFIG_REMAKE_ELF #define CONFIG_BOARD_EARLY_INIT_F @@ -103,19 +105,11 @@ #endif #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - MFG_NAND_PARTITION \ - "clk_ignore_unused "\ - "\0" \ + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83100000\0" \ "initrd_high=0xffffffff\0" \ - "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ - "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ - "else fastboot 1; fi\0" \ + "emmc_dev=0\0" \ + "sd_dev=1\0" \ #define XEN_BOOT_ENV \ "xenhyper_bootargs=console=dtuart dtuart=/serial@5a060000 dom0_mem=1024M dom0_max_vcpus=2 dom0_vcpus_pin=true\0" \ diff --git a/include/configs/imx_env.h b/include/configs/imx_env.h new file mode 100644 index 0000000000..f0f5e8fa3f --- /dev/null +++ b/include/configs/imx_env.h @@ -0,0 +1,18 @@ +/* Copyright 2018 NXP + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __IMX_COMMON_CONFIG_H +#define __IMX_COMMON_CONFIG_H + +#define CONFIG_MFG_ENV_SETTINGS_DEFAULT \ + "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ + "rdinit=/linuxrc " \ + "clk_ignore_unused "\ + "\0" \ + "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ + "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ + "else echo \"Run fastboot ...\"; fastboot 0; fi\0" \ + +#endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5acb18885a..625936751b 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1285,6 +1285,7 @@ CONFIG_MENUKEY CONFIG_MENUPROMPT CONFIG_MENU_SHOW CONFIG_MFG_ENV_SETTINGS +CONFIG_MFG_ENV_SETTINGS_DEFAULT CONFIG_MII CONFIG_MIIM_ADDRESS CONFIG_MII_DEFAULT_TSEC |