diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-12-01 00:42:53 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2019-12-01 00:44:07 +0100 |
| commit | 0392cd3a5b2a00a13dc3f48ea74f4f28613ee6ab (patch) | |
| tree | fb495c1109d34f1d6615618b8195d0b0a8035ff6 /ice40 | |
| parent | 1c1c096861d553f1fc71d7db3652af25b980b219 (diff) | |
| download | nextpnr-0392cd3a5b2a00a13dc3f48ea74f4f28613ee6ab.tar.gz nextpnr-0392cd3a5b2a00a13dc3f48ea74f4f28613ee6ab.tar.bz2 nextpnr-0392cd3a5b2a00a13dc3f48ea74f4f28613ee6ab.zip | |
Add bba #embed support
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/family.cmake | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/ice40/family.cmake b/ice40/family.cmake index e31fce2d..2859f456 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -84,6 +84,7 @@ if (NOT EXTERNAL_CHIPDB) set(DEV_TXT_DB ${ICEBOX_ROOT}/chipdb-${dev}.txt) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bba) set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.cc) + set(DEV_BIN_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.bin) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) if(PREGENERATED_BBA_PATH) @@ -97,11 +98,19 @@ if (NOT EXTERNAL_CHIPDB) COMMAND mv ${DEV_CC_BBA_DB}.new ${DEV_CC_BBA_DB} DEPENDS ${DEV_CONSTIDS_INC} ${DEV_GFXH} ${DEV_TXT_DB} ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) - add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm --c ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new - COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB} - DEPENDS bbasm ${DEV_CC_BBA_DB} - ) + if(USE_C_EMBED) + add_custom_command(OUTPUT ${DEV_CC_DB} + COMMAND bbasm --e ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new ${DEV_BIN_DB} + COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB} + DEPENDS bbasm ${DEV_CC_BBA_DB} + ) + else() + add_custom_command(OUTPUT ${DEV_CC_DB} + COMMAND bbasm --c ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new + COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB} + DEPENDS bbasm ${DEV_CC_BBA_DB} + ) + endif() endif() if (SERIALIZE_CHIPDB) set(PREV_DEV_CC_BBA_DB ${DEV_CC_BBA_DB}) |