diff options
author | Tom Rini <trini@konsulko.com> | 2021-10-25 12:09:57 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-10-25 12:09:57 -0400 |
commit | 397b35f09794e40d62d5e4f53992e2a711dc8be1 (patch) | |
tree | 0696b5205c1151a600643238cb9da1f93dd15806 /tools | |
parent | 35a7677e382172e5024b38ff997944ca83909384 (diff) | |
parent | c846fe43f0561311eb7261b34023a04646cdbd0d (diff) | |
download | u-boot-397b35f09794e40d62d5e4f53992e2a711dc8be1.zip u-boot-397b35f09794e40d62d5e4f53992e2a711dc8be1.tar.gz u-boot-397b35f09794e40d62d5e4f53992e2a711dc8be1.tar.bz2 |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxiWIP/25Oct2021
- Add and enable watchdog driver
- Prepare for SYSRESET driven AXP poweroff
- Prepare for SoCs without MMC2
- Some fixes for extending SPL (SPL-DM for RISC-V)
- Some preparations for proper VBUS management
- Fix secure monitor move
Diffstat (limited to 'tools')
-rw-r--r-- | tools/mksunxiboot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/mksunxiboot.c b/tools/mksunxiboot.c index a18c9d9..becc365 100644 --- a/tools/mksunxiboot.c +++ b/tools/mksunxiboot.c @@ -12,10 +12,10 @@ #include <stdlib.h> #include <string.h> #include <errno.h> +#include <sunxi_image.h> #include <sys/types.h> #include <sys/stat.h> #include "imagetool.h" -#include "../arch/arm/include/asm/arch-sunxi/spl.h" #define STAMP_VALUE 0x5F0A6C39 |