From 67accc1f691259b5fbd5d01035417bbec7982d60 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Mon, 18 Aug 2008 16:48:27 +0000 Subject: [PATCH] Fix Kconfig dependencies and update defconfigs. Signed-off-by: Carl-Daniel Hailfinger Acked-by: Ronald G. Minnich git-svn-id: svn://coreboot.org/repository/coreboot-v3@784 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- arch/x86/Kconfig | 6 +++++- device/Kconfig | 2 ++ mainboard/emulation/qemu-x86/defconfig | 6 ++++-- mainboard/pcengines/alix1c/defconfig | 6 ++++-- mainboard/pcengines/alix2c3/defconfig | 5 +++-- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index c814113426..8fbce99f83 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -93,12 +93,14 @@ config K8_ALLOCATE_MMIO_RANGE config LOGICAL_CPUS hex + depends CPU_AMD_K8 default 1 help How many logical CPUs there are. Fix me. config MAX_PHYSICAL_CPUS hex + depends CPU_AMD_K8 default 1 help Max number of physical CPUs (sockets) @@ -138,6 +140,7 @@ config ACPI_TABLE config SMP boolean + depends CPU_I586 || CPU_AMD_K8 default 0 help This option is used to enable certain functions to make @@ -147,7 +150,7 @@ config SMP config IOAPIC boolean - depends ARCH_X86 + depends ARCH_X86 && CPU_AMD_K8 default 0 help If you want to configure an IOAPIC, set this. @@ -216,6 +219,7 @@ config HT_FREQ_800MHZ config USBDEBUG_DIRECT boolean + depends SOUTHBRIDGE_NVIDIA_MCP55 default 0 help Determines if we enable USB Direct debugging. If you don't have a dongle, diff --git a/device/Kconfig b/device/Kconfig index 8b68979d58..0d147e0b4d 100644 --- a/device/Kconfig +++ b/device/Kconfig @@ -97,11 +97,13 @@ config SUSPEND_TO_RAM config PCI_64BIT_PREF_MEM bool "64 bit prefetchable memory addresses" + depends CPU_AMD_K8 help Enable support for 64-bit prefetchable memory addresses in PCI. config HW_MEM_HOLE_SIZEK hex "HW memory hole size in KB" + depends CPU_AMD_K8 default 0x1000 help Some chipsets support setting up a "hole" at the top of memory. It is essentially diff --git a/mainboard/emulation/qemu-x86/defconfig b/mainboard/emulation/qemu-x86/defconfig index 747dc37597..1a14dfadd2 100644 --- a/mainboard/emulation/qemu-x86/defconfig +++ b/mainboard/emulation/qemu-x86/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# coreboot version: 3.0.0 -# Thu Mar 13 07:13:17 2008 +# coreboot version: 3.0."782" +# Mon Aug 18 18:45:49 2008 # # @@ -17,6 +17,7 @@ CONFIG_LOCALVERSION="" # CONFIG_VENDOR_ADL is not set # CONFIG_VENDOR_AMD is not set # CONFIG_VENDOR_ARTECGROUP is not set +# CONFIG_VENDOR_GIGABYTE is not set CONFIG_VENDOR_EMULATION=y # CONFIG_VENDOR_PCENGINES is not set CONFIG_MAINBOARD_DIR="emulation/qemu-x86" @@ -31,6 +32,7 @@ CONFIG_ARCH_X86=y CONFIG_ARCH="x86" CONFIG_CPU_I586=y CONFIG_OPTION_TABLE=y +# CONFIG_SMP is not set CONFIG_CARBASE=0x8f000 CONFIG_CARSIZE=0x1000 diff --git a/mainboard/pcengines/alix1c/defconfig b/mainboard/pcengines/alix1c/defconfig index 3dbe2ce439..f3b03c5ea1 100644 --- a/mainboard/pcengines/alix1c/defconfig +++ b/mainboard/pcengines/alix1c/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# coreboot version: 3.0.0 -# Sun Feb 24 11:45:09 2008 +# coreboot version: 3.0."782" +# Mon Aug 18 18:45:50 2008 # # @@ -18,10 +18,12 @@ CONFIG_LOCALVERSION="" # CONFIG_VENDOR_ADL is not set # CONFIG_VENDOR_AMD is not set # CONFIG_VENDOR_ARTECGROUP is not set +# CONFIG_VENDOR_GIGABYTE is not set # CONFIG_VENDOR_EMULATION is not set CONFIG_VENDOR_PCENGINES=y CONFIG_MAINBOARD_DIR="pcengines/alix1c" CONFIG_BOARD_PCENGINES_ALIX1C=y +# CONFIG_BOARD_PCENGINES_ALIX2C3 is not set # CONFIG_COREBOOT_ROMSIZE_KB_128 is not set # CONFIG_COREBOOT_ROMSIZE_KB_256 is not set CONFIG_COREBOOT_ROMSIZE_KB_512=y diff --git a/mainboard/pcengines/alix2c3/defconfig b/mainboard/pcengines/alix2c3/defconfig index c0ff7ba613..496d02c7a4 100644 --- a/mainboard/pcengines/alix2c3/defconfig +++ b/mainboard/pcengines/alix2c3/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# coreboot version: 3.0."656"' -# Wed Apr 9 20:59:03 2008 +# coreboot version: 3.0."782" +# Mon Aug 18 18:45:50 2008 # # @@ -17,6 +17,7 @@ CONFIG_LOCALVERSION="" # CONFIG_VENDOR_ADL is not set # CONFIG_VENDOR_AMD is not set # CONFIG_VENDOR_ARTECGROUP is not set +# CONFIG_VENDOR_GIGABYTE is not set # CONFIG_VENDOR_EMULATION is not set CONFIG_VENDOR_PCENGINES=y CONFIG_MAINBOARD_DIR="pcengines/alix2c3"