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

Jump to bottom

Improve drivers, Update LIB UART #385

Merged
merged 10 commits into from
Apr 8, 2022
Merged

Improve drivers, Update LIB UART #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ea0433
feat(sw): update LIB, UART with improved drivers
P-Miranda Apr 6, 2022
7162d7f
fix(test): update LIB, test.expected files
P-Miranda Apr 6, 2022
3296a20
update(UART): update UART submodule
P-Miranda Apr 6, 2022
9118c26
update(submodules): Update LIB, UART
P-Miranda Apr 6, 2022
c040a45
update(LIB, UART)
P-Miranda Apr 7, 2022
870d229
feat(sw): update UART, LIB software drivers
P-Miranda Apr 8, 2022
e0d208f
feat(sw): update LIB, UART
P-Miranda Apr 8, 2022
327c7a9
update(LIB, UART)
P-Miranda Apr 8, 2022
61e6ec0
feat(test): update test.expected files
P-Miranda Apr 8, 2022
584ba4e
update(UART)
P-Miranda Apr 8, 2022
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
Binary file modified document/pb/pb.pdf
View file
Open in desktop
Binary file not shown.
Binary file modified document/presentation/presentation.pdf
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions hardware/fpga/quartus/CYCLONEV-GT-DK/test.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ IOb-Bootloader: connected!
IOb-UART: requesting to receive file
IOb-Console: got file send request
IOb-Console: file name b'firmware.bin'
IOb-Console: file of size 19100 bytes
IOb-Console: file of size 19092 bytes
IOb-Console: file sent
IOb-UART: file received
IOb-Bootloader: Loading firmware...
IOb-UART: requesting to send file
IOb-Console: got file receive request
IOb-Console: file name b's_fw.bin'
IOb-Console : file size: 19100 bytes
IOb-Console : file size: 19092 bytes
IOb-Console: file received
IOb-UART: file sent
IOb-Bootloader: Restart CPU to run user program...
Expand Down
8 changes: 4 additions & 4 deletions hardware/fpga/vivado/AES-KU040-DB-G/test.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ IOb-Bootloader: connected!
IOb-UART: requesting to receive file
IOb-Console: got file send request
IOb-Console: file name b'firmware.bin'
IOb-Console: file of size 19100 bytes
IOb-Console: file of size 19092 bytes
IOb-Console: file sent
IOb-UART: file received
IOb-Bootloader: Loading firmware...
IOb-UART: requesting to send file
IOb-Console: got file receive request
IOb-Console: file name b's_fw.bin'
IOb-Console : file size: 19100 bytes
IOb-Console : file size: 19092 bytes
IOb-Console: file received
IOb-UART: file sent
IOb-Bootloader: Restart CPU to run user program...
Expand Down Expand Up @@ -72,14 +72,14 @@ IOb-Bootloader: program to run from DDR
IOb-UART: requesting to receive file
IOb-Console: got file send request
IOb-Console: file name b'firmware.bin'
IOb-Console: file of size 19252 bytes
IOb-Console: file of size 19244 bytes
IOb-Console: file sent
IOb-UART: file received
IOb-Bootloader: Loading firmware...
IOb-UART: requesting to send file
IOb-Console: got file receive request
IOb-Console: file name b's_fw.bin'
IOb-Console : file size: 19252 bytes
IOb-Console : file size: 19244 bytes
IOb-Console: file received
IOb-UART: file sent
IOb-Bootloader: Restart CPU to run user program...
Expand Down
8 changes: 4 additions & 4 deletions hardware/simulation/test.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ IOb-Bootloader: connected!
IOb-UART: requesting to receive file
IOb-Console: got file send request
IOb-Console: file name b'firmware.bin'
IOb-Console: file of size 19092 bytes
IOb-Console: file of size 19084 bytes
0 %
10 %
20 %
Expand All @@ -45,7 +45,7 @@ IOb-Bootloader: Loading firmware...
IOb-UART: requesting to send file
IOb-Console: got file receive request
IOb-Console: file name b's_fw.bin'
IOb-Console : file size: 19092 bytes
IOb-Console : file size: 19084 bytes
0 %
10 %
20 %
Expand Down Expand Up @@ -121,7 +121,7 @@ IOb-Bootloader: program to run from DDR
IOb-UART: requesting to receive file
IOb-Console: got file send request
IOb-Console: file name b'firmware.bin'
IOb-Console: file of size 19252 bytes
IOb-Console: file of size 19244 bytes
0 %
10 %
20 %
Expand All @@ -139,7 +139,7 @@ IOb-Bootloader: Loading firmware...
IOb-UART: requesting to send file
IOb-Console: got file receive request
IOb-Console: file name b's_fw.bin'
IOb-Console : file size: 19252 bytes
IOb-Console : file size: 19244 bytes
0 %
10 %
20 %
Expand Down
2 changes: 1 addition & 1 deletion software/bootloader/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ boot.elf: ../template.lds $(HDR) $(SRC)
$(TOOLCHAIN_PREFIX)objcopy -O binary boot.elf boot.bin

clean: gen-clean
@rm -rf boot.bin boot.elf boot.map *.hex *swreg.h
@rm -rf boot.bin boot.elf boot.map *.hex *swreg*.h *swreg*.c

.PHONY: clean
4 changes: 2 additions & 2 deletions software/bootloader/boot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ int main() {

//connect with console
do {
if(uart_istxready())
if(UART_GET_TXREADY())
uart_putc((char) ENQ);
} while(!uart_isrxready());
} while(!UART_GET_RXREADY());

//welcome message
uart_puts (PROGNAME);
Expand Down
3 changes: 2 additions & 1 deletion software/firmware/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ firmware.elf: ../template.lds $(HDR) $(SRC)
$(TOOLCHAIN_PREFIX)objcopy -O binary firmware.elf firmware.bin

clean: gen-clean
@rm -rf firmware.bin firmware.elf firmware.map *.hex periphs.h *swreg.h
@rm -rf firmware.bin firmware.elf firmware.map *.hex periphs.h *swreg*.h \
*swreg*.c

.PHONY: clean
2 changes: 1 addition & 1 deletion software/pc-emul/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ test:
diff -q $(PC_DIR)/test.log $(PC_DIR)/test.expected

clean:
@rm -rf firmware.out periphs.h test.log *swreg.h
@rm -rf firmware.out periphs.h test.log *swreg*.h *swreg*.c

.PHONY: all build run clean subs periphs_tmp.h test
2 changes: 1 addition & 1 deletion submodules/LIB
Open in desktop
Submodule LIB updated 1 files
+158 −24 software/python/mkregs.py
2 changes: 1 addition & 1 deletion submodules/UART
Open in desktop
Submodule UART updated 9 files
+5 −2 software/embedded/embedded.mk
+0 −71 software/embedded/iob-uart-emb.c
+27 −10 software/iob-uart.c
+2 −18 software/iob-uart.h
+0 −99 software/pc-emul/iob-uart-pc-emul.c
+88 −0 software/pc-emul/iob_uart_swreg_pc_emul.c
+4 −2 software/pc-emul/pc-emul.mk
+1 −1 software/software.mk
+1 −1 submodules/LIB