Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5459
-gerrit
commit 7a0d2bc317e14785734cc66709b1d668a074abb6 Author: Alexandru Gagniuc mr.nuke.me@gmail.com Date: Sat Apr 5 10:21:57 2014 -0500
hudson boards: Don't require ide.asl file on boards without IDE
Not all boards which use the Hudson southbridge have IDE. However, the southbridge's asl included an 'ide.asl' file which had to be present in $(mainboard_dir)/acpi.
Address this issue by including ide.asl only in boards which have IDE, and remove it from all other hudson boards.
Change-Id: Ie2efb7ebf8f5b527e26d7aaaeafbd3053a9a6b28 Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com --- src/mainboard/amd/parmer/dsdt.asl | 6 ++++++ src/mainboard/amd/thatcher/dsdt.asl | 6 ++++++ src/mainboard/asus/f2a85-m/acpi/ide.asl | 20 -------------------- src/mainboard/hp/pavilion_m6_1035dx/acpi/ide.asl | 20 -------------------- src/southbridge/amd/agesa/hudson/acpi/fch.asl | 5 ----- 5 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/src/mainboard/amd/parmer/dsdt.asl b/src/mainboard/amd/parmer/dsdt.asl index ef2ae6f..f3d0265 100644 --- a/src/mainboard/amd/parmer/dsdt.asl +++ b/src/mainboard/amd/parmer/dsdt.asl @@ -62,6 +62,12 @@ DefinitionBlock ( /* Describe the AMD Fusion Controller Hub Southbridge */ #include <southbridge/amd/agesa/hudson/acpi/fch.asl>
+ /* 0:14.1 - Primary (and only) IDE channel */ + Device(IDEC) { + Name(_ADR, 0x00140001) + #include "acpi/ide.asl" + } /* end IDEC */ + }
/* Describe PCI INT[A-H] for the Southbridge */ diff --git a/src/mainboard/amd/thatcher/dsdt.asl b/src/mainboard/amd/thatcher/dsdt.asl index ef2ae6f..f3d0265 100644 --- a/src/mainboard/amd/thatcher/dsdt.asl +++ b/src/mainboard/amd/thatcher/dsdt.asl @@ -62,6 +62,12 @@ DefinitionBlock ( /* Describe the AMD Fusion Controller Hub Southbridge */ #include <southbridge/amd/agesa/hudson/acpi/fch.asl>
+ /* 0:14.1 - Primary (and only) IDE channel */ + Device(IDEC) { + Name(_ADR, 0x00140001) + #include "acpi/ide.asl" + } /* end IDEC */ + }
/* Describe PCI INT[A-H] for the Southbridge */ diff --git a/src/mainboard/asus/f2a85-m/acpi/ide.asl b/src/mainboard/asus/f2a85-m/acpi/ide.asl deleted file mode 100644 index be4d9bb..0000000 --- a/src/mainboard/asus/f2a85-m/acpi/ide.asl +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Sage Electronic Engineering, LLC - * - * 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; version 2 of the License. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* No IDE functionality */ diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ide.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/ide.asl deleted file mode 100644 index be4d9bb..0000000 --- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/ide.asl +++ /dev/null @@ -1,20 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Sage Electronic Engineering, LLC - * - * 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; version 2 of the License. - * - * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/* No IDE functionality */ diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl index 06b4fe7..f56b69c 100644 --- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl +++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl @@ -67,11 +67,6 @@ Device(SDCN) { } /* end SDCN */
#if !CONFIG_SOUTHBRIDGE_AMD_AGESA_YANGTZE -/* 0:14.1 - Primary (and only) IDE channel */ -Device(IDEC) { - Name(_ADR, 0x00140001) - #include "acpi/ide.asl" -} /* end IDEC */
/* 0:14.4 - PCI slot 1, 2, 3 */ Device(PIBR) {