the following patch was just integrated into master:
commit ae6e0c6bebc45f4c0b21a68e636a0d87b78db9cb
Author: Martin Roth <gaumless(a)gmail.com>
Date: Mon May 19 15:28:00 2014 -0600
cpu/intel/fsp_model_206ax: change realpath to readlink
realpath and readlink can be used to do the same thing - in this case
we're turning path1/path2/../path3/path4 into path1/path3/path4 so
that the makefile's wildcard routine can evaluate it.
Debian derivatives don't seem to include realpath. (and even when it's
installed, it's not the gnu coreutils version.)
Change-Id: I0a80a1d9b563810bdf96aea9d5de79ce1cea457a
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
Reviewed-on: http://review.coreboot.org/5793
Reviewed-by: Marc Jones <marc.jones(a)se-eng.com>
Tested-by: build bot (Jenkins)
See http://review.coreboot.org/5793 for details.
-gerrit
Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5886
-gerrit
commit dd52a55d2f85cbc16463f0462c6da465568161aa
Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
Date: Sat May 31 07:41:14 2014 +1000
mainboard/jetway/nf81-t56n-lf: Rewrite ACPI OS detection
Rewrite the ACPI OS detection method to support modern versions of
Windows and consider FreeBSD also.
Change-Id: Ied6a300fc17e455db1a51368fea238a53df657a8
Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
---
.../jetway/nf81-t56n-lf/acpi/mainboard.asl | 47 ++++++++++++++++------
1 file changed, 34 insertions(+), 13 deletions(-)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
index 49ea44f..47c17df 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
@@ -2,6 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2011 Advanced Micro Devices, Inc.
+ * Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -30,27 +31,47 @@ Name(HPBA, 0xFED00000) /* Base address of HPET table */
Name(SSFG, 0x0D) /* S1 support: bit 0, S2 Support: bit 1, etc. S0 & S5 assumed */
/* Some global data */
-Name(OSTP, 3) /* Assume nothing. WinXp = 1, Vista = 2, Linux = 3, WinCE = 4 */
+Name(OSTP, 3)
Name(OSV, Ones) /* Assume nothing */
Name(PMOD, One) /* Assume APIC */
Scope(\_SB) {
- Method(CkOT, 0){
-
- if(LNotEqual(OSTP, Ones)) {Return(OSTP)} /* OS version was already detected */
+ Method(CkOT, 0, NotSerialized)
+ {
+ If (LNotEqual (OSTP, Ones))
+ {
+ Return (OSTP) /* OS version was already detected */
+ }
- if(CondRefOf(\_OSI,Local1))
+ Store (One, OSTP) /* Assume some form of XP */
+ If (CondRefOf (\_OSI, Local1))
+ {
+ If (\_OSI ("Linux"))
+ {
+ Store (0x03, OSTP)
+ }
+ If (\_OSI ("FreeBSD"))
+ {
+ Store (0x06, OSTP)
+ }
+ If (\_OSI("Windows 2009"))
+ {
+ Store(0x0E, OSTP)
+ }
+ }
+ Else
{
- Store(1, OSTP) /* Assume some form of XP */
- if (\_OSI("Windows 2006")) /* Vista */
+ If (WCMP (\_OS, "Microsoft Windows"))
{
- Store(2, OSTP)
+ Store(One, OSTP)
}
- } else {
- If(WCMP(\_OS,"Linux")) {
- Store(3, OSTP) /* Linux */
- } Else {
- Store(4, OSTP) /* Gotta be WinCE */
+ If (WCMP (\_OS, "Linux"))
+ {
+ Store(0x03, OSTP)
+ }
+ If (WCMP (\_OS, "FreeBSD"))
+ {
+ Store(0x06, OSTP)
}
}
Return(OSTP)
Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5793
-gerrit
commit 37a152f8a840a87609530ae860fb5f4b4886ac7b
Author: Martin Roth <gaumless(a)gmail.com>
Date: Mon May 19 15:28:00 2014 -0600
cpu/intel/fsp_model_206ax: change realpath to readlink
realpath and readlink can be used to do the same thing - in this case
we're turning path1/path2/../path3/path4 into path1/path3/path4 so
that the makefile's wildcard routine can evaluate it.
Debian derivatives don't seem to include realpath. (and even when it's
installed, it's not the gnu coreutils version.)
Change-Id: I0a80a1d9b563810bdf96aea9d5de79ce1cea457a
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
---
src/cpu/intel/fsp_model_206ax/Makefile.inc | 2 +-
src/soc/intel/fsp_baytrail/microcode/Makefile.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/cpu/intel/fsp_model_206ax/Makefile.inc b/src/cpu/intel/fsp_model_206ax/Makefile.inc
index c6d7339..cb7f2a8 100644
--- a/src/cpu/intel/fsp_model_206ax/Makefile.inc
+++ b/src/cpu/intel/fsp_model_206ax/Makefile.inc
@@ -8,7 +8,7 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c
cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
ifneq ($(CONFIG_MICROCODE_INCLUDE_PATH),)
-ifneq ($(wildcard $(shell realpath -L "$(top)/$(CONFIG_MICROCODE_INCLUDE_PATH)")),)
+ifneq ($(wildcard $(shell readlink -f "$(top)/$(CONFIG_MICROCODE_INCLUDE_PATH)")),)
CPPFLAGS_common += -I$(CONFIG_MICROCODE_INCLUDE_PATH)
endif
endif
diff --git a/src/soc/intel/fsp_baytrail/microcode/Makefile.inc b/src/soc/intel/fsp_baytrail/microcode/Makefile.inc
index 012c712..f6ee135 100644
--- a/src/soc/intel/fsp_baytrail/microcode/Makefile.inc
+++ b/src/soc/intel/fsp_baytrail/microcode/Makefile.inc
@@ -19,7 +19,7 @@
cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c
ifneq ($(CONFIG_MICROCODE_INCLUDE_PATH),)
-ifneq ($(wildcard $(shell realpath -q -L "$(top)/$(CONFIG_MICROCODE_INCLUDE_PATH)")),)
+ifneq ($(wildcard $(shell readlink -f "$(top)/$(CONFIG_MICROCODE_INCLUDE_PATH)")),)
CPPFLAGS_common += -I$(CONFIG_MICROCODE_INCLUDE_PATH)
endif
endif