diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-16 18:10:31 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-16 18:10:31 -0400 |
| commit | c83b1bb923421e95e499b22b010d2f9f463c1226 (patch) | |
| tree | 48860f46e83dc30d9a77fac61c979fb3625588d7 /Makefile | |
| parent | d2a93a88631929169d3ef1c537430330404f96f7 (diff) | |
| parent | d11ef4d54cab0e740efbceb9c6b5697a41770eea (diff) | |
| download | u-boot-c83b1bb923421e95e499b22b010d2f9f463c1226.zip u-boot-c83b1bb923421e95e499b22b010d2f9f463c1226.tar.gz u-boot-c83b1bb923421e95e499b22b010d2f9f463c1226.tar.bz2 | |
Merge tag 'dm-pull-15oct19' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
binman enhancements:
- Dropping some test Elf files and building them from source instead
- Refactoring of x86 16-bit entries
- Support for SPL symbols within sections
- Handle the 'notes' sections and hidden symbols in recent binutils
- Improved error reporting with a tool fails
libfdt and documentation fixes
vboot required-key test
driver model power-domain controls
patman Message-Id enhancement
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1458,14 +1458,18 @@ quiet_cmd_ldr = LD $@ cmd_ldr = $(LD) $(LDFLAGS_$(@F)) \ $(filter-out FORCE,$^) -o $@ -u-boot.rom: u-boot-x86-16bit.bin u-boot.bin \ +u-boot.rom: u-boot-x86-start16.bin u-boot-x86-reset16.bin u-boot.bin \ $(if $(CONFIG_SPL_X86_16BIT_INIT),spl/u-boot-spl.bin) \ $(if $(CONFIG_TPL_X86_16BIT_INIT),tpl/u-boot-tpl.bin) \ $(if $(CONFIG_HAVE_REFCODE),refcode.bin) FORCE $(call if_changed,binman) -OBJCOPYFLAGS_u-boot-x86-16bit.bin := -O binary -j .start16 -j .resetvec -u-boot-x86-16bit.bin: u-boot FORCE +OBJCOPYFLAGS_u-boot-x86-start16.bin := -O binary -j .start16 +u-boot-x86-start16.bin: u-boot FORCE + $(call if_changed,objcopy) + +OBJCOPYFLAGS_u-boot-x86-reset16.bin := -O binary -j .resetvec +u-boot-x86-reset16.bin: u-boot FORCE $(call if_changed,objcopy) endif |