diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-10 12:23:08 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-10 12:23:08 -0800 |
| commit | 2106c6cf594866061f56b09d1396bb80df51802e (patch) | |
| tree | 65c94c63d5737d88653d87e7285627650318b55a /firmware/zpu/usrp2p/bootloader | |
| parent | 916223ef3544452bee57b08f9593aa9da66212a5 (diff) | |
| download | uhd-2106c6cf594866061f56b09d1396bb80df51802e.tar.gz uhd-2106c6cf594866061f56b09d1396bb80df51802e.tar.bz2 uhd-2106c6cf594866061f56b09d1396bb80df51802e.zip | |
usrp2: firmware pad bins to zero to deal with optimizing out the static vars that init to zero
removed the spi flash init in favor of an initialization constant at zero
tweaked the cmakelists flags list
added pad option to the gen binaries macro
Diffstat (limited to 'firmware/zpu/usrp2p/bootloader')
| -rw-r--r-- | firmware/zpu/usrp2p/bootloader/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | firmware/zpu/usrp2p/bootloader/init_bootloader.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/firmware/zpu/usrp2p/bootloader/CMakeLists.txt b/firmware/zpu/usrp2p/bootloader/CMakeLists.txt index 41c86cc9a..26836726d 100644 --- a/firmware/zpu/usrp2p/bootloader/CMakeLists.txt +++ b/firmware/zpu/usrp2p/bootloader/CMakeLists.txt @@ -24,7 +24,7 @@ MACRO(GEN_RMI target) ADD_CUSTOM_COMMAND( OUTPUT ${name}.rmi DEPENDS ${name}.bin COMMAND ${PYTHON_EXECUTABLE} - ARGS ${CMAKE_SOURCE_DIR}/bin/bin_to_ram_macro_init.py ${name}.bin ${name}.rmi + ${CMAKE_SOURCE_DIR}/bin/bin_to_ram_macro_init.py ${name}.bin ${name}.rmi ) #add a top level target for output files ADD_CUSTOM_TARGET( @@ -35,5 +35,5 @@ ENDMACRO(GEN_RMI) ######################################################################## ADD_EXECUTABLE(init_bootloader.elf init_bootloader.c) TARGET_LINK_LIBRARIES(init_bootloader.elf libusrp2pfw) -GEN_OUTPUTS(init_bootloader.elf) +GEN_OUTPUTS(init_bootloader.elf 0x1fff) GEN_RMI(init_bootloader.bin) diff --git a/firmware/zpu/usrp2p/bootloader/init_bootloader.c b/firmware/zpu/usrp2p/bootloader/init_bootloader.c index f71b0a7b2..e960fe474 100644 --- a/firmware/zpu/usrp2p/bootloader/init_bootloader.c +++ b/firmware/zpu/usrp2p/bootloader/init_bootloader.c @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) { output_regs->leds = 0x00; hal_uart_init(); spif_init(); - spi_flash_init(); i2c_init(); //for EEPROM puts("USRP2+ bootloader super ultra ZPU edition\n"); |