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

Fix x86_64 #26

Merged
merged 4 commits into from
Aug 15, 2024
Merged

Fix x86_64 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da0faa0
Add bzImage build for x86_64
jamcleod Aug 12, 2024
9663307
Add configs for serial output
jamcleod Aug 13, 2024
8cac606
Add suggestions from Cole and Luke
jamcleod Aug 13, 2024
b0bde9b
Update submodule to fix cpuid clobber
jamcleod Aug 14, 2024
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
*.log
*.linted
cache/
kernels/
6 changes: 6 additions & 0 deletions _in_container_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ for TARGET in $TARGETS; do
BUILD_TARGETS="vmlinux zImage"
elif [ $TARGET == "arm64" ]; then
BUILD_TARGETS="vmlinux Image.gz"
elif [ $TARGET == "x86_64" ]; then
BUILD_TARGETS="vmlinux bzImage"
fi

# Set short_arch based on TARGET
Expand Down Expand Up @@ -81,6 +83,10 @@ for TARGET in $TARGETS; do
if [ -f "/tmp/build/${VERSION}/${TARGET}/arch/${short_arch}/boot/zImage" ]; then
cp "/tmp/build/${VERSION}/${TARGET}/arch/${short_arch}/boot/zImage" /kernels/$VERSION/zImage.${TARGET}
fi

if [ -f "/tmp/build/${VERSION}/${TARGET}/arch/${short_arch}/boot/bzImage" ]; then
cp "/tmp/build/${VERSION}/${TARGET}/arch/${short_arch}/boot/bzImage" /kernels/$VERSION/bzImage.${TARGET}
fi

# Copy out Image.gz (if present)
if [ -f "/tmp/build/${VERSION}/${TARGET}/arch/${short_arch}/boot/Image.gz" ]; then
Expand Down
1 change: 0 additions & 1 deletion configs/4.10/x86-common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
#include "all-common.inc"

18 changes: 18 additions & 0 deletions configs/4.10/x86_64
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
#include "x86-common.inc"

CONFIG_SMP=y
CONFIG_COMPAT=y
CONFIG_SERIAL_NONSTANDARD=y
Copy link

Choose a reason for hiding this comment

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

Why nonstandard?

CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_8250_DETECT_IRQ=y
CONFIG_SERIAL_8250_RSA=y
Comment on lines +8 to +13
Copy link

Choose a reason for hiding this comment

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

If these are unnecessary, could we delete? If they're required that's fine.


CONFIG_IA32_EMULATION=y
CONFIG_VIRTIO_RING=y

CONFIG_VIRTIO_FS=y
CONFIG_PCI_HOST_GENERIC=y
CONFIG_PCI_QUIRKS=y
CONFIG_BLK_DEV_SD=y
Comment on lines +20 to +21
Copy link

Choose a reason for hiding this comment

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

Same point for these being necessary or not.

2 changes: 1 addition & 1 deletion linux/4.10
Open in desktop
Submodule 4.10 updated 3 files
+50 −42 fs/exec.c
+8 −10 include/linux/hypercall.h
+2 −0 include/linux/syscalls.h
Loading