Switch Dell 3050 Micro to newer coreboot revision
Specifically, use the same revision that Mate used in patchset 15. This will ensure that any issues are *not* caused by the coreboot revision; this is being done, because the old coreboot revision was from July, but patchset 15 from Mate is based on a September revision of coreboot. I've been eliminating as many variables as possible, trying to fix SeaBIOS payload on this machine, because it hangs in Libreboot, but not when building from gerrit directly, which means the coreboot revision may be a factor (since I'm using his patches on an older revision so upstream might have made some changes since then that the port relies on). For this, a new coreboot tree is used, called "dell7", referring to the fact that Kabylake is Intel's 7th generation. Signed-off-by: Leah Rowe <leah@libreboot.org>m920qwip
parent
99a88ebfa2
commit
d8ac9d53b6
|
@ -10,9 +10,9 @@ CONFIG_LOCALVERSION=""
|
|||
CONFIG_CBFS_PREFIX="fallback"
|
||||
CONFIG_COMPILER_GCC=y
|
||||
# CONFIG_COMPILER_LLVM_CLANG is not set
|
||||
CONFIG_ARCH_SUPPORTS_CLANG=y
|
||||
# CONFIG_ANY_TOOLCHAIN is not set
|
||||
# CONFIG_CCACHE is not set
|
||||
# CONFIG_LTO is not set
|
||||
# CONFIG_IWYU is not set
|
||||
# CONFIG_FMD_GENPARSER is not set
|
||||
# CONFIG_UTIL_GENPARSER is not set
|
||||
|
@ -57,6 +57,7 @@ CONFIG_TSEG_STAGE_CACHE=y
|
|||
# CONFIG_VENDOR_AOOSTAR is not set
|
||||
# CONFIG_VENDOR_AOPEN is not set
|
||||
# CONFIG_VENDOR_APPLE is not set
|
||||
# CONFIG_VENDOR_ARM is not set
|
||||
# CONFIG_VENDOR_ASROCK is not set
|
||||
# CONFIG_VENDOR_ASUS is not set
|
||||
# CONFIG_VENDOR_BIOSTAR is not set
|
||||
|
@ -68,6 +69,7 @@ CONFIG_TSEG_STAGE_CACHE=y
|
|||
# CONFIG_VENDOR_CWWK is not set
|
||||
CONFIG_VENDOR_DELL=y
|
||||
# CONFIG_VENDOR_EMULATION is not set
|
||||
# CONFIG_VENDOR_ERYING is not set
|
||||
# CONFIG_VENDOR_EXAMPLE is not set
|
||||
# CONFIG_VENDOR_FACEBOOK is not set
|
||||
# CONFIG_VENDOR_FOXCONN is not set
|
||||
|
@ -75,12 +77,14 @@ CONFIG_VENDOR_DELL=y
|
|||
# CONFIG_VENDOR_GETAC is not set
|
||||
# CONFIG_VENDOR_GIGABYTE is not set
|
||||
# CONFIG_VENDOR_GOOGLE is not set
|
||||
# CONFIG_VENDOR_HARDKERNEL is not set
|
||||
# CONFIG_VENDOR_HP is not set
|
||||
# CONFIG_VENDOR_IBASE is not set
|
||||
# CONFIG_VENDOR_IBM is not set
|
||||
# CONFIG_VENDOR_INTEL is not set
|
||||
# CONFIG_VENDOR_INVENTEC is not set
|
||||
# CONFIG_VENDOR_KONTRON is not set
|
||||
# CONFIG_VENDOR_LATTEPANDA is not set
|
||||
# CONFIG_VENDOR_LENOVO is not set
|
||||
# CONFIG_VENDOR_LIBRETREND is not set
|
||||
# CONFIG_VENDOR_MSI is not set
|
||||
|
@ -124,14 +128,18 @@ CONFIG_MAX_CPUS=8
|
|||
CONFIG_POST_DEVICE=y
|
||||
CONFIG_POST_IO=y
|
||||
CONFIG_UART_FOR_CONSOLE=0
|
||||
CONFIG_OVERRIDE_DEVICETREE=""
|
||||
CONFIG_DEVICETREE="devicetree.cb"
|
||||
# CONFIG_VBOOT is not set
|
||||
CONFIG_OVERRIDE_DEVICETREE=""
|
||||
# CONFIG_VGA_BIOS is not set
|
||||
CONFIG_PCIEXP_ASPM=y
|
||||
CONFIG_PCIEXP_L1_SUB_STATE=y
|
||||
CONFIG_PCIEXP_CLK_PM=y
|
||||
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Dell Inc."
|
||||
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
|
||||
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
|
||||
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
|
||||
# CONFIG_FATAL_ASSERTS is not set
|
||||
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
|
||||
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
|
||||
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
|
||||
|
@ -141,9 +149,8 @@ CONFIG_MAX_SOCKET=1
|
|||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||
# CONFIG_CONSOLE_POST is not set
|
||||
CONFIG_USE_PM_ACPI_TIMER=y
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
CONFIG_BOARD_DELL_OPTIPLEX_3050=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
|
@ -161,15 +168,14 @@ CONFIG_BOARD_DELL_OPTIPLEX_3050=y
|
|||
# CONFIG_BOARD_DELL_OPTIPLEX_9010 is not set
|
||||
# CONFIG_BOARD_DELL_PRECISION_T1650 is not set
|
||||
# CONFIG_BOARD_DELL_XPS_8300 is not set
|
||||
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
|
||||
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
|
||||
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
|
||||
CONFIG_DCACHE_RAM_BASE=0xfef00000
|
||||
CONFIG_DCACHE_RAM_SIZE=0x40000
|
||||
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
|
||||
CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
|
||||
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
|
||||
CONFIG_HAVE_INTEL_FIRMWARE=y
|
||||
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
|
||||
# CONFIG_USE_LEGACY_8254_TIMER is not set
|
||||
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
|
||||
CONFIG_DRIVERS_INTEL_WIFI=y
|
||||
CONFIG_IFD_BIN_PATH="../../../config/ifd/3050micro/ifd"
|
||||
|
@ -179,9 +185,7 @@ CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
|
|||
CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
|
||||
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
|
||||
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
|
||||
# CONFIG_USE_LEGACY_8254_TIMER is not set
|
||||
# CONFIG_DEBUG_SMI is not set
|
||||
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
|
||||
# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE is not set
|
||||
CONFIG_HAVE_IFD_BIN=y
|
||||
CONFIG_PS2K_EISAID="PNP0303"
|
||||
|
@ -260,10 +264,13 @@ CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
|
|||
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
|
||||
CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
|
||||
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
|
||||
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
|
||||
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
|
||||
CONFIG_INTEL_GMA_BCLV_WIDTH=16
|
||||
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
|
||||
CONFIG_INTEL_GMA_BCLM_WIDTH=16
|
||||
CONFIG_FSP_PUBLISH_MBP_HOB=y
|
||||
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
|
||||
CONFIG_MAX_HECI_DEVICES=5
|
||||
CONFIG_BOOTBLOCK_IN_CBFS=y
|
||||
CONFIG_HAVE_PAM0_REGISTER=y
|
||||
|
@ -372,6 +379,8 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
|
|||
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
|
||||
CONFIG_SA_ENABLE_DPR=y
|
||||
CONFIG_HAVE_CAPID_A_REGISTER=y
|
||||
CONFIG_HAVE_BDSM_BGSM_REGISTER=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
|
||||
|
@ -498,6 +507,9 @@ CONFIG_DEBUG_HW_BREAKPOINTS=y
|
|||
CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
|
||||
# CONFIG_DUMP_SMBIOS_TYPE17 is not set
|
||||
CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
|
||||
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
|
||||
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
|
||||
CONFIG_DEFAULT_EBDA_SIZE=0x400
|
||||
# end of Chipset
|
||||
|
||||
#
|
||||
|
@ -520,6 +532,11 @@ CONFIG_NO_EARLY_GFX_INIT=y
|
|||
CONFIG_GENERIC_LINEAR_FRAMEBUFFER=y
|
||||
CONFIG_LINEAR_FRAMEBUFFER=y
|
||||
# CONFIG_BOOTSPLASH is not set
|
||||
CONFIG_DEFAULT_SCREEN_ROTATION_NONE=y
|
||||
# CONFIG_DEFAULT_SCREEN_ROTATION_90 is not set
|
||||
# CONFIG_DEFAULT_SCREEN_ROTATION_180 is not set
|
||||
# CONFIG_DEFAULT_SCREEN_ROTATION_270 is not set
|
||||
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
|
||||
# end of Display
|
||||
|
||||
CONFIG_PCI=y
|
||||
|
@ -548,6 +565,7 @@ CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y
|
|||
#
|
||||
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
|
||||
# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
|
||||
# CONFIG_DRIVERS_EFI_FW_INFO is not set
|
||||
# CONFIG_ELOG is not set
|
||||
CONFIG_CACHE_MRC_SETTINGS=y
|
||||
CONFIG_MRC_SETTINGS_PROTECT=y
|
||||
|
@ -582,13 +600,12 @@ CONFIG_FSP_T_RESERVED_SIZE=0x0
|
|||
CONFIG_FSP_M_XIP=y
|
||||
CONFIG_HAVE_FSP_LOGO_SUPPORT=y
|
||||
CONFIG_FSP_COMPRESS_FSP_S_LZ4=y
|
||||
CONFIG_FSP_STATUS_GLOBAL_RESET_REQUIRED_3=y
|
||||
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
|
||||
CONFIG_SOC_INTEL_COMMON_FSP_RESET=y
|
||||
CONFIG_USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM=y
|
||||
CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y
|
||||
CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y
|
||||
# CONFIG_DISPLAY_FSP_TIMESTAMPS is not set
|
||||
# CONFIG_BUILDING_WITH_DEBUG_FSP is not set
|
||||
CONFIG_INTEL_GMA_ACPI=y
|
||||
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
|
||||
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
|
||||
|
@ -763,7 +780,6 @@ CONFIG_HAVE_GPIO_SNAPSHOT_VERIFY_SUPPORT=y
|
|||
# General Debug Settings
|
||||
#
|
||||
# CONFIG_GDB_STUB is not set
|
||||
# CONFIG_FATAL_ASSERTS is not set
|
||||
CONFIG_HAVE_DEBUG_GPIO=y
|
||||
# CONFIG_DEBUG_GPIO is not set
|
||||
# CONFIG_DEBUG_CBFS is not set
|
||||
|
|
|
@ -10,9 +10,9 @@ CONFIG_LOCALVERSION=""
|
|||
CONFIG_CBFS_PREFIX="fallback"
|
||||
CONFIG_COMPILER_GCC=y
|
||||
# CONFIG_COMPILER_LLVM_CLANG is not set
|
||||
CONFIG_ARCH_SUPPORTS_CLANG=y
|
||||
# CONFIG_ANY_TOOLCHAIN is not set
|
||||
# CONFIG_CCACHE is not set
|
||||
# CONFIG_LTO is not set
|
||||
# CONFIG_IWYU is not set
|
||||
# CONFIG_FMD_GENPARSER is not set
|
||||
# CONFIG_UTIL_GENPARSER is not set
|
||||
|
@ -57,6 +57,7 @@ CONFIG_TSEG_STAGE_CACHE=y
|
|||
# CONFIG_VENDOR_AOOSTAR is not set
|
||||
# CONFIG_VENDOR_AOPEN is not set
|
||||
# CONFIG_VENDOR_APPLE is not set
|
||||
# CONFIG_VENDOR_ARM is not set
|
||||
# CONFIG_VENDOR_ASROCK is not set
|
||||
# CONFIG_VENDOR_ASUS is not set
|
||||
# CONFIG_VENDOR_BIOSTAR is not set
|
||||
|
@ -68,6 +69,7 @@ CONFIG_TSEG_STAGE_CACHE=y
|
|||
# CONFIG_VENDOR_CWWK is not set
|
||||
CONFIG_VENDOR_DELL=y
|
||||
# CONFIG_VENDOR_EMULATION is not set
|
||||
# CONFIG_VENDOR_ERYING is not set
|
||||
# CONFIG_VENDOR_EXAMPLE is not set
|
||||
# CONFIG_VENDOR_FACEBOOK is not set
|
||||
# CONFIG_VENDOR_FOXCONN is not set
|
||||
|
@ -75,12 +77,14 @@ CONFIG_VENDOR_DELL=y
|
|||
# CONFIG_VENDOR_GETAC is not set
|
||||
# CONFIG_VENDOR_GIGABYTE is not set
|
||||
# CONFIG_VENDOR_GOOGLE is not set
|
||||
# CONFIG_VENDOR_HARDKERNEL is not set
|
||||
# CONFIG_VENDOR_HP is not set
|
||||
# CONFIG_VENDOR_IBASE is not set
|
||||
# CONFIG_VENDOR_IBM is not set
|
||||
# CONFIG_VENDOR_INTEL is not set
|
||||
# CONFIG_VENDOR_INVENTEC is not set
|
||||
# CONFIG_VENDOR_KONTRON is not set
|
||||
# CONFIG_VENDOR_LATTEPANDA is not set
|
||||
# CONFIG_VENDOR_LENOVO is not set
|
||||
# CONFIG_VENDOR_LIBRETREND is not set
|
||||
# CONFIG_VENDOR_MSI is not set
|
||||
|
@ -122,14 +126,18 @@ CONFIG_MAX_CPUS=8
|
|||
CONFIG_POST_DEVICE=y
|
||||
CONFIG_POST_IO=y
|
||||
CONFIG_UART_FOR_CONSOLE=0
|
||||
CONFIG_OVERRIDE_DEVICETREE=""
|
||||
CONFIG_DEVICETREE="devicetree.cb"
|
||||
# CONFIG_VBOOT is not set
|
||||
CONFIG_OVERRIDE_DEVICETREE=""
|
||||
# CONFIG_VGA_BIOS is not set
|
||||
CONFIG_PCIEXP_ASPM=y
|
||||
CONFIG_PCIEXP_L1_SUB_STATE=y
|
||||
CONFIG_PCIEXP_CLK_PM=y
|
||||
CONFIG_MAINBOARD_SMBIOS_MANUFACTURER="Dell Inc."
|
||||
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
|
||||
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
|
||||
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
|
||||
# CONFIG_FATAL_ASSERTS is not set
|
||||
CONFIG_INTEL_GMA_VBT_FILE="src/mainboard/$(MAINBOARDDIR)/data.vbt"
|
||||
# CONFIG_DISABLE_HECI1_AT_PRE_BOOT is not set
|
||||
CONFIG_PRERAM_CBMEM_CONSOLE_SIZE=0xc00
|
||||
|
@ -139,9 +147,8 @@ CONFIG_MAX_SOCKET=1
|
|||
CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
||||
# CONFIG_CONSOLE_POST is not set
|
||||
CONFIG_USE_PM_ACPI_TIMER=y
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
CONFIG_BOARD_DELL_OPTIPLEX_3050=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
|
@ -159,15 +166,14 @@ CONFIG_BOARD_DELL_OPTIPLEX_3050=y
|
|||
# CONFIG_BOARD_DELL_OPTIPLEX_9010 is not set
|
||||
# CONFIG_BOARD_DELL_PRECISION_T1650 is not set
|
||||
# CONFIG_BOARD_DELL_XPS_8300 is not set
|
||||
CONFIG_ECAM_MMCONF_BASE_ADDRESS=0xe0000000
|
||||
CONFIG_ECAM_MMCONF_BUS_NUMBER=256
|
||||
CONFIG_MEMLAYOUT_LD_FILE="src/arch/x86/memlayout.ld"
|
||||
CONFIG_DCACHE_RAM_BASE=0xfef00000
|
||||
CONFIG_DCACHE_RAM_SIZE=0x40000
|
||||
CONFIG_C_ENV_BOOTBLOCK_SIZE=0x40000
|
||||
CONFIG_DCACHE_BSP_STACK_SIZE=0x4000
|
||||
CONFIG_MAX_ACPI_TABLE_SIZE_KB=144
|
||||
CONFIG_HAVE_INTEL_FIRMWARE=y
|
||||
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
|
||||
# CONFIG_USE_LEGACY_8254_TIMER is not set
|
||||
CONFIG_MRC_SETTINGS_CACHE_SIZE=0x10000
|
||||
CONFIG_DRIVERS_INTEL_WIFI=y
|
||||
CONFIG_IFD_BIN_PATH="../../../config/ifd/3050micro/ifd"
|
||||
|
@ -177,9 +183,7 @@ CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x20000
|
|||
CONFIG_ACPI_FNKEY_GEN_SCANCODE=0
|
||||
CONFIG_CARDBUS_PLUGIN_SUPPORT=y
|
||||
CONFIG_SPI_FLASH_DONT_INCLUDE_ALL_DRIVERS=y
|
||||
# CONFIG_USE_LEGACY_8254_TIMER is not set
|
||||
# CONFIG_DEBUG_SMI is not set
|
||||
CONFIG_MAINBOARD_SMBIOS_PRODUCT_NAME="OptiPlex 3050 Micro"
|
||||
# CONFIG_SOC_INTEL_COMMON_BLOCK_SGX_ENABLE is not set
|
||||
CONFIG_HAVE_IFD_BIN=y
|
||||
CONFIG_PS2K_EISAID="PNP0303"
|
||||
|
@ -258,10 +262,13 @@ CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_M_VAL=0x30
|
|||
CONFIG_SOC_INTEL_COMMON_LPSS_UART_CLK_N_VAL=0xc35
|
||||
CONFIG_FSP_HEADER_PATH="3rdparty/fsp/KabylakeFspBinPkg/Include/"
|
||||
CONFIG_FSP_FD_PATH="3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd"
|
||||
CONFIG_SOC_INTEL_COMMON_DEBUG_CONSENT=0
|
||||
CONFIG_INTEL_GMA_BCLV_OFFSET=0xc8254
|
||||
CONFIG_INTEL_GMA_BCLV_WIDTH=16
|
||||
CONFIG_INTEL_GMA_BCLM_OFFSET=0xc8256
|
||||
CONFIG_INTEL_GMA_BCLM_WIDTH=16
|
||||
CONFIG_FSP_PUBLISH_MBP_HOB=y
|
||||
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
|
||||
CONFIG_MAX_HECI_DEVICES=5
|
||||
CONFIG_BOOTBLOCK_IN_CBFS=y
|
||||
CONFIG_HAVE_PAM0_REGISTER=y
|
||||
|
@ -370,6 +377,8 @@ CONFIG_SOC_INTEL_COMMON_BLOCK_SMM_S5_DELAY_MS=0
|
|||
CONFIG_SOC_INTEL_COMMON_BLOCK_SPI=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_SA=y
|
||||
CONFIG_SA_ENABLE_DPR=y
|
||||
CONFIG_HAVE_CAPID_A_REGISTER=y
|
||||
CONFIG_HAVE_BDSM_BGSM_REGISTER=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_THERMAL_PCI_DEV=y
|
||||
CONFIG_SOC_INTEL_COMMON_BLOCK_TIMER=y
|
||||
|
@ -496,6 +505,9 @@ CONFIG_DEBUG_HW_BREAKPOINTS=y
|
|||
CONFIG_DEBUG_NULL_DEREF_BREAKPOINTS=y
|
||||
# CONFIG_DUMP_SMBIOS_TYPE17 is not set
|
||||
CONFIG_X86_BOOTBLOCK_EXTRA_PROGRAM_SZ=0
|
||||
CONFIG_DEFAULT_EBDA_LOWMEM=0x100000
|
||||
CONFIG_DEFAULT_EBDA_SEGMENT=0xF600
|
||||
CONFIG_DEFAULT_EBDA_SIZE=0x400
|
||||
# end of Chipset
|
||||
|
||||
#
|
||||
|
@ -516,6 +528,7 @@ CONFIG_NO_EARLY_GFX_INIT=y
|
|||
#
|
||||
CONFIG_VGA_TEXT_FRAMEBUFFER=y
|
||||
# CONFIG_GENERIC_LINEAR_FRAMEBUFFER is not set
|
||||
CONFIG_DEFAULT_SCREEN_ROTATION_INT=0
|
||||
# end of Display
|
||||
|
||||
CONFIG_PCI=y
|
||||
|
@ -544,6 +557,7 @@ CONFIG_RESOURCE_ALLOCATION_TOP_DOWN=y
|
|||
#
|
||||
CONFIG_CRB_TPM_BASE_ADDRESS=0xfed40000
|
||||
# CONFIG_DRIVERS_EFI_VARIABLE_STORE is not set
|
||||
# CONFIG_DRIVERS_EFI_FW_INFO is not set
|
||||
# CONFIG_ELOG is not set
|
||||
CONFIG_CACHE_MRC_SETTINGS=y
|
||||
CONFIG_MRC_SETTINGS_PROTECT=y
|
||||
|
@ -578,13 +592,12 @@ CONFIG_FSP_T_RESERVED_SIZE=0x0
|
|||
CONFIG_FSP_M_XIP=y
|
||||
CONFIG_HAVE_FSP_LOGO_SUPPORT=y
|
||||
CONFIG_FSP_COMPRESS_FSP_S_LZ4=y
|
||||
CONFIG_FSP_STATUS_GLOBAL_RESET_REQUIRED_3=y
|
||||
CONFIG_FSP_STATUS_GLOBAL_RESET=0x40000003
|
||||
CONFIG_SOC_INTEL_COMMON_FSP_RESET=y
|
||||
CONFIG_USE_FSP_NOTIFY_PHASE_POST_PCI_ENUM=y
|
||||
CONFIG_USE_FSP_NOTIFY_PHASE_READY_TO_BOOT=y
|
||||
CONFIG_USE_FSP_NOTIFY_PHASE_END_OF_FIRMWARE=y
|
||||
# CONFIG_DISPLAY_FSP_TIMESTAMPS is not set
|
||||
# CONFIG_BUILDING_WITH_DEBUG_FSP is not set
|
||||
CONFIG_INTEL_GMA_ACPI=y
|
||||
CONFIG_VBT_CBFS_COMPRESSION_LZMA=y
|
||||
# CONFIG_VBT_CBFS_COMPRESSION_LZ4 is not set
|
||||
|
@ -760,7 +773,6 @@ CONFIG_HAVE_GPIO_SNAPSHOT_VERIFY_SUPPORT=y
|
|||
# General Debug Settings
|
||||
#
|
||||
# CONFIG_GDB_STUB is not set
|
||||
# CONFIG_FATAL_ASSERTS is not set
|
||||
CONFIG_HAVE_DEBUG_GPIO=y
|
||||
# CONFIG_DEBUG_GPIO is not set
|
||||
# CONFIG_DEBUG_CBFS is not set
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
tree="default"
|
||||
tree="dell7"
|
||||
xarch="i386-elf"
|
||||
payload_seabios="y"
|
||||
payload_grub="y"
|
||||
|
@ -9,4 +9,4 @@ vcfg="3050micro"
|
|||
build_depend="seabios/default grub/xhci memtest86plus"
|
||||
IFD_platform="sklkbl"
|
||||
grubname="fallback/payload" # make GRUB the primary payload on this board
|
||||
seabiosname="seabios.elf" # this actually disables the seabios payload
|
||||
seabiosname="seabios.elf"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
From 66896f156eaade2c01636ac445cfd47afa6a32cc Mon Sep 17 00:00:00 2001
|
||||
From 2d266c50e2062dc202209494e9c1532ce8debd29 Mon Sep 17 00:00:00 2001
|
||||
From: Mate Kukri <kukri.mate@gmail.com>
|
||||
Date: Thu, 24 Oct 2024 18:05:19 +0100
|
||||
Subject: [PATCH 61/65] [WIP] OptiPlex 3050 Micro port
|
||||
Subject: [PATCH 1/4] [WIP] OptiPlex 3050 Micro port
|
||||
|
||||
- Boots Linux
|
||||
- SMSC SCH5553 SIO/EC
|
|
@ -1,7 +1,7 @@
|
|||
From 782562bca3d9904e1e34f2cc6089876412b276cd Mon Sep 17 00:00:00 2001
|
||||
From 6140f780837726a24d6c473ac50a62fdd5ee8f2d Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <info@minifree.org>
|
||||
Date: Sun, 6 Oct 2024 17:25:27 +0100
|
||||
Subject: [PATCH 64/65] dell/optiplex_3050: add hda_verb.c
|
||||
Subject: [PATCH 2/4] dell/optiplex_3050: add hda_verb.c
|
||||
|
||||
Configured for the line jack at the front of the machine.
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
From 60de0b27075ef9cc8339896e769e4231a43ceeea Mon Sep 17 00:00:00 2001
|
||||
From e8c7028be21084ef2f89140cccb393ca7a0ff327 Mon Sep 17 00:00:00 2001
|
||||
From: Leah Rowe <info@minifree.org>
|
||||
Date: Sun, 6 Oct 2024 23:48:05 +0100
|
||||
Subject: [PATCH 65/65] dell/optiplex_3050: Add data.vbt
|
||||
Subject: [PATCH 3/4] dell/optiplex_3050: Add data.vbt
|
||||
|
||||
Signed-off-by: Leah Rowe <info@minifree.org>
|
||||
---
|
|
@ -0,0 +1,39 @@
|
|||
From d7f20d6adf94e6c4736c55e88fcd1c8bde88994a Mon Sep 17 00:00:00 2001
|
||||
From: Nicholas Chin <nic.c3.14@gmail.com>
|
||||
Date: Fri, 12 May 2023 19:55:15 -0600
|
||||
Subject: [PATCH 4/4] Remove warning for coreboot images built without a
|
||||
payload
|
||||
|
||||
I added this in upstream to prevent people from accidentally flashing
|
||||
roms without a payload resulting in a no boot situation, but in
|
||||
libreboot lbmk handles the payload and thus this warning always comes
|
||||
up. This has caused confusion and concern so just patch it out.
|
||||
---
|
||||
payloads/Makefile.mk | 13 +------------
|
||||
1 file changed, 1 insertion(+), 12 deletions(-)
|
||||
|
||||
diff --git a/payloads/Makefile.mk b/payloads/Makefile.mk
|
||||
index 5f988dac1b..516133880f 100644
|
||||
--- a/payloads/Makefile.mk
|
||||
+++ b/payloads/Makefile.mk
|
||||
@@ -50,16 +50,5 @@ distclean-payloads:
|
||||
print-repo-info-payloads:
|
||||
-$(foreach payload, $(PAYLOADS_LIST), $(MAKE) -C $(payload) print-repo-info 2>/dev/null; )
|
||||
|
||||
-ifeq ($(CONFIG_PAYLOAD_NONE),y)
|
||||
-show_notices:: warn_no_payload
|
||||
-endif
|
||||
-
|
||||
-warn_no_payload:
|
||||
- printf "\n\t** WARNING **\n"
|
||||
- printf "coreboot has been built without a payload. Writing\n"
|
||||
- printf "a coreboot image without a payload to your board's\n"
|
||||
- printf "flash chip will result in a non-booting system. You\n"
|
||||
- printf "can use cbfstool to add a payload to the image.\n\n"
|
||||
-
|
||||
.PHONY: force-payload coreinfo nvramcui
|
||||
-.PHONY: clean-payloads distclean-payloads print-repo-info-payloads warn_no_payload
|
||||
+.PHONY: clean-payloads distclean-payloads print-repo-info-payloads
|
||||
--
|
||||
2.39.5
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
tree="dell7"
|
||||
rev="e81fdd74a930b0bf8105816ea115ceaeb99bae1d"
|
|
@ -143,7 +143,6 @@ CONFIG_TPM_PIRQ=0x0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -144,7 +144,6 @@ CONFIG_TPM_PIRQ=0x0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_MT=y
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_TPM_PIRQ=0x0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_MT=y
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -144,7 +144,6 @@ CONFIG_TPM_PIRQ=0x0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_TPM_PIRQ=0x0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -141,7 +141,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
CONFIG_BOARD_DELL_E4300=y
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -139,7 +139,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
CONFIG_BOARD_DELL_E4300=y
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
CONFIG_BOARD_DELL_LATITUDE_E5420=y
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
CONFIG_BOARD_DELL_LATITUDE_E5420=y
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -141,7 +141,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
CONFIG_BOARD_DELL_E6400=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -139,7 +139,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
CONFIG_BOARD_DELL_E6400=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -138,7 +138,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
CONFIG_BOARD_DELL_E6400=y
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -142,7 +142,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -140,7 +140,6 @@ CONFIG_BOOT_DEVICE_SPI_FLASH_BUS=0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -143,7 +143,6 @@ CONFIG_TPM_PIRQ=0x0
|
|||
# CONFIG_BOARD_DELL_LATITUDE_E7240 is not set
|
||||
# CONFIG_BOARD_DELL_E4300 is not set
|
||||
# CONFIG_BOARD_DELL_E6400 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_3050 is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_SFF is not set
|
||||
# CONFIG_BOARD_DELL_OPTIPLEX_9020_MT is not set
|
||||
# CONFIG_BOARD_DELL_LATITUDE_E5420 is not set
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://www.mirrorservice.org/sites/libreboot.org/release/misc/acpica/acpica-unix-20230628.tar.gz"
|
||||
subfile_bkup="https://mirror.math.princeton.edu/pub/libreboot/misc/acpica/acpica-unix-20230628.tar.gz"
|
||||
subhash="d726e69ebd8b8110690e3aff8d1919b43b0a2185efdeb9131ea8d89d321ca3a318a89c721ea740ae366f31ed3d1c11c2906f8807ee8a190e6f67fe5b2023cea4"
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://ftp.nluug.nl/pub/gnu/binutils/binutils-2.43.1.tar.xz"
|
||||
subfile_bkup="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/binutils/binutils-2.43.1.tar.xz"
|
||||
subhash="20977ad17729141a2c26d358628f44a0944b84dcfefdec2ba029c2d02f40dfc41cc91c0631044560d2bd6f9a51e1f15846b4b311befbe14f1239f14ff7d57824"
|
|
@ -0,0 +1,3 @@
|
|||
subrepo="https://review.coreboot.org/fsp.git"
|
||||
subrepo_bkup="https://github.com/coreboot/fsp"
|
||||
subhash="68328e297e195a6cfb1949b60d971c032a172ba3"
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz"
|
||||
subfile_bkup="https://ftp.nluug.nl/pub/gnu/gcc/gcc-14.2.0/gcc-14.2.0.tar.xz"
|
||||
subhash="932bdef0cda94bacedf452ab17f103c0cb511ff2cec55e9112fc0328cbf1d803b42595728ea7b200e0a057c03e85626f937012e49a7515bc5dd256b2bf4bc396"
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz"
|
||||
subfile_bkup="https://ftp.nluug.nl/pub/gnu/gmp/gmp-6.3.0.tar.xz"
|
||||
subhash="e85a0dab5195889948a3462189f0e0598d331d3457612e2d3350799dba2e244316d256f8161df5219538eb003e4b5343f989aaa00f96321559063ed8c8f29fd2"
|
|
@ -0,0 +1,3 @@
|
|||
subrepo="https://review.coreboot.org/intel-microcode.git"
|
||||
subrepo_bkup="https://github.com/coreboot/intel-microcode"
|
||||
subhash="fbfe741896c55b36fcbf0560a68be96286103556"
|
|
@ -0,0 +1,3 @@
|
|||
subrepo="https://review.coreboot.org/libgfxinit.git"
|
||||
subrepo_bkup="https://github.com/coreboot/libgfxinit"
|
||||
subhash="17cfc92f402493979783585b6581efbd98c0cf07"
|
|
@ -0,0 +1,42 @@
|
|||
From ba078864500de99c26b6ea7e3fdcef19bca582a7 Mon Sep 17 00:00:00 2001
|
||||
From: Nicholas Chin <nic.c3.14@gmail.com>
|
||||
Date: Mon, 20 May 2024 10:10:03 -0600
|
||||
Subject: [PATCH 1/1] g45/hw-gfx-gma-plls.adb: Make reference clock frequency
|
||||
configurable
|
||||
|
||||
Instead of assuming a 96 MHz reference clock frequency, use the value
|
||||
specified by the new INTEL_GMA_DPLL_REF_FREQ Kconfig. This defaults to
|
||||
96 MHz to preserve the existing behavior. An example of where this is
|
||||
needed is the DPLL_REF_SSCLK input, which will typically be 100 MHz
|
||||
to support LVDS spread spectrum clocking.
|
||||
|
||||
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
|
||||
---
|
||||
common/g45/hw-gfx-gma-plls.adb | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/common/g45/hw-gfx-gma-plls.adb b/common/g45/hw-gfx-gma-plls.adb
|
||||
index 67242f2..5e970d7 100644
|
||||
--- a/common/g45/hw-gfx-gma-plls.adb
|
||||
+++ b/common/g45/hw-gfx-gma-plls.adb
|
||||
@@ -12,6 +12,8 @@
|
||||
-- GNU General Public License for more details.
|
||||
--
|
||||
|
||||
+with CB.Config;
|
||||
+
|
||||
with HW.Time;
|
||||
with HW.GFX.GMA.Config;
|
||||
with HW.GFX.GMA.Registers;
|
||||
@@ -460,7 +462,7 @@ is
|
||||
(Display => Port_Cfg.Display,
|
||||
Target_Dotclock => Target_Clock,
|
||||
-- should be, but doesn't has to be always the same:
|
||||
- Reference_Clock => 96_000_000,
|
||||
+ Reference_Clock => CB.Config.INTEL_GMA_DPLL_REF_FREQ,
|
||||
Best_Clock => Clk,
|
||||
Valid => Success);
|
||||
else
|
||||
--
|
||||
2.39.2
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
subrepo="https://review.coreboot.org/libhwbase.git"
|
||||
subrepo_bkup="https://github.com/coreboot/libhwbase"
|
||||
subhash="584629b9f4771b7618951cec57df2ca3af9c6981"
|
|
@ -0,0 +1,12 @@
|
|||
3rdparty/fsp
|
||||
3rdparty/intel-microcode
|
||||
3rdparty/libgfxinit
|
||||
3rdparty/libhwbase
|
||||
3rdparty/vboot
|
||||
util/crossgcc/tarballs/binutils-2.43.1.tar.xz
|
||||
util/crossgcc/tarballs/gcc-14.2.0.tar.xz
|
||||
util/crossgcc/tarballs/gmp-6.3.0.tar.xz
|
||||
util/crossgcc/tarballs/mpc-1.3.1.tar.gz
|
||||
util/crossgcc/tarballs/mpfr-4.2.1.tar.xz
|
||||
util/crossgcc/tarballs/nasm-2.16.03.tar.bz2
|
||||
util/crossgcc/tarballs/acpica-unix-20230628.tar.gz
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpc/mpc-1.3.1.tar.gz"
|
||||
subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpc/mpc-1.3.1.tar.gz"
|
||||
subhash="4bab4ef6076f8c5dfdc99d810b51108ced61ea2942ba0c1c932d624360a5473df20d32b300fc76f2ba4aa2a97e1f275c9fd494a1ba9f07c4cb2ad7ceaeb1ae97"
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/mpfr/mpfr-4.2.1.tar.xz"
|
||||
subfile_bkup="https://ftp.nluug.nl/pub/gnu/mpfr/mpfr-4.2.1.tar.xz"
|
||||
subhash="bc68c0d755d5446403644833ecbb07e37360beca45f474297b5d5c40926df1efc3e2067eecffdf253f946288bcca39ca89b0613f545d46a9e767d1d4cf358475"
|
|
@ -0,0 +1,3 @@
|
|||
subfile="https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/nasm-2.16.03.tar.bz2"
|
||||
subfile_bkup="https://www.mirrorservice.org/sites/distfiles.macports.org/nasm/nasm-2.16.03.tar.bz2"
|
||||
subhash="f28445d368debdf44219cc57df33800a8c0e49186cd60836d4adfec7700d53b801d34aa9fc9bfda74169843f33a1e8b465e11292582eb968bb9c3a26f54dd172"
|
|
@ -0,0 +1,3 @@
|
|||
subrepo="https://review.coreboot.org/vboot.git"
|
||||
subrepo_bkup="https://github.com/coreboot/vboot"
|
||||
subhash="f1f70f46dc5482bb7c654e53ed58d4001e386df2"
|
|
@ -0,0 +1,178 @@
|
|||
From 195f61375aeec9eec16604ec59f6eda2e6058cc1 Mon Sep 17 00:00:00 2001
|
||||
From: "Luke T. Shumaker" <lukeshu@lukeshu.com>
|
||||
Date: Thu, 30 May 2024 14:08:33 -0600
|
||||
Subject: [PATCH 1/1] extract_vmlinuz.c: Fix the bounds check on
|
||||
vmlinuz_header_{offset,size}
|
||||
|
||||
The check on vmlinuz_header_offset and vmlinuz_header_size is obviously
|
||||
wrong:
|
||||
|
||||
if (!vmlinuz_header_size ||
|
||||
kpart_data + vmlinuz_header_offset + vmlinuz_header_size >
|
||||
kpart_data) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
`kpart_data + some_unsigned_values` can obviously never be `> kpart_data`,
|
||||
unless something has overflowed! And `vmlinuz_header_offset` hasn't even
|
||||
been set yet (besides being initialized to zero)!
|
||||
|
||||
GCC will deduce that if the check didn't cause the function to bail, then
|
||||
vmlinuz_header_size (a uint32_t) must be "negative"; that is: in the range
|
||||
[2GiB,4GiB).
|
||||
|
||||
On platforms where size_t is 32-bits, this is *especially* broken.
|
||||
memcpy's size argument must be in the range [0,2GiB). Because GCC has
|
||||
proved that vmlinuz_header_size is higher than that, it will fail to
|
||||
compile:
|
||||
|
||||
host/lib/extract_vmlinuz.c:67:9: error: 'memcpy' specified bound between 2147483648 and 4294967295 exceeds maximum object size 2147483647 [-Werror=stringop-overflow=]
|
||||
|
||||
So, fix the check.
|
||||
|
||||
I can now say that what I suspect the original author meant to write would
|
||||
be the following patch, if `vmlinuz_header_offset` were already set:
|
||||
|
||||
-kpart_data + vmlinuz_header_offset + vmlinuz_header_size > kpart_data
|
||||
+now + vmlinuz_header_offset + vmlinuz_header_size > kpart_size
|
||||
|
||||
This hypothesis is supported by `now` not getting incremented by
|
||||
`kblob_size` the way it is for the keyblock and preamble sizes.
|
||||
|
||||
However, we can also see that even this "corrected" bounds check is
|
||||
insufficient: it does not detect the vmlinuz_header overflowing into
|
||||
kblob_data.
|
||||
|
||||
OK, so let's describe the fix:
|
||||
|
||||
Have a `*vmlinuz_header` pointer instead of a
|
||||
`uint64_t vmlinuz_header_offset`, to be more similar to all the other
|
||||
regions. With this change, the correct check becomes a simple
|
||||
|
||||
vmlinuz_header + vmlinuz_header_size > kblob_data
|
||||
|
||||
While we're at it, make some changes that could have helped avoid this in
|
||||
the first place:
|
||||
|
||||
- Add comments.
|
||||
- Calculate the vmlinuz_header offset right away, instead of waiting.
|
||||
- Go ahead and increment `now` by `kblob_size`, to increase regularity.
|
||||
|
||||
Change-Id: I5c03e49070b6dd2e04459566ef7dd129d27736e4
|
||||
---
|
||||
host/lib/extract_vmlinuz.c | 72 +++++++++++++++++++++++++++-----------
|
||||
1 file changed, 51 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/host/lib/extract_vmlinuz.c b/host/lib/extract_vmlinuz.c
|
||||
index 4ccfcf33..d2c09443 100644
|
||||
--- a/host/lib/extract_vmlinuz.c
|
||||
+++ b/host/lib/extract_vmlinuz.c
|
||||
@@ -15,16 +15,44 @@
|
||||
|
||||
int ExtractVmlinuz(void *kpart_data, size_t kpart_size,
|
||||
void **vmlinuz_out, size_t *vmlinuz_size) {
|
||||
+ // We're going to be extracting `vmlinuz_header` and
|
||||
+ // `kblob_data`, and returning the concatenation of them.
|
||||
+ //
|
||||
+ // kpart_data = +-[kpart_size]------------------------------------+
|
||||
+ // | |
|
||||
+ // keyblock = | +-[keyblock->keyblock_size]-------------------+ |
|
||||
+ // | | struct vb2_keyblock keyblock | |
|
||||
+ // | | char [] ...data... | |
|
||||
+ // | +---------------------------------------------+ |
|
||||
+ // | |
|
||||
+ // preamble = | +-[preamble->preamble_size]-------------------+ |
|
||||
+ // | | struct vb2_kernel_preamble preamble | |
|
||||
+ // | | char [] ...data... | |
|
||||
+ // | | char [] vmlinuz_header | |
|
||||
+ // | | char [] ...data... | |
|
||||
+ // | +---------------------------------------------+ |
|
||||
+ // | |
|
||||
+ // kblob_data= | +-[preamble->body_signature.data_size]--------+ |
|
||||
+ // | | char [] ...data... | |
|
||||
+ // | +---------------------------------------------+ |
|
||||
+ // | |
|
||||
+ // +-------------------------------------------------+
|
||||
+
|
||||
size_t now = 0;
|
||||
+ // The 3 sections of kpart_data.
|
||||
+ struct vb2_keyblock *keyblock = NULL;
|
||||
struct vb2_kernel_preamble *preamble = NULL;
|
||||
uint8_t *kblob_data = NULL;
|
||||
uint32_t kblob_size = 0;
|
||||
+ // vmlinuz_header
|
||||
+ uint8_t *vmlinuz_header = NULL;
|
||||
uint32_t vmlinuz_header_size = 0;
|
||||
- uint64_t vmlinuz_header_address = 0;
|
||||
- uint64_t vmlinuz_header_offset = 0;
|
||||
+ // The concatenated result.
|
||||
void *vmlinuz = NULL;
|
||||
|
||||
- struct vb2_keyblock *keyblock = (struct vb2_keyblock *)kpart_data;
|
||||
+ // Isolate the 3 sections of kpart_data.
|
||||
+
|
||||
+ keyblock = (struct vb2_keyblock *)kpart_data;
|
||||
now += keyblock->keyblock_size;
|
||||
if (now > kpart_size)
|
||||
return 1;
|
||||
@@ -36,37 +64,39 @@ int ExtractVmlinuz(void *kpart_data, size_t kpart_size,
|
||||
|
||||
kblob_data = kpart_data + now;
|
||||
kblob_size = preamble->body_signature.data_size;
|
||||
-
|
||||
- if (!kblob_data || (now + kblob_size) > kpart_size)
|
||||
+ now += kblob_size;
|
||||
+ if (now > kpart_size)
|
||||
return 1;
|
||||
|
||||
+ // Find `vmlinuz_header` within `preamble`.
|
||||
+
|
||||
if (preamble->header_version_minor > 0) {
|
||||
- vmlinuz_header_address = preamble->vmlinuz_header_address;
|
||||
+ // calculate the vmlinuz_header offset from
|
||||
+ // the beginning of the kpart_data. The kblob doesn't
|
||||
+ // include the body_load_offset, but does include
|
||||
+ // the keyblock and preamble sections.
|
||||
+ size_t vmlinuz_header_offset =
|
||||
+ preamble->vmlinuz_header_address -
|
||||
+ preamble->body_load_address +
|
||||
+ keyblock->keyblock_size +
|
||||
+ preamble->preamble_size;
|
||||
+
|
||||
+ vmlinuz_header = kpart_data + vmlinuz_header_offset;
|
||||
vmlinuz_header_size = preamble->vmlinuz_header_size;
|
||||
}
|
||||
|
||||
- if (!vmlinuz_header_size ||
|
||||
- kpart_data + vmlinuz_header_offset + vmlinuz_header_size >
|
||||
- kpart_data) {
|
||||
+ if (!vmlinuz_header ||
|
||||
+ !vmlinuz_header_size ||
|
||||
+ vmlinuz_header + vmlinuz_header_size > kblob_data) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
- // calculate the vmlinuz_header offset from
|
||||
- // the beginning of the kpart_data. The kblob doesn't
|
||||
- // include the body_load_offset, but does include
|
||||
- // the keyblock and preamble sections.
|
||||
- vmlinuz_header_offset = vmlinuz_header_address -
|
||||
- preamble->body_load_address +
|
||||
- keyblock->keyblock_size +
|
||||
- preamble->preamble_size;
|
||||
+ // Concatenate and return.
|
||||
|
||||
vmlinuz = malloc(vmlinuz_header_size + kblob_size);
|
||||
if (vmlinuz == NULL)
|
||||
return 1;
|
||||
-
|
||||
- memcpy(vmlinuz, kpart_data + vmlinuz_header_offset,
|
||||
- vmlinuz_header_size);
|
||||
-
|
||||
+ memcpy(vmlinuz, vmlinuz_header, vmlinuz_header_size);
|
||||
memcpy(vmlinuz + vmlinuz_header_size, kblob_data, kblob_size);
|
||||
|
||||
*vmlinuz_out = vmlinuz;
|
||||
--
|
||||
2.45.1
|
||||
|
Loading…
Reference in New Issue