diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-21 14:11:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-21 14:11:11 -0400 |
| commit | 271dc9ce7f9652e2fe3794871900fef292a9777b (patch) | |
| tree | 809041444563947c9df97e6e7149abf79c9431b6 /include/config_distro_bootcmd.h | |
| parent | 226a35ef0ef310d8fffa3e6283ee3aab9dab26aa (diff) | |
| parent | f5128514137633ee951b1c484945bec9092c4e99 (diff) | |
Merge branch '2019-06-21-master-imports'
- Assorted small fixes
- Bugfix RSA handling code to reject images with unknown padding.
- Some boards disabled unused features to turn off DM warnings.
Diffstat (limited to 'include/config_distro_bootcmd.h')
| -rw-r--r-- | include/config_distro_bootcmd.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index 4993303f4d9..26e61ef1969 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -229,10 +229,23 @@ #endif #ifdef CONFIG_IDE -#define BOOTENV_SHARED_IDE BOOTENV_SHARED_BLKDEV(ide) +#define BOOTENV_RUN_IDE_INIT "run ide_init; " +#define BOOTENV_SET_IDE_NEED_INIT "setenv ide_need_init; " +#define BOOTENV_SHARED_IDE \ + "ide_init=" \ + "if ${ide_need_init}; then " \ + "setenv ide_need_init false; " \ + "ide reset; " \ + "fi\0" \ + \ + "ide_boot=" \ + BOOTENV_RUN_IDE_INIT \ + BOOTENV_SHARED_BLKDEV_BODY(ide) #define BOOTENV_DEV_IDE BOOTENV_DEV_BLKDEV #define BOOTENV_DEV_NAME_IDE BOOTENV_DEV_NAME_BLKDEV #else +#define BOOTENV_RUN_IDE_INIT +#define BOOTENV_SET_IDE_NEED_INIT #define BOOTENV_SHARED_IDE #define BOOTENV_DEV_IDE \ BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_IDE @@ -451,6 +464,7 @@ \ "distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT \ BOOTENV_SET_NVME_NEED_INIT \ + BOOTENV_SET_IDE_NEED_INIT \ "for target in ${boot_targets}; do " \ "run bootcmd_${target}; " \ "done\0" |