Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CPLD tool: Rename to cpld_bitstream.py

Browse Source
This commit is contained in:
Jared Boone
2019-02-28 22:00:46 -08:00
parent 75adda314e
commit 057b9273d5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/CMakeLists.txt
View File

@ -31,7 +31,7 @@ SET(PATH_HACKRF ${PATH_HACKRF_FIRMWARE}/..)
SET(PATH_HACKRF_FIRMWARE_COMMON ${PATH_HACKRF_FIRMWARE}/common) SET(PATH_HACKRF_FIRMWARE_COMMON ${PATH_HACKRF_FIRMWARE}/common)
SET(LIBOPENCM3 ${PATH_HACKRF_FIRMWARE}/libopencm3) SET(LIBOPENCM3 ${PATH_HACKRF_FIRMWARE}/libopencm3)
SET(PATH_DFU_PY ${PATH_HACKRF_FIRMWARE}/dfu.py) SET(PATH_DFU_PY ${PATH_HACKRF_FIRMWARE}/dfu.py)
SET(PATH_XSVF_TOOL ${PATH_HACKRF_FIRMWARE}/tools/cpld_crc.py) SET(PATH_CPLD_BITSTREAM_TOOL ${PATH_HACKRF_FIRMWARE}/tools/cpld_bitstream.py)
set(PATH_HACKRF_CPLD_DATA_C ${CMAKE_CURRENT_BINARY_DIR}/hackrf_cpld_data.c) set(PATH_HACKRF_CPLD_DATA_C ${CMAKE_CURRENT_BINARY_DIR}/hackrf_cpld_data.c)
include(ExternalProject) include(ExternalProject)

4
firmware/hackrf_usb/CMakeLists.txt
View File

@ -27,8 +27,8 @@ include(../hackrf-common.cmake)
add_custom_command( add_custom_command(
OUTPUT ${PATH_HACKRF_CPLD_DATA_C} OUTPUT ${PATH_HACKRF_CPLD_DATA_C}
COMMAND ${PATH_XSVF_TOOL} --code ${PATH_HACKRF_CPLD_XSVF} >${PATH_HACKRF_CPLD_DATA_C} COMMAND ${PATH_CPLD_BITSTREAM_TOOL} --code ${PATH_HACKRF_CPLD_XSVF} >${PATH_HACKRF_CPLD_DATA_C}
DEPENDS ${PATH_XSVF_TOOL} ${PATH_HACKRF_CPLD_XSVF} DEPENDS ${PATH_CPLD_BITSTREAM_TOOL} ${PATH_HACKRF_CPLD_XSVF}
) )
set(SRC_M4 set(SRC_M4

4
firmware/tools/cpld_crc.py → firmware/tools/cpld_bitstream.py
View File

@ -196,8 +196,8 @@ if args.checksum:
crc = DumbCRC32() crc = DumbCRC32()
verify_block = verify_blocks[1] verify_block = verify_blocks[1]
for address, data, mask in verify_block: for row in verify_block:
valid_data = data & mask valid_data = row['data'] & row['mask']
bytes = valid_data.to_bytes(bytes_of_data, byteorder='little') bytes = valid_data.to_bytes(bytes_of_data, byteorder='little')
crc.update(bytes) crc.update(bytes)