diff options
| author | David Shah <dave@ds0.me> | 2019-09-19 15:57:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-19 15:57:23 +0100 |
| commit | f8719a5717e19511d57fa880ed7b623719b8af49 (patch) | |
| tree | 81e4e35abbf666a5242af0af440aa9c368d80f44 /ecp5 | |
| parent | c2299c8972e0cd22641d7d3b8e0bf7c19a42c3cb (diff) | |
| parent | 2f9b04fd5642fcb1346b51d3a63367c09fc61486 (diff) | |
| download | nextpnr-f8719a5717e19511d57fa880ed7b623719b8af49.tar.gz nextpnr-f8719a5717e19511d57fa880ed7b623719b8af49.tar.bz2 nextpnr-f8719a5717e19511d57fa880ed7b623719b8af49.zip | |
Merge pull request #330 from zeldin/bba
bba: Default to native endian in bbasm
Diffstat (limited to 'ecp5')
| -rw-r--r-- | ecp5/family.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ecp5/family.cmake b/ecp5/family.cmake index ec857569..a1043762 100644 --- a/ecp5/family.cmake +++ b/ecp5/family.cmake @@ -22,7 +22,8 @@ if (NOT EXTERNAL_CHIPDB) set(DB_PY ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/trellis_import.py) file(MAKE_DIRECTORY ecp5/chipdbs/) - add_library(ecp5_chipdb OBJECT ecp5/chipdbs/) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/) + add_library(ecp5_chipdb OBJECT ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/) target_compile_definitions(ecp5_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) target_include_directories(ecp5_chipdb PRIVATE ${family}/) @@ -37,7 +38,7 @@ if (NOT EXTERNAL_CHIPDB) set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/ecp5/resources/chipdb.rc PROPERTIES LANGUAGE RC) set(PREV_DEV_CC_BBA_DB) foreach (dev ${devices}) - set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bin) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/chipdb-${dev}.bin) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bba) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/constids.inc) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} @@ -45,7 +46,7 @@ if (NOT EXTERNAL_CHIPDB) DEPENDS ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm ${DEV_CC_BBA_DB} ${DEV_CC_DB} + COMMAND bbasm ${BBASM_ENDIAN_FLAG} ${DEV_CC_BBA_DB} ${DEV_CC_DB} DEPENDS bbasm ${DEV_CC_BBA_DB} ) if (SERIALIZE_CHIPDB) @@ -61,7 +62,7 @@ if (NOT EXTERNAL_CHIPDB) target_compile_options(ecp5_chipdb PRIVATE -g0 -O0 -w) set(PREV_DEV_CC_BBA_DB) foreach (dev ${devices}) - set(DEV_CC_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.cc) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ecp5/chipdbs/chipdb-${dev}.cc) set(DEV_CC_BBA_DB ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/chipdbs/chipdb-${dev}.bba) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ecp5/constids.inc) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} @@ -70,7 +71,7 @@ if (NOT EXTERNAL_CHIPDB) DEPENDS ${DB_PY} ${PREV_DEV_CC_BBA_DB} ) add_custom_command(OUTPUT ${DEV_CC_DB} - COMMAND bbasm --c ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new + 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} ) |