make OS boot work; used heads/linuxboot#1378

daringer · Apr 19, 2023 · c78a48d · c78a48d
1 parent 3a72627
commit c78a48d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/boards/nitropad-x/nitropad-x.config b/boards/nitropad-x/nitropad-x.config
@@ -64,6 +64,9 @@ export CONFIG_BOOTSCRIPT=/bin/gui-init
 
 #export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off"
 
+export CONFIG_BOOT_KERNEL_ADD="intel_iommu=igfx_off"
+export CONFIG_BOOT_KERNEL_REMOVE="intel_iommu=on intel_iommu=igfx_off"
+
 #TPM2 requirements
 export CONFIG_TPM2_TOOLS=y
 export CONFIG_PRIMARY_KEY_TYPE=ecc

diff --git a/config/coreboot-nitropad-x.config b/config/coreboot-nitropad-x.config
@@ -14,6 +14,9 @@ CONFIG_ME_BIN_PATH="me.bin"
 CONFIG_HAVE_IFD_BIN=y
 CONFIG_HAVE_ME_BIN=y
 
+CONFIG_LINUX_COMMAND_LINE="iommu=pt video=eDP-1:1920x1080 drm_kms_helper.drm_leak_fbdev_smem=1 i915.enable_fbc=0"
+
+
 # CONFIG_CONSOLE_SERIAL is not set
 # CONFIG_POST_IO is not set
 CONFIG_VBOOT=n

diff --git a/config/linux-nitropad-x.config b/config/linux-nitropad-x.config
@@ -200,6 +200,7 @@ CONFIG_I2C_SLAVE=y
 # CONFIG_X86_PKG_TEMP_THERMAL is not set
 CONFIG_MFD_SYSCON=y
 CONFIG_DRM=y
+CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM=y
 CONFIG_DRM_I915=y
 CONFIG_DRM_AST=y
 CONFIG_FB_VESA=y

diff --git a/patches/kexec-2.0.22.patch b/patches/kexec-2.0.22.patch
@@ -21,13 +21,14 @@ diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup
 index 057ee14..43e017a 100644
 --- a/kexec/arch/i386/x86-linux-setup.c
 +++ b/kexec/arch/i386/x86-linux-setup.c
-@@ -137,7 +137,8 @@ static int setup_linux_vesafb(struct x86_linux_param_header *real_mode)
+@@ -137,7 +137,9 @@ static int setup_linux_vesafb(struct x86_linux_param_header *real_mode)
  goto out;
  if (-1 == ioctl(fd, FBIOGET_VSCREENINFO, &var))
  goto out;
 - if (0 == strcmp(fix.id, "VESA VGA")) {
 + if (0 == strcmp(fix.id, "VESA VGA")
-+ || 0 == strcmp(fix.id, "inteldrmfb")) {
++ || 0 == strcmp(fix.id, "inteldrmfb")
++ || 0 == strcmp(fix.id, "i915drmfb")) {
  /* VIDEO_TYPE_VLFB */
  real_mode->orig_video_isVGA = 0x23;
  } else if (0 == strcmp(fix.id, "EFI VGA")) {