Skip to content

Commit c78a48d

Browse files
committed
make OS boot work; used heads/linuxboot#1378
1 parent 3a72627 commit c78a48d

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

boards/nitropad-x/nitropad-x.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
6464

6565
#export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off"
6666

67+
export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off"
68+
export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
69+
6770
#TPM2 requirements
6871
export CONFIG_TPM2_TOOLS=y
6972
export CONFIG_PRIMARY_KEY_TYPE=ecc

config/coreboot-nitropad-x.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ CONFIG_ME_BIN_PATH="me.bin"
1414
CONFIG_HAVE_IFD_BIN=y
1515
CONFIG_HAVE_ME_BIN=y
1616

17+
CONFIG_LINUX_COMMAND_LINE="iommu=pt video=eDP-1:1920x1080 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0"
18+
19+
1720
# CONFIG_CONSOLE_SERIAL is not set
1821
# CONFIG_POST_IO is not set
1922
CONFIG_VBOOT=n

config/linux-nitropad-x.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ CONFIG_I2C_SLAVE=y
200200
# CONFIG_X86_PKG_TEMP_THERMAL is not set
201201
CONFIG_MFD_SYSCON=y
202202
CONFIG_DRM=y
203+
CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM=y
203204
CONFIG_DRM_I915=y
204205
CONFIG_DRM_AST=y
205206
CONFIG_FB_VESA=y

patches/kexec-2.0.22.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup
2121
index 057ee14..43e017a 100644
2222
--- a/kexec/arch/i386/x86-linux-setup.c
2323
+++ b/kexec/arch/i386/x86-linux-setup.c
24-
@@ -137,7 +137,8 @@ static int setup_linux_vesafb(struct x86_linux_param_header *real_mode)
24+
@@ -137,7 +137,9 @@ static int setup_linux_vesafb(struct x86_linux_param_header *real_mode)
2525
goto out;
2626
if (-1 == ioctl(fd, FBIOGET_VSCREENINFO, &var))
2727
goto out;
2828
- if (0 == strcmp(fix.id, "VESA VGA")) {
2929
+ if (0 == strcmp(fix.id, "VESA VGA")
30-
+ || 0 == strcmp(fix.id, "inteldrmfb")) {
30+
+ || 0 == strcmp(fix.id, "inteldrmfb")
31+
+ || 0 == strcmp(fix.id, "i915drmfb")) {
3132
/* VIDEO_TYPE_VLFB */
3233
real_mode->orig_video_isVGA = 0x23;
3334
} else if (0 == strcmp(fix.id, "EFI VGA")) {

0 commit comments

Comments
 (0)