Skip to content

Commit

Permalink
cleanup/further rename affects
Browse files Browse the repository at this point in the history
  • Loading branch information
@RehabMan
RehabMan committed May 7, 2018
1 parent 65f624a commit b2052c1
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 45 deletions.
2 changes: 1 addition & 1 deletion SSDT-D-DA.dsl
View file
Expand Up @@ -8,7 +8,7 @@
// provides an easy way to disable it by simply enabling this SSDT from the Clover menu.
// By default, this SSDT is not injected due to it being listed in DisabledAML.

DefinitionBlock("", "SSDT", 2, "hack", "_DISDA", 0)
DefinitionBlock("", "SSDT", 2, "hack", "_D-DA", 0)
{
Name(RMDA, 1)
}
Expand Down
2 changes: 1 addition & 1 deletion SSDT-NUC5.dsl
View file
Expand Up @@ -28,7 +28,7 @@ DefinitionBlock("", "SSDT", 2, "hack", "_NUC5", 0)
#include "SSDT-HDEF.dsl"
#include "SSDT-HDAU.dsl"
#include "SSDT-LPC.dsl"
#include "SSDT-Disable_EHCI.dsl"
#include "SSDT-D-EHCI.dsl"
#include "SSDT-EC.dsl"
//#include "SSDT-PTS.dsl"
}
Expand Down
19 changes: 1 addition & 18 deletions SSDT-RMNE.dsl
View file
@@ -1,21 +1,4 @@
/* ssdt.dsl -- SSDT injector for NullEthernet
*
* Copyright (c) 2014 RehabMan <racerrehabman@gmail.com>
* All rights reserved.
*
* 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 the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
*/

// Use this SSDT as an alternative to patching your DSDT...
// SSDT-RMNE.dsl -- SSDT injector for NullEthernet

//DefinitionBlock("", "SSDT", 2, "RehabMan", "_RMNE", 0x00001000)
//{
Expand Down
2 changes: 1 addition & 1 deletion SSDT-SKLSPF.dsl
View file
@@ -1,4 +1,4 @@
// SSDT-SkylakeSpoof.dsl
// SSDT-SKLSPF.dsl
//
// The purpose of this file is to allow KabyLake systems to spoof Skylake graphics.
// Just include the built version of this file in ACPI/patched.
Expand Down
2 changes: 1 addition & 1 deletion SSDT_NVMe09.dsl
View file
@@ -1,6 +1,6 @@
// Inject bogus class code for NVMe SSD so that native IONVMeFamily.kext does not load

DefinitionBlock("", "SSDT", 2, "hack", "_NVMe09", 0)
DefinitionBlock("", "SSDT", 2, "hack", "@NVMe09", 0)
{
External(_SB.PCI0.RP09.PXSX, DeviceObj)
Method(_SB.PCI0.RP09.PXSX._DSM, 4)
Expand Down
2 changes: 1 addition & 1 deletion SSDT_NVMe13.dsl
View file
@@ -1,6 +1,6 @@
// Inject bogus class code for NVMe SSD so that native IONVMeFamily.kext does not load

DefinitionBlock("", "SSDT", 2, "hack", "_NVMe13", 0)
DefinitionBlock("", "SSDT", 2, "hack", "@NVMe13", 0)
{
External(_SB.PCI0.RP13.PXSX, DeviceObj)
Method(_SB.PCI0.RP13.PXSX._DSM, 4)
Expand Down
24 changes: 12 additions & 12 deletions makefile
View file
Expand Up @@ -29,16 +29,16 @@ ALL=$(BUILDDIR)/SSDT-NUC5.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT-NUC6.aml $(BUILDDIR)/SSDT-NUC6-SC.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT-NUC7.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT-STCK6.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT_NVMe-RP09.aml $(BUILDDIR)/SSDT_NVMe-RP13.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT-DisableDA.aml $(BUILDDIR)/SSDT-SkylakeSpoof.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT_NVMe09.aml $(BUILDDIR)/SSDT_NVMe13.aml
ALL:=$(ALL) $(BUILDDIR)/SSDT-D-DA.aml $(BUILDDIR)/SSDT-SKLSPF.aml

.PHONY: all
all: $(ALL) $(HDAZML_ALL) #$(HDAINJECT) $(HDAHCDINJECT)

$(BUILDDIR)/%.aml : %.dsl
iasl $(IASLOPTS) -p $@ $<

$(BUILDDIR)/SSDT-NUC5.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-HDAU.dsl SSDT-LPC.dsl SSDT-Disable_EHCI.dsl SSDT-EC.dsl SSDT-PTS.dsl
$(BUILDDIR)/SSDT-NUC5.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-HDAU.dsl SSDT-LPC.dsl SSDT-D-EHCI.dsl SSDT-EC.dsl SSDT-PTS.dsl

$(BUILDDIR)/SSDT-NUC6.aml: SSDT-XOSI.dsl SSDT-IGPU.dsl SSDT-USB.dsl SSDT-XHC.dsl SSDT-SATA.dsl SSDT-NUCHDA.dsl SSDT-HDEF.dsl SSDT-EC.dsl SSDT-PTS.dsl

Expand All @@ -52,9 +52,9 @@ $(BUILDDIR)/SSDT_NVMe-RP09.aml: SSDT_NVMe-RP09.dsl

$(BUILDDIR)/SSDT_NVMe-RP13.aml: SSDT_NVMe-RP13.dsl

$(BUILDDIR)/SSDT-DisableDA.aml: SSDT-DisableDA.dsl
$(BUILDDIR)/SSDT-D-DA.aml: SSDT-D-DA.dsl

$(BUILDDIR)/SSDT-SkylakeSpoof.aml: SSDT-SkylakeSpoof.dsl
$(BUILDDIR)/SSDT-SKLSPF.aml: SSDT-SKLSPF.dsl


.PHONY: clean
Expand All @@ -69,48 +69,48 @@ install_nuc5: $(ALL)
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT-*.aml
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT.aml
cp $(BUILDDIR)/SSDT-NUC5.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-DisableDA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-D-DA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched

.PHONY: install_nuc6
install_nuc6: $(ALL)
$(eval EFIDIR:=$(shell ./mount_efi.sh))
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT-*.aml
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT.aml
cp $(BUILDDIR)/SSDT-NUC6.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-DisableDA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-D-DA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched

.PHONY: install_nuc6sc
install_nuc6sc: $(ALL)
$(eval EFIDIR:=$(shell ./mount_efi.sh))
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT-*.aml
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT.aml
cp $(BUILDDIR)/SSDT-NUC6-SC.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-DisableDA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-D-DA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched

.PHONY: install_nuc7
install_nuc7: $(ALL)
$(eval EFIDIR:=$(shell ./mount_efi.sh))
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT-*.aml
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT.aml
cp $(BUILDDIR)/SSDT-NUC7.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-DisableDA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-D-DA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched

.PHONY: install_nuc7spoof
install_nuc7spoof: $(ALL)
$(eval EFIDIR:=$(shell ./mount_efi.sh))
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT-*.aml
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT.aml
cp $(BUILDDIR)/SSDT-NUC7.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-DisableDA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-SkylakeSpoof.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-D-DA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-SKLSPF.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched

.PHONY: install_stick6
install_stick6: $(ALL)
$(eval EFIDIR:=$(shell ./mount_efi.sh))
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT-*.aml
rm -f $(EFIDIR)/EFI/CLOVER/ACPI/patched/SSDT.aml
cp $(BUILDDIR)/SSDT-STCK6.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-DisableDA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched
cp $(BUILDDIR)/SSDT-D-DA.aml $(EFIDIR)/EFI/CLOVER/ACPI/patched

#$(HDAINJECT) $(HDAHCDINJECT) $(HDAZML_ALL): $(RESOURCES)/*.plist ./patch_hda.sh
$(HDAZML_ALL): $(RESOURCES)/*.plist ./patch_hda.sh
Expand Down
20 changes: 10 additions & 10 deletions nuc5.xcodeproj/project.pbxproj
View file
Expand Up @@ -15,7 +15,7 @@
84178DE71D0DD4AE006A3D30 /* config_nuc6_sc.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_nuc6_sc.plist; sourceTree = "<group>"; };
84490D5D1A14945B000E1BFB /* patch_hda.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = patch_hda.sh; sourceTree = "<group>"; };
8467C38E1A23A9FC00FCF396 /* mount_efi.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = mount_efi.sh; sourceTree = "<group>"; };
ED0EF6761CFBE3EA00243958 /* SSDT-Disable_EHCI.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-Disable_EHCI.dsl"; sourceTree = "<group>"; };
ED0EF6761CFBE3EA00243958 /* SSDT-D-EHCI.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-D-EHCI.dsl"; sourceTree = "<group>"; };
ED2089AF1EDAA40E00D46BEA /* SSDT-PTS.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-PTS.dsl"; sourceTree = "<group>"; };
ED272D611CCC789300FE569D /* install_tools.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = install_tools.sh; sourceTree = "<group>"; };
ED373E171C0535C1005018E4 /* SSDT-IGPU.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-IGPU.dsl"; sourceTree = "<group>"; };
Expand All @@ -31,22 +31,22 @@
ED5448361CFFD70D007F89F0 /* SSDT-HDEF.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-HDEF.dsl"; sourceTree = "<group>"; };
ED5448371CFFD70D007F89F0 /* SSDT-XHC.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-XHC.dsl"; sourceTree = "<group>"; };
ED5448391CFFD743007F89F0 /* SSDT-HDAU.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-HDAU.dsl"; sourceTree = "<group>"; };
ED69BD9C1F49E40000F480D0 /* SSDT_NVMe-RP09.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT_NVMe-RP09.dsl"; sourceTree = "<group>"; };
ED69BD9D1F49E40500F480D0 /* SSDT_NVMe-RP13.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT_NVMe-RP13.dsl"; sourceTree = "<group>"; };
ED69BD9C1F49E40000F480D0 /* SSDT_NVMe09.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SSDT_NVMe09.dsl; sourceTree = "<group>"; };
ED69BD9D1F49E40500F480D0 /* SSDT_NVMe13.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = SSDT_NVMe13.dsl; sourceTree = "<group>"; };
ED71D7551B98D1F80006C457 /* config_install_nuc5.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_install_nuc5.plist; sourceTree = "<group>"; };
ED7BC9771EBADEE5007AF0D8 /* SSDT-NUC5.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC5.dsl"; sourceTree = "<group>"; };
ED7BC9781EBADF2E007AF0D8 /* SSDT-NUC6-SC.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC6-SC.dsl"; sourceTree = "<group>"; };
ED7BC9791EBADF2E007AF0D8 /* SSDT-NUC7.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC7.dsl"; sourceTree = "<group>"; };
ED7BC97A1EBADF2E007AF0D8 /* SSDT-NUC6.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUC6.dsl"; sourceTree = "<group>"; };
ED94CBBC1F587026006BD42C /* SSDT-SkylakeSpoof.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-SkylakeSpoof.dsl"; sourceTree = "<group>"; };
ED94CBBC1F587026006BD42C /* SSDT-SKLSPF.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-SKLSPF.dsl"; sourceTree = "<group>"; };
ED9653F31E9FCDB300E38E76 /* config_nuc7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_nuc7.plist; sourceTree = "<group>"; };
ED9653F41E9FCDB300E38E76 /* config_install_nuc7.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_install_nuc7.plist; sourceTree = "<group>"; };
ED998A4E1ED3E3E30067757C /* config_install_stick6.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_install_stick6.plist; sourceTree = "<group>"; };
ED998A4F1ED3E3E30067757C /* config_stick6.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_stick6.plist; sourceTree = "<group>"; };
EDA342501CFC99B700E14DE0 /* SSDT-SATA.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-SATA.dsl"; sourceTree = "<group>"; };
EDAA88F11CFB6A6D008BA1EE /* SSDT-NUCHDA.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-NUCHDA.dsl"; sourceTree = "<group>"; };
EDAAB2161ECB551A00077D9B /* SSDT-EC.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-EC.dsl"; sourceTree = "<group>"; };
EDB6A7311F58666600780158 /* SSDT-DisableDA.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-DisableDA.dsl"; sourceTree = "<group>"; };
EDB6A7311F58666600780158 /* SSDT-D-DA.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-D-DA.dsl"; sourceTree = "<group>"; };
EDC38F2A1FC9DA8100C9E61F /* SSDT-USB-NUC7.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-USB-NUC7.dsl"; sourceTree = "<group>"; };
EDCF685A1CFBBD03009D6CCD /* SSDT-LPC.dsl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "SSDT-LPC.dsl"; sourceTree = "<group>"; };
EDD762461CFC968400A2D6BA /* config_install_nuc6.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = config_install_nuc6.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -77,7 +77,7 @@
ED48C0CF1ED3DD7700D66B7A /* SSDT-STCK6.dsl */,
ED48DF001B4CCCC800BDDC62 /* SSDT-XOSI.dsl */,
ED373E171C0535C1005018E4 /* SSDT-IGPU.dsl */,
ED94CBBC1F587026006BD42C /* SSDT-SkylakeSpoof.dsl */,
ED94CBBC1F587026006BD42C /* SSDT-SKLSPF.dsl */,
ED373E181C0535C1005018E4 /* SSDT-USB.dsl */,
EDC38F2A1FC9DA8100C9E61F /* SSDT-USB-NUC7.dsl */,
ED48C0CE1ED3DD5100D66B7A /* SSDT-USB-STCK.dsl */,
Expand All @@ -86,14 +86,14 @@
EDAA88F11CFB6A6D008BA1EE /* SSDT-NUCHDA.dsl */,
ED5448361CFFD70D007F89F0 /* SSDT-HDEF.dsl */,
ED5448391CFFD743007F89F0 /* SSDT-HDAU.dsl */,
EDB6A7311F58666600780158 /* SSDT-DisableDA.dsl */,
EDB6A7311F58666600780158 /* SSDT-D-DA.dsl */,
EDCF685A1CFBBD03009D6CCD /* SSDT-LPC.dsl */,
ED0EF6761CFBE3EA00243958 /* SSDT-Disable_EHCI.dsl */,
ED0EF6761CFBE3EA00243958 /* SSDT-D-EHCI.dsl */,
EDAAB2161ECB551A00077D9B /* SSDT-EC.dsl */,
ED48C0D01ED3DF4A00D66B7A /* SSDT-RMNE.dsl */,
ED2089AF1EDAA40E00D46BEA /* SSDT-PTS.dsl */,
ED69BD9C1F49E40000F480D0 /* SSDT_NVMe-RP09.dsl */,
ED69BD9D1F49E40500F480D0 /* SSDT_NVMe-RP13.dsl */,
ED69BD9C1F49E40000F480D0 /* SSDT_NVMe09.dsl */,
ED69BD9D1F49E40500F480D0 /* SSDT_NVMe13.dsl */,
8467C38E1A23A9FC00FCF396 /* mount_efi.sh */,
ED3F518B1A2029DE0060691A /* download.sh */,
ED272D611CCC789300FE569D /* install_tools.sh */,
Expand Down

0 comments on commit b2052c1

Please sign in to comment.