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 /ice40 | |
| 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 'ice40')
| -rw-r--r-- | ice40/family.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ice40/family.cmake b/ice40/family.cmake index 6c46f459..8b2c4385 100644 --- a/ice40/family.cmake +++ b/ice40/family.cmake @@ -12,7 +12,8 @@ if (NOT EXTERNAL_CHIPDB) set(ICEBOX_ROOT "/usr/local/share/icebox" CACHE STRING "icebox location root") file(MAKE_DIRECTORY ice40/chipdbs/) - add_library(ice40_chipdb OBJECT ice40/chipdbs/) + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/) + add_library(ice40_chipdb OBJECT ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/) target_compile_definitions(ice40_chipdb PRIVATE NEXTPNR_NAMESPACE=nextpnr_${family}) target_include_directories(ice40_chipdb PRIVATE ${family}/) @@ -36,7 +37,7 @@ if (NOT EXTERNAL_CHIPDB) endif() 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_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.bin) + set(DEV_CC_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) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} @@ -44,7 +45,7 @@ if (NOT EXTERNAL_CHIPDB) 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 ${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) @@ -75,7 +76,7 @@ if (NOT EXTERNAL_CHIPDB) endif() 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_SOURCE_DIR}/ice40/chipdbs/chipdb-${dev}.cc) + set(DEV_CC_DB ${CMAKE_CURRENT_BINARY_DIR}/ice40/chipdbs/chipdb-${dev}.cc) set(DEV_CONSTIDS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/constids.inc) set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h) add_custom_command(OUTPUT ${DEV_CC_BBA_DB} @@ -84,7 +85,7 @@ if (NOT EXTERNAL_CHIPDB) 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 ${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} ) |