File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 22
33export CONFIG_COREBOOT=y
44export CONFIG_COREBOOT_VERSION=dasharo
5- export CONFIG_LINUX_VERSION=6.1.8
5+ export CONFIG_LINUX_VERSION=6.11.9
66
77CONFIG_COREBOOT_CONFIG=config/coreboot-novacustom-v540tu.config
88CONFIG_LINUX_CONFIG=config/linux-nitropad-x.config
Original file line number Diff line number Diff line change @@ -34,6 +34,9 @@ linux_hash := 40f014d53e81f204f6d2a364aae4201ae07970dd1b70dc602d7c66c1a140f558
3434else ifeq "$(CONFIG_LINUX_VERSION)" "6.1.8"
3535linux_version := 6.1.8
3636linux_hash := b60bb53ab8ba370a270454b11e93d41af29126fc72bd6ede517673e2e57b816d
37+ else ifeq "$(CONFIG_LINUX_VERSION)" "6.11.9"
38+ linux_version := 6.11.9
39+ linux_hash := 75658a7aa3bd9598c96ee1e5862c5e1d34fced75c28d825c727a1510a6f384b4
3740else
3841$(error "$(BOARD): does not specify linux kernel version under CONFIG_LINUX_VERSION")
3942endif
@@ -280,7 +283,7 @@ linux.save_in_versioned_defconfig_format:
280283
281284# This one can be used in kernel version bump, which will accept all new defconfig options for the new version.
282285# PLEASE VERIFY CHANGES AND KEEP THINGS MINIMAL IN PRs.
283- linux.save_in_oldconfig_format_in_place :
286+ linux.save_in_olddefconfig_format_in_place :
284287 mkdir -p "$(build)/$(linux_dir)" \
285288 && cp "$(pwd)/$(linux_kconfig)" "$(build)/$(linux_dir)/.config" \
286289 && $(MAKE) -C "$(build)/$(linux_base_dir)" \
Original file line number Diff line number Diff line change 1+ diff --recursive -u ./clean/linux-4.9.80/drivers/acpi/acpica/evxfevnt.c linux-4.9.80/drivers/acpi/acpica/evxfevnt.c
2+ --- ./clean/linux-4.9.80/drivers/acpi/acpica/evxfevnt.c 2018-02-03 11:05:43.000000000 -0500
3+ +++ linux-4.9.80/drivers/acpi/acpica/evxfevnt.c 2018-02-07 15:51:28.786502597 -0500
4+ @@ -111,6 +111,8 @@
5+ }
6+
7+ ACPI_ERROR((AE_INFO, "Hardware did not enter ACPI mode"));
8+ + printk("%s:%d faking ACPI mode\n", __func__, __LINE__);
9+ + return_ACPI_STATUS(AE_OK);
10+ return_ACPI_STATUS(AE_NO_HARDWARE_RESPONSE);
11+ }
12+
13+ diff --recursive -u ./clean/linux-4.9.80/drivers/acpi/acpica/hwacpi.c linux-4.9.80/drivers/acpi/acpica/hwacpi.c
14+ --- ./clean/linux-4.9.80/drivers/acpi/acpica/hwacpi.c 2018-02-03 11:05:43.000000000 -0500
15+ +++ linux-4.9.80/drivers/acpi/acpica/hwacpi.c 2018-02-07 15:51:35.126557868 -0500
16+ @@ -168,12 +168,16 @@
17+
18+ status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
19+ if (ACPI_FAILURE(status)) {
20+ + printk("%s:%d faking ACPI mode\n", __func__, __LINE__);
21+ + return_UINT32(ACPI_SYS_MODE_ACPI);
22+ return_UINT32(ACPI_SYS_MODE_LEGACY);
23+ }
24+
25+ if (value) {
26+ return_UINT32(ACPI_SYS_MODE_ACPI);
27+ } else {
28+ + //printk("%s:%d faking ACPI mode\n", __func__, __LINE__);
29+ + // return_UINT32(ACPI_SYS_MODE_ACPI);
30+ return_UINT32(ACPI_SYS_MODE_LEGACY);
31+ }
32+ }
Original file line number Diff line number Diff line change 1+ diff --recursive -u ./clean/linux-4.9.80/drivers/ata/libahci.c linux-4.9.80/drivers/ata/libahci.c
2+ --- ./clean/linux-4.9.80/drivers/ata/libahci.c 2018-02-03 11:05:43.000000000 -0500
3+ +++ linux-4.9.80/drivers/ata/libahci.c 2018-02-07 18:02:32.526535910 -0500
4+ @@ -537,8 +537,12 @@
5+ }
6+
7+ /* fabricate port_map from cap.nr_ports for < AHCI 1.3 */
8+ - if (!port_map && vers < 0x10300) {
9+ - port_map = (1 << ahci_nr_ports(cap)) - 1;
10+ + if (!port_map) { // && vers < 0x10300) {
11+ + printk("%s: saved_port=%02x\n", __func__, hpriv->saved_port_map);
12+ + writel(0x1, mmio + HOST_PORTS_IMPL);
13+ + port_map = readl(mmio + HOST_PORTS_IMPL);
14+ +
15+ + //port_map = (1 << ahci_nr_ports(cap)) - 1;
16+ dev_warn(dev, "forcing PORTS_IMPL to 0x%lx\n", port_map);
17+
18+ /* write the fixed up value to the PI register */
You can’t perform that action at this time.
0 commit comments