aboutsummaryrefslogtreecommitdiffstats
path: root/ice40/family.cmake
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2018-07-24 21:10:42 +0200
committerClifford Wolf <clifford@clifford.at>2018-07-24 21:10:42 +0200
commitc3859072d4e621186e7b4ded3d2311ce0e8d31ba (patch)
tree118c1fe5df54a31cf516a3ca4fe72aa6e5940095 /ice40/family.cmake
parent1b7b4ece06645c5d98b009b9a53e368817163c4b (diff)
downloadnextpnr-c3859072d4e621186e7b4ded3d2311ce0e8d31ba.tar.gz
nextpnr-c3859072d4e621186e7b4ded3d2311ce0e8d31ba.tar.bz2
nextpnr-c3859072d4e621186e7b4ded3d2311ce0e8d31ba.zip
Use bbasm to create iCE40 chipdb
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40/family.cmake')
-rw-r--r--ice40/family.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/ice40/family.cmake b/ice40/family.cmake
index 95cdf331..374c62eb 100644
--- a/ice40/family.cmake
+++ b/ice40/family.cmake
@@ -24,11 +24,11 @@ if (MSVC)
set(DEV_PORTS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/portpins.inc)
set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h)
add_custom_command(OUTPUT ${DEV_CC_BBA_DB}
- COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -b -p ${DEV_PORTS_INC} -g ${DEV_GFXH} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB}
+ COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -p ${DEV_PORTS_INC} -g ${DEV_GFXH} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB}
DEPENDS ${DEV_TXT_DB} ${DB_PY}
)
add_custom_command(OUTPUT ${DEV_CC_DB}
- COMMAND bbasm < ${DEV_CC_BBA_DB} > ${DEV_CC_DB}
+ COMMAND bbasm ${DEV_CC_BBA_DB} ${DEV_CC_DB}
DEPENDS bbasm ${DEV_CC_BBA_DB}
)
target_sources(ice40_chipdb PRIVATE ${DEV_CC_DB})
@@ -46,12 +46,12 @@ else()
set(DEV_PORTS_INC ${CMAKE_CURRENT_SOURCE_DIR}/ice40/portpins.inc)
set(DEV_GFXH ${CMAKE_CURRENT_SOURCE_DIR}/ice40/gfx.h)
add_custom_command(OUTPUT ${DEV_CC_BBA_DB}
- COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -c -p ${DEV_PORTS_INC} -g ${DEV_GFXH} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB}.new
+ COMMAND ${PYTHON_EXECUTABLE} ${DB_PY} -p ${DEV_PORTS_INC} -g ${DEV_GFXH} ${DEV_TXT_DB} > ${DEV_CC_BBA_DB}.new
COMMAND mv ${DEV_CC_BBA_DB}.new ${DEV_CC_BBA_DB}
DEPENDS ${DEV_TXT_DB} ${DB_PY}
)
add_custom_command(OUTPUT ${DEV_CC_DB}
- COMMAND bbasm < ${DEV_CC_BBA_DB} > ${DEV_CC_DB}.new
+ COMMAND bbasm -c ${DEV_CC_BBA_DB} ${DEV_CC_DB}.new
COMMAND mv ${DEV_CC_DB}.new ${DEV_CC_DB}
DEPENDS bbasm ${DEV_CC_BBA_DB}
)