diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-25 23:12:43 -0400 |
| commit | 7a1a01c6029039e4fa6aa185cdbbf9a357eecba7 (patch) | |
| tree | f145f655379b2298dc58ef11aa03742c159e7f56 /arch/arm/include/asm/mach-imx/boot_mode.h | |
| parent | 9f9ecd3e4d7839e24c182fb7b24937e19b670f1b (diff) | |
| parent | acbc1d86f16cc8372cccb7b862a0b9dc242f8fe5 (diff) | |
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- mx6: SOCs user selectable
Fix for imx6q_logic
Some DM conversion
- mx7: introduce secondary boot device
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/720918010
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/include/asm/mach-imx/boot_mode.h')
| -rw-r--r-- | arch/arm/include/asm/mach-imx/boot_mode.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/mach-imx/boot_mode.h b/arch/arm/include/asm/mach-imx/boot_mode.h index 3a483b6afa..6dc5855968 100644 --- a/arch/arm/include/asm/mach-imx/boot_mode.h +++ b/arch/arm/include/asm/mach-imx/boot_mode.h @@ -7,6 +7,8 @@ #define _ASM_BOOT_MODE_H #define MAKE_CFGVAL(cfg1, cfg2, cfg3, cfg4) \ ((cfg4) << 24) | ((cfg3) << 16) | ((cfg2) << 8) | (cfg1) +#define MAKE_CFGVAL_PRIMARY_BOOT 0xfffffff0 +#define MAKE_CFGVAL_SECONDARY_BOOT 0xffffffff enum boot_device { WEIM_NOR_BOOT, |