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

Support in.tftpd and gdb debugging in qemu #371

Merged
merged 3 commits into from Nov 3, 2017

Conversation

stffrdhrn
Copy link
Contributor

These are not really related, but they were sitting in my repo when I started to update to latest upstream. I figured I clean them up and send upstream.

The atftpd package is not available on fedora.  The default tftpd
package is in.tftpd.  I have been using this and it works fine, although
the logs may not be as nice.

Allow the make file to fall back to use in.tftpd if atftpd is not
available.  Report an error if nothing is available.
In case we want to debug always keep open a gdb socket.
Makefile Outdated
@@ -212,18 +212,31 @@ bios-flash: $(BIOS_FILE) bios-flash-$(PLATFORM)
# TFTP booting stuff
# --------------------------------------
# TFTP server for minisoc to load firmware from
ATFTPD := $(shell which atftpd 2>/dev/null)
INTFTPD := $(shell which in.tftpd 2>/dev/null)
Copy link
Member

Choose a reason for hiding this comment

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

These will run every time the Makefile is opened which can make things slow. Could we instead do the if/then/else in shell inside the targets?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, right. I'll change it.

As suggested by mithro, this way the checks are not executed on every
execution of the script.  I am not so happy how this looks but it works
ok now.
@stffrdhrn
Copy link
Contributor Author

I have updated, not sure if you like the style but it seems to work ok.

@mithro
Copy link
Member

mithro commented Nov 3, 2017

LGTM! Will just wait for CI to confirm things are still working and then I'll merge.

@mithro mithro merged commit bbede92 into timvideos:master Nov 3, 2017
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

2 participants