[coreboot] r1021 - in coreboot-v3: arch/x86 mainboard/amd/serengeti

Author: myles
Date: 2008-11-14 16:19:39 +0100 (Fri, 14 Nov 2008)
New Revision: 1021

Modified:
   coreboot-v3/arch/x86/Kconfig
   coreboot-v3/mainboard/amd/serengeti/dts
Log:
This patch makes it so serengeti builds again.

It includes an ide option that has to be there, and fixes a CPU test in
Kconfig.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: coreboot-v3/arch/x86/Kconfig
===================================================================
--- coreboot-v3/arch/x86/Kconfig	2008-11-14 14:49:28 UTC (rev 1020)
+++ coreboot-v3/arch/x86/Kconfig	2008-11-14 15:19:39 UTC (rev 1021)
@@ -109,8 +109,7 @@

config LOGICAL_CPUS
    hex
-	depends CPU_AMD_K8
-	depends CPU_INTEL_CORE2
+	depends CPU_AMD_K8 || CPU_INTEL_CORE2
    default 1
    help
      How many logical CPUs there are. FIXME.

Modified: coreboot-v3/mainboard/amd/serengeti/dts
===================================================================
--- coreboot-v3/mainboard/amd/serengeti/dts	2008-11-14 14:49:28 UTC (rev 1020)
+++ coreboot-v3/mainboard/amd/serengeti/dts	2008-11-14 15:19:39 UTC (rev 1021)
@@ -51,6 +51,8 @@
    		};
    		pci@1,1 {
    			/config/("southbridge/amd/amd8111/ide.dts");
+				ide0_enable = "1";
+				ide1_enable = "1";
    		};
    		pci@1,2 {
    			/config/("southbridge/amd/amd8111/smbus.dts");