Commit 5ac19de9c58792522da1c41504d268ff6db8bc13
1 parent
1ae19858dd
Exists in
smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga
and in
5 other branches
MLK-18906-1 create shared common config file imx_env.h
Move common mfgtools config into this config files. Signed-off-by: Frank Li <Frank.Li@nxp.com>
Showing 4 changed files with 30 additions and 21 deletions Side-by-side Diff
include/configs/imx8mm_evk.h
| ... | ... | @@ -10,6 +10,8 @@ |
| 10 | 10 | #include <linux/sizes.h> |
| 11 | 11 | #include <asm/arch/imx-regs.h> |
| 12 | 12 | |
| 13 | +#include "imx_env.h" | |
| 14 | + | |
| 13 | 15 | #ifdef CONFIG_SECURE_BOOT |
| 14 | 16 | #define CONFIG_CSF_SIZE 0x2000 /* 8K region */ |
| 15 | 17 | #endif |
| 16 | 18 | |
| ... | ... | @@ -100,18 +102,12 @@ |
| 100 | 102 | #endif |
| 101 | 103 | |
| 102 | 104 | #define CONFIG_MFG_ENV_SETTINGS \ |
| 103 | - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ | |
| 104 | - "rdinit=/linuxrc " \ | |
| 105 | - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ | |
| 106 | - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ | |
| 107 | - "g_mass_storage.iSerialNumber=\"\" "\ | |
| 108 | - "clk_ignore_unused "\ | |
| 109 | - "\0" \ | |
| 105 | + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ | |
| 110 | 106 | "initrd_addr=0x43800000\0" \ |
| 111 | 107 | "initrd_high=0xffffffff\0" \ |
| 112 | - "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ | |
| 113 | - "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ | |
| 114 | - "else echo \"Run fastboot ...\"; fastboot 0; fi\0" \ | |
| 108 | + "emmc_dev=1\0"\ | |
| 109 | + "sd_dev=0\0" \ | |
| 110 | + | |
| 115 | 111 | /* Initial environment variables */ |
| 116 | 112 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 117 | 113 | CONFIG_MFG_ENV_SETTINGS \ |
include/configs/imx8qxp_mek.h
| ... | ... | @@ -10,6 +10,8 @@ |
| 10 | 10 | #include <linux/sizes.h> |
| 11 | 11 | #include <asm/arch/imx-regs.h> |
| 12 | 12 | |
| 13 | +#include "imx_env.h" | |
| 14 | + | |
| 13 | 15 | #define CONFIG_REMAKE_ELF |
| 14 | 16 | |
| 15 | 17 | #define CONFIG_BOARD_EARLY_INIT_F |
| 16 | 18 | |
| ... | ... | @@ -103,19 +105,11 @@ |
| 103 | 105 | #endif |
| 104 | 106 | |
| 105 | 107 | #define CONFIG_MFG_ENV_SETTINGS \ |
| 106 | - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ | |
| 107 | - "rdinit=/linuxrc " \ | |
| 108 | - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ | |
| 109 | - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ | |
| 110 | - "g_mass_storage.iSerialNumber=\"\" "\ | |
| 111 | - MFG_NAND_PARTITION \ | |
| 112 | - "clk_ignore_unused "\ | |
| 113 | - "\0" \ | |
| 108 | + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ | |
| 114 | 109 | "initrd_addr=0x83100000\0" \ |
| 115 | 110 | "initrd_high=0xffffffff\0" \ |
| 116 | - "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ | |
| 117 | - "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ | |
| 118 | - "else fastboot 1; fi\0" \ | |
| 111 | + "emmc_dev=0\0" \ | |
| 112 | + "sd_dev=1\0" \ | |
| 119 | 113 | |
| 120 | 114 | #define XEN_BOOT_ENV \ |
| 121 | 115 | "xenhyper_bootargs=console=dtuart dtuart=/serial@5a060000 dom0_mem=1024M dom0_max_vcpus=2 dom0_vcpus_pin=true\0" \ |
include/configs/imx_env.h
| 1 | +/* Copyright 2018 NXP | |
| 2 | + * | |
| 3 | + * SPDX-License-Identifier: GPL-2.0+ | |
| 4 | + */ | |
| 5 | + | |
| 6 | +#ifndef __IMX_COMMON_CONFIG_H | |
| 7 | +#define __IMX_COMMON_CONFIG_H | |
| 8 | + | |
| 9 | +#define CONFIG_MFG_ENV_SETTINGS_DEFAULT \ | |
| 10 | + "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ | |
| 11 | + "rdinit=/linuxrc " \ | |
| 12 | + "clk_ignore_unused "\ | |
| 13 | + "\0" \ | |
| 14 | + "bootcmd_mfg=run mfgtool_args; if iminfo ${initrd_addr}; then "\ | |
| 15 | + "booti ${loadaddr} ${initrd_addr} ${fdt_addr};"\ | |
| 16 | + "else echo \"Run fastboot ...\"; fastboot 0; fi\0" \ | |
| 17 | + | |
| 18 | +#endif |
scripts/config_whitelist.txt