diff options
-rw-r--r-- | COPYING | 15 | ||||
-rw-r--r-- | picorv32.v | 2 | ||||
-rw-r--r-- | picosoc/Makefile | 4 | ||||
-rw-r--r-- | picosoc/firmware.c | 2 | ||||
-rw-r--r-- | picosoc/hx8kdemo.v | 2 | ||||
-rw-r--r-- | picosoc/hx8kdemo_tb.v | 2 | ||||
-rw-r--r-- | picosoc/ice40up5k_spram.v | 2 | ||||
-rw-r--r-- | picosoc/icebreaker.v | 6 | ||||
-rw-r--r-- | picosoc/icebreaker_tb.v | 2 | ||||
-rw-r--r-- | picosoc/picosoc.v | 11 | ||||
-rw-r--r-- | picosoc/simpleuart.v | 2 | ||||
-rw-r--r-- | picosoc/spiflash.v | 2 | ||||
-rw-r--r-- | picosoc/spiflash_tb.v | 2 | ||||
-rw-r--r-- | picosoc/spimemio.v | 2 |
14 files changed, 38 insertions, 18 deletions
@@ -0,0 +1,15 @@ +ISC License + +Copyright (C) 2015 - 2021 Claire Xenia Wolf <claire@yosyshq.com> + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -1,7 +1,7 @@ /* * PicoRV32 -- A Small RISC-V (RV32I) Processor Core * - * Copyright (C) 2015 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2015 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/Makefile b/picosoc/Makefile index 8055ea0..2f40df4 100644 --- a/picosoc/Makefile +++ b/picosoc/Makefile @@ -57,7 +57,7 @@ icebsynsim: icebreaker_syn_tb.vvp icebreaker_fw.hex vvp -N $< +firmware=icebreaker_fw.hex icebreaker.json: icebreaker.v ice40up5k_spram.v spimemio.v simpleuart.v picosoc.v ../picorv32.v - yosys -ql icebreaker.log -p 'synth_ice40 -top icebreaker -json icebreaker.json' $^ + yosys -ql icebreaker.log -p 'synth_ice40 -dsp -top icebreaker -json icebreaker.json' $^ icebreaker_tb.vvp: icebreaker_tb.v icebreaker.v ice40up5k_spram.v spimemio.v simpleuart.v picosoc.v ../picorv32.v spiflash.v iverilog -s testbench -o $@ $^ `yosys-config --datdir/ice40/cells_sim.v` @@ -69,7 +69,7 @@ icebreaker_syn.v: icebreaker.json yosys -p 'read_json icebreaker.json; write_verilog icebreaker_syn.v' icebreaker.asc: icebreaker.pcf icebreaker.json - nextpnr-ice40 --freq 13 --up5k --asc icebreaker.asc --pcf icebreaker.pcf --json icebreaker.json + nextpnr-ice40 --freq 13 --up5k --package sg48 --asc icebreaker.asc --pcf icebreaker.pcf --json icebreaker.json icebreaker.bin: icebreaker.asc icetime -d up5k -c 12 -mtr icebreaker.rpt icebreaker.asc diff --git a/picosoc/firmware.c b/picosoc/firmware.c index 425e036..aadf31b 100644 --- a/picosoc/firmware.c +++ b/picosoc/firmware.c @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/hx8kdemo.v b/picosoc/hx8kdemo.v index 9b784f8..f9a82f1 100644 --- a/picosoc/hx8kdemo.v +++ b/picosoc/hx8kdemo.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/hx8kdemo_tb.v b/picosoc/hx8kdemo_tb.v index 734f483..3fe9c1d 100644 --- a/picosoc/hx8kdemo_tb.v +++ b/picosoc/hx8kdemo_tb.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/ice40up5k_spram.v b/picosoc/ice40up5k_spram.v index 6edb23b..6d010f2 100644 --- a/picosoc/ice40up5k_spram.v +++ b/picosoc/ice40up5k_spram.v @@ -2,7 +2,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/icebreaker.v b/picosoc/icebreaker.v index 0b401db..a943bc6 100644 --- a/picosoc/icebreaker.v +++ b/picosoc/icebreaker.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -108,7 +108,9 @@ module icebreaker ( picosoc #( .BARREL_SHIFTER(0), - .ENABLE_MULDIV(0), + .ENABLE_MUL(0), + .ENABLE_DIV(0), + .ENABLE_FAST_MUL(1), .MEM_WORDS(MEM_WORDS) ) soc ( .clk (clk ), diff --git a/picosoc/icebreaker_tb.v b/picosoc/icebreaker_tb.v index 209d165..c09c10d 100644 --- a/picosoc/icebreaker_tb.v +++ b/picosoc/icebreaker_tb.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/picosoc.v b/picosoc/picosoc.v index 9c5981e..9790791 100644 --- a/picosoc/picosoc.v +++ b/picosoc/picosoc.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -70,7 +70,9 @@ module picosoc ( input flash_io3_di ); parameter [0:0] BARREL_SHIFTER = 1; - parameter [0:0] ENABLE_MULDIV = 1; + parameter [0:0] ENABLE_MUL = 1; + parameter [0:0] ENABLE_DIV = 1; + parameter [0:0] ENABLE_FAST_MUL = 0; parameter [0:0] ENABLE_COMPRESSED = 1; parameter [0:0] ENABLE_COUNTERS = 1; parameter [0:0] ENABLE_IRQ_QREGS = 0; @@ -136,8 +138,9 @@ module picosoc ( .BARREL_SHIFTER(BARREL_SHIFTER), .COMPRESSED_ISA(ENABLE_COMPRESSED), .ENABLE_COUNTERS(ENABLE_COUNTERS), - .ENABLE_MUL(ENABLE_MULDIV), - .ENABLE_DIV(ENABLE_MULDIV), + .ENABLE_MUL(ENABLE_MUL), + .ENABLE_DIV(ENABLE_DIV), + .ENABLE_FAST_MUL(ENABLE_FAST_MUL), .ENABLE_IRQ(1), .ENABLE_IRQ_QREGS(ENABLE_IRQ_QREGS) ) cpu ( diff --git a/picosoc/simpleuart.v b/picosoc/simpleuart.v index 1efddef..5ffef77 100644 --- a/picosoc/simpleuart.v +++ b/picosoc/simpleuart.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/spiflash.v b/picosoc/spiflash.v index 298219d..22b337b 100644 --- a/picosoc/spiflash.v +++ b/picosoc/spiflash.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/spiflash_tb.v b/picosoc/spiflash_tb.v index f300373..a5b5edc 100644 --- a/picosoc/spiflash_tb.v +++ b/picosoc/spiflash_tb.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/picosoc/spimemio.v b/picosoc/spimemio.v index 0bbf532..b4ee446 100644 --- a/picosoc/spimemio.v +++ b/picosoc/spimemio.v @@ -1,7 +1,7 @@ /* * PicoSoC - A simple example SoC using PicoRV32 * - * Copyright (C) 2017 Clifford Wolf <clifford@clifford.at> + * Copyright (C) 2017 Claire Xenia Wolf <claire@yosyshq.com> * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above |