diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-11 20:12:57 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-11 20:12:57 +0200 |
| commit | be73894bea1c5719eccfad6b8c7e7ae44798a68a (patch) | |
| tree | fa66dc9a9579e373789cf8a7659d53c1a610a660 /ice40 | |
| parent | ac6748238015cca1a107d99bf0f175c45eda7b2f (diff) | |
| download | nextpnr-be73894bea1c5719eccfad6b8c7e7ae44798a68a.tar.gz nextpnr-be73894bea1c5719eccfad6b8c7e7ae44798a68a.tar.bz2 nextpnr-be73894bea1c5719eccfad6b8c7e7ae44798a68a.zip | |
Add "nextpnr.h"
Signed-off-by: Clifford Wolf <clifford@clifford.at>
Diffstat (limited to 'ice40')
| -rw-r--r-- | ice40/bitstream.h | 2 | ||||
| -rw-r--r-- | ice40/chip.cc | 2 | ||||
| -rw-r--r-- | ice40/chip.h | 6 | ||||
| -rw-r--r-- | ice40/chipdb.py | 2 | ||||
| -rw-r--r-- | ice40/main.cc | 2 | ||||
| -rw-r--r-- | ice40/pybindings.cc | 5 |
6 files changed, 9 insertions, 10 deletions
diff --git a/ice40/bitstream.h b/ice40/bitstream.h index 9b08f96e..fecc14e1 100644 --- a/ice40/bitstream.h +++ b/ice40/bitstream.h @@ -21,7 +21,7 @@ #define ICE40_BITSTREAM_H #include <iostream> -#include "chip.h" +#include "nextpnr.h" void write_asc(const Design &design, std::ostream &out); diff --git a/ice40/chip.cc b/ice40/chip.cc index 5f6560c5..42252fa0 100644 --- a/ice40/chip.cc +++ b/ice40/chip.cc @@ -17,8 +17,8 @@ * */ -#include "chip.h" #include "log.h" +#include "nextpnr.h" // ----------------------------------------------------------------------- diff --git a/ice40/chip.h b/ice40/chip.h index 3ab3f3d2..451be9ce 100644 --- a/ice40/chip.h +++ b/ice40/chip.h @@ -17,11 +17,13 @@ * */ -#include "design.h" - #ifndef CHIP_H #define CHIP_H +#ifndef NEXTPNR_H +#error Include "chip.h" via "nextpnr.h" only. +#endif + struct DelayInfo { float delay = 0; diff --git a/ice40/chipdb.py b/ice40/chipdb.py index f57d307c..34366679 100644 --- a/ice40/chipdb.py +++ b/ice40/chipdb.py @@ -311,7 +311,7 @@ elif dev_name == "5k": add_bel_gb( 6, 0, 6) add_bel_gb(19, 0, 7) -print('#include "chip.h"') +print('#include "nextpnr.h"') for bel in range(len(bel_name)): print("static BelWirePOD bel_wires_%d[%d] = {" % (bel, len(bel_wires[bel]))) diff --git a/ice40/main.cc b/ice40/main.cc index e87862be..cceb2b04 100644 --- a/ice40/main.cc +++ b/ice40/main.cc @@ -25,10 +25,10 @@ #include <fstream> #include <iostream> #include "bitstream.h" -#include "design.h" #include "jsonparse.h" #include "log.h" #include "mainwindow.h" +#include "nextpnr.h" #include "place.h" #include "pybindings.h" #include "route.h" diff --git a/ice40/pybindings.cc b/ice40/pybindings.cc index f9385153..c00bf6b9 100644 --- a/ice40/pybindings.cc +++ b/ice40/pybindings.cc @@ -18,11 +18,8 @@ * */ -#include "chip.h" -#include "design.h" - -// include after design.h/chip.h #include "pybindings.h" +#include "nextpnr.h" void arch_wrap_python() { |