From ceae968e2cc3d9318c70e34a5424080f9f345eea Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sun, 26 Apr 2015 11:53:40 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/9998 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- 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 --- 6 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 src/soc/marvell/Kconfig delete mode 100644 src/vendorcode/Kconfig (limited to 'src') diff --git a/src/cpu/intel/Kconfig b/src/cpu/intel/Kconfig index de76e3ed72..b388c50f29 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 a14515c008..25bb202490 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 a14515c008..69f53d9557 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 3e083d6e0c..dea25ea32e 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 95b8c50f54..0000000000 --- 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 9b6e5d4cab..0000000000 --- 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 -- cgit v1.2.3