diff options
| author | Felix Singer <felixsinger@posteo.net> | 2020-12-06 11:51:10 +0100 |
|---|---|---|
| committer | Michael Niewöhner <foss@mniewoehner.de> | 2020-12-08 20:50:27 +0000 |
| commit | d60abfcb74ab4580f95cba1f8bfd71824acd7de6 (patch) | |
| tree | b884cf2c9a923c2fc977721b3af85aef58befeb2 | |
| parent | bd7020d68cca2d64869e9fd59cfcb125d80589ad (diff) | |
soc/intel/skylake: Shorten SATA mode enum value names
The Skylake FSP isn't used by coreboot anymore. Therefore, drop the
misleading comment and the "KBLFSP" extension from the names of these
enums.
Also, drop the "MODE" extension to make their names shorter in general,
since it doesn't add any more value.
Built clevo/n130wu with BUILD_TIMELESS=1, coreboot.rom remains
identical.
Change-Id: If37d40e4e1dfd11e9315039acde7cafee0ac60f0
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48377
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb | 2 | ||||
| -rw-r--r-- | src/mainboard/kontron/bsl6/devicetree.cb | 2 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x11-lga1151-series/devicetree.cb | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/chip.h | 7 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb b/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb index 55c5a69b52..f65a3d35d5 100644 --- a/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb +++ b/src/mainboard/clevo/kbl-u/variants/n13xwu/devicetree.cb @@ -80,7 +80,7 @@ chip soc/intel/skylake device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 on # SATA - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "0" # Ports register "SataPortsEnable[0]" = "1" diff --git a/src/mainboard/kontron/bsl6/devicetree.cb b/src/mainboard/kontron/bsl6/devicetree.cb index ef1f0d4a5f..9b3b8bf10b 100644 --- a/src/mainboard/kontron/bsl6/devicetree.cb +++ b/src/mainboard/kontron/bsl6/devicetree.cb @@ -95,7 +95,7 @@ chip soc/intel/skylake device pci 16.3 off end # Management Engine KT Redirection device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 on # SATA - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "1" register "SataPortsEnable[0]" = "1" register "SataPortsEnable[1]" = "1" diff --git a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb index c021372fb9..422cd8452d 100644 --- a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb +++ b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb @@ -5,7 +5,7 @@ chip soc/intel/skylake register "SaGv" = "SaGv_Disabled" # SATA configuration - register "SataMode" = "KBLFSP_SATA_MODE_AHCI" + register "SataMode" = "SATA_AHCI" register "SataSalpSupport" = "1" register "SataPortsEnable" = "{ \ [0] = 1, \ diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h index 0bab45ab22..58d172f074 100644 --- a/src/soc/intel/skylake/chip.h +++ b/src/soc/intel/skylake/chip.h @@ -142,11 +142,8 @@ struct soc_intel_skylake_config { /* SATA related */ enum { - /* Documentation and header files of Skylake FSP disagree on - the values, Kaby Lake FSP (KabylakeFsp0001 on github) uses - these: */ - KBLFSP_SATA_MODE_AHCI = 0, - KBLFSP_SATA_MODE_RAID = 1, + SATA_AHCI = 0, + SATA_RAID = 1, } SataMode; u8 SataSalpSupport; u8 SataPortsEnable[8]; |