From 9a684fcb0fe28a47d23b7cb3acbd2add47c6ac50 Mon Sep 17 00:00:00 2001 From: Jens Rottmann Date: Mon, 30 Aug 2010 16:36:51 +0000 Subject: Restructured all vendors' Kconfig files to no longer source the boards' Kconfigs from within the choice/endchoice block. This makes it possible to define user visible board specific options. Moved all vendor names and PCI ids to the vendors' Kconfigs. Now all options in each file depend on the same symbol, so replaced all "depends on"s with a single "if". Sorted boards (sort -d), cleaned whitespace. This patch also introduces a dummy option BOARD_SPECIFIC_OPTIONS, which is always "y" and never used. It it simply needed to have something to attach the boards' "select" statements to. Signed-off-by: Jens Rottmann Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5754 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/newisys/Kconfig | 13 +++++++++++-- src/mainboard/newisys/khepri/Kconfig | 23 +++++------------------ 2 files changed, 16 insertions(+), 20 deletions(-) (limited to 'src/mainboard/newisys') diff --git a/src/mainboard/newisys/Kconfig b/src/mainboard/newisys/Kconfig index 308cced541..2870c412b6 100644 --- a/src/mainboard/newisys/Kconfig +++ b/src/mainboard/newisys/Kconfig @@ -1,8 +1,17 @@ +if VENDOR_NEWISYS + choice prompt "Mainboard model" - depends on VENDOR_NEWISYS -source "src/mainboard/newisys/khepri/Kconfig" +config BOARD_NEWISYS_KHEPRI + bool "Khephri - 2100 Server (SUN Fire v20z)" endchoice +source "src/mainboard/newisys/khepri/Kconfig" + +config MAINBOARD_VENDOR + string + default "Newisys" + +endif # VENDOR_NEWISYS diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index 4d480adaf2..859bb19bb8 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -1,5 +1,7 @@ -config BOARD_NEWISYS_KHEPRI - bool "Khephri - 2100 Server (SUN Fire v20z)" +if BOARD_NEWISYS_KHEPRI + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -18,80 +20,65 @@ config BOARD_NEWISYS_KHEPRI config MAINBOARD_DIR string default newisys/khepri - depends on BOARD_NEWISYS_KHEPRI config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_NEWISYS_KHEPRI config DCACHE_RAM_SIZE hex default 0x01000 - depends on BOARD_NEWISYS_KHEPRI config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_NEWISYS_KHEPRI config K8_REV_F_SUPPORT bool default n - depends on BOARD_NEWISYS_KHEPRI config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_NEWISYS_KHEPRI config MAINBOARD_PART_NUMBER string default "Khepri" - depends on BOARD_NEWISYS_KHEPRI config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_NEWISYS_KHEPRI config MAX_CPUS int default 4 - depends on BOARD_NEWISYS_KHEPRI config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_NEWISYS_KHEPRI config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_NEWISYS_KHEPRI config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_NEWISYS_KHEPRI config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_NEWISYS_KHEPRI config IRQ_SLOT_COUNT int default 9 - depends on BOARD_NEWISYS_KHEPRI config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x17c2 - depends on BOARD_NEWISYS_KHEPRI config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x10 - depends on BOARD_NEWISYS_KHEPRI +endif # BOARD_NEWISYS_KHEPRI -- cgit v1.2.3