diff options
| author | Tom Rini <[email protected]> | 2022-03-31 08:28:43 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-03-31 08:28:43 -0400 |
| commit | 64b78f5721e65e96ea5a3d100d46b2e6fda722df (patch) | |
| tree | 37fd38e4ec59c6abcf1cc9c23c5bef1c09393dd4 /Makefile | |
| parent | 0c60b657d8455784a58bfe08acff66a43dfccaad (diff) | |
| parent | 52ae8d6cc8b2f4ec53228e1d9216b5d9071cb325 (diff) | |
Merge branch '2022-03-31-critical-fixes'
- Fixes for 2 gateworks platforms, Edison platform, incorrectly showing
2 logos on LCD screens, not cleaning a generated environment file and
correct the CONFIG_SYS_IMMR Kconfig migration on a number of MPC85xx
platforms.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -2187,8 +2187,8 @@ CLEAN_DIRS += $(MODVERDIR) \ $(filter-out include, $(shell ls -1 $d 2>/dev/null)))) CLEAN_FILES += include/bmp_logo.h include/bmp_logo_data.h \ - drivers/video/u_boot_logo.S tools/version.h \ - u-boot* MLO* SPL System.map fit-dtb.blob* \ + include/generated/env.in drivers/video/u_boot_logo.S \ + tools/version.h u-boot* MLO* SPL System.map fit-dtb.blob* \ u-boot-ivt.img.log u-boot-dtb.imx.log SPL.log u-boot.imx.log \ lpc32xx-* bl31.c bl31.elf bl31_*.bin image.map tispl.bin* \ idbloader.img flash.bin flash.log defconfig keep-syms-lto.c \ |