Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename logical library 'iCE40UP' to 'iCE40' #67

Merged
merged 3 commits into from
Jun 11, 2021
Merged

rename logical library 'iCE40UP' to 'iCE40' #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67ef2f9
[gitignore] ignore generated SVG files in docs/figures
umarcor Jun 10, 2021
c7dbf48
[gitignore] update path to examples
umarcor Jun 10, 2021
c6796bd
rename logical library 'iCE40UP' to 'iCE40'
umarcor Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ sw/image_gen/image_gen.exe
/docs/doxygen_build/
/docs/.asciidoctor/
/docs/public/
/docs/figures/diag-*.svg

# compiled ghdl stuff
*.cf
*.o

# example bitstreams
/examples/*.bit
/setups/examples/*.bit
4 changes: 2 additions & 2 deletions setups/examples/neorv32_Fomu_BoardTop_Minimal.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives and macros
library iCE40;
use iCE40.components.all; -- for device primitives and macros

entity neorv32_Fomu_BoardTop_Minimal is
port (
Expand Down
4 changes: 2 additions & 2 deletions setups/examples/neorv32_Fomu_BoardTop_MinimalBoot.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives and macros
library iCE40;
use iCE40.components.all; -- for device primitives and macros

entity neorv32_Fomu_BoardTop_MinimalBoot is
port (
Expand Down
4 changes: 2 additions & 2 deletions setups/examples/neorv32_Fomu_BoardTop_UP5KDemo.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives and macros
library iCE40;
use iCE40.components.all; -- for device primitives and macros

entity neorv32_Fomu_BoardTop_UP5KDemo is
port (
Expand Down
4 changes: 2 additions & 2 deletions setups/examples/neorv32_UPduino_v3_BoardTop_MinimalBoot.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives and macros
library iCE40;
use iCE40.components.all; -- for device primitives and macros

entity neorv32_UPduino_v3_BoardTop_MinimalBoot is
port (
Expand Down
4 changes: 2 additions & 2 deletions setups/examples/neorv32_UPduino_v3_BoardTop_UP5KDemo.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ library ieee;
use ieee.std_logic_1164.all;
use ieee.numeric_std.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives and macros
library iCE40;
use iCE40.components.all; -- for device primitives and macros

entity neorv32_UPduino_v3_BoardTop_UP5KDemo is
port (
Expand Down
6 changes: 3 additions & 3 deletions setups/osflow/devices/ice40/neorv32_dmem.ice40up_spram.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all;
library iCE40;
use iCE40.components.all;

entity neorv32_dmem is
generic (
Expand Down Expand Up @@ -96,7 +96,7 @@ begin
-- Sanity Checks --------------------------------------------------------------------------
-- -------------------------------------------------------------------------------------------
assert not (DMEM_SIZE > 64*1024) report "DMEM has a fixed physical size of 64kB. Logical size must be less or equal." severity error;


-- Access Control -------------------------------------------------------------------------
-- -------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions setups/osflow/devices/ice40/neorv32_imem.ice40up_spram.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all;
library iCE40;
use iCE40.components.all;

entity neorv32_imem is
generic (
Expand Down
6 changes: 3 additions & 3 deletions setups/osflow/synthesis.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ice40up-obj08.cf: ${ICE40_SRC}
ghdl -a $(GHDL_FLAGS) --work=iCE40UP ${ICE40_SRC}
ice40-obj08.cf: ${ICE40_SRC}
ghdl -a $(GHDL_FLAGS) --work=iCE40 ${ICE40_SRC}

neorv32-obj08.cf: ice40up-obj08.cf ${NEORV32_SRC}
neorv32-obj08.cf: ice40-obj08.cf ${NEORV32_SRC}
ghdl -a $(GHDL_FLAGS) --work=neorv32 ${NEORV32_SRC}

work-obj08.cf: neorv32-obj08.cf ${DESIGN_SRC} ${BOARD_SRC}
Expand Down
4 changes: 2 additions & 2 deletions setups/radiant/UPduino_v2/neorv32_dmem.ice40up_spram.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all;
library iCE40;
use iCE40.components.all;

entity neorv32_dmem is
generic (
Expand Down
4 changes: 2 additions & 2 deletions setups/radiant/UPduino_v2/neorv32_imem.ice40up_spram.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all;
library iCE40;
use iCE40.components.all;

entity neorv32_imem is
generic (
Expand Down
4 changes: 2 additions & 2 deletions setups/radiant/UPduino_v2/neorv32_upduino_v2_top.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives
library iCE40;
use iCE40.components.all; -- for device primitives

entity neorv32_upduino_v2_top is
port (
Expand Down
6 changes: 3 additions & 3 deletions setups/radiant/UPduino_v3/neorv32_dmem.ice40up_spram.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all;
library iCE40;
use iCE40.components.all;

entity neorv32_dmem is
generic (
Expand Down Expand Up @@ -96,7 +96,7 @@ begin
-- Sanity Checks --------------------------------------------------------------------------
-- -------------------------------------------------------------------------------------------
assert not (DMEM_SIZE > 64*1024) report "DMEM has a fixed physical size of 64kB. Logical size must be less or equal." severity error;


-- Access Control -------------------------------------------------------------------------
-- -------------------------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions setups/radiant/UPduino_v3/neorv32_imem.ice40up_spram.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all;
library iCE40;
use iCE40.components.all;

entity neorv32_imem is
generic (
Expand Down
4 changes: 2 additions & 2 deletions setups/radiant/UPduino_v3/neorv32_upduino_v3_top.vhd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ use ieee.numeric_std.all;
library neorv32;
use neorv32.neorv32_package.all;

library iCE40UP;
use iCE40UP.components.all; -- for device primitives and macros
library iCE40;
use iCE40.components.all; -- for device primitives and macros

entity neorv32_upduino_v3_top is
port (
Expand Down