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.

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

sDDF compatibiity changes for LionsOS Kitty example #81

Merged
merged 36 commits into from
Aug 6, 2024

Conversation

wom-bat
Copy link
Contributor

@wom-bat wom-bat commented Jul 15, 2024

-- Introduce serial_config.h
-- Move both config files (ethernet_config.h and serial_config.h) into
a config directory
-- Adjust micropython glue files to use new serial interfaces -- Adjust system description file to use new serial interfaces -- Adjust nfs subsystem to use new serial interfaces -- Update to latest libvmm and sDDF

Compiles, but untested.

@wom-bat wom-bat marked this pull request as draft July 15, 2024 09:36
@wom-bat wom-bat marked this pull request as ready for review August 2, 2024 04:36
IMAGE_FILE := webserver.img
REPORT_FILE := report.txt

#.EXTRA_PREREQS := submodules
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this line is not needed, so will remove it.



#define SERIAL_TX_CH 0
extern serial_queue_handle_t serial_tx_queue_handle;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we externing this now?


IMAGE_FILE := $(BUILD_DIR)/webserver.img
REPORT_FILE := $(BUILD_DIR)/report.txt
nproc:= $(shell sh -c "if test -f /proc/cpuinfo; then grep processor /proc/cpuinfo | wc -l; else echo 2; fi")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. Not sure about this, it should be up to the user to decide how many threads Make should start. Anyways, we can sort that out later.

Comment on lines 2 to 3
#ifndef KITTY_ETHERNET_CONFIG_H
#define KITTY_ETHERNET_CONFIG_H
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this? I thought #pragma once made it not necessary.

wom-bat and others added 22 commits August 6, 2024 11:55
-- Introduce serial_config.h
-- Move both config files (ethernet_config.h and serial_config.h) into
   a config directory
-- Adjust micropython glue files to use new serial interfaces
-- Adjust system description file to use new serial interfaces
-- Adjust nfs subsystem to use new serial interfaces
-- Update to latest libvmm and sDDF

Compiles, but untested.

Signed-off-by: Peter Chubb <Peter.Chubb@unsw.edu.au>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
I've only done this with new lines.  Eventually I want everything to
be readable on a 80-char wide window.

Signed-off-by: Peter Chubb <Peter.Chubb@unsw.edu.au>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: James Archer <j.archer@unsw.edu.au>
Signed-off-by: James Archer <j.archer@unsw.edu.au>
Signed-off-by: James Archer <j.archer@unsw.edu.au>
Create the new kitty.mk and fix vmm.c for new paths.

Signed-off-by: Peter Chubb <Peter.Chubb@unsw.edu.au>
and fix system file.

This version runs.

Signed-off-by: Peter Chubb <Peter.Chubb@unsw.edu.au>
Libvmm includes are now in a separate include directory

Signed-off-by: Peter Chubb <Peter.Chubb@unsw.edu.au>
Signed-off-by: Peter Chubb <peter.chubb@unsw.edu.au>
Ivan-Velickovic and others added 14 commits August 6, 2024 11:55
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: James Archer <j.archer@unsw.edu.au>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Courtney Darville <courtneydarville94@outlook.com>
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
@Ivan-Velickovic Ivan-Velickovic merged commit 0ccb330 into main Aug 6, 2024
3 checks passed
@Ivan-Velickovic Ivan-Velickovic deleted the new_serial branch August 6, 2024 02:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants