kconfig: drop intermittend forwarder files

With kconfig understanding wildcards, we don't need
Kconfig files that just include other Kconfig files
anymore.

Change-Id: I7584e675f78fcb4ff1fdb0731e340533c5bc040d
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/9298
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2015-04-04 01:58:28 +02:00
parent f34ea5f660
commit a48ca841a2
47 changed files with 53 additions and 350 deletions

View File

@ -255,39 +255,11 @@ config UPDATE_IMAGE
endmenu endmenu
source src/mainboard/Kconfig source "src/mainboard/Kconfig"
# This option is used to set the architecture of a mainboard to X86. source "src/arch/*/Kconfig"
# It is usually set in mainboard/*/Kconfig.
config ARCH_X86
bool
default n
select PCI
config ARCH_ARM source "src/vendorcode/*/Kconfig"
bool
default n
config ARCH_ARM64
bool
default n
config ARCH_RISCV
bool
default n
select ANY_TOOLCHAIN
config ARCH_MIPS
bool
default n
source src/arch/x86/Kconfig
source src/arch/arm/Kconfig
source src/arch/arm64/Kconfig
source src/arch/riscv/Kconfig
source src/arch/mips/Kconfig
source src/vendorcode/Kconfig
config SYSTEM_TYPE_LAPTOP config SYSTEM_TYPE_LAPTOP
default n default n
@ -296,18 +268,19 @@ config SYSTEM_TYPE_LAPTOP
menu "Chipset" menu "Chipset"
comment "CPU" comment "CPU"
source src/cpu/Kconfig source "src/cpu/Kconfig"
comment "Northbridge" comment "Northbridge"
source src/northbridge/Kconfig source "src/northbridge/*/*/Kconfig"
comment "Southbridge" comment "Southbridge"
source src/southbridge/Kconfig source "src/southbridge/*/*/Kconfig"
comment "Super I/O" comment "Super I/O"
source src/superio/Kconfig source "src/superio/*/Kconfig"
comment "Embedded Controllers" comment "Embedded Controllers"
source src/ec/Kconfig source "src/ec/acpi/Kconfig"
source "src/ec/*/*/Kconfig"
comment "SoC" comment "SoC"
source src/soc/Kconfig source "src/soc/*/*/Kconfig"
source src/drivers/intel/fsp/Kconfig source "src/drivers/intel/fsp/Kconfig"
endmenu endmenu
@ -319,10 +292,10 @@ config MAINBOARD_HAS_BOOTBLOCK_INIT
bool bool
default n default n
source src/device/Kconfig source "src/device/Kconfig"
menu "Generic Drivers" menu "Generic Drivers"
source src/drivers/Kconfig source "src/drivers/*/Kconfig"
endmenu endmenu
config TPM config TPM
@ -365,7 +338,7 @@ config BOOTMODE_STRAPS
bool bool
default n default n
source src/console/Kconfig source "src/console/Kconfig"
config HAVE_ACPI_RESUME config HAVE_ACPI_RESUME
bool bool

View File

@ -1,3 +1,7 @@
config ARCH_ARM
bool
default n
config ARCH_BOOTBLOCK_ARM config ARCH_BOOTBLOCK_ARM
bool bool
default n default n

View File

@ -1,3 +1,7 @@
config ARCH_ARM64
bool
default n
config ARCH_BOOTBLOCK_ARM64 config ARCH_BOOTBLOCK_ARM64
bool bool
default n default n

View File

@ -19,6 +19,10 @@
# MA 02110-1301 USA # MA 02110-1301 USA
# #
config ARCH_MIPS
bool
default n
config ARCH_BOOTBLOCK_MIPS config ARCH_BOOTBLOCK_MIPS
bool bool
default n default n

View File

@ -1,3 +1,7 @@
config ARCH_RISCV
bool
default n
config ARCH_BOOTBLOCK_RISCV config ARCH_BOOTBLOCK_RISCV
bool bool
default n default n

View File

@ -13,6 +13,11 @@
## GNU General Public License for more details. ## GNU General Public License for more details.
## ##
config ARCH_X86
bool
default n
select PCI
config ARCH_BOOTBLOCK_X86_32 config ARCH_BOOTBLOCK_X86_32
bool bool
default n default n

View File

@ -2,17 +2,7 @@
# The if controls how the evaluation occurs. # The if controls how the evaluation occurs.
# (See also src/Kconfig) # (See also src/Kconfig)
source src/cpu/allwinner/Kconfig source "src/cpu/*/Kconfig"
source src/cpu/armltd/Kconfig
source src/cpu/ti/Kconfig
source src/cpu/amd/Kconfig
source src/cpu/dmp/Kconfig
source src/cpu/intel/Kconfig
source src/cpu/mips/Kconfig
source src/cpu/via/Kconfig
source src/cpu/qemu-x86/Kconfig
source src/cpu/x86/Kconfig
if ARCH_X86 if ARCH_X86

View File

@ -80,10 +80,6 @@ config SMM_TSEG
bool bool
default n default n
config SMM_TSEG_SIZE
hex
default 0
config SMM_MODULES config SMM_MODULES
bool bool
default n default n

View File

@ -1,45 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2010 Rudolf Marek <r.marek@assembler.cz>
##
## 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/drivers/ams/Kconfig
source src/drivers/ati/Kconfig
source src/drivers/dec/Kconfig
source src/drivers/elog/Kconfig
source src/drivers/emulation/Kconfig
source src/drivers/generic/Kconfig
source src/drivers/gic/Kconfig
source src/drivers/i2c/Kconfig
source src/drivers/ics/Kconfig
source src/drivers/intel/Kconfig
source src/drivers/ipmi/Kconfig
source src/drivers/lenovo/Kconfig
source src/drivers/maxim/Kconfig
source src/drivers/parade/Kconfig
if PC80_SYSTEM
source src/drivers/pc80/Kconfig
endif
source src/drivers/sil/Kconfig
source src/drivers/spi/Kconfig
source src/drivers/ti/Kconfig
source src/drivers/trident/Kconfig
source src/drivers/uart/Kconfig
source src/drivers/usb/Kconfig
source src/drivers/xgi/Kconfig
source src/drivers/xpowers/Kconfig
source src/drivers/ricoh/rce822/Kconfig

View File

@ -1,5 +1,7 @@
# Might be removed (alongside with the PS/2 init code) once payloads # Might be removed (alongside with the PS/2 init code) once payloads
# reliably support PS/2 init themselves. # reliably support PS/2 init themselves.
if PC80_SYSTEM
config DRIVERS_PS2_KEYBOARD config DRIVERS_PS2_KEYBOARD
bool "PS/2 keyboard init" bool "PS/2 keyboard init"
default y default y
@ -26,3 +28,5 @@ config LPC_TPM
config DRIVERS_MC146818 config DRIVERS_MC146818
bool bool
default y if ARCH_X86 default y if ARCH_X86
endif

View File

@ -0,0 +1 @@
source src/drivers/ricoh/rce822/Kconfig

View File

@ -1,7 +0,0 @@
source src/ec/acpi/Kconfig
source src/ec/compal/Kconfig
source src/ec/google/Kconfig
source src/ec/kontron/Kconfig
source src/ec/lenovo/Kconfig
source src/ec/smsc/Kconfig
source src/ec/quanta/Kconfig

View File

@ -1 +0,0 @@
source src/ec/compal/ene932/Kconfig

View File

@ -1 +0,0 @@
source src/ec/google/chromeec/Kconfig

View File

@ -1 +0,0 @@
source src/ec/kontron/it8516e/Kconfig

View File

@ -1,2 +0,0 @@
source src/ec/lenovo/h8/Kconfig
source src/ec/lenovo/pmh7/Kconfig

View File

@ -1,2 +0,0 @@
source src/ec/quanta/ene_kb3940q/Kconfig
source src/ec/quanta/it8518/Kconfig

View File

@ -1 +0,0 @@
source src/ec/smsc/mec1308/Kconfig

View File

@ -1,5 +0,0 @@
source src/northbridge/amd/Kconfig
source src/northbridge/dmp/Kconfig
source src/northbridge/intel/Kconfig
source src/northbridge/rdc/Kconfig
source src/northbridge/via/Kconfig

View File

@ -1,7 +0,0 @@
source src/northbridge/amd/amdk8/Kconfig
source src/northbridge/amd/gx2/Kconfig
source src/northbridge/amd/amdfam10/Kconfig
source src/northbridge/amd/lx/Kconfig
source src/northbridge/amd/agesa/Kconfig
source src/northbridge/amd/cimx/Kconfig
source src/northbridge/amd/pi/Kconfig

View File

@ -32,13 +32,7 @@ config S3_VGA_ROM_RUN
bool bool
default n default n
source src/northbridge/amd/agesa/family10/Kconfig source "src/northbridge/amd/agesa/*/Kconfig"
source src/northbridge/amd/agesa/family12/Kconfig
source src/northbridge/amd/agesa/family14/Kconfig
source src/northbridge/amd/agesa/family15/Kconfig
source src/northbridge/amd/agesa/family15tn/Kconfig
source src/northbridge/amd/agesa/family15rl/Kconfig
source src/northbridge/amd/agesa/family16kb/Kconfig
# TODO: Reservation for heap seems excessive # TODO: Reservation for heap seems excessive
config HEAP_SIZE config HEAP_SIZE

View File

@ -1,20 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2013 DMP Electronics 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/northbridge/dmp/vortex86ex/Kconfig

View File

@ -1,17 +0,0 @@
source src/northbridge/intel/e7501/Kconfig
source src/northbridge/intel/e7505/Kconfig
source src/northbridge/intel/i3100/Kconfig
source src/northbridge/intel/i440bx/Kconfig
source src/northbridge/intel/i440lx/Kconfig
source src/northbridge/intel/i82810/Kconfig
source src/northbridge/intel/i82830/Kconfig
source src/northbridge/intel/i855/Kconfig
source src/northbridge/intel/i945/Kconfig
source src/northbridge/intel/gm45/Kconfig
source src/northbridge/intel/sch/Kconfig
source src/northbridge/intel/i5000/Kconfig
source src/northbridge/intel/nehalem/Kconfig
source src/northbridge/intel/sandybridge/Kconfig
source src/northbridge/intel/haswell/Kconfig
source src/northbridge/intel/fsp_sandybridge/Kconfig
source src/northbridge/intel/fsp_rangeley/Kconfig

View File

@ -1 +0,0 @@
source src/northbridge/rdc/r8610/Kconfig

View File

@ -1,4 +0,0 @@
source src/northbridge/via/cn700/Kconfig
source src/northbridge/via/cx700/Kconfig
source src/northbridge/via/vx800/Kconfig
source src/northbridge/via/vx900/Kconfig

View File

@ -1,7 +0,0 @@
source src/soc/imgtec/Kconfig
source src/soc/intel/Kconfig
source src/soc/nvidia/Kconfig
source src/soc/qualcomm/Kconfig
source src/soc/rockchip/Kconfig
source src/soc/samsung/Kconfig
source src/soc/ucb/Kconfig

View File

@ -1 +0,0 @@
source src/soc/imgtec/pistachio/Kconfig

View File

@ -1,4 +0,0 @@
source src/soc/intel/baytrail/Kconfig
source src/soc/intel/broadwell/Kconfig
source src/soc/intel/fsp_baytrail/Kconfig
source src/soc/intel/common/Kconfig

View File

@ -1,2 +0,0 @@
source src/soc/nvidia/tegra124/Kconfig
source src/soc/nvidia/tegra132/Kconfig

View File

@ -1,9 +0,0 @@
source src/soc/qualcomm/ipq806x/Kconfig
config CBFS_SIZE
hex "Size of CBFS filesystem in ROM"
default ROM_SIZE
help
CBFS size needs to match the size of memory allocated to the
coreboot blob elsewhere in the system. Make sure this config option
is fine tuned in the board config file.

View File

@ -13,6 +13,14 @@ config SOC_QC_IPQ806X
if SOC_QC_IPQ806X if SOC_QC_IPQ806X
config CBFS_SIZE
hex "Size of CBFS filesystem in ROM"
default ROM_SIZE
help
CBFS size needs to match the size of memory allocated to the
coreboot blob elsewhere in the system. Make sure this config option
is fine tuned in the board config file.
config BOOTBLOCK_ROM_OFFSET config BOOTBLOCK_ROM_OFFSET
hex hex
default 0x0 default 0x0

View File

@ -1,20 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright 2014 Rockchip 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/rockchip/rk3288/Kconfig

View File

@ -1,2 +0,0 @@
source src/soc/samsung/exynos5250/Kconfig
source src/soc/samsung/exynos5420/Kconfig

View File

@ -1 +0,0 @@
source src/soc/ucb/riscv/Kconfig

View File

@ -1,10 +0,0 @@
source src/southbridge/amd/Kconfig
source src/southbridge/broadcom/Kconfig
source src/southbridge/dmp/Kconfig
source src/southbridge/intel/Kconfig
source src/southbridge/nvidia/Kconfig
source src/southbridge/rdc/Kconfig
source src/southbridge/ricoh/Kconfig
source src/southbridge/sis/Kconfig
source src/southbridge/ti/Kconfig
source src/southbridge/via/Kconfig

View File

@ -1,15 +0,0 @@
source src/southbridge/amd/amd8111/Kconfig
source src/southbridge/amd/amd8131/Kconfig
source src/southbridge/amd/cs5536/Kconfig
source src/southbridge/amd/amd8132/Kconfig
source src/southbridge/amd/amd8151/Kconfig
source src/southbridge/amd/cs5535/Kconfig
source src/southbridge/amd/rs690/Kconfig
source src/southbridge/amd/sb600/Kconfig
source src/southbridge/amd/rs780/Kconfig
source src/southbridge/amd/sb700/Kconfig
source src/southbridge/amd/sb800/Kconfig
source src/southbridge/amd/cimx/Kconfig
source src/southbridge/amd/agesa/Kconfig
source src/southbridge/amd/pi/Kconfig
source src/southbridge/amd/sr5650/Kconfig

View File

@ -1,3 +0,0 @@
source src/southbridge/broadcom/bcm21000/Kconfig
source src/southbridge/broadcom/bcm5780/Kconfig
source src/southbridge/broadcom/bcm5785/Kconfig

View File

@ -1,20 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2013 DMP Electronics 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/southbridge/dmp/vortex86ex/Kconfig

View File

@ -1,18 +0,0 @@
source src/southbridge/intel/common/Kconfig
source src/southbridge/intel/esb6300/Kconfig
source src/southbridge/intel/i3100/Kconfig
source src/southbridge/intel/i82371eb/Kconfig
source src/southbridge/intel/i82801ax/Kconfig
source src/southbridge/intel/i82801bx/Kconfig
source src/southbridge/intel/i82801cx/Kconfig
source src/southbridge/intel/i82801dx/Kconfig
source src/southbridge/intel/i82801ex/Kconfig
source src/southbridge/intel/i82801gx/Kconfig
source src/southbridge/intel/i82801ix/Kconfig
source src/southbridge/intel/i82870/Kconfig
source src/southbridge/intel/sch/Kconfig
source src/southbridge/intel/bd82x6x/Kconfig
source src/southbridge/intel/ibexpeak/Kconfig
source src/southbridge/intel/lynxpoint/Kconfig
source src/southbridge/intel/fsp_bd82x6x/Kconfig
source src/southbridge/intel/fsp_rangeley/Kconfig

View File

@ -1,2 +0,0 @@
source src/southbridge/nvidia/ck804/Kconfig
source src/southbridge/nvidia/mcp55/Kconfig

View File

@ -1 +0,0 @@
source src/southbridge/rdc/r8610/Kconfig

View File

@ -1 +0,0 @@
source src/southbridge/ricoh/rl5c476/Kconfig

View File

@ -1 +0,0 @@
source src/southbridge/sis/sis966/Kconfig

View File

@ -1,22 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2008-2009 coresystems GmbH
##
## 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/southbridge/ti/pci7420/Kconfig
source src/southbridge/ti/pcixx12/Kconfig
source src/southbridge/ti/pci1x2x/Kconfig

View File

@ -1,2 +0,0 @@
source src/southbridge/via/k8t890/Kconfig
source src/southbridge/via/vt8237r/Kconfig

View File

@ -1,32 +0,0 @@
##
## This file is part of the coreboot project.
##
## Copyright (C) 2009 Ronald G. Minnich
##
## 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
##
config SUPERIO_WANTS_14MHZ_CLOCK
bool
source src/superio/fintek/Kconfig
source src/superio/intel/Kconfig
source src/superio/ite/Kconfig
source src/superio/nsc/Kconfig
source src/superio/nuvoton/Kconfig
source src/superio/renesas/Kconfig
source src/superio/serverengines/Kconfig
source src/superio/smsc/Kconfig
source src/superio/via/Kconfig
source src/superio/winbond/Kconfig

View File

@ -18,6 +18,9 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
## ##
config SUPERIO_WANTS_14MHZ_CLOCK
bool
config SUPERIO_SMSC_FDC37M60X config SUPERIO_SMSC_FDC37M60X
bool bool
config SUPERIO_SMSC_FDC37N972 config SUPERIO_SMSC_FDC37N972