Skip to content

A few small fixups #10

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

Merged
nathanchance merged 3 commits into from
Apr 27, 2020
Merged

A few small fixups #10

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
d0e40a7
README.txt: Add x86
nathanchance Apr 27, 2020
b2c59b2
boot-qemu.sh: Set QEMU_RAM default in invoke_qemu
nathanchance Apr 27, 2020
b76079a
github: Add CODEOWNERS
nathanchance Apr 27, 2020
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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @msfjarvis @nathanchance @nickdesaulniers @tpimh
1 change: 1 addition & 0 deletions README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ Required parameters:
* ppc32
* ppc64
* ppc64le
* x86
* x86_64

-k | --kbuild-folder:
Expand Down
7 changes: 1 addition & 6 deletions boot-qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ function setup_qemu_args() {
-dtb "${KBUILD_DIR}"/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dtb
-machine palmetto-bmc
-no-reboot)
QEMU_RAM=512m
QEMU=(qemu-system-arm)
;;

Expand All @@ -122,7 +121,6 @@ function setup_qemu_args() {
-dtb "${KBUILD_DIR}"/arch/arm/boot/dts/aspeed-bmc-opp-romulus.dtb
-machine romulus-bmc
-no-reboot)
QEMU_RAM=512m
QEMU=(qemu-system-arm)
;;

Expand All @@ -131,7 +129,6 @@ function setup_qemu_args() {
QEMU_ARCH_ARGS=(-append "console=ttyAMA0${RDINIT}"
-machine virt
-no-reboot)
QEMU_RAM=512m
QEMU=(qemu-system-arm)
;;

Expand All @@ -140,7 +137,6 @@ function setup_qemu_args() {
QEMU_ARCH_ARGS=(-append "console=ttyAMA0${RDINIT}"
-cpu cortex-a57
-machine virt)
QEMU_RAM=512m
QEMU=(qemu-system-aarch64)
;;

Expand All @@ -149,7 +145,6 @@ function setup_qemu_args() {
QEMU_ARCH_ARGS=("${APPEND_RDINIT[@]}"
-cpu 24Kf
-machine malta)
QEMU_RAM=512m
QEMU=(qemu-system-"${ARCH}")
ARCH=mips
;;
Expand Down Expand Up @@ -191,7 +186,6 @@ function setup_qemu_args() {
# Use KVM if the processor supports it (first part) and the KVM module is loaded (second part)
[[ $(grep -c -E 'vmx|svm' /proc/cpuinfo) -gt 0 && $(lsmod 2>/dev/null | grep -c kvm) -gt 0 ]] &&
QEMU_ARCH_ARGS=("${QEMU_ARCH_ARGS[@]}" -cpu host -d "unimp,guest_errors" -enable-kvm)
QEMU_RAM=512m
QEMU=(qemu-system-x86_64)
;;
esac
Expand All @@ -205,6 +199,7 @@ function setup_qemu_args() {
# Invoke QEMU
function invoke_qemu() {
${INTERACTIVE} || QEMU=(timeout "${TIMEOUT:=3m}" unbuffer "${QEMU[@]}")
[[ -z ${QEMU_RAM} ]] && QEMU_RAM=512m
if ${GDB:=false}; then
while true; do
if lsof -i:1234 &>/dev/null; then
Expand Down