[coreboot-gerrit] New patch to review for coreboot: 681e511 Fix some minor Kconfig issues

Martin Roth (gaumless@gmail.com) gerrit at coreboot.org
Sun Apr 26 19:54:02 CEST 2015 

Martin Roth (gaumless at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9998

-gerrit

commit 681e511a7c7e98d5a9b60960cfae3c00de60b67b
Author: Martin Roth <gaumless at gmail.com>
Date:   Sun Apr 26 11:53:40 2015 -0600

    Fix some minor Kconfig issues
    
    - Remove Kconfig files that are no longer used:
        src/vencorcode/Kconfig
        src/soc/marvell/Kconfig
    - Fix the drivers/sil/Kconfig to point to drivers/sil/3114 which had
    the same code.
    - Make sure all Kconfig files have linefeeds at the end. This can cause
    problems, although it wasn't in this case.
    - Include cpu/intel/model_65x/Kconfig which was not being included.
    
    Change-Id: Ia57a1e0433e302fa9be557525dc966cae57059c9
    Signed-off-by: Martin Roth <gaumless at gmail.com>
---
 .cproject                    | 67 ++++++++++++++++++++++++++++++++++++++++++++
 src/cpu/intel/Kconfig        |  1 +
 src/drivers/sil/3114/Kconfig |  2 --
 src/drivers/sil/Kconfig      |  9 +-----
 src/drivers/xgi/Kconfig      |  2 +-
 src/soc/marvell/Kconfig      | 20 -------------
 src/vendorcode/Kconfig       |  3 --
 7 files changed, 70 insertions(+), 34 deletions(-)

diff --git a/.cproject b/.cproject
new file mode 100644
index 0000000..1a44180
--- /dev/null
+++ b/.cproject
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="0.227203105">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="0.227203105" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration buildProperties="" description="" id="0.227203105" name="Default" parent="org.eclipse.cdt.build.core.prefbase.cfg">
+					<folderInfo id="0.227203105." name="/" resourcePath="">
+						<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1831375886" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
+							<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1831375886.1605981842" name=""/>
+							<builder id="org.eclipse.cdt.build.core.settings.default.builder.154623879" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.libs.2032601676" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.752467967" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1388888267" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.2062217200" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1536862774" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.531631635" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.559293682" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.519709530" name="LLVM bytecode assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.498415159" languageId="org.eclipse.cdt.managedbuilder.llvm.ui.llvmAssembly" languageName="LLVM bytecode assembly" sourceContentType="org.eclipse.cdt.managedbuilder.llvm.ui.llvmAssemblySource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+							<tool id="org.eclipse.cdt.build.core.settings.holder.1942923672" name="UPC" superClass="org.eclipse.cdt.build.core.settings.holder">
+								<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.306395160" languageId="org.eclipse.cdt.core.parser.upc.upc" languageName="UPC" sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="coreboot.org.null.494320332" name="coreboot.org"/>
+	</storageModule>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="0.227203105">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
+		<buildTargets>
+			<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments/>
+				<buildTarget>all</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>false</runAllBuilders>
+			</target>
+		</buildTargets>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+</cproject>
diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig
index de76e3e..b388c50 100644
--- a/src/cpu/intel/Kconfig
+++ b/src/cpu/intel/Kconfig
@@ -1,5 +1,6 @@
 # CPU models
 source src/cpu/intel/model_6xx/Kconfig
+source src/cpu/intel/model_65x/Kconfig
 source src/cpu/intel/model_67x/Kconfig
 source src/cpu/intel/model_68x/Kconfig
 source src/cpu/intel/model_69x/Kconfig
diff --git a/src/drivers/sil/3114/Kconfig b/src/drivers/sil/3114/Kconfig
index a14515c..25bb202 100644
--- a/src/drivers/sil/3114/Kconfig
+++ b/src/drivers/sil/3114/Kconfig
@@ -4,5 +4,3 @@ config DRIVERS_SIL_3114
 	help
 	It sets PCI class to IDE compatible native mode, allowing
 	SeaBIOS, FILO etc... to boot from it.
-
-
diff --git a/src/drivers/sil/Kconfig b/src/drivers/sil/Kconfig
index a14515c..69f53d9 100644
--- a/src/drivers/sil/Kconfig
+++ b/src/drivers/sil/Kconfig
@@ -1,8 +1 @@
-config DRIVERS_SIL_3114
-	bool "Silicon Image SIL3114"
-	default n
-	help
-	It sets PCI class to IDE compatible native mode, allowing
-	SeaBIOS, FILO etc... to boot from it.
-
-
+source "src/drivers/sil/3114/Kconfig"
diff --git a/src/drivers/xgi/Kconfig b/src/drivers/xgi/Kconfig
index 3e083d6..dea25ea 100644
--- a/src/drivers/xgi/Kconfig
+++ b/src/drivers/xgi/Kconfig
@@ -1,2 +1,2 @@
 source src/drivers/xgi/common/Kconfig
-source src/drivers/xgi/z9s/Kconfig
\ No newline at end of file
+source src/drivers/xgi/z9s/Kconfig
diff --git a/src/soc/marvell/Kconfig b/src/soc/marvell/Kconfig
deleted file mode 100644
index 95b8c50..0000000
--- a/src/soc/marvell/Kconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-##
-## This file is part of the coreboot project.
-##
-## Copyright 2014 Google Inc.
-##
-## 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
-##
-
-source src/soc/marvell/bg4cd/Kconfig
diff --git a/src/vendorcode/Kconfig b/src/vendorcode/Kconfig
deleted file mode 100644
index 9b6e5d4..0000000
--- a/src/vendorcode/Kconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-source src/vendorcode/amd/Kconfig
-source src/vendorcode/google/Kconfig
-source src/vendorcode/intel/Kconfig

More information about the coreboot-gerrit mailing list