diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:38:50 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-08-18 14:38:50 -0700 |
| commit | 42547a0be8e52758d340fd1eba51a2dd5274a652 (patch) | |
| tree | 5233f8799ff73adab77e17840c7604fb3a1aced7 /firmware/microblaze/Makefile.common | |
| parent | 00ee9dddb649881c715012c48eed13d001ad5318 (diff) | |
| download | uhd-42547a0be8e52758d340fd1eba51a2dd5274a652.tar.gz uhd-42547a0be8e52758d340fd1eba51a2dd5274a652.tar.bz2 uhd-42547a0be8e52758d340fd1eba51a2dd5274a652.zip | |
Moved UDP firmware update stuff out of fw_common.h into udp_fw_update.h.
This stuff should only go back into fw_common.h if we decide to integrate firmware update into
the UHD code. Right now it's a separate Python script.
Also moved udp_fw_update.h to lib/ because it's the same between USRP2 and USRP2P.
Diffstat (limited to 'firmware/microblaze/Makefile.common')
| -rw-r--r-- | firmware/microblaze/Makefile.common | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/firmware/microblaze/Makefile.common b/firmware/microblaze/Makefile.common index ceb6a553a..4e726edab 100644 --- a/firmware/microblaze/Makefile.common +++ b/firmware/microblaze/Makefile.common @@ -59,8 +59,13 @@ COMMON_LFLAGS = \ ######################################################################## # Common stuff for building top level microblaze images ######################################################################## +#we use COMMON_IHX_ARGS to relocate the reset and interrupt vectors to +#just below the start of code. upon creating the BIN, any leading padding +#is thrown out, so the .bin file is valid for uploading to USRP2P. this +#does not affect USRP2 because the USRP2 already starts at 0x0000, and +#because the relocate_args are not defined for USRP2's Makefile.am. .elf.bin: - $(MB_OBJCOPY) -O binary $< $@ + $(MB_OBJCOPY) -O binary $(RELOCATE_ARGS) $< $@ .elf.dump: $(MB_OBJDUMP) -DSC $< > $@ @@ -69,7 +74,7 @@ COMMON_LFLAGS = \ $(HEXDUMP) -v -e'1/1 "%.2X\n"' $< > $@ .elf.ihx: - $(MB_OBJCOPY) -O ihex $(COMMON_IHX_ARGS) $< $@ + $(MB_OBJCOPY) -O ihex $(RELOCATE_ARGS) $< $@ _generated_from_elf = \ $(noinst_PROGRAMS:.elf=.map) \ |