coreboot August 2010

coreboot@coreboot.org

67 participants
267 discussions

mainboard.c: init() still being called?
by Jens Rottmann 30 Aug '10

30 Aug '10

Hi all, in Nov 2008 (around rev. 3760) I had done Coreboot support for 2 of our boards (LiPPERT RoadRunner-LX and SpaceRunner-LX). Now I'd like to add support for 2 more, based on the code for the previous ones as the hardware is quite similar. However in the past 2 years / 2000 revs Coreboot has evolved quite a lot! Even though SpaceRunner support still compiles, it doesn't quite seem to work as it did back then. Looks like I have to try and bring the 2 older board's code up to scratch first before I can base anything on it. The old code defined a config byte (for some GPIOs) in struct mainboard_lippert_spacerunner_lx_config (chip.h), which used to be set in Config.lb with a simple register "..." = "..." statement and used in mainboard.c's init() by casting dev->chip_info to struct mainboard_lippert_spacerunner_lx_config. The current code still has the struct (renamed to mainboard_config), but while changing Config.lb to devicetree.cb the register statement got dropped so there's no longer any value assigned to the config byte. I tried to re-add the register line where it was before (before chip northbridge/...) but this seems no longer to be allowed. And more importantly, init() which uses the config byte is still there but does not seem to be executed any more. At least I couldn't see its debug output. I tried to look at the AMD DB800, which had served as my example at the time, but the DB800 code hasn't changed, so probably its init() isn't called now either. (Only the DB800 doesn't do anything important there.) I noticed that enable_dev() is still being called. Is this a bug? Or is this on purpose? Am I meant to move my code from init() to enable_dev()? But then why does dev->ops still contain an init field? I tried reading the docs both in the wiki and the documentation/ dir, but this seems seriously outdated and more misleading than helpful, because I as a newbie cannot possibly know which parts of the docs still apply and which to ignore. Doxygen produced 50998 files with details about each function and struct, which is rather overwhelming when you don't even know what you're looking for and trying to get sort of a general overview. I tried looking at other boards which define something in struct mainboard_config, but they all seemed to have suffered a similar fate, I couldn't find one which still assigns a value to it in devicetree.cb. About a dozen use dev->ops->init in mainboard.c but I can't see what they would do differently that their init() would be actually called. - Maybe it isn't either? Any pointer in the right direction would be appreciated. Thanks in advance, Jens Rottmann

5 24

[commit] r5755 - trunk/src/mainboard/intel/mtarvon
by repository service 30 Aug '10

30 Aug '10

Author: stepan Date: Mon Aug 30 18:52:48 2010 New Revision: 5755 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5755 Log: Fix intel mtarvon compilation by switching it over to CAR. This should be unproblematic, as there are other boards with the same "socket" that work with CAR already. Tests are highly appreciated though! Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/mainboard/intel/mtarvon/Kconfig Modified: trunk/src/mainboard/intel/mtarvon/Kconfig ============================================================================== --- trunk/src/mainboard/intel/mtarvon/Kconfig Mon Aug 30 18:36:51 2010 (r5754) +++ trunk/src/mainboard/intel/mtarvon/Kconfig Mon Aug 30 18:52:48 2010 (r5755) @@ -7,7 +7,7 @@ select NORTHBRIDGE_INTEL_I3100 select SOUTHBRIDGE_INTEL_I3100 select SUPERIO_INTEL_I3100 - select ROMCC + select USE_DCACHE_RAM select HAVE_HARD_RESET select HAVE_PIRQ_TABLE select HAVE_MP_TABLE @@ -34,6 +34,14 @@ hex default 0x2680 +config DCACHE_RAM_BASE + hex + default 0xffdf8000 + +config DCACHE_RAM_SIZE + hex + default 0x8000 + config MAX_CPUS int default 4

1 0

[commit] r5754 - in trunk/src/mainboard: . a-trend a-trend/atc-6220 a-trend/atc-6240 abit abit/be6-ii_v2_0 advantech advantech/pcm-5820 amd amd/db800 amd/dbm690t amd/mahogany amd/mahogany_fam10 amd...
by repository service 30 Aug '10

30 Aug '10

Author: stepan Date: Mon Aug 30 18:36:51 2010 New Revision: 5754 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5754 Log: 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 <JRottmann(a)LiPPERTEmbedded.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/src/mainboard/Kconfig trunk/src/mainboard/a-trend/Kconfig trunk/src/mainboard/a-trend/atc-6220/Kconfig trunk/src/mainboard/a-trend/atc-6240/Kconfig trunk/src/mainboard/abit/Kconfig trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig trunk/src/mainboard/advantech/Kconfig trunk/src/mainboard/advantech/pcm-5820/Kconfig trunk/src/mainboard/amd/Kconfig trunk/src/mainboard/amd/db800/Kconfig trunk/src/mainboard/amd/dbm690t/Kconfig trunk/src/mainboard/amd/mahogany/Kconfig trunk/src/mainboard/amd/mahogany_fam10/Kconfig trunk/src/mainboard/amd/norwich/Kconfig trunk/src/mainboard/amd/pistachio/Kconfig trunk/src/mainboard/amd/rumba/Kconfig trunk/src/mainboard/amd/serengeti_cheetah/Kconfig trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig trunk/src/mainboard/amd/tilapia_fam10/Kconfig trunk/src/mainboard/arima/Kconfig trunk/src/mainboard/arima/hdama/Kconfig trunk/src/mainboard/artecgroup/Kconfig trunk/src/mainboard/artecgroup/dbe61/Kconfig trunk/src/mainboard/asi/Kconfig trunk/src/mainboard/asi/mb_5blgp/Kconfig trunk/src/mainboard/asi/mb_5blmp/Kconfig trunk/src/mainboard/asrock/939a785gmh/Kconfig trunk/src/mainboard/asrock/Kconfig trunk/src/mainboard/asus/Kconfig trunk/src/mainboard/asus/a8n_e/Kconfig trunk/src/mainboard/asus/a8v-e_se/Kconfig trunk/src/mainboard/asus/m2v-mx_se/Kconfig trunk/src/mainboard/asus/mew-am/Kconfig trunk/src/mainboard/asus/mew-vm/Kconfig trunk/src/mainboard/asus/p2b-d/Kconfig trunk/src/mainboard/asus/p2b-ds/Kconfig trunk/src/mainboard/asus/p2b-f/Kconfig trunk/src/mainboard/asus/p2b-ls/Kconfig trunk/src/mainboard/asus/p2b/Kconfig trunk/src/mainboard/asus/p3b-f/Kconfig trunk/src/mainboard/axus/Kconfig trunk/src/mainboard/axus/tc320/Kconfig trunk/src/mainboard/azza/Kconfig trunk/src/mainboard/azza/pt-6ibd/Kconfig trunk/src/mainboard/bcom/Kconfig trunk/src/mainboard/bcom/winnet100/Kconfig trunk/src/mainboard/bcom/winnetp680/Kconfig trunk/src/mainboard/biostar/Kconfig trunk/src/mainboard/biostar/m6tba/Kconfig trunk/src/mainboard/broadcom/Kconfig trunk/src/mainboard/broadcom/blast/Kconfig trunk/src/mainboard/compaq/Kconfig trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig trunk/src/mainboard/dell/Kconfig trunk/src/mainboard/dell/s1850/Kconfig trunk/src/mainboard/digitallogic/Kconfig trunk/src/mainboard/digitallogic/adl855pc/Kconfig trunk/src/mainboard/digitallogic/msm586seg/Kconfig trunk/src/mainboard/digitallogic/msm800sev/Kconfig trunk/src/mainboard/eaglelion/5bcm/Kconfig trunk/src/mainboard/eaglelion/Kconfig trunk/src/mainboard/ecs/Kconfig trunk/src/mainboard/ecs/p6iwp-fe/Kconfig trunk/src/mainboard/emulation/Kconfig trunk/src/mainboard/emulation/qemu-x86/Kconfig trunk/src/mainboard/getac/Kconfig trunk/src/mainboard/getac/p470/Kconfig trunk/src/mainboard/gigabyte/Kconfig trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig trunk/src/mainboard/gigabyte/m57sli/Kconfig trunk/src/mainboard/gigabyte/ma785gmt/Kconfig trunk/src/mainboard/gigabyte/ma78gm/Kconfig trunk/src/mainboard/hp/Kconfig trunk/src/mainboard/hp/dl145_g1/Kconfig trunk/src/mainboard/hp/dl145_g3/Kconfig trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig trunk/src/mainboard/ibase/Kconfig trunk/src/mainboard/ibase/mb899/Kconfig trunk/src/mainboard/ibm/Kconfig trunk/src/mainboard/ibm/e325/Kconfig trunk/src/mainboard/ibm/e326/Kconfig trunk/src/mainboard/iei/Kconfig trunk/src/mainboard/iei/juki-511p/Kconfig trunk/src/mainboard/iei/nova4899r/Kconfig trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig trunk/src/mainboard/intel/Kconfig trunk/src/mainboard/intel/d810e2cb/Kconfig trunk/src/mainboard/intel/d945gclf/Kconfig trunk/src/mainboard/intel/eagleheights/Kconfig trunk/src/mainboard/intel/jarrell/Kconfig trunk/src/mainboard/intel/mtarvon/Kconfig trunk/src/mainboard/intel/truxton/Kconfig trunk/src/mainboard/intel/xe7501devkit/Kconfig trunk/src/mainboard/iwill/Kconfig trunk/src/mainboard/iwill/dk8_htx/Kconfig trunk/src/mainboard/iwill/dk8s2/Kconfig trunk/src/mainboard/iwill/dk8x/Kconfig trunk/src/mainboard/jetway/Kconfig trunk/src/mainboard/jetway/j7f24/Kconfig trunk/src/mainboard/jetway/pa78vm5/Kconfig trunk/src/mainboard/kontron/986lcd-m/Kconfig trunk/src/mainboard/kontron/Kconfig trunk/src/mainboard/kontron/kt690/Kconfig trunk/src/mainboard/lanner/Kconfig trunk/src/mainboard/lanner/em8510/Kconfig trunk/src/mainboard/lippert/Kconfig trunk/src/mainboard/lippert/frontrunner/Kconfig trunk/src/mainboard/lippert/roadrunner-lx/Kconfig trunk/src/mainboard/lippert/spacerunner-lx/Kconfig trunk/src/mainboard/mitac/6513wu/Kconfig trunk/src/mainboard/mitac/Kconfig trunk/src/mainboard/msi/Kconfig trunk/src/mainboard/msi/ms6119/Kconfig trunk/src/mainboard/msi/ms6147/Kconfig trunk/src/mainboard/msi/ms6156/Kconfig trunk/src/mainboard/msi/ms6178/Kconfig trunk/src/mainboard/msi/ms7135/Kconfig trunk/src/mainboard/msi/ms7260/Kconfig trunk/src/mainboard/msi/ms9185/Kconfig trunk/src/mainboard/msi/ms9282/Kconfig trunk/src/mainboard/msi/ms9652_fam10/Kconfig trunk/src/mainboard/nec/Kconfig trunk/src/mainboard/nec/powermate2000/Kconfig trunk/src/mainboard/newisys/Kconfig trunk/src/mainboard/newisys/khepri/Kconfig trunk/src/mainboard/nokia/Kconfig trunk/src/mainboard/nokia/ip530/Kconfig trunk/src/mainboard/nvidia/Kconfig trunk/src/mainboard/nvidia/l1_2pvv/Kconfig trunk/src/mainboard/olpc/Kconfig trunk/src/mainboard/olpc/btest/Kconfig trunk/src/mainboard/olpc/rev_a/Kconfig trunk/src/mainboard/pcengines/Kconfig trunk/src/mainboard/pcengines/alix1c/Kconfig trunk/src/mainboard/pcengines/alix2d3/Kconfig trunk/src/mainboard/rca/Kconfig trunk/src/mainboard/rca/rm4100/Kconfig trunk/src/mainboard/roda/Kconfig trunk/src/mainboard/roda/rk886ex/Kconfig trunk/src/mainboard/soyo/Kconfig trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig trunk/src/mainboard/sunw/Kconfig trunk/src/mainboard/sunw/ultra40/Kconfig trunk/src/mainboard/supermicro/Kconfig trunk/src/mainboard/supermicro/h8dme/Kconfig trunk/src/mainboard/supermicro/h8dmr/Kconfig trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig trunk/src/mainboard/supermicro/x6dai_g/Kconfig trunk/src/mainboard/supermicro/x6dhe_g/Kconfig trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig trunk/src/mainboard/technexion/Kconfig trunk/src/mainboard/technexion/tim5690/Kconfig trunk/src/mainboard/technexion/tim8690/Kconfig trunk/src/mainboard/technologic/Kconfig trunk/src/mainboard/technologic/ts5300/Kconfig trunk/src/mainboard/televideo/Kconfig trunk/src/mainboard/televideo/tc7020/Kconfig trunk/src/mainboard/thomson/Kconfig trunk/src/mainboard/thomson/ip1000/Kconfig trunk/src/mainboard/traverse/Kconfig trunk/src/mainboard/traverse/geos/Kconfig trunk/src/mainboard/tyan/Kconfig trunk/src/mainboard/tyan/s1846/Kconfig trunk/src/mainboard/tyan/s2735/Kconfig trunk/src/mainboard/tyan/s2850/Kconfig trunk/src/mainboard/tyan/s2875/Kconfig trunk/src/mainboard/tyan/s2880/Kconfig trunk/src/mainboard/tyan/s2881/Kconfig trunk/src/mainboard/tyan/s2882/Kconfig trunk/src/mainboard/tyan/s2885/Kconfig trunk/src/mainboard/tyan/s2891/Kconfig trunk/src/mainboard/tyan/s2892/Kconfig trunk/src/mainboard/tyan/s2895/Kconfig trunk/src/mainboard/tyan/s2912/Kconfig trunk/src/mainboard/tyan/s2912_fam10/Kconfig trunk/src/mainboard/tyan/s4880/Kconfig trunk/src/mainboard/tyan/s4882/Kconfig trunk/src/mainboard/via/Kconfig trunk/src/mainboard/via/epia-cn/Kconfig trunk/src/mainboard/via/epia-m/Kconfig trunk/src/mainboard/via/epia-m700/Kconfig trunk/src/mainboard/via/epia-n/Kconfig trunk/src/mainboard/via/epia/Kconfig trunk/src/mainboard/via/pc2500e/Kconfig trunk/src/mainboard/via/vt8454c/Kconfig trunk/src/mainboard/winent/Kconfig trunk/src/mainboard/winent/pl6064/Kconfig trunk/src/mainboard/wyse/Kconfig trunk/src/mainboard/wyse/s50/Kconfig Modified: trunk/src/mainboard/Kconfig ============================================================================== --- trunk/src/mainboard/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -115,311 +115,6 @@ endchoice -config MAINBOARD_VENDOR - string - default "Abit" - depends on VENDOR_ABIT - -config MAINBOARD_VENDOR - string - default "Advantech" - depends on VENDOR_ADVANTECH - -config MAINBOARD_VENDOR - string - default "AMD" - depends on VENDOR_AMD - -config MAINBOARD_VENDOR - string - default "Arima" - depends on VENDOR_ARIMA - -config MAINBOARD_VENDOR - string - default "Artec Group" - depends on VENDOR_ARTEC_GROUP - -config MAINBOARD_VENDOR - string - default "ASI" - depends on VENDOR_ASI - -config MAINBOARD_VENDOR - string - default "ASROCK" - depends on VENDOR_ASROCK - -config MAINBOARD_VENDOR - string - default "ASUS" - depends on VENDOR_ASUS - -config MAINBOARD_VENDOR - string - default "A-Trend" - depends on VENDOR_A_TREND - -config MAINBOARD_VENDOR - string - default "AXUS" - depends on VENDOR_AXUS - -config MAINBOARD_VENDOR - string - default "AZZA" - depends on VENDOR_AZZA - -config MAINBOARD_VENDOR - string - default "BCOM" - depends on VENDOR_BCOM - -config MAINBOARD_VENDOR - string - default "Biostar" - depends on VENDOR_BIOSTAR - -config MAINBOARD_VENDOR - string - default "Broadcom" - depends on VENDOR_BROADCOM - -config MAINBOARD_VENDOR - string - default "Compaq" - depends on VENDOR_COMPAQ - -config MAINBOARD_VENDOR - string - default "Dell" - depends on VENDOR_DELL - -config MAINBOARD_VENDOR - string - default "DIGITAL-LOGIC" - depends on VENDOR_DIGITAL_LOGIC - -config MAINBOARD_VENDOR - string - default "EagleLion" - depends on VENDOR_EAGLELION - -config MAINBOARD_VENDOR - string - default "ECS" - depends on VENDOR_ECS - -config MAINBOARD_VENDOR - string - default "Emulation" - depends on VENDOR_EMULATION - -config MAINBOARD_VENDOR - string - default "Getac" - depends on VENDOR_GETAC - -config MAINBOARD_VENDOR - string - default "GIGABYTE" - depends on VENDOR_GIGABYTE - -config MAINBOARD_VENDOR - string - default "HP" - depends on VENDOR_HP - -config MAINBOARD_VENDOR - string - default "iBase" - depends on VENDOR_IBASE - -config MAINBOARD_VENDOR - string - default "IBM" - depends on VENDOR_IBM - -config MAINBOARD_VENDOR - string - default "IEI" - depends on VENDOR_IEI - -config MAINBOARD_VENDOR - string - default "Intel" - depends on VENDOR_INTEL - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x8086 - depends on VENDOR_INTEL - -config MAINBOARD_VENDOR - string - default "IWILL" - depends on VENDOR_IWILL - -config MAINBOARD_VENDOR - string - default "Jetway" - depends on VENDOR_JETWAY - -config MAINBOARD_VENDOR - string - default "Kontron" - depends on VENDOR_KONTRON - -config MAINBOARD_VENDOR - string - default "Lanner" - depends on VENDOR_LANNER - -config MAINBOARD_VENDOR - string - default "Lippert" - depends on VENDOR_LIPPERT - -config MAINBOARD_VENDOR - string - default "Mitac" - depends on VENDOR_MITAC - -config MAINBOARD_VENDOR - string - default "MSI" - depends on VENDOR_MSI - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1462 - depends on VENDOR_MSI - -config MAINBOARD_VENDOR - string - default "NEC" - depends on VENDOR_NEC - -config MAINBOARD_VENDOR - string - default "Newisys" - depends on VENDOR_NEWISYS - -config MAINBOARD_VENDOR - string - default "Nokia" - depends on VENDOR_NOKIA - -config MAINBOARD_VENDOR - string - default "NVIDIA" - depends on VENDOR_NVIDIA - -config MAINBOARD_VENDOR - string - default "OLPC" - depends on VENDOR_OLPC - -config MAINBOARD_VENDOR - string - default "PC Engines" - depends on VENDOR_PC_ENGINES - -config MAINBOARD_VENDOR - string - default "RCA" - depends on VENDOR_RCA - -config MAINBOARD_VENDOR - string - default "Roda" - depends on VENDOR_RODA - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x4352 - depends on VENDOR_RODA - -config MAINBOARD_VENDOR - string - default "Soyo" - depends on VENDOR_SOYO - -config MAINBOARD_VENDOR - string - default "Sun" - depends on VENDOR_SUNW - -config MAINBOARD_VENDOR - string - default "Supermicro" - depends on VENDOR_SUPERMICRO - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x15d9 - depends on VENDOR_SUPERMICRO - -config MAINBOARD_VENDOR - string - default "Technexion" - depends on VENDOR_TECHNEXION - -config MAINBOARD_VENDOR - string - default "Technologic" - depends on VENDOR_TECHNOLOGIC - -config MAINBOARD_VENDOR - string - default "TeleVideo" - depends on VENDOR_TELEVIDEO - -config MAINBOARD_VENDOR - string - default "Thomson" - depends on VENDOR_THOMSON - -config MAINBOARD_VENDOR - string - default "Traverse Technologies" - depends on VENDOR_TRAVERSE - -config MAINBOARD_VENDOR - string - default "Tyan" - depends on VENDOR_TYAN - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x10f1 - depends on VENDOR_TYAN - -config MAINBOARD_VENDOR - string - default "VIA" - depends on VENDOR_VIA - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x1019 - depends on VENDOR_VIA - -config MAINBOARD_VENDOR - string - default "Win Enterprise" - depends on VENDOR_WINENT - -config MAINBOARD_VENDOR - string - default "Wyse" - depends on VENDOR_WYSE - -config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID - hex - default 0x102d - depends on VENDOR_WYSE - source "src/mainboard/a-trend/Kconfig" source "src/mainboard/abit/Kconfig" source "src/mainboard/advantech/Kconfig" @@ -556,4 +251,3 @@ default 0x400000 if COREBOOT_ROMSIZE_KB_4096 endmenu - Modified: trunk/src/mainboard/a-trend/Kconfig ============================================================================== --- trunk/src/mainboard/a-trend/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/a-trend/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,13 +16,23 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_A_TREND choice prompt "Mainboard model" - depends on VENDOR_A_TREND + +config BOARD_A_TREND_ATC_6220 + bool "ATC-6220" +config BOARD_A_TREND_ATC_6240 + bool "ATC-6240" + +endchoice source "src/mainboard/a-trend/atc-6220/Kconfig" source "src/mainboard/a-trend/atc-6240/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "A-Trend" +endif # VENDOR_A_TREND Modified: trunk/src/mainboard/a-trend/atc-6220/Kconfig ============================================================================== --- trunk/src/mainboard/a-trend/atc-6220/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/a-trend/atc-6220/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_A_TREND_ATC_6220 -config BOARD_A_TREND_ATC_6220 - bool "ATC-6220" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default a-trend/atc-6220 - depends on BOARD_A_TREND_ATC_6220 config MAINBOARD_PART_NUMBER string default "ATC-6220" - depends on BOARD_A_TREND_ATC_6220 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_A_TREND_ATC_6220 +endif # BOARD_A_TREND_ATC_6220 Modified: trunk/src/mainboard/a-trend/atc-6240/Kconfig ============================================================================== --- trunk/src/mainboard/a-trend/atc-6240/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/a-trend/atc-6240/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_A_TREND_ATC_6240 -config BOARD_A_TREND_ATC_6240 - bool "ATC-6240" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default a-trend/atc-6240 - depends on BOARD_A_TREND_ATC_6240 config MAINBOARD_PART_NUMBER string default "ATC-6240" - depends on BOARD_A_TREND_ATC_6240 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_A_TREND_ATC_6240 +endif # BOARD_A_TREND_ATC_6240 Modified: trunk/src/mainboard/abit/Kconfig ============================================================================== --- trunk/src/mainboard/abit/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/abit/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_ABIT choice prompt "Mainboard model" - depends on VENDOR_ABIT -source "src/mainboard/abit/be6-ii_v2_0/Kconfig" +config BOARD_ABIT_BE6_II_V2_0 + bool "BE6-II V2.0" endchoice +source "src/mainboard/abit/be6-ii_v2_0/Kconfig" + +config MAINBOARD_VENDOR + string + default "Abit" + +endif # VENDOR_ABIT Modified: trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig ============================================================================== --- trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/abit/be6-ii_v2_0/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ABIT_BE6_II_V2_0 -config BOARD_ABIT_BE6_II_V2_0 - bool "BE6-II V2.0" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default abit/be6-ii_v2_0 - depends on BOARD_ABIT_BE6_II_V2_0 config MAINBOARD_PART_NUMBER string default "BE6-II V2.0" - depends on BOARD_ABIT_BE6_II_V2_0 config IRQ_SLOT_COUNT int default 9 - depends on BOARD_ABIT_BE6_II_V2_0 +endif # BOARD_ABIT_BE6_II_V2_0 Modified: trunk/src/mainboard/advantech/Kconfig ============================================================================== --- trunk/src/mainboard/advantech/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/advantech/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_ADVANTECH choice prompt "Mainboard model" - depends on VENDOR_ADVANTECH -source "src/mainboard/advantech/pcm-5820/Kconfig" +config BOARD_ADVANTECH_PCM_5820 + bool "PCM-5820" endchoice +source "src/mainboard/advantech/pcm-5820/Kconfig" + +config MAINBOARD_VENDOR + string + default "Advantech" + +endif # VENDOR_ADVANTECH Modified: trunk/src/mainboard/advantech/pcm-5820/Kconfig ============================================================================== --- trunk/src/mainboard/advantech/pcm-5820/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/advantech/pcm-5820/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ADVANTECH_PCM_5820 -config BOARD_ADVANTECH_PCM_5820 - bool "PCM-5820" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default advantech/pcm-5820 - depends on BOARD_ADVANTECH_PCM_5820 config MAINBOARD_PART_NUMBER string default "PCM-5820" - depends on BOARD_ADVANTECH_PCM_5820 config IRQ_SLOT_COUNT int default 2 - depends on BOARD_ADVANTECH_PCM_5820 +endif # BOARD_ADVANTECH_PCM_5820 Modified: trunk/src/mainboard/amd/Kconfig ============================================================================== --- trunk/src/mainboard/amd/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,17 +1,44 @@ +if VENDOR_AMD + choice prompt "Mainboard model" - depends on VENDOR_AMD + +config BOARD_AMD_DB800 + bool "DB800 (Salsa)" +config BOARD_AMD_DBM690T + bool "DBM690T (Herring)" +config BOARD_AMD_MAHOGANY + bool "Mahogany" +config BOARD_AMD_MAHOGANY_FAM10 + bool "Mahogany (Fam10)" +config BOARD_AMD_NORWICH + bool "Norwich" +config BOARD_AMD_PISTACHIO + bool "Pistachio" +config BOARD_AMD_RUMBA + bool "Rumba" +config BOARD_AMD_SERENGETI_CHEETAH + bool "Serengeti Cheetah" +config BOARD_AMD_SERENGETI_CHEETAH_FAM10 + bool "Serengeti Cheetah (Fam10)" +config BOARD_AMD_TILAPIA_FAM10 + bool "Tilapia (Fam10)" + +endchoice source "src/mainboard/amd/db800/Kconfig" source "src/mainboard/amd/dbm690t/Kconfig" source "src/mainboard/amd/mahogany/Kconfig" source "src/mainboard/amd/mahogany_fam10/Kconfig" -source "src/mainboard/amd/tilapia_fam10/Kconfig" source "src/mainboard/amd/norwich/Kconfig" source "src/mainboard/amd/pistachio/Kconfig" source "src/mainboard/amd/rumba/Kconfig" source "src/mainboard/amd/serengeti_cheetah/Kconfig" source "src/mainboard/amd/serengeti_cheetah_fam10/Kconfig" +source "src/mainboard/amd/tilapia_fam10/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "AMD" +endif # VENDOR_AMD Modified: trunk/src/mainboard/amd/db800/Kconfig ============================================================================== --- trunk/src/mainboard/amd/db800/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/db800/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_DB800 - bool "DB800 (Salsa)" +if BOARD_AMD_DB800 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -14,19 +16,17 @@ config MAINBOARD_DIR string default amd/db800 - depends on BOARD_AMD_DB800 config MAINBOARD_PART_NUMBER string default "DB800" - depends on BOARD_AMD_DB800 config IRQ_SLOT_COUNT int default 4 - depends on BOARD_AMD_DB800 config RAMBASE hex default 0x4000 - depends on BOARD_AMD_DB800 + +endif # BOARD_AMD_DB800 Modified: trunk/src/mainboard/amd/dbm690t/Kconfig ============================================================================== --- trunk/src/mainboard/amd/dbm690t/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/dbm690t/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_DBM690T - bool "DBM690T (Herring)" +if BOARD_AMD_DBM690T + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_S1G1 select NORTHBRIDGE_AMD_AMDK8 @@ -22,86 +24,71 @@ config MAINBOARD_DIR string default amd/dbm690t - depends on BOARD_AMD_DBM690T # This is a temporary fix, and should be removed when the race condition for # building option_table.h is fixed. config WARNINGS_ARE_ERRORS bool default n - depends on BOARD_AMD_DBM690T config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_AMD_DBM690T config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_AMD_DBM690T config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_AMD_DBM690T config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_AMD_DBM690T config MAINBOARD_PART_NUMBER string default "DBM690T" - depends on BOARD_AMD_DBM690T config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_DBM690T config MAX_CPUS int default 2 - depends on BOARD_AMD_DBM690T config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_AMD_DBM690T config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_DBM690T config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_AMD_DBM690T config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_AMD_DBM690T config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_AMD_DBM690T config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_DBM690T config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_AMD_DBM690T config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3050 - depends on BOARD_AMD_DBM690T + +endif # BOARD_AMD_DBM690T Modified: trunk/src/mainboard/amd/mahogany/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/mahogany/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_MAHOGANY - bool "Mahogany" +if BOARD_AMD_MAHOGANY + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2 select NORTHBRIDGE_AMD_AMDK8 @@ -24,79 +26,65 @@ config MAINBOARD_DIR string default amd/mahogany - depends on BOARD_AMD_MAHOGANY config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_AMD_MAHOGANY config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_AMD_MAHOGANY config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_AMD_MAHOGANY config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_AMD_MAHOGANY config MAINBOARD_PART_NUMBER string default "MAHOGANY" - depends on BOARD_AMD_MAHOGANY config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_MAHOGANY config MAX_CPUS int default 8 - depends on BOARD_AMD_MAHOGANY config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_AMD_MAHOGANY config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_MAHOGANY config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_AMD_MAHOGANY config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_AMD_MAHOGANY config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_AMD_MAHOGANY config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_MAHOGANY config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_AMD_MAHOGANY config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_AMD_MAHOGANY + +endif # BOARD_AMD_MAHOGANY Modified: trunk/src/mainboard/amd/mahogany_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/mahogany_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/mahogany_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_MAHOGANY_FAM10 - bool "Mahogany (Fam10)" +if BOARD_AMD_MAHOGANY_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2R2 select NORTHBRIDGE_AMD_AMDFAM10 @@ -27,99 +29,81 @@ config MAINBOARD_DIR string default amd/mahogany_fam10 - depends on BOARD_AMD_MAHOGANY_FAM10 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_AMD_MAHOGANY_FAM10 config MAINBOARD_PART_NUMBER string default "Mahogany (Fam10)" - depends on BOARD_AMD_MAHOGANY_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_MAHOGANY_FAM10 config MAX_CPUS int default 8 - depends on BOARD_AMD_MAHOGANY_FAM10 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_AMD_MAHOGANY_FAM10 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_MAHOGANY_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_AMD_MAHOGANY_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_AMD_MAHOGANY_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_AMD_MAHOGANY_FAM10 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_AMD_MAHOGANY_FAM10 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_MAHOGANY_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_01000095.h" - depends on BOARD_AMD_MAHOGANY_FAM10 config RAMTOP hex default 0x2000000 - depends on BOARD_AMD_MAHOGANY_FAM10 config HEAP_SIZE hex default 0xc0000 - depends on BOARD_AMD_MAHOGANY_FAM10 config ACPI_SSDTX_NUM int default 0 - depends on BOARD_AMD_MAHOGANY_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_AMD_MAHOGANY_FAM10 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_AMD_MAHOGANY_FAM10 config RAMBASE hex default 0x200000 - depends on BOARD_AMD_MAHOGANY_FAM10 config COMPRESS hex default 0 - depends on BOARD_AMD_MAHOGANY_FAM10 + +endif # BOARD_AMD_MAHOGANY_FAM10 Modified: trunk/src/mainboard/amd/norwich/Kconfig ============================================================================== --- trunk/src/mainboard/amd/norwich/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/norwich/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_NORWICH - bool "Norwich" +if BOARD_AMD_NORWICH + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,19 +15,17 @@ config MAINBOARD_DIR string default amd/norwich - depends on BOARD_AMD_NORWICH config MAINBOARD_PART_NUMBER string default "Norwich" - depends on BOARD_AMD_NORWICH config IRQ_SLOT_COUNT int default 6 - depends on BOARD_AMD_NORWICH config RAMBASE hex default 0x4000 - depends on BOARD_AMD_NORWICH + +endif # BOARD_AMD_NORWICH Modified: trunk/src/mainboard/amd/pistachio/Kconfig ============================================================================== --- trunk/src/mainboard/amd/pistachio/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/pistachio/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_PISTACHIO - bool "Pistachio" +if BOARD_AMD_PISTACHIO + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2 select NORTHBRIDGE_AMD_AMDK8 @@ -21,79 +23,65 @@ config MAINBOARD_DIR string default amd/pistachio - depends on BOARD_AMD_PISTACHIO config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_AMD_PISTACHIO config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_AMD_PISTACHIO config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_AMD_PISTACHIO config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_AMD_PISTACHIO config MAINBOARD_PART_NUMBER string default "Pistachio" - depends on BOARD_AMD_PISTACHIO config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_PISTACHIO config MAX_CPUS int default 2 - depends on BOARD_AMD_PISTACHIO config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_AMD_PISTACHIO config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_PISTACHIO config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_AMD_PISTACHIO config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_AMD_PISTACHIO config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_AMD_PISTACHIO config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_PISTACHIO config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_AMD_PISTACHIO config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3050 - depends on BOARD_AMD_PISTACHIO + +endif # BOARD_AMD_PISTACHIO Modified: trunk/src/mainboard/amd/rumba/Kconfig ============================================================================== --- trunk/src/mainboard/amd/rumba/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/rumba/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_AMD_RUMBA -config BOARD_AMD_RUMBA - bool "Rumba" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -31,15 +32,13 @@ config MAINBOARD_DIR string default amd/rumba - depends on BOARD_AMD_RUMBA config MAINBOARD_PART_NUMBER string default "Rumba" - depends on BOARD_AMD_RUMBA config IRQ_SLOT_COUNT int default 2 - depends on BOARD_AMD_RUMBA +endif # BOARD_AMD_RUMBA Modified: trunk/src/mainboard/amd/serengeti_cheetah/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/serengeti_cheetah/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_SERENGETI_CHEETAH - bool "Serengeti Cheetah" +if BOARD_AMD_SERENGETI_CHEETAH + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -24,94 +26,77 @@ config MAINBOARD_DIR string default amd/serengeti_cheetah - depends on BOARD_AMD_SERENGETI_CHEETAH config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_AMD_SERENGETI_CHEETAH config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_AMD_SERENGETI_CHEETAH config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_AMD_SERENGETI_CHEETAH config APIC_ID_OFFSET hex default 0x8 - depends on BOARD_AMD_SERENGETI_CHEETAH config MAINBOARD_PART_NUMBER string default "Serengeti Cheetah" - depends on BOARD_AMD_SERENGETI_CHEETAH config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_SERENGETI_CHEETAH config MAX_CPUS int default 8 - depends on BOARD_AMD_SERENGETI_CHEETAH config MAX_PHYSICAL_CPUS int default 4 - depends on BOARD_AMD_SERENGETI_CHEETAH config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_SERENGETI_CHEETAH config MEM_TRAIN_SEQ int default 1 - depends on BOARD_AMD_SERENGETI_CHEETAH config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_AMD_SERENGETI_CHEETAH config HT_CHAIN_END_UNITID_BASE hex default 0x6 - depends on BOARD_AMD_SERENGETI_CHEETAH config HT_CHAIN_UNITID_BASE hex default 0xa - depends on BOARD_AMD_SERENGETI_CHEETAH config SERIAL_CPU_INIT bool default n - depends on BOARD_AMD_SERENGETI_CHEETAH config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_SERENGETI_CHEETAH config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex - default 0x1022 - depends on BOARD_AMD_SERENGETI_CHEETAH + default 0x1022 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex - default 0x2b80 - depends on BOARD_AMD_SERENGETI_CHEETAH + default 0x2b80 config ACPI_SSDTX_NUM int default 4 - depends on BOARD_AMD_SERENGETI_CHEETAH + +endif # BOARD_AMD_SERENGETI_CHEETAH Modified: trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_SERENGETI_CHEETAH_FAM10 - bool "Serengeti Cheetah (Fam10)" +if BOARD_AMD_SERENGETI_CHEETAH_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F_1207 select NORTHBRIDGE_AMD_AMDFAM10 @@ -25,100 +27,82 @@ config MAINBOARD_DIR string default amd/serengeti_cheetah_fam10 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config MAINBOARD_PART_NUMBER string default "Serengeti Cheetah (Fam10)" - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 # 6 * MAX_PHYSICAL_CPUS config MAX_CPUS int default 48 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config MAX_PHYSICAL_CPUS int default 8 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x6 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config HT_CHAIN_UNITID_BASE hex default 0xa - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_01000095.h" - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config RAMTOP hex default 0x1000000 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config HEAP_SIZE hex default 0xc0000 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config ACPI_SSDTX_NUM int default 5 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2b80 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config RAMBASE hex default 0x200000 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 config ID_SECTION_OFFSET hex default 0x80 - depends on BOARD_AMD_SERENGETI_CHEETAH_FAM10 + +endif # BOARD_AMD_SERENGETI_CHEETAH_FAM10 Modified: trunk/src/mainboard/amd/tilapia_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/amd/tilapia_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/amd/tilapia_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_AMD_TILAPIA_FAM10 - bool "Tilapia (Fam10)" +if BOARD_AMD_TILAPIA_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM3 select NORTHBRIDGE_AMD_AMDFAM10 @@ -27,99 +29,81 @@ config MAINBOARD_DIR string default amd/tilapia_fam10 - depends on BOARD_AMD_TILAPIA_FAM10 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_AMD_TILAPIA_FAM10 config MAINBOARD_PART_NUMBER string default "Tilapia (Fam10)" - depends on BOARD_AMD_TILAPIA_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_AMD_TILAPIA_FAM10 config MAX_CPUS int default 8 - depends on BOARD_AMD_TILAPIA_FAM10 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_AMD_TILAPIA_FAM10 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_AMD_TILAPIA_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_AMD_TILAPIA_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_AMD_TILAPIA_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_AMD_TILAPIA_FAM10 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_AMD_TILAPIA_FAM10 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_AMD_TILAPIA_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_010000b6.h" - depends on BOARD_AMD_TILAPIA_FAM10 config RAMTOP hex default 0x2000000 - depends on BOARD_AMD_TILAPIA_FAM10 config HEAP_SIZE hex default 0xc0000 - depends on BOARD_AMD_TILAPIA_FAM10 config ACPI_SSDTX_NUM int default 0 - depends on BOARD_AMD_TILAPIA_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_AMD_TILAPIA_FAM10 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_AMD_TILAPIA_FAM10 config RAMBASE hex default 0x200000 - depends on BOARD_AMD_TILAPIA_FAM10 config COMPRESS hex default 0 - depends on BOARD_AMD_TILAPIA_FAM10 + +endif # BOARD_AMD_TILAPIA_FAM10 Modified: trunk/src/mainboard/arima/Kconfig ============================================================================== --- trunk/src/mainboard/arima/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/arima/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_ARIMA + choice prompt "Mainboard model" - depends on VENDOR_ARIMA -source "src/mainboard/arima/hdama/Kconfig" +config BOARD_ARIMA_HDAMA + bool "HDAMA" endchoice +source "src/mainboard/arima/hdama/Kconfig" + +config MAINBOARD_VENDOR + string + default "Arima" + +endif # VENDOR_ARIMA Modified: trunk/src/mainboard/arima/hdama/Kconfig ============================================================================== --- trunk/src/mainboard/arima/hdama/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/arima/hdama/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_ARIMA_HDAMA - bool "HDAMA" +if BOARD_ARIMA_HDAMA + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -18,64 +20,53 @@ config MAINBOARD_DIR string default arima/hdama - depends on BOARD_ARIMA_HDAMA config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x161f - depends on BOARD_ARIMA_HDAMA config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3016 - depends on BOARD_ARIMA_HDAMA config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_ARIMA_HDAMA config MAINBOARD_PART_NUMBER string default "HDAMA" - depends on BOARD_ARIMA_HDAMA config HW_MEM_HOLE_SIZEK hex default 0x0 - depends on BOARD_ARIMA_HDAMA config MAX_CPUS int default 4 - depends on BOARD_ARIMA_HDAMA config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_ARIMA_HDAMA config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_ARIMA_HDAMA config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_ARIMA_HDAMA config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_ARIMA_HDAMA config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_ARIMA_HDAMA config IRQ_SLOT_COUNT int default 9 - depends on BOARD_ARIMA_HDAMA + +endif # BOARD_ARIMA_HDAMA Modified: trunk/src/mainboard/artecgroup/Kconfig ============================================================================== --- trunk/src/mainboard/artecgroup/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/artecgroup/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_ARTEC_GROUP + choice prompt "Mainboard model" - depends on VENDOR_ARTEC_GROUP -source "src/mainboard/artecgroup/dbe61/Kconfig" +config BOARD_ARTECGROUP_DBE61 + bool "DBE61" endchoice +source "src/mainboard/artecgroup/dbe61/Kconfig" + +config MAINBOARD_VENDOR + string + default "Artec Group" + +endif # VENDOR_ARTEC_GROUP Modified: trunk/src/mainboard/artecgroup/dbe61/Kconfig ============================================================================== --- trunk/src/mainboard/artecgroup/dbe61/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/artecgroup/dbe61/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_ARTECGROUP_DBE61 - bool "DBE61" +if BOARD_ARTECGROUP_DBE61 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,19 +15,17 @@ config MAINBOARD_DIR string default artecgroup/dbe61 - depends on BOARD_ARTECGROUP_DBE61 config MAINBOARD_PART_NUMBER string default "DBE61" - depends on BOARD_ARTECGROUP_DBE61 config IRQ_SLOT_COUNT int default 3 - depends on BOARD_ARTECGROUP_DBE61 #config RAMBASE # hex # default 0x4000 -## depends on BOARD_ARTECGROUP_DBE61 + +endif # BOARD_ARTECGROUP_DBE61 Modified: trunk/src/mainboard/asi/Kconfig ============================================================================== --- trunk/src/mainboard/asi/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asi/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,13 +16,23 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_ASI choice prompt "Mainboard model" - depends on VENDOR_ASI + +config BOARD_ASI_MB_5BLGP + bool "MB-5BLGP" +config BOARD_ASI_MB_5BLMP + bool "MB-5BLMP" + +endchoice source "src/mainboard/asi/mb_5blgp/Kconfig" source "src/mainboard/asi/mb_5blmp/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "ASI" +endif # VENDOR_ASI Modified: trunk/src/mainboard/asi/mb_5blgp/Kconfig ============================================================================== --- trunk/src/mainboard/asi/mb_5blgp/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asi/mb_5blgp/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASI_MB_5BLGP -config BOARD_ASI_MB_5BLGP - bool "MB-5BLGP" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default asi/mb_5blgp - depends on BOARD_ASI_MB_5BLGP config MAINBOARD_PART_NUMBER string default "MB-5BLGP" - depends on BOARD_ASI_MB_5BLGP config IRQ_SLOT_COUNT int default 3 - depends on BOARD_ASI_MB_5BLGP +endif # BOARD_ASI_MB_5BLGP Modified: trunk/src/mainboard/asi/mb_5blmp/Kconfig ============================================================================== --- trunk/src/mainboard/asi/mb_5blmp/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asi/mb_5blmp/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASI_MB_5BLMP -config BOARD_ASI_MB_5BLMP - bool "MB-5BLMP" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default asi/mb_5blmp - depends on BOARD_ASI_MB_5BLMP config MAINBOARD_PART_NUMBER string default "MB-5BLMP" - depends on BOARD_ASI_MB_5BLMP config IRQ_SLOT_COUNT int default 5 - depends on BOARD_ASI_MB_5BLMP +endif # BOARD_ASI_MB_5BLMP Modified: trunk/src/mainboard/asrock/939a785gmh/Kconfig ============================================================================== --- trunk/src/mainboard/asrock/939a785gmh/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asrock/939a785gmh/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_ASROCK_939A785GMH - bool "939A785GMH/128M" +if BOARD_ASROCK_939A785GMH + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_939 select K8_HT_FREQ_1G_SUPPORT @@ -25,79 +27,65 @@ config MAINBOARD_DIR string default asrock/939a785gmh - depends on BOARD_ASROCK_939A785GMH config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_ASROCK_939A785GMH config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_ASROCK_939A785GMH config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_ASROCK_939A785GMH config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_ASROCK_939A785GMH config MAINBOARD_PART_NUMBER string default "939A785GMH" - depends on BOARD_ASROCK_939A785GMH config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_ASROCK_939A785GMH config MAX_CPUS int default 8 - depends on BOARD_ASROCK_939A785GMH config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_ASROCK_939A785GMH config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_ASROCK_939A785GMH config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_ASROCK_939A785GMH config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_ASROCK_939A785GMH config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_ASROCK_939A785GMH config IRQ_SLOT_COUNT int default 11 - depends on BOARD_ASROCK_939A785GMH config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_ASROCK_939A785GMH config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_ASROCK_939A785GMH + +endif # BOARD_ASROCK_939A785GMH Modified: trunk/src/mainboard/asrock/Kconfig ============================================================================== --- trunk/src/mainboard/asrock/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asrock/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_ASROCK choice prompt "Mainboard model" - depends on VENDOR_ASROCK -source "src/mainboard/asrock/939a785gmh/Kconfig" +config BOARD_ASROCK_939A785GMH + bool "939A785GMH/128M" endchoice +source "src/mainboard/asrock/939a785gmh/Kconfig" + +config MAINBOARD_VENDOR + string + default "ASROCK" + +endif # VENDOR_ASROCK Modified: trunk/src/mainboard/asus/Kconfig ============================================================================== --- trunk/src/mainboard/asus/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,22 +16,50 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_ASUS choice prompt "Mainboard model" - depends on VENDOR_ASUS + +config BOARD_ASUS_A8N_E + bool "A8N-E" +config BOARD_ASUS_A8V_E_SE + bool "A8V-E SE" +config BOARD_ASUS_M2V_MX_SE + bool "M2V-MX SE" +config BOARD_ASUS_MEW_AM + bool "MEW-AM" +config BOARD_ASUS_MEW_VM + bool "MEW-VM" +config BOARD_ASUS_P2B + bool "P2B" +config BOARD_ASUS_P2B_D + bool "P2B-D" +config BOARD_ASUS_P2B_DS + bool "P2B-DS" +config BOARD_ASUS_P2B_F + bool "P2B-F" +config BOARD_ASUS_P2B_LS + bool "P2B-LS" +config BOARD_ASUS_P3B_F + bool "P3B-F" + +endchoice source "src/mainboard/asus/a8n_e/Kconfig" source "src/mainboard/asus/a8v-e_se/Kconfig" +source "src/mainboard/asus/m2v-mx_se/Kconfig" +source "src/mainboard/asus/mew-am/Kconfig" +source "src/mainboard/asus/mew-vm/Kconfig" source "src/mainboard/asus/p2b/Kconfig" source "src/mainboard/asus/p2b-d/Kconfig" source "src/mainboard/asus/p2b-ds/Kconfig" -source "src/mainboard/asus/p2b-ls/Kconfig" source "src/mainboard/asus/p2b-f/Kconfig" +source "src/mainboard/asus/p2b-ls/Kconfig" source "src/mainboard/asus/p3b-f/Kconfig" -source "src/mainboard/asus/m2v-mx_se/Kconfig" -source "src/mainboard/asus/mew-am/Kconfig" -source "src/mainboard/asus/mew-vm/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "ASUS" +endif # VENDOR_ASUS Modified: trunk/src/mainboard/asus/a8n_e/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8n_e/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/a8n_e/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_ASUS_A8N_E - bool "A8N-E" +if BOARD_ASUS_A8N_E + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_939 select NORTHBRIDGE_AMD_AMDK8 @@ -17,80 +19,65 @@ config MAINBOARD_DIR string default asus/a8n_e - depends on BOARD_ASUS_A8N_E config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_ASUS_A8N_E config DCACHE_RAM_SIZE hex default 0x01000 - depends on BOARD_ASUS_A8N_E config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_ASUS_A8N_E config MEM_TRAIN_SEQ int default 2 - depends on BOARD_ASUS_A8N_E config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_ASUS_A8N_E config MAINBOARD_PART_NUMBER string default "A8N-E" - depends on BOARD_ASUS_A8N_E config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_ASUS_A8N_E config MAX_CPUS int default 2 - depends on BOARD_ASUS_A8N_E config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_ASUS_A8N_E config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_ASUS_A8N_E config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_ASUS_A8N_E config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_ASUS_A8N_E config IRQ_SLOT_COUNT int default 13 - depends on BOARD_ASUS_A8N_E config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1043 - depends on BOARD_ASUS_A8N_E config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x815a - depends on BOARD_ASUS_A8N_E +endif # BOARD_ASUS_A8N_E Modified: trunk/src/mainboard/asus/a8v-e_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/a8v-e_se/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/a8v-e_se/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_ASUS_A8V_E_SE - bool "A8V-E SE" +if BOARD_ASUS_A8V_E_SE + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_939 select K8_HT_FREQ_1G_SUPPORT @@ -17,69 +19,57 @@ config MAINBOARD_DIR string default asus/a8v-e_se - depends on BOARD_ASUS_A8V_E_SE config DCACHE_RAM_BASE hex default 0xcc000 - depends on BOARD_ASUS_A8V_E_SE config DCACHE_RAM_SIZE hex default 0x4000 - depends on BOARD_ASUS_A8V_E_SE config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x1000 - depends on BOARD_ASUS_A8V_E_SE config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_ASUS_A8V_E_SE config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_ASUS_A8V_E_SE config MAINBOARD_PART_NUMBER string default "A8V-E SE" - depends on BOARD_ASUS_A8V_E_SE config HW_MEM_HOLE_SIZEK hex default 0 - depends on BOARD_ASUS_A8V_E_SE config MAX_CPUS int default 2 - depends on BOARD_ASUS_A8V_E_SE config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_ASUS_A8V_E_SE config HEAP_SIZE hex default 0x40000 - depends on BOARD_ASUS_A8V_E_SE config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_ASUS_A8V_E_SE config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_ASUS_A8V_E_SE config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1043 - depends on BOARD_ASUS_A8V_E_SE + +endif # BOARD_ASUS_A8V_E_SE Modified: trunk/src/mainboard/asus/m2v-mx_se/Kconfig ============================================================================== --- trunk/src/mainboard/asus/m2v-mx_se/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/m2v-mx_se/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_M2V_MX_SE -config BOARD_ASUS_M2V_MX_SE - bool "M2V-MX SE" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2 select NORTHBRIDGE_AMD_AMDK8 @@ -37,65 +38,53 @@ config MAINBOARD_DIR string default asus/m2v-mx_se - depends on BOARD_ASUS_M2V_MX_SE config DCACHE_RAM_BASE hex default 0xcc000 - depends on BOARD_ASUS_M2V_MX_SE config DCACHE_RAM_SIZE hex default 0x4000 - depends on BOARD_ASUS_M2V_MX_SE config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_ASUS_M2V_MX_SE config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_ASUS_M2V_MX_SE config MAINBOARD_PART_NUMBER string default "M2V-MX SE" - depends on BOARD_ASUS_M2V_MX_SE config MAX_CPUS int default 2 - depends on BOARD_ASUS_M2V_MX_SE config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_ASUS_M2V_MX_SE config HEAP_SIZE hex default 0x40000 - depends on BOARD_ASUS_M2V_MX_SE config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_ASUS_M2V_MX_SE config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_ASUS_M2V_MX_SE config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_ASUS_M2V_MX_SE config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1043 - depends on BOARD_ASUS_M2V_MX_SE +endif # BOARD_ASUS_M2V_MX_SE Modified: trunk/src/mainboard/asus/mew-am/Kconfig ============================================================================== --- trunk/src/mainboard/asus/mew-am/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/mew-am/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_MEW_AM -config BOARD_ASUS_MEW_AM - bool "MEW-AM" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -34,15 +35,13 @@ config MAINBOARD_DIR string default asus/mew-am - depends on BOARD_ASUS_MEW_AM config MAINBOARD_PART_NUMBER string default "MEW-AM" - depends on BOARD_ASUS_MEW_AM config IRQ_SLOT_COUNT int default 8 - depends on BOARD_ASUS_MEW_AM +endif # BOARD_ASUS_MEW_AM Modified: trunk/src/mainboard/asus/mew-vm/Kconfig ============================================================================== --- trunk/src/mainboard/asus/mew-vm/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/mew-vm/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_MEW_VM -config BOARD_ASUS_MEW_VM - bool "MEW-VM" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -35,15 +36,13 @@ config MAINBOARD_DIR string default asus/mew-vm - depends on BOARD_ASUS_MEW_VM config MAINBOARD_PART_NUMBER string default "MEW-VM" - depends on BOARD_ASUS_MEW_VM config IRQ_SLOT_COUNT int default 11 - depends on BOARD_ASUS_MEW_VM +endif # BOARD_ASUS_MEW_VM Modified: trunk/src/mainboard/asus/p2b-d/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-d/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/p2b-d/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_P2B_D -config BOARD_ASUS_P2B_D - bool "P2B-D" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -35,20 +36,17 @@ config MAINBOARD_DIR string default asus/p2b-d - depends on BOARD_ASUS_P2B_D config MAINBOARD_PART_NUMBER string default "P2B-D" - depends on BOARD_ASUS_P2B_D config IRQ_SLOT_COUNT int default 6 - depends on BOARD_ASUS_P2B_D config MAX_CPUS int default 2 - depends on BOARD_ASUS_P2B_D +endif # BOARD_ASUS_P2B_D Modified: trunk/src/mainboard/asus/p2b-ds/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-ds/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/p2b-ds/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_P2B_DS -config BOARD_ASUS_P2B_DS - bool "P2B-DS" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -35,20 +36,17 @@ config MAINBOARD_DIR string default asus/p2b-ds - depends on BOARD_ASUS_P2B_DS config MAINBOARD_PART_NUMBER string default "P2B-DS" - depends on BOARD_ASUS_P2B_DS config IRQ_SLOT_COUNT int default 7 - depends on BOARD_ASUS_P2B_DS config MAX_CPUS int default 2 - depends on BOARD_ASUS_P2B_DS +endif # BOARD_ASUS_P2B_DS Modified: trunk/src/mainboard/asus/p2b-f/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-f/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/p2b-f/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_P2B_F -config BOARD_ASUS_P2B_F - bool "P2B-F" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default asus/p2b-f - depends on BOARD_ASUS_P2B_F config MAINBOARD_PART_NUMBER string default "P2B-F" - depends on BOARD_ASUS_P2B_F config IRQ_SLOT_COUNT int default 7 - depends on BOARD_ASUS_P2B_F +endif # BOARD_ASUS_P2B_F Modified: trunk/src/mainboard/asus/p2b-ls/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b-ls/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/p2b-ls/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_P2B_LS -config BOARD_ASUS_P2B_LS - bool "P2B-LS" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default asus/p2b-ls - depends on BOARD_ASUS_P2B_LS config MAINBOARD_PART_NUMBER string default "P2B-LS" - depends on BOARD_ASUS_P2B_LS config IRQ_SLOT_COUNT int default 8 - depends on BOARD_ASUS_P2B_LS +endif # BOARD_ASUS_P2B_LS Modified: trunk/src/mainboard/asus/p2b/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p2b/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/p2b/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_P2B -config BOARD_ASUS_P2B - bool "P2B" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default asus/p2b - depends on BOARD_ASUS_P2B config MAINBOARD_PART_NUMBER string default "P2B" - depends on BOARD_ASUS_P2B config IRQ_SLOT_COUNT int default 6 - depends on BOARD_ASUS_P2B +endif # BOARD_ASUS_P2B Modified: trunk/src/mainboard/asus/p3b-f/Kconfig ============================================================================== --- trunk/src/mainboard/asus/p3b-f/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/asus/p3b-f/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ASUS_P3B_F -config BOARD_ASUS_P3B_F - bool "P3B-F" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default asus/p3b-f - depends on BOARD_ASUS_P3B_F config MAINBOARD_PART_NUMBER string default "P3B-F" - depends on BOARD_ASUS_P3B_F config IRQ_SLOT_COUNT int default 8 - depends on BOARD_ASUS_P3B_F +endif # BOARD_ASUS_P3B_F Modified: trunk/src/mainboard/axus/Kconfig ============================================================================== --- trunk/src/mainboard/axus/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/axus/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_AXUS choice prompt "Mainboard model" - depends on VENDOR_AXUS -source "src/mainboard/axus/tc320/Kconfig" +config BOARD_AXUS_TC320 + bool "TC320" endchoice +source "src/mainboard/axus/tc320/Kconfig" + +config MAINBOARD_VENDOR + string + default "AXUS" + +endif # VENDOR_AXUS Modified: trunk/src/mainboard/axus/tc320/Kconfig ============================================================================== --- trunk/src/mainboard/axus/tc320/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/axus/tc320/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_AXUS_TC320 -config BOARD_AXUS_TC320 - bool "TC320" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,16 +34,14 @@ config MAINBOARD_DIR string default axus/tc320 - depends on BOARD_AXUS_TC320 config MAINBOARD_PART_NUMBER string default "TC320" - depends on BOARD_AXUS_TC320 # Soldered NIC, internal USB, no real PCI slots. config IRQ_SLOT_COUNT int default 2 - depends on BOARD_AXUS_TC320 +endif # BOARD_AXUS_TC320 Modified: trunk/src/mainboard/azza/Kconfig ============================================================================== --- trunk/src/mainboard/azza/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/azza/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_AZZA choice prompt "Mainboard model" - depends on VENDOR_AZZA -source "src/mainboard/azza/pt-6ibd/Kconfig" +config BOARD_AZZA_PT_6IBD + bool "PT-6IBD" endchoice +source "src/mainboard/azza/pt-6ibd/Kconfig" + +config MAINBOARD_VENDOR + string + default "AZZA" + +endif # VENDOR_AZZA Modified: trunk/src/mainboard/azza/pt-6ibd/Kconfig ============================================================================== --- trunk/src/mainboard/azza/pt-6ibd/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/azza/pt-6ibd/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_AZZA_PT_6IBD -config BOARD_AZZA_PT_6IBD - bool "PT-6IBD" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default azza/pt-6ibd - depends on BOARD_AZZA_PT_6IBD config MAINBOARD_PART_NUMBER string default "PT-6IBD" - depends on BOARD_AZZA_PT_6IBD config IRQ_SLOT_COUNT int default 7 - depends on BOARD_AZZA_PT_6IBD +endif # BOARD_AZZA_PT_6IBD Modified: trunk/src/mainboard/bcom/Kconfig ============================================================================== --- trunk/src/mainboard/bcom/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/bcom/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,13 +16,23 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_BCOM choice prompt "Mainboard model" - depends on VENDOR_BCOM + +config BOARD_BCOM_WINNET100 + bool "WinNET100" +config BOARD_BCOM_WINNETP680 + bool "WinNET P680" + +endchoice source "src/mainboard/bcom/winnet100/Kconfig" source "src/mainboard/bcom/winnetp680/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "BCOM" +endif # VENDOR_BCOM Modified: trunk/src/mainboard/bcom/winnet100/Kconfig ============================================================================== --- trunk/src/mainboard/bcom/winnet100/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/bcom/winnet100/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_BCOM_WINNET100 -config BOARD_BCOM_WINNET100 - bool "WinNET100" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,16 +34,14 @@ config MAINBOARD_DIR string default bcom/winnet100 - depends on BOARD_BCOM_WINNET100 config MAINBOARD_PART_NUMBER string default "WinNET100" - depends on BOARD_BCOM_WINNET100 # Soldered NIC, internal USB, no real PCI slots. config IRQ_SLOT_COUNT int default 2 - depends on BOARD_BCOM_WINNET100 +endif # BOARD_BCOM_WINNET100 Modified: trunk/src/mainboard/bcom/winnetp680/Kconfig ============================================================================== --- trunk/src/mainboard/bcom/winnetp680/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/bcom/winnetp680/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_BCOM_WINNETP680 - bool "WinNET P680" +if BOARD_BCOM_WINNETP680 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_CN700 @@ -13,20 +15,17 @@ config MAINBOARD_DIR string default bcom/winnetp680 - depends on BOARD_BCOM_WINNETP680 config MAINBOARD_PART_NUMBER string default "WinNET P680" - depends on BOARD_BCOM_WINNETP680 config IRQ_SLOT_COUNT int default 10 - depends on BOARD_BCOM_WINNETP680 config RAMBASE hex default 0x4000 - depends on BOARD_BCOM_WINNETP680 +endif # BOARD_BCOM_WINNETP680 Modified: trunk/src/mainboard/biostar/Kconfig ============================================================================== --- trunk/src/mainboard/biostar/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/biostar/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_BIOSTAR choice prompt "Mainboard model" - depends on VENDOR_BIOSTAR -source "src/mainboard/biostar/m6tba/Kconfig" +config BOARD_BIOSTAR_M6TBA + bool "M6TBA" endchoice +source "src/mainboard/biostar/m6tba/Kconfig" + +config MAINBOARD_VENDOR + string + default "Biostar" + +endif # VENDOR_BIOSTAR Modified: trunk/src/mainboard/biostar/m6tba/Kconfig ============================================================================== --- trunk/src/mainboard/biostar/m6tba/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/biostar/m6tba/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_BIOSTAR_M6TBA -config BOARD_BIOSTAR_M6TBA - bool "M6TBA" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default biostar/m6tba - depends on BOARD_BIOSTAR_M6TBA config MAINBOARD_PART_NUMBER string default "M6TBA" - depends on BOARD_BIOSTAR_M6TBA config IRQ_SLOT_COUNT int default 7 - depends on BOARD_BIOSTAR_M6TBA +endif # BOARD_BIOSTAR_M6TBA Modified: trunk/src/mainboard/broadcom/Kconfig ============================================================================== --- trunk/src/mainboard/broadcom/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/broadcom/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_BROADCOM + choice prompt "Mainboard model" - depends on VENDOR_BROADCOM -source "src/mainboard/broadcom/blast/Kconfig" +config BOARD_BROADCOM_BLAST + bool "Blast" endchoice +source "src/mainboard/broadcom/blast/Kconfig" + +config MAINBOARD_VENDOR + string + default "Broadcom" + +endif # VENDOR_BROADCOM Modified: trunk/src/mainboard/broadcom/blast/Kconfig ============================================================================== --- trunk/src/mainboard/broadcom/blast/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/broadcom/blast/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_BROADCOM_BLAST - bool "Blast" +if BOARD_BROADCOM_BLAST + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,80 +21,65 @@ config MAINBOARD_DIR string default broadcom/blast - depends on BOARD_BROADCOM_BLAST config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_BROADCOM_BLAST config DCACHE_RAM_SIZE hex default 0x01000 - depends on BOARD_BROADCOM_BLAST config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x0 - depends on BOARD_BROADCOM_BLAST config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_BROADCOM_BLAST config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_BROADCOM_BLAST config MAINBOARD_PART_NUMBER string default "Blast" - depends on BOARD_BROADCOM_BLAST config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_BROADCOM_BLAST config MAX_CPUS int default 4 - depends on BOARD_BROADCOM_BLAST config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_BROADCOM_BLAST config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_BROADCOM_BLAST config HT_CHAIN_UNITID_BASE hex default 0x6 - depends on BOARD_BROADCOM_BLAST config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_BROADCOM_BLAST config IRQ_SLOT_COUNT int default 11 - depends on BOARD_BROADCOM_BLAST config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x161f - depends on BOARD_BROADCOM_BLAST config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3050 - depends on BOARD_BROADCOM_BLAST +endif # BOARD_BROADCOM_BLAST Modified: trunk/src/mainboard/compaq/Kconfig ============================================================================== --- trunk/src/mainboard/compaq/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/compaq/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_COMPAQ choice prompt "Mainboard model" - depends on VENDOR_COMPAQ -source "src/mainboard/compaq/deskpro_en_sff_p600/Kconfig" +config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 + bool "Deskpro EN SFF P600" endchoice +source "src/mainboard/compaq/deskpro_en_sff_p600/Kconfig" + +config MAINBOARD_VENDOR + string + default "Compaq" + +endif # VENDOR_COMPAQ Modified: trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig ============================================================================== --- trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_COMPAQ_DESKPRO_EN_SFF_P600 -config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 - bool "Deskpro EN SFF P600" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default compaq/deskpro_en_sff_p600 - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 config MAINBOARD_PART_NUMBER string default "Deskpro EN SFF P600" - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 config IRQ_SLOT_COUNT int default 5 - depends on BOARD_COMPAQ_DESKPRO_EN_SFF_P600 +endif # BOARD_COMPAQ_DESKPRO_EN_SFF_P600 Modified: trunk/src/mainboard/dell/Kconfig ============================================================================== --- trunk/src/mainboard/dell/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/dell/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_DELL + choice prompt "Mainboard model" - depends on VENDOR_DELL -source "src/mainboard/dell/s1850/Kconfig" +config BOARD_DELL_S1850 + bool "PowerEdge 1850" endchoice +source "src/mainboard/dell/s1850/Kconfig" + +config MAINBOARD_VENDOR + string + default "Dell" + +endif # VENDOR_DELL Modified: trunk/src/mainboard/dell/s1850/Kconfig ============================================================================== --- trunk/src/mainboard/dell/s1850/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/dell/s1850/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_DELL_S1850 - bool "PowerEdge 1850" +if BOARD_DELL_S1850 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7520 @@ -19,35 +21,29 @@ config MAINBOARD_DIR string default dell/s1850 - depends on BOARD_DELL_S1850 config MAINBOARD_PART_NUMBER string default "PowerEdge 1850" - depends on BOARD_DELL_S1850 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x5580 - depends on BOARD_DELL_S1850 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_DELL_S1850 - config MAX_CPUS int default 4 - depends on BOARD_DELL_S1850 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_DELL_S1850 config IRQ_SLOT_COUNT int default 9 - depends on BOARD_DELL_S1850 + +endif # BOARD_DELL_S1850 Modified: trunk/src/mainboard/digitallogic/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/digitallogic/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,10 +1,23 @@ +if VENDOR_DIGITAL_LOGIC + choice prompt "Mainboard model" - depends on VENDOR_DIGITAL_LOGIC + +config BOARD_DIGITALLOGIC_ADL855PC + bool "smartModule855" +config BOARD_DIGITALLOGIC_MSM586SEG + bool "MSM586SEG" +config BOARD_DIGITALLOGIC_MSM800SEV + bool "MSM800SEV" + +endchoice source "src/mainboard/digitallogic/adl855pc/Kconfig" source "src/mainboard/digitallogic/msm586seg/Kconfig" source "src/mainboard/digitallogic/msm800sev/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "DIGITAL-LOGIC" +endif # VENDOR_DIGITAL_LOGIC Modified: trunk/src/mainboard/digitallogic/adl855pc/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/adl855pc/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/digitallogic/adl855pc/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_DIGITALLOGIC_ADL855PC - bool "smartModule855" +if BOARD_DIGITALLOGIC_ADL855PC + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA479M select NORTHBRIDGE_INTEL_I855 @@ -15,24 +17,21 @@ config MAINBOARD_DIR string default digitallogic/adl855pc - depends on BOARD_DIGITALLOGIC_ADL855PC config MAINBOARD_PART_NUMBER string default "smartModule855" - depends on BOARD_DIGITALLOGIC_ADL855PC config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_DIGITALLOGIC_ADL855PC config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_DIGITALLOGIC_ADL855PC config IRQ_SLOT_COUNT int default 5 - depends on BOARD_DIGITALLOGIC_ADL855PC + +endif # BOARD_DIGITALLOGIC_ADL855PC Modified: trunk/src/mainboard/digitallogic/msm586seg/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/msm586seg/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/digitallogic/msm586seg/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_DIGITALLOGIC_MSM586SEG - bool "MSM586SEG" +if BOARD_DIGITALLOGIC_MSM586SEG + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SC520 select HAVE_PIRQ_TABLE @@ -10,14 +12,13 @@ config MAINBOARD_DIR string default digitallogic/msm586seg - depends on BOARD_DIGITALLOGIC_MSM586SEG config MAINBOARD_PART_NUMBER string default "MSM586SEG" - depends on BOARD_DIGITALLOGIC_MSM586SEG config IRQ_SLOT_COUNT int default 2 - depends on BOARD_DIGITALLOGIC_MSM586SEG + +endif # BOARD_DIGITALLOGIC_MSM586SEG Modified: trunk/src/mainboard/digitallogic/msm800sev/Kconfig ============================================================================== --- trunk/src/mainboard/digitallogic/msm800sev/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/digitallogic/msm800sev/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_DIGITALLOGIC_MSM800SEV - bool "MSM800SEV" +if BOARD_DIGITALLOGIC_MSM800SEV + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -14,19 +16,17 @@ config MAINBOARD_DIR string default digitallogic/msm800sev - depends on BOARD_DIGITALLOGIC_MSM800SEV config MAINBOARD_PART_NUMBER string default "MSM800SEV" - depends on BOARD_DIGITALLOGIC_MSM800SEV config IRQ_SLOT_COUNT int default 9 - depends on BOARD_DIGITALLOGIC_MSM800SEV config RAMBASE hex default 0x4000 - depends on BOARD_DIGITALLOGIC_MSM800SEV + +endif # BOARD_DIGITALLOGIC_MSM800SEV Modified: trunk/src/mainboard/eaglelion/5bcm/Kconfig ============================================================================== --- trunk/src/mainboard/eaglelion/5bcm/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/eaglelion/5bcm/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_EAGLELION_5BCM -config BOARD_EAGLELION_5BCM - bool "5BCM" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default eaglelion/5bcm - depends on BOARD_EAGLELION_5BCM config MAINBOARD_PART_NUMBER string default "5BCM" - depends on BOARD_EAGLELION_5BCM config IRQ_SLOT_COUNT int default 2 - depends on BOARD_EAGLELION_5BCM +endif # BOARD_EAGLELION_5BCM Modified: trunk/src/mainboard/eaglelion/Kconfig ============================================================================== --- trunk/src/mainboard/eaglelion/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/eaglelion/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_EAGLELION choice prompt "Mainboard model" - depends on VENDOR_EAGLELION -source "src/mainboard/eaglelion/5bcm/Kconfig" +config BOARD_EAGLELION_5BCM + bool "5BCM" endchoice +source "src/mainboard/eaglelion/5bcm/Kconfig" + +config MAINBOARD_VENDOR + string + default "EagleLion" + +endif # VENDOR_EAGLELION Modified: trunk/src/mainboard/ecs/Kconfig ============================================================================== --- trunk/src/mainboard/ecs/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ecs/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -17,12 +17,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_ECS choice prompt "Mainboard model" - depends on VENDOR_ECS -source "src/mainboard/ecs/p6iwp-fe/Kconfig" +config BOARD_ECS_P6IWP_FE + bool "P6IWP-FE" endchoice +source "src/mainboard/ecs/p6iwp-fe/Kconfig" + +config MAINBOARD_VENDOR + string + default "ECS" + +endif # VENDOR_ECS Modified: trunk/src/mainboard/ecs/p6iwp-fe/Kconfig ============================================================================== --- trunk/src/mainboard/ecs/p6iwp-fe/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ecs/p6iwp-fe/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -17,9 +17,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_ECS_P6IWP_FE -config BOARD_ECS_P6IWP_FE - bool "P6IWP-FE" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -35,15 +36,13 @@ config MAINBOARD_DIR string default ecs/p6iwp-fe - depends on BOARD_ECS_P6IWP_FE config MAINBOARD_PART_NUMBER string default "P6IWP-FE" - depends on BOARD_ECS_P6IWP_FE config IRQ_SLOT_COUNT int default 10 - depends on BOARD_ECS_P6IWP_FE +endif # BOARD_ECS_P6IWP_FE Modified: trunk/src/mainboard/emulation/Kconfig ============================================================================== --- trunk/src/mainboard/emulation/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/emulation/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,7 +1,17 @@ +if VENDOR_EMULATION + choice prompt "Mainboard model" - depends on VENDOR_EMULATION -source "src/mainboard/emulation/qemu-x86/Kconfig" +config BOARD_EMULATION_QEMU_X86 + bool "QEMU x86" endchoice + +source "src/mainboard/emulation/qemu-x86/Kconfig" + +config MAINBOARD_VENDOR + string + default "Emulation" + +endif # VENDOR_EMULATION Modified: trunk/src/mainboard/emulation/qemu-x86/Kconfig ============================================================================== --- trunk/src/mainboard/emulation/qemu-x86/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/emulation/qemu-x86/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_EMULATION_QEMU_X86 - bool "QEMU x86" +if BOARD_EMULATION_QEMU_X86 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select SOUTHBRIDGE_INTEL_I82371EB select ROMCC @@ -12,14 +14,13 @@ config MAINBOARD_DIR string default emulation/qemu-x86 - depends on BOARD_EMULATION_QEMU_X86 config MAINBOARD_PART_NUMBER string default "QEMU x86" - depends on BOARD_EMULATION_QEMU_X86 config IRQ_SLOT_COUNT int default 6 - depends on BOARD_EMULATION_QEMU_X86 + +endif # BOARD_EMULATION_QEMU_X86 Modified: trunk/src/mainboard/getac/Kconfig ============================================================================== --- trunk/src/mainboard/getac/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/getac/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,11 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_GETAC choice prompt "Mainboard model" - depends on VENDOR_GETAC -source "src/mainboard/getac/p470/Kconfig" +config BOARD_GETAC_P470 + bool "P470" endchoice + +source "src/mainboard/getac/p470/Kconfig" + +config MAINBOARD_VENDOR + string + default "Getac" + +endif # VENDOR_GETAC Modified: trunk/src/mainboard/getac/p470/Kconfig ============================================================================== --- trunk/src/mainboard/getac/p470/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/getac/p470/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_GETAC_P470 -config BOARD_GETAC_P470 - bool "P470" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 @@ -48,45 +49,37 @@ config MAINBOARD_DIR string default getac/p470 - depends on BOARD_GETAC_P470 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_GETAC_P470 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_GETAC_P470 config MAINBOARD_PART_NUMBER string default "P470" - depends on BOARD_GETAC_P470 config MMCONF_BASE_ADDRESS hex default 0xf0000000 - depends on BOARD_GETAC_P470 config IRQ_SLOT_COUNT int default 18 - depends on BOARD_GETAC_P470 config MAX_CPUS int default 4 - depends on BOARD_GETAC_P470 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_GETAC_P470 config FALLBACK_VGA_BIOS_FILE string default "getac-pci8086,27a2.rom" - depends on BOARD_GETAC_P470 +endif # BOARD_GETAC_P470 Modified: trunk/src/mainboard/gigabyte/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,10 +16,25 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_GIGABYTE choice prompt "Mainboard model" - depends on VENDOR_GIGABYTE + +config BOARD_GIGABYTE_GA_2761GXDK + bool "GA-2761GXDK" +config BOARD_GIGABYTE_GA_6BXC + bool "GA-6BXC" +config BOARD_GIGABYTE_GA_6BXE + bool "GA-6BXE" +config BOARD_GIGABYTE_M57SLI + bool "GA-M57SLI-S4" +config BOARD_GIGABYTE_GA785GMT + bool "MA785GMT" +config BOARD_GIGABYTE_MA78GM + bool "MA78GM-US2H" + +endchoice source "src/mainboard/gigabyte/ga_2761gxdk/Kconfig" source "src/mainboard/gigabyte/ga-6bxc/Kconfig" @@ -27,5 +42,9 @@ source "src/mainboard/gigabyte/m57sli/Kconfig" source "src/mainboard/gigabyte/ma785gmt/Kconfig" source "src/mainboard/gigabyte/ma78gm/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "GIGABYTE" + +endif # VENDOR_GIGABYTE Modified: trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/ga-6bxc/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_GIGABYTE_GA_6BXC -config BOARD_GIGABYTE_GA_6BXC - bool "GA-6BXC" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default gigabyte/ga-6bxc - depends on BOARD_GIGABYTE_GA_6BXC config MAINBOARD_PART_NUMBER string default "GA-6BXC" - depends on BOARD_GIGABYTE_GA_6BXC config IRQ_SLOT_COUNT int default 6 - depends on BOARD_GIGABYTE_GA_6BXC +endif # BOARD_GIGABYTE_GA_6BXC Modified: trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/ga-6bxe/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -17,9 +17,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_GIGABYTE_GA_6BXE -config BOARD_GIGABYTE_GA_6BXE - bool "GA-6BXE" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -34,15 +35,13 @@ config MAINBOARD_DIR string default gigabyte/ga-6bxe - depends on BOARD_GIGABYTE_GA_6BXE config MAINBOARD_PART_NUMBER string default "GA-6BXE" - depends on BOARD_GIGABYTE_GA_6BXE config IRQ_SLOT_COUNT int default 7 - depends on BOARD_GIGABYTE_GA_6BXE +endif # BOARD_GIGABYTE_GA_6BXE Modified: trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/ga_2761gxdk/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_GIGABYTE_GA_2761GXDK - bool "GA-2761GXDK" +if BOARD_GIGABYTE_GA_2761GXDK + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2 select NORTHBRIDGE_AMD_AMDK8 @@ -18,94 +20,77 @@ config MAINBOARD_DIR string default gigabyte/ga_2761gxdk - depends on BOARD_GIGABYTE_GA_2761GXDK config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_GIGABYTE_GA_2761GXDK config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_GIGABYTE_GA_2761GXDK config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_GIGABYTE_GA_2761GXDK config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_GIGABYTE_GA_2761GXDK config MEM_TRAIN_SEQ int default 2 - depends on BOARD_GIGABYTE_GA_2761GXDK config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_GIGABYTE_GA_2761GXDK config MAINBOARD_PART_NUMBER string default "GA-2761GXDK" - depends on BOARD_GIGABYTE_GA_2761GXDK config PCI_64BIT_PREF_MEM bool - default n - depends on BOARD_GIGABYTE_GA_2761GXDK + default n config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_GIGABYTE_GA_2761GXDK config MAX_CPUS int default 2 - depends on BOARD_GIGABYTE_GA_2761GXDK config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_GIGABYTE_GA_2761GXDK config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_GIGABYTE_GA_2761GXDK config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_GIGABYTE_GA_2761GXDK config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_GIGABYTE_GA_2761GXDK config SERIAL_CPU_INIT bool default n - depends on BOARD_GIGABYTE_GA_2761GXDK config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1039 - depends on BOARD_GIGABYTE_GA_2761GXDK config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1234 - depends on BOARD_GIGABYTE_GA_2761GXDK config IRQ_SLOT_COUNT int default 11 - depends on BOARD_GIGABYTE_GA_2761GXDK + +endif # BOARD_GIGABYTE_GA_2761GXDK Modified: trunk/src/mainboard/gigabyte/m57sli/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/m57sli/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/m57sli/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_GIGABYTE_M57SLI - bool "GA-M57SLI-S4" +if BOARD_GIGABYTE_M57SLI + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2 select NORTHBRIDGE_AMD_AMDK8 @@ -21,94 +23,77 @@ config MAINBOARD_DIR string default gigabyte/m57sli - depends on BOARD_GIGABYTE_M57SLI config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_GIGABYTE_M57SLI config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_GIGABYTE_M57SLI config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_GIGABYTE_M57SLI config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_GIGABYTE_M57SLI config MEM_TRAIN_SEQ int default 2 - depends on BOARD_GIGABYTE_M57SLI config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_GIGABYTE_M57SLI config MAINBOARD_PART_NUMBER string default "GA-M57SLI-S4" - depends on BOARD_GIGABYTE_M57SLI config PCI_64BIT_PREF_MEM bool - default n - depends on BOARD_GIGABYTE_M57SLI + default n config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_GIGABYTE_M57SLI config MAX_CPUS int default 2 - depends on BOARD_GIGABYTE_M57SLI config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_GIGABYTE_M57SLI config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_GIGABYTE_M57SLI config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_GIGABYTE_M57SLI config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_GIGABYTE_M57SLI config SERIAL_CPU_INIT bool default n - depends on BOARD_GIGABYTE_M57SLI config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_GIGABYTE_M57SLI config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2b80 - depends on BOARD_GIGABYTE_M57SLI config IRQ_SLOT_COUNT int default 11 - depends on BOARD_GIGABYTE_M57SLI + +endif # BOARD_GIGABYTE_M57SLI Modified: trunk/src/mainboard/gigabyte/ma785gmt/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ma785gmt/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/ma785gmt/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_GIGABYTE_GA785GMT - bool "MA785GMT" +if BOARD_GIGABYTE_GA785GMT + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM3 select NORTHBRIDGE_AMD_AMDFAM10 @@ -27,99 +29,81 @@ config MAINBOARD_DIR string default gigabyte/ma785gmt - depends on BOARD_GIGABYTE_GA785GMT config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_GIGABYTE_GA785GMT config MAINBOARD_PART_NUMBER string default "Gigabyte GA785GMT" - depends on BOARD_GIGABYTE_GA785GMT config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_GIGABYTE_GA785GMT config MAX_CPUS int default 8 - depends on BOARD_GIGABYTE_GA785GMT config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_GIGABYTE_GA785GMT config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_GIGABYTE_GA785GMT config MEM_TRAIN_SEQ int default 2 - depends on BOARD_GIGABYTE_GA785GMT config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_GIGABYTE_GA785GMT config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_GIGABYTE_GA785GMT config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_GIGABYTE_GA785GMT config IRQ_SLOT_COUNT int default 11 - depends on BOARD_GIGABYTE_GA785GMT config AMD_UCODE_PATCH_FILE string default "mc_patch_010000b6.h" - depends on BOARD_GIGABYTE_GA785GMT config RAMTOP hex default 0x2000000 - depends on BOARD_GIGABYTE_GA785GMT config HEAP_SIZE hex default 0xc0000 - depends on BOARD_GIGABYTE_GA785GMT config ACPI_SSDTX_NUM int default 0 - depends on BOARD_GIGABYTE_GA785GMT config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_GIGABYTE_GA785GMT config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_GIGABYTE_GA785GMT config RAMBASE hex default 0x200000 - depends on BOARD_GIGABYTE_GA785GMT config COMPRESS hex default 0 - depends on BOARD_GIGABYTE_GA785GMT + +endif # BOARD_GIGABYTE_GA785GMT Modified: trunk/src/mainboard/gigabyte/ma78gm/Kconfig ============================================================================== --- trunk/src/mainboard/gigabyte/ma78gm/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/gigabyte/ma78gm/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_GIGABYTE_MA78GM - bool "MA78GM-US2H" +if BOARD_GIGABYTE_MA78GM + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2R2 select NORTHBRIDGE_AMD_AMDFAM10 @@ -27,99 +29,81 @@ config MAINBOARD_DIR string default gigabyte/ma78gm - depends on BOARD_GIGABYTE_MA78GM config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_GIGABYTE_MA78GM config MAINBOARD_PART_NUMBER string default "GIGABYTE MA78GM" - depends on BOARD_GIGABYTE_MA78GM config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_GIGABYTE_MA78GM config MAX_CPUS int default 8 - depends on BOARD_GIGABYTE_MA78GM config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_GIGABYTE_MA78GM config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_GIGABYTE_MA78GM config MEM_TRAIN_SEQ int default 2 - depends on BOARD_GIGABYTE_MA78GM config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_GIGABYTE_MA78GM config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_GIGABYTE_MA78GM config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_GIGABYTE_MA78GM config IRQ_SLOT_COUNT int default 11 - depends on BOARD_GIGABYTE_MA78GM config AMD_UCODE_PATCH_FILE string default "mc_patch_01000095.h" - depends on BOARD_GIGABYTE_MA78GM config RAMTOP hex default 0x2000000 - depends on BOARD_GIGABYTE_MA78GM config HEAP_SIZE hex default 0xc0000 - depends on BOARD_GIGABYTE_MA78GM config ACPI_SSDTX_NUM int default 0 - depends on BOARD_GIGABYTE_MA78GM config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_GIGABYTE_MA78GM config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_GIGABYTE_MA78GM config RAMBASE hex default 0x200000 - depends on BOARD_GIGABYTE_MA78GM config COMPRESS hex default 0 - depends on BOARD_GIGABYTE_MA78GM + +endif # BOARD_GIGABYTE_MA78GM Modified: trunk/src/mainboard/hp/Kconfig ============================================================================== --- trunk/src/mainboard/hp/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/hp/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,10 +1,23 @@ +if VENDOR_HP + choice prompt "Mainboard model" - depends on VENDOR_HP + +config BOARD_HP_DL145_G1 + bool "ProLiant DL145 G1" +config BOARD_HP_DL145_G3 + bool "ProLiant DL145 G3" +config BOARD_HP_E_VECTRA_P2706T + bool "e-Vectra P2706T" + +endchoice source "src/mainboard/hp/dl145_g1/Kconfig" source "src/mainboard/hp/dl145_g3/Kconfig" source "src/mainboard/hp/e_vectra_p2706t/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "HP" +endif # VENDOR_HP Modified: trunk/src/mainboard/hp/dl145_g1/Kconfig ============================================================================== --- trunk/src/mainboard/hp/dl145_g1/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/hp/dl145_g1/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_HP_DL145_G1 - bool "ProLiant DL145 G1" +if BOARD_HP_DL145_G1 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -18,64 +20,53 @@ config MAINBOARD_DIR string default hp/dl145_g1 - depends on BOARD_HP_DL145_G1 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_HP_DL145_G1 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_HP_DL145_G1 config MAINBOARD_PART_NUMBER string default "ProLiant DL145 G1" - depends on BOARD_HP_DL145_G1 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_HP_DL145_G1 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x7460 - depends on BOARD_HP_DL145_G1 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_HP_DL145_G1 config MAX_CPUS int default 4 - depends on BOARD_HP_DL145_G1 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_HP_DL145_G1 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_HP_DL145_G1 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_HP_DL145_G1 config HT_CHAIN_END_UNITID_BASE hex default 0x6 - depends on BOARD_HP_DL145_G1 config IRQ_SLOT_COUNT int default 9 - depends on BOARD_HP_DL145_G1 + +endif # BOARD_HP_DL145_G1 Modified: trunk/src/mainboard/hp/dl145_g3/Kconfig ============================================================================== --- trunk/src/mainboard/hp/dl145_g3/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/hp/dl145_g3/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_HP_DL145_G3 - bool "ProLiant DL145 G3" +if BOARD_HP_DL145_G3 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -20,69 +22,57 @@ config MAINBOARD_DIR string default hp/dl145_g3 - depends on BOARD_HP_DL145_G3 config DCACHE_RAM_BASE hex default 0xcc000 - depends on BOARD_HP_DL145_G3 config DCACHE_RAM_SIZE hex default 0x04000 - depends on BOARD_HP_DL145_G3 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_HP_DL145_G3 config APIC_ID_OFFSET hex default 0x8 - depends on BOARD_HP_DL145_G3 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_HP_DL145_G3 config MAINBOARD_PART_NUMBER string default "ProLiant DL145 G3" - depends on BOARD_HP_DL145_G3 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_HP_DL145_G3 config MAX_CPUS int default 4 - depends on BOARD_HP_DL145_G3 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_HP_DL145_G3 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_HP_DL145_G3 config HT_CHAIN_UNITID_BASE hex default 0x6 - depends on BOARD_HP_DL145_G3 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_HP_DL145_G3 config IRQ_SLOT_COUNT int default 15 - depends on BOARD_HP_DL145_G3 + +endif # BOARD_HP_DL145_G3 Modified: trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig ============================================================================== --- trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/hp/e_vectra_p2706t/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -20,8 +20,10 @@ # FIXME: It's a PC87360 actually. # FIXME: It's an i810E actually! # FIXME: ROM chip size really 512KB? -config BOARD_HP_E_VECTRA_P2706T - bool "e-Vectra P2706T" +if BOARD_HP_E_VECTRA_P2706T + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -37,15 +39,13 @@ config MAINBOARD_DIR string default hp/e_vectra_p2706t - depends on BOARD_HP_E_VECTRA_P2706T config MAINBOARD_PART_NUMBER string default "e-Vectra P2706T" - depends on BOARD_HP_E_VECTRA_P2706T config IRQ_SLOT_COUNT int default 3 - depends on BOARD_HP_E_VECTRA_P2706T +endif # BOARD_HP_E_VECTRA_P2706T Modified: trunk/src/mainboard/ibase/Kconfig ============================================================================== --- trunk/src/mainboard/ibase/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ibase/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_IBASE + choice - prompt "Mainboard model" - depends on VENDOR_IBASE + prompt "Mainboard model" -source "src/mainboard/ibase/mb899/Kconfig" +config BOARD_IBASE_MB899 + bool "MB899" endchoice +source "src/mainboard/ibase/mb899/Kconfig" + +config MAINBOARD_VENDOR + string + default "iBase" + +endif # VENDOR_IBASE Modified: trunk/src/mainboard/ibase/mb899/Kconfig ============================================================================== --- trunk/src/mainboard/ibase/mb899/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ibase/mb899/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IBASE_MB899 - bool "MB899" +if BOARD_IBASE_MB899 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 @@ -24,45 +26,37 @@ config MAINBOARD_DIR string default ibase/mb899 - depends on BOARD_IBASE_MB899 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_IBASE_MB899 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_IBASE_MB899 config MAINBOARD_PART_NUMBER string default "MB899" - depends on BOARD_IBASE_MB899 config MMCONF_BASE_ADDRESS hex default 0xf0000000 - depends on BOARD_IBASE_MB899 config IRQ_SLOT_COUNT int default 18 - depends on BOARD_IBASE_MB899 config MAX_CPUS int default 4 - depends on BOARD_IBASE_MB899 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_IBASE_MB899 config FALLBACK_VGA_BIOS_FILE string default "amipci_01.20" - depends on BOARD_IBASE_MB899 +endif # BOARD_IBASE_MB899 Modified: trunk/src/mainboard/ibm/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ibm/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,9 +1,20 @@ +if VENDOR_IBM + choice prompt "Mainboard model" - depends on VENDOR_IBM + +config BOARD_IBM_E325 + bool "eServer 325" +config BOARD_IBM_E326 + bool "eServer 326" + +endchoice source "src/mainboard/ibm/e325/Kconfig" source "src/mainboard/ibm/e326/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "IBM" +endif # VENDOR_IBM Modified: trunk/src/mainboard/ibm/e325/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e325/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ibm/e325/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IBM_E325 - bool "eServer 325" +if BOARD_IBM_E325 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,74 +21,61 @@ config MAINBOARD_DIR string default ibm/e325 - depends on BOARD_IBM_E325 config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_IBM_E325 config DCACHE_RAM_SIZE hex default 0x1000 - depends on BOARD_IBM_E325 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x0 - depends on BOARD_IBM_E325 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_IBM_E325 config MAINBOARD_PART_NUMBER string default "eServer 325" - depends on BOARD_IBM_E325 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_IBM_E325 config MAX_CPUS int default 1 - depends on BOARD_IBM_E325 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_IBM_E325 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_IBM_E325 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_IBM_E325 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_IBM_E325 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_IBM_E325 config SERIAL_CPU_INIT bool default n - depends on BOARD_IBM_E325 config IRQ_SLOT_COUNT int default 12 - depends on BOARD_IBM_E325 + +endif # BOARD_IBM_E325 Modified: trunk/src/mainboard/ibm/e326/Kconfig ============================================================================== --- trunk/src/mainboard/ibm/e326/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/ibm/e326/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IBM_E326 - bool "eServer 326" +if BOARD_IBM_E326 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,74 +21,61 @@ config MAINBOARD_DIR string default ibm/e326 - depends on BOARD_IBM_E326 config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_IBM_E326 config DCACHE_RAM_SIZE hex default 0x1000 - depends on BOARD_IBM_E326 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x0 - depends on BOARD_IBM_E326 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_IBM_E326 config MAINBOARD_PART_NUMBER string default "eServer 326" - depends on BOARD_IBM_E326 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_IBM_E326 config MAX_CPUS int default 2 - depends on BOARD_IBM_E326 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_IBM_E326 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_IBM_E326 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_IBM_E326 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_IBM_E326 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_IBM_E326 config SERIAL_CPU_INIT bool default n - depends on BOARD_IBM_E326 config IRQ_SLOT_COUNT int default 12 - depends on BOARD_IBM_E326 + +endif # BOARD_IBM_E326 Modified: trunk/src/mainboard/iei/Kconfig ============================================================================== --- trunk/src/mainboard/iei/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iei/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,14 +16,26 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_IEI choice prompt "Mainboard model" - depends on VENDOR_IEI + +config BOARD_IEI_JUKI_511P + bool "JUKI-511P" +config BOARD_IEI_NOVA_4899R + bool "NOVA-4899R" +config BOARD_IEI_PCISA_LX_800_R10 + bool "PCISA LX-800-R10" + +endchoice source "src/mainboard/iei/juki-511p/Kconfig" source "src/mainboard/iei/nova4899r/Kconfig" source "src/mainboard/iei/pcisa-lx-800-r10/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "IEI" +endif # VENDOR_IEI Modified: trunk/src/mainboard/iei/juki-511p/Kconfig ============================================================================== --- trunk/src/mainboard/iei/juki-511p/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iei/juki-511p/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_IEI_JUKI_511P -config BOARD_IEI_JUKI_511P - bool "JUKI-511P" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default iei/juki-511p - depends on BOARD_IEI_JUKI_511P config MAINBOARD_PART_NUMBER string default "JUKI-511P" - depends on BOARD_IEI_JUKI_511P config IRQ_SLOT_COUNT int default 2 - depends on BOARD_IEI_JUKI_511P +endif # BOARD_IEI_JUKI_511P Modified: trunk/src/mainboard/iei/nova4899r/Kconfig ============================================================================== --- trunk/src/mainboard/iei/nova4899r/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iei/nova4899r/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_IEI_NOVA_4899R -config BOARD_IEI_NOVA_4899R - bool "NOVA-4899R" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -34,15 +35,13 @@ config MAINBOARD_DIR string default iei/nova4899r - depends on BOARD_IEI_NOVA_4899R config MAINBOARD_PART_NUMBER string default "NOVA-4899R" - depends on BOARD_IEI_NOVA_4899R config IRQ_SLOT_COUNT int default 5 - depends on BOARD_IEI_NOVA_4899R +endif # BOARD_IEI_NOVA_4899R Modified: trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig ============================================================================== --- trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iei/pcisa-lx-800-r10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IEI_PCISA_LX_800_R10 - bool "PCISA LX-800-R10" +if BOARD_IEI_PCISA_LX_800_R10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,20 +15,17 @@ config MAINBOARD_DIR string default iei/pcisa-lx-800-r10 - depends on BOARD_IEI_PCISA_LX_800_R10 config MAINBOARD_PART_NUMBER string default "PCISA-LX-800-R10" - depends on BOARD_IEI_PCISA_LX_800_R10 config IRQ_SLOT_COUNT int default 9 - depends on BOARD_IEI_PCISA_LX_800_R10 config RAMBASE hex default 0x4000 - depends on BOARD_IEI_PCISA_LX_800_R10 +endif # BOARD_IEI_PCISA_LX_800_R10 Modified: trunk/src/mainboard/intel/Kconfig ============================================================================== --- trunk/src/mainboard/intel/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,6 +1,24 @@ +if VENDOR_INTEL + choice - prompt "Mainboard model" - depends on VENDOR_INTEL + prompt "Mainboard model" + +config BOARD_INTEL_D810E2CB + bool "D810E2CB" +config BOARD_INTEL_D945GCLF + bool "D945GCLF" +config BOARD_INTEL_EAGLEHEIGHTS + bool "EagleHeights" +config BOARD_INTEL_JARRELL + bool "Jarrell (SE7520JR2)" +config BOARD_INTEL_MTARVON + bool "3100 devkit (Mt. Arvon)" +config BOARD_INTEL_TRUXTON + bool "EP80579 devkit (Truxton)" +config BOARD_INTEL_XE7501DEVKIT + bool "XE7501devkit" + +endchoice source "src/mainboard/intel/d810e2cb/Kconfig" source "src/mainboard/intel/d945gclf/Kconfig" @@ -10,5 +28,12 @@ source "src/mainboard/intel/truxton/Kconfig" source "src/mainboard/intel/xe7501devkit/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Intel" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x8086 +endif # VENDOR_INTEL Modified: trunk/src/mainboard/intel/d810e2cb/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d810e2cb/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/d810e2cb/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_INTEL_D810E2CB -config BOARD_INTEL_D810E2CB - bool "D810E2CB" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_FC_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -35,15 +36,13 @@ config MAINBOARD_DIR string default intel/d810e2cb - depends on BOARD_INTEL_D810E2CB config MAINBOARD_PART_NUMBER string default "D810E2CB" - depends on BOARD_INTEL_D810E2CB config IRQ_SLOT_COUNT int default 7 - depends on BOARD_INTEL_D810E2CB +endif # BOARD_INTEL_D810E2CB Modified: trunk/src/mainboard/intel/d945gclf/Kconfig ============================================================================== --- trunk/src/mainboard/intel/d945gclf/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/d945gclf/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_INTEL_D945GCLF -config BOARD_INTEL_D945GCLF - bool "D945GCLF" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_ATOM_230 select CPU_INTEL_SOCKET_441 @@ -47,45 +48,37 @@ config MAINBOARD_DIR string default intel/d945gclf - depends on BOARD_INTEL_D945GCLF config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_INTEL_D945GCLF config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_INTEL_D945GCLF config MAINBOARD_PART_NUMBER string default "D945GCLF" - depends on BOARD_INTEL_D945GCLF config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x464C - depends on BOARD_INTEL_D945GCLF config MMCONF_BASE_ADDRESS hex default 0xf0000000 - depends on BOARD_INTEL_D945GCLF config IRQ_SLOT_COUNT int default 18 - depends on BOARD_INTEL_D945GCLF config MAX_CPUS int default 4 - depends on BOARD_INTEL_D945GCLF config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_INTEL_D945GCLF +endif # BOARD_INTEL_D945GCLF Modified: trunk/src/mainboard/intel/eagleheights/Kconfig ============================================================================== --- trunk/src/mainboard/intel/eagleheights/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/eagleheights/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_INTEL_EAGLEHEIGHTS - bool "EagleHeights" +if BOARD_INTEL_EAGLEHEIGHTS + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_BGA956 select NORTHBRIDGE_INTEL_I3100 @@ -21,44 +23,37 @@ config MAINBOARD_DIR string default intel/eagleheights - depends on BOARD_INTEL_EAGLEHEIGHTS config MMCONF_BASE_ADDRESS hex default 0xe0000000 - depends on BOARD_INTEL_EAGLEHEIGHTS config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_INTEL_EAGLEHEIGHTS config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_INTEL_EAGLEHEIGHTS config MAINBOARD_PART_NUMBER string default "EagleHeights" - depends on BOARD_INTEL_EAGLEHEIGHTS config MMCONF_BASE_ADDRESS hex default 0xe0000000 - depends on BOARD_INTEL_EAGLEHEIGHTS config IRQ_SLOT_COUNT int default 9 - depends on BOARD_INTEL_EAGLEHEIGHTS config MAX_CPUS int default 4 - depends on BOARD_INTEL_EAGLEHEIGHTS config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_INTEL_EAGLEHEIGHTS + +endif # BOARD_INTEL_EAGLEHEIGHTS Modified: trunk/src/mainboard/intel/jarrell/Kconfig ============================================================================== --- trunk/src/mainboard/intel/jarrell/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/jarrell/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_INTEL_JARRELL - bool "Jarrell (SE7520JR2)" +if BOARD_INTEL_JARRELL + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7520 @@ -20,30 +22,25 @@ config MAINBOARD_DIR string default intel/jarrell - depends on BOARD_INTEL_JARRELL config MAINBOARD_PART_NUMBER string default "Jarrell" - depends on BOARD_INTEL_JARRELL config MAX_CPUS int default 4 - depends on BOARD_INTEL_JARRELL config IRQ_SLOT_COUNT int default 18 - depends on BOARD_INTEL_JARRELL config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x8086 - depends on BOARD_INTEL_JARRELL config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1079 - depends on BOARD_INTEL_JARRELL +endif # BOARD_INTEL_JARRELL Modified: trunk/src/mainboard/intel/mtarvon/Kconfig ============================================================================== --- trunk/src/mainboard/intel/mtarvon/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/mtarvon/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_INTEL_MTARVON - bool "3100 devkit (Mt. Arvon)" +if BOARD_INTEL_MTARVON + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA479M select NORTHBRIDGE_INTEL_I3100 @@ -15,29 +17,25 @@ config MAINBOARD_DIR string default intel/mtarvon - depends on BOARD_INTEL_MTARVON config MAINBOARD_PART_NUMBER string default "3100 devkit (Mt. Arvon)" - depends on BOARD_INTEL_MTARVON config IRQ_SLOT_COUNT int default 1 - depends on BOARD_INTEL_MTARVON config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x8086 - depends on BOARD_INTEL_MTARVON config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2680 - depends on BOARD_INTEL_MTARVON config MAX_CPUS int default 4 - depends on BOARD_INTEL_MTARVON + +endif # BOARD_INTEL_MTARVON Modified: trunk/src/mainboard/intel/truxton/Kconfig ============================================================================== --- trunk/src/mainboard/intel/truxton/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/truxton/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_INTEL_TRUXTON - bool "EP80579 devkit (Truxton)" +if BOARD_INTEL_TRUXTON + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_EP80579 select NORTHBRIDGE_INTEL_I3100 @@ -16,29 +18,25 @@ config MAINBOARD_DIR string default intel/truxton - depends on BOARD_INTEL_TRUXTON config MAINBOARD_PART_NUMBER string default "Truxton" - depends on BOARD_INTEL_TRUXTON config IRQ_SLOT_COUNT int default 1 - depends on BOARD_INTEL_TRUXTON config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x8086 - depends on BOARD_INTEL_TRUXTON config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2680 - depends on BOARD_INTEL_TRUXTON config MAX_CPUS int default 4 - depends on BOARD_INTEL_TRUXTON + +endif # BOARD_INTEL_TRUXTON Modified: trunk/src/mainboard/intel/xe7501devkit/Kconfig ============================================================================== --- trunk/src/mainboard/intel/xe7501devkit/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/intel/xe7501devkit/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_INTEL_XE7501DEVKIT - bool "XE7501devkit" +if BOARD_INTEL_XE7501DEVKIT + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7501 @@ -18,35 +20,29 @@ config MAINBOARD_DIR string default intel/xe7501devkit - depends on BOARD_INTEL_XE7501DEVKIT config MAINBOARD_PART_NUMBER string default "XE7501devkit" - depends on BOARD_INTEL_XE7501DEVKIT config IRQ_SLOT_COUNT int default 12 - depends on BOARD_INTEL_XE7501DEVKIT config MAX_CPUS int default 2 - depends on BOARD_INTEL_XE7501DEVKIT config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_INTEL_XE7501DEVKIT config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x8086 - depends on BOARD_INTEL_XE7501DEVKIT config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2480 - depends on BOARD_INTEL_XE7501DEVKIT +endif # BOARD_INTEL_XE7501DEVKIT Modified: trunk/src/mainboard/iwill/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iwill/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,10 +1,23 @@ +if VENDOR_IWILL + choice prompt "Mainboard model" - depends on VENDOR_IWILL + +config BOARD_IWILL_DK8_HTX + bool "DK8-HTX" +config BOARD_IWILL_DK8S2 + bool "DK8S2" +config BOARD_IWILL_DK8X + bool "DK8X" + +endchoice source "src/mainboard/iwill/dk8_htx/Kconfig" source "src/mainboard/iwill/dk8s2/Kconfig" source "src/mainboard/iwill/dk8x/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "IWILL" +endif # VENDOR_IWILL Modified: trunk/src/mainboard/iwill/dk8_htx/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8_htx/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iwill/dk8_htx/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IWILL_DK8_HTX - bool "DK8-HTX" +if BOARD_IWILL_DK8_HTX + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -23,89 +25,73 @@ config MAINBOARD_DIR string default iwill/dk8_htx - depends on BOARD_IWILL_DK8_HTX config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_IWILL_DK8_HTX config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_IWILL_DK8_HTX config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_IWILL_DK8_HTX config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_IWILL_DK8_HTX config MAINBOARD_PART_NUMBER string default "DK8-HTX" - depends on BOARD_IWILL_DK8_HTX config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_IWILL_DK8_HTX config MAX_CPUS int default 4 - depends on BOARD_IWILL_DK8_HTX config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_IWILL_DK8_HTX config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_IWILL_DK8_HTX config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_IWILL_DK8_HTX config HT_CHAIN_END_UNITID_BASE hex default 0x6 - depends on BOARD_IWILL_DK8_HTX config HT_CHAIN_UNITID_BASE hex default 0xa - depends on BOARD_IWILL_DK8_HTX config SERIAL_CPU_INIT bool default n - depends on BOARD_IWILL_DK8_HTX config IRQ_SLOT_COUNT int default 11 - depends on BOARD_IWILL_DK8_HTX config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_IWILL_DK8_HTX config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2b80 - depends on BOARD_IWILL_DK8_HTX config ACPI_SSDTX_NUM int default 5 - depends on BOARD_IWILL_DK8_HTX + +endif # BOARD_IWILL_DK8_HTX Modified: trunk/src/mainboard/iwill/dk8s2/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8s2/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iwill/dk8s2/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IWILL_DK8S2 - bool "DK8S2" +if BOARD_IWILL_DK8S2 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -20,85 +22,69 @@ config MAINBOARD_DIR string default iwill/dk8s2 - depends on BOARD_IWILL_DK8S2 config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_IWILL_DK8S2 config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_IWILL_DK8S2 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_IWILL_DK8S2 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_IWILL_DK8S2 config MAINBOARD_PART_NUMBER string default "DK8S2" - depends on BOARD_IWILL_DK8S2 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_IWILL_DK8S2 config MAX_CPUS int default 2 - depends on BOARD_IWILL_DK8S2 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_IWILL_DK8S2 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_IWILL_DK8S2 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_IWILL_DK8S2 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_IWILL_DK8S2 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_IWILL_DK8S2 config SERIAL_CPU_INIT bool default n - depends on BOARD_IWILL_DK8S2 config IRQ_SLOT_COUNT int default 12 - depends on BOARD_IWILL_DK8S2 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x161f - depends on BOARD_IWILL_DK8S2 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3016 - depends on BOARD_IWILL_DK8S2 +endif # BOARD_IWILL_DK8S2 Modified: trunk/src/mainboard/iwill/dk8x/Kconfig ============================================================================== --- trunk/src/mainboard/iwill/dk8x/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/iwill/dk8x/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_IWILL_DK8X - bool "DK8X" +if BOARD_IWILL_DK8X + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,74 +21,61 @@ config MAINBOARD_DIR string default iwill/dk8x - depends on BOARD_IWILL_DK8X config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_IWILL_DK8X config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_IWILL_DK8X config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_IWILL_DK8X config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_IWILL_DK8X config MAINBOARD_PART_NUMBER string default "DK8X" - depends on BOARD_IWILL_DK8X config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_IWILL_DK8X config MAX_CPUS int default 2 - depends on BOARD_IWILL_DK8X config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_IWILL_DK8X config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_IWILL_DK8X config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_IWILL_DK8X config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_IWILL_DK8X config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_IWILL_DK8X config SERIAL_CPU_INIT bool default n - depends on BOARD_IWILL_DK8X config IRQ_SLOT_COUNT int default 9 - depends on BOARD_IWILL_DK8X + +endif # BOARD_IWILL_DK8X Modified: trunk/src/mainboard/jetway/Kconfig ============================================================================== --- trunk/src/mainboard/jetway/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/jetway/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,20 @@ +if VENDOR_JETWAY + choice prompt "Mainboard model" - depends on VENDOR_JETWAY + +config BOARD_JETWAY_J7F24 + bool "J7F24" +config BOARD_JETWAY_PA78VM5 + bool "PA78VM5 (Fam10)" + +endchoice source "src/mainboard/jetway/j7f24/Kconfig" source "src/mainboard/jetway/pa78vm5/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Jetway" + +endif # VENDOR_JETWAY Modified: trunk/src/mainboard/jetway/j7f24/Kconfig ============================================================================== --- trunk/src/mainboard/jetway/j7f24/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/jetway/j7f24/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,6 +1,8 @@ # FIXME: There is no such board, "J7F24" is probably too generic and/or wrong. -config BOARD_JETWAY_J7F24 - bool "J7F24" +if BOARD_JETWAY_J7F24 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_CN700 @@ -13,19 +15,17 @@ config MAINBOARD_DIR string default jetway/j7f24 - depends on BOARD_JETWAY_J7F24 config MAINBOARD_PART_NUMBER string default "J7f24" - depends on BOARD_JETWAY_J7F24 config RAMBASE hex default 0x4000 - depends on BOARD_JETWAY_J7F24 config IRQ_SLOT_COUNT int default 10 - depends on BOARD_JETWAY_J7F24 + +endif # BOARD_JETWAY_J7F24 Modified: trunk/src/mainboard/jetway/pa78vm5/Kconfig ============================================================================== --- trunk/src/mainboard/jetway/pa78vm5/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/jetway/pa78vm5/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_JETWAY_PA78VM5 - bool "PA78VM5 (Fam10)" +if BOARD_JETWAY_PA78VM5 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2R2 select NORTHBRIDGE_AMD_AMDFAM10 @@ -27,99 +29,81 @@ config MAINBOARD_DIR string default jetway/pa78vm5 - depends on BOARD_JETWAY_PA78VM5 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_JETWAY_PA78VM5 config MAINBOARD_PART_NUMBER string default "PA78VM5 (Fam10)" - depends on BOARD_JETWAY_PA78VM5 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_JETWAY_PA78VM5 config MAX_CPUS int default 8 - depends on BOARD_JETWAY_PA78VM5 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_JETWAY_PA78VM5 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_JETWAY_PA78VM5 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_JETWAY_PA78VM5 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_JETWAY_PA78VM5 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_JETWAY_PA78VM5 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_JETWAY_PA78VM5 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_JETWAY_PA78VM5 config AMD_UCODE_PATCH_FILE string default "mc_patch_010000b6.h" - depends on BOARD_JETWAY_PA78VM5 config RAMTOP hex default 0x2000000 - depends on BOARD_JETWAY_PA78VM5 config HEAP_SIZE hex default 0xc0000 - depends on BOARD_JETWAY_PA78VM5 config ACPI_SSDTX_NUM int default 0 - depends on BOARD_JETWAY_PA78VM5 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3060 - depends on BOARD_JETWAY_PA78VM5 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_JETWAY_PA78VM5 config RAMBASE hex default 0x200000 - depends on BOARD_JETWAY_PA78VM5 config COMPRESS hex default 0 - depends on BOARD_JETWAY_PA78VM5 + +endif # BOARD_JETWAY_PA78VM5 Modified: trunk/src/mainboard/kontron/986lcd-m/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/986lcd-m/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/kontron/986lcd-m/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_KONTRON_986LCD_M - bool "986LCD-M/mITX" +if BOARD_KONTRON_986LCD_M + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 @@ -24,45 +26,37 @@ config MAINBOARD_DIR string default kontron/986lcd-m - depends on BOARD_KONTRON_986LCD_M config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_KONTRON_986LCD_M config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_KONTRON_986LCD_M config MAINBOARD_PART_NUMBER string default "986LCD-M" - depends on BOARD_KONTRON_986LCD_M config MMCONF_BASE_ADDRESS hex default 0xf0000000 - depends on BOARD_KONTRON_986LCD_M config IRQ_SLOT_COUNT int default 18 - depends on BOARD_KONTRON_986LCD_M config MAX_CPUS int default 4 - depends on BOARD_KONTRON_986LCD_M config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_KONTRON_986LCD_M config FALLBACK_VGA_BIOS_FILE string default "amipci_01.20" - depends on BOARD_KONTRON_986LCD_M +endif # BOARD_KONTRON_986LCD_M Modified: trunk/src/mainboard/kontron/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/kontron/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,20 @@ +if VENDOR_KONTRON + choice prompt "Mainboard model" - depends on VENDOR_KONTRON + +config BOARD_KONTRON_986LCD_M + bool "986LCD-M/mITX" +config BOARD_KONTRON_KT690 + bool "KT690/mITX" + +endchoice source "src/mainboard/kontron/986lcd-m/Kconfig" source "src/mainboard/kontron/kt690/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Kontron" + +endif # VENDOR_KONTRON Modified: trunk/src/mainboard/kontron/kt690/Kconfig ============================================================================== --- trunk/src/mainboard/kontron/kt690/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/kontron/kt690/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_KONTRON_KT690 - bool "KT690/mITX" +if BOARD_KONTRON_KT690 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_S1G1 select NORTHBRIDGE_AMD_AMDK8 @@ -23,69 +25,57 @@ config MAINBOARD_DIR string default kontron/kt690 - depends on BOARD_KONTRON_KT690 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1488 - depends on BOARD_KONTRON_KT690 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x6900 - depends on BOARD_KONTRON_KT690 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_KONTRON_KT690 config MAINBOARD_PART_NUMBER string default "KT690/mITX" - depends on BOARD_KONTRON_KT690 config HEAP_SIZE hex default 0x8000 - depends on BOARD_KONTRON_KT690 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_KONTRON_KT690 config MAX_CPUS int default 2 - depends on BOARD_KONTRON_KT690 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_KONTRON_KT690 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_KONTRON_KT690 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_KONTRON_KT690 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_KONTRON_KT690 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_KONTRON_KT690 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_KONTRON_KT690 + +endif # BOARD_KONTRON_KT690 Modified: trunk/src/mainboard/lanner/Kconfig ============================================================================== --- trunk/src/mainboard/lanner/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/lanner/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_LANNER + choice prompt "Mainboard model" - depends on VENDOR_LANNER -source "src/mainboard/lanner/em8510/Kconfig" +config BOARD_LANNER_EM8510 + bool "EM-8510" endchoice +source "src/mainboard/lanner/em8510/Kconfig" + +config MAINBOARD_VENDOR + string + default "Lanner" + +endif # VENDOR_LANNER Modified: trunk/src/mainboard/lanner/em8510/Kconfig ============================================================================== --- trunk/src/mainboard/lanner/em8510/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/lanner/em8510/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_LANNER_EM8510 - bool "EM-8510" +if BOARD_LANNER_EM8510 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA479M select NORTHBRIDGE_INTEL_I855 @@ -15,24 +17,21 @@ config MAINBOARD_DIR string default lanner/em8510 - depends on BOARD_LANNER_EM8510 config MAINBOARD_PART_NUMBER string default "EM-8510" - depends on BOARD_LANNER_EM8510 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_LANNER_EM8510 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_LANNER_EM8510 config IRQ_SLOT_COUNT int default 10 - depends on BOARD_LANNER_EM8510 + +endif # BOARD_LANNER_EM8510 Modified: trunk/src/mainboard/lippert/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/lippert/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,10 +1,23 @@ +if VENDOR_LIPPERT + choice prompt "Mainboard model" - depends on VENDOR_LIPPERT + +config BOARD_LIPPERT_FRONTRUNNER + bool "Cool Frontrunner" +config BOARD_LIPPERT_ROADRUNNER_LX + bool "Cool RoadRunner-LX" +config BOARD_LIPPERT_SPACERUNNER_LX + bool "Cool SpaceRunner-LX" + +endchoice source "src/mainboard/lippert/frontrunner/Kconfig" source "src/mainboard/lippert/roadrunner-lx/Kconfig" source "src/mainboard/lippert/spacerunner-lx/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Lippert" +endif # VENDOR_LIPPERT Modified: trunk/src/mainboard/lippert/frontrunner/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/frontrunner/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/lippert/frontrunner/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_LIPPERT_FRONTRUNNER - bool "Cool Frontrunner" +if BOARD_LIPPERT_FRONTRUNNER + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -12,15 +14,13 @@ config MAINBOARD_DIR string default lippert/frontrunner - depends on BOARD_LIPPERT_FRONTRUNNER config MAINBOARD_PART_NUMBER string default "Cool Frontrunner" - depends on BOARD_LIPPERT_FRONTRUNNER config IRQ_SLOT_COUNT int default 2 - depends on BOARD_LIPPERT_FRONTRUNNER +endif # BOARD_LIPPERT_FRONTRUNNER Modified: trunk/src/mainboard/lippert/roadrunner-lx/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/roadrunner-lx/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/lippert/roadrunner-lx/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_LIPPERT_ROADRUNNER_LX - bool "Cool RoadRunner-LX" +if BOARD_LIPPERT_ROADRUNNER_LX + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -14,19 +16,17 @@ config MAINBOARD_DIR string default lippert/roadrunner-lx - depends on BOARD_LIPPERT_ROADRUNNER_LX config MAINBOARD_PART_NUMBER string default "Cool RoadRunner-LX" - depends on BOARD_LIPPERT_ROADRUNNER_LX config IRQ_SLOT_COUNT int default 7 - depends on BOARD_LIPPERT_ROADRUNNER_LX config RAMBASE hex default 0x4000 - depends on BOARD_LIPPERT_ROADRUNNER_LX + +endif # BOARD_LIPPERT_ROADRUNNER_LX Modified: trunk/src/mainboard/lippert/spacerunner-lx/Kconfig ============================================================================== --- trunk/src/mainboard/lippert/spacerunner-lx/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/lippert/spacerunner-lx/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_LIPPERT_SPACERUNNER_LX - bool "Cool SpaceRunner-LX" +if BOARD_LIPPERT_SPACERUNNER_LX + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -15,19 +17,17 @@ config MAINBOARD_DIR string default lippert/spacerunner-lx - depends on BOARD_LIPPERT_SPACERUNNER_LX config MAINBOARD_PART_NUMBER string default "Cool SpaceRunner-LX" - depends on BOARD_LIPPERT_SPACERUNNER_LX config IRQ_SLOT_COUNT int default 7 - depends on BOARD_LIPPERT_SPACERUNNER_LX config RAMBASE hex default 0x4000 - depends on BOARD_LIPPERT_SPACERUNNER_LX + +endif # BOARD_LIPPERT_SPACERUNNER_LX Modified: trunk/src/mainboard/mitac/6513wu/Kconfig ============================================================================== --- trunk/src/mainboard/mitac/6513wu/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/mitac/6513wu/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_MITAC_6513WU -config BOARD_MITAC_6513WU - bool "6513WU" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -34,15 +35,13 @@ config MAINBOARD_DIR string default mitac/6513wu - depends on BOARD_MITAC_6513WU config MAINBOARD_PART_NUMBER string default "6513WU" - depends on BOARD_MITAC_6513WU config IRQ_SLOT_COUNT int default 8 - depends on BOARD_MITAC_6513WU +endif # BOARD_MITAC_6513WU Modified: trunk/src/mainboard/mitac/Kconfig ============================================================================== --- trunk/src/mainboard/mitac/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/mitac/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_MITAC choice prompt "Mainboard model" - depends on VENDOR_MITAC -source "src/mainboard/mitac/6513wu/Kconfig" +config BOARD_MITAC_6513WU + bool "6513WU" endchoice +source "src/mainboard/mitac/6513wu/Kconfig" + +config MAINBOARD_VENDOR + string + default "Mitac" + +endif # VENDOR_MITAC Modified: trunk/src/mainboard/msi/Kconfig ============================================================================== --- trunk/src/mainboard/msi/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,10 +16,31 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_MSI choice prompt "Mainboard model" - depends on VENDOR_MSI + +config BOARD_MSI_MS_6119 + bool "MS-6119" +config BOARD_MSI_MS_6147 + bool "MS-6147" +config BOARD_MSI_MS_6156 + bool "MS-6156" +config BOARD_MSI_MS_6178 + bool "MS-6178" +config BOARD_MSI_MS7135 + bool "MS-7135 (K8N Neo3)" +config BOARD_MSI_MS7260 + bool "MS-7260 (K9N Neo)" +config BOARD_MSI_MS9185 + bool "MS-9185 (K9SD Master-S2R)" +config BOARD_MSI_MS9282 + bool "MS-9282 (K9SD Master)" +config BOARD_MSI_MS9652_FAM10 + bool "MS-9652 Fam10 (Speedster K9ND)" + +endchoice source "src/mainboard/msi/ms6119/Kconfig" source "src/mainboard/msi/ms6147/Kconfig" @@ -31,5 +52,12 @@ source "src/mainboard/msi/ms9282/Kconfig" source "src/mainboard/msi/ms9652_fam10/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "MSI" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x1462 +endif # VENDOR_MSI Modified: trunk/src/mainboard/msi/ms6119/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6119/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms6119/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_MSI_MS_6119 -config BOARD_MSI_MS_6119 - bool "MS-6119" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default msi/ms6119 - depends on BOARD_MSI_MS_6119 config MAINBOARD_PART_NUMBER string default "MS-6119" - depends on BOARD_MSI_MS_6119 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_MSI_MS_6119 +endif # BOARD_MSI_MS_6119 Modified: trunk/src/mainboard/msi/ms6147/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6147/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms6147/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_MSI_MS_6147 -config BOARD_MSI_MS_6147 - bool "MS-6147" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default msi/ms6147 - depends on BOARD_MSI_MS_6147 config MAINBOARD_PART_NUMBER string default "MS-6147" - depends on BOARD_MSI_MS_6147 config IRQ_SLOT_COUNT int default 8 - depends on BOARD_MSI_MS_6147 +endif # BOARD_MSI_MS_6147 Modified: trunk/src/mainboard/msi/ms6156/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6156/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms6156/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_MSI_MS_6156 -config BOARD_MSI_MS_6156 - bool "MS-6156" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default msi/ms6156 - depends on BOARD_MSI_MS_6156 config MAINBOARD_PART_NUMBER string default "MS-6156" - depends on BOARD_MSI_MS_6156 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_MSI_MS_6156 +endif # BOARD_MSI_MS_6156 Modified: trunk/src/mainboard/msi/ms6178/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms6178/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms6178/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_MSI_MS_6178 -config BOARD_MSI_MS_6178 - bool "MS-6178" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -33,21 +34,18 @@ config MAINBOARD_DIR string default msi/ms6178 - depends on BOARD_MSI_MS_6178 config MAINBOARD_PART_NUMBER string default "MS-6178" - depends on BOARD_MSI_MS_6178 config IRQ_SLOT_COUNT int default 4 - depends on BOARD_MSI_MS_6178 # No need to override the chipset FALLBACK_VGA_BIOS_ID. config FALLBACK_VGA_BIOS_FILE string default "i810.vga" - depends on BOARD_MSI_MS_6178 +endif # BOARD_MSI_MS_6178 Modified: trunk/src/mainboard/msi/ms7135/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7135/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms7135/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_MSI_MS7135 - bool "MS-7135 (K8N Neo3)" +if BOARD_MSI_MS7135 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_754 select NORTHBRIDGE_AMD_AMDK8 @@ -17,79 +19,65 @@ config MAINBOARD_DIR string default msi/ms7135 - depends on BOARD_MSI_MS7135 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_MSI_MS7135 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_MSI_MS7135 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_MSI_MS7135 config MAINBOARD_PART_NUMBER string default "MS-7135" - depends on BOARD_MSI_MS7135 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x7135 - depends on BOARD_MSI_MS7135 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_MSI_MS7135 config MAX_CPUS int default 2 - depends on BOARD_MSI_MS7135 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_MSI_MS7135 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_MSI_MS7135 config HT_CHAIN_UNITID_BASE hex default 0 - depends on BOARD_MSI_MS7135 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_MSI_MS7135 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_MSI_MS7135 config IRQ_SLOT_COUNT int default 13 - depends on BOARD_MSI_MS7135 config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_MSI_MS7135 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_MSI_MS7135 + +endif # BOARD_MSI_MS7135 Modified: trunk/src/mainboard/msi/ms7260/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms7260/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms7260/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_MSI_MS7260 - bool "MS-7260 (K9N Neo)" +if BOARD_MSI_MS7260 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_AM2 select NORTHBRIDGE_AMD_AMDK8 @@ -19,94 +21,77 @@ config MAINBOARD_DIR string default msi/ms7260 - depends on BOARD_MSI_MS7260 config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_MSI_MS7260 config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_MSI_MS7260 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_MSI_MS7260 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_MSI_MS7260 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_MSI_MS7260 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_MSI_MS7260 config MAINBOARD_PART_NUMBER string default "MS-7260" - depends on BOARD_MSI_MS7260 config PCI_64BIT_PREF_MEM bool - default n - depends on BOARD_MSI_MS7260 + default n config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_MSI_MS7260 config MAX_CPUS int default 2 - depends on BOARD_MSI_MS7260 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_MSI_MS7260 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_MSI_MS7260 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_MSI_MS7260 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_MSI_MS7260 config SERIAL_CPU_INIT bool default n - depends on BOARD_MSI_MS7260 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1462 - depends on BOARD_MSI_MS7260 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x7260 - depends on BOARD_MSI_MS7260 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_MSI_MS7260 + +endif # BOARD_MSI_MS7260 Modified: trunk/src/mainboard/msi/ms9185/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9185/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms9185/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_MSI_MS9185 - bool "MS-9185 (K9SD Master-S2R)" +if BOARD_MSI_MS9185 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -20,75 +22,61 @@ config MAINBOARD_DIR string default msi/ms9185 - depends on BOARD_MSI_MS9185 config DCACHE_RAM_BASE hex default 0xcc000 - depends on BOARD_MSI_MS9185 config DCACHE_RAM_SIZE hex default 0x04000 - depends on BOARD_MSI_MS9185 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_MSI_MS9185 config APIC_ID_OFFSET hex default 0x8 - depends on BOARD_MSI_MS9185 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_MSI_MS9185 config MAINBOARD_PART_NUMBER string default "MS-9185" - depends on BOARD_MSI_MS9185 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_MSI_MS9185 config MAX_CPUS int default 4 - depends on BOARD_MSI_MS9185 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_MSI_MS9185 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_MSI_MS9185 config HT_CHAIN_UNITID_BASE hex default 0x6 - depends on BOARD_MSI_MS9185 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_MSI_MS9185 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_MSI_MS9185 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2b80 - depends on BOARD_MSI_MS9185 +endif # BOARD_MSI_MS9185 Modified: trunk/src/mainboard/msi/ms9282/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9282/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms9282/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_MSI_MS9282 - bool "MS-9282 (K9SD Master)" +if BOARD_MSI_MS9282 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -18,89 +20,73 @@ config MAINBOARD_DIR string default msi/ms9282 - depends on BOARD_MSI_MS9282 config DCACHE_RAM_BASE hex default 0xcc000 - depends on BOARD_MSI_MS9282 config DCACHE_RAM_SIZE hex default 0x04000 - depends on BOARD_MSI_MS9282 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_MSI_MS9282 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_MSI_MS9282 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_MSI_MS9282 config MAINBOARD_PART_NUMBER string default "MS-9282" - depends on BOARD_MSI_MS9282 config PCI_64BIT_PREF_MEM bool - default n - depends on BOARD_MSI_MS9282 + default n config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_MSI_MS9282 config MAX_CPUS int default 4 - depends on BOARD_MSI_MS9282 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_MSI_MS9282 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_MSI_MS9282 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_MSI_MS9282 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_MSI_MS9282 config SERIAL_CPU_INIT bool default n - depends on BOARD_MSI_MS9282 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1462 - depends on BOARD_MSI_MS9282 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x9282 - depends on BOARD_MSI_MS9282 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_MSI_MS9282 + +endif # BOARD_MSI_MS9282 Modified: trunk/src/mainboard/msi/ms9652_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/msi/ms9652_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/msi/ms9652_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_MSI_MS9652_FAM10 - bool "MS-9652 Fam10 (Speedster K9ND)" +if BOARD_MSI_MS9652_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F_1207 select NORTHBRIDGE_AMD_AMDFAM10 @@ -20,216 +22,175 @@ config MAINBOARD_DIR string default msi/ms9652_fam10 - depends on BOARD_MSI_MS9652_FAM10 config DCACHE_RAM_BASE hex default 0xc4000 - depends on BOARD_MSI_MS9652_FAM10 config DCACHE_RAM_SIZE hex default 0x0c000 - depends on BOARD_MSI_MS9652_FAM10 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x04000 - depends on BOARD_MSI_MS9652_FAM10 config GENERATE_PIRQ_TABLE bool default y - depends on BOARD_MSI_MS9652_FAM10 # Define to 0 because the IRQ slot count is # determined dynamically for this board. config IRQ_SLOT_COUNT int default 0 - depends on BOARD_MSI_MS9652_FAM10 config MAX_CPUS int default 8 - depends on BOARD_MSI_MS9652_FAM10 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_MSI_MS9652_FAM10 config LOGICAL_CPUS bool default y - depends on BOARD_MSI_MS9652_FAM10 config IOAPIC bool default y - depends on BOARD_MSI_MS9652_FAM10 config SMP bool default y - depends on BOARD_MSI_MS9652_FAM10 config STACK_SIZE hex default 0x20000 - depends on BOARD_MSI_MS9652_FAM10 config HEAP_SIZE hex default 0x20000 - depends on BOARD_MSI_MS9652_FAM10 config USE_OPTION_TABLE bool default n - depends on BOARD_MSI_MS9652_FAM10 config MAINBOARD_PART_NUMBER string default "MS-9652" - depends on BOARD_MSI_MS9652_FAM10 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1462 - depends on BOARD_MSI_MS9652_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x9652 - depends on BOARD_MSI_MS9652_FAM10 config RAMBASE hex default 0x00200000 - depends on BOARD_MSI_MS9652_FAM10 config TTYS0_BAUD int default 115200 - depends on BOARD_MSI_MS9652_FAM10 config TTYS0_BASE hex default 0x3f8 - depends on BOARD_MSI_MS9652_FAM10 config TTYS0_LCS int default 3 - depends on BOARD_MSI_MS9652_FAM10 config DEFAULT_CONSOLE_LOGLEVEL int default 9 - depends on BOARD_MSI_MS9652_FAM10 config MAXIMUM_CONSOLE_LOGLEVEL int default 9 - depends on BOARD_MSI_MS9652_FAM10 config MAINBOARD_POWER_ON_AFTER_POWER_FAIL bool default y - depends on BOARD_MSI_MS9652_FAM10 config CONSOLE_SERIAL8250 bool default y - depends on BOARD_MSI_MS9652_FAM10 config CONSOLE_VGA bool default y - depends on BOARD_MSI_MS9652_FAM10 config PCI_ROM_RUN bool default y - depends on BOARD_MSI_MS9652_FAM10 config USBDEBUG bool default n - depends on BOARD_MSI_MS9652_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_MSI_MS9652_FAM10 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_MSI_MS9652_FAM10 config HT_CHAIN_UNITID_BASE hex default 0x20 - depends on BOARD_MSI_MS9652_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x00 - depends on BOARD_MSI_MS9652_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_MSI_MS9652_FAM10 config VAR_MTRR_HOLE bool default n - depends on BOARD_MSI_MS9652_FAM10 config SERIAL_CPU_INIT bool default y - depends on BOARD_MSI_MS9652_FAM10 config APIC_ID_OFFSET hex default 0x00 - depends on BOARD_MSI_MS9652_FAM10 config LIFT_BSP_APIC_ID bool default 1 - depends on BOARD_MSI_MS9652_FAM10 config RAMTOP hex default 0x1000000 - depends on BOARD_MSI_MS9652_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_MSI_MS9652_FAM10 config WAIT_BEFORE_CPUS_INIT bool default n - depends on BOARD_MSI_MS9652_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_01000096.h" - depends on BOARD_MSI_MS9652_FAM10 config ID_SECTION_OFFSET hex default 0x80 - depends on BOARD_MSI_MS9652_FAM10 config HT3_SUPPORT bool default y - depends on BOARD_MSI_MS9652_FAM10 + +endif # BOARD_MSI_MS9652_FAM10 Modified: trunk/src/mainboard/nec/Kconfig ============================================================================== --- trunk/src/mainboard/nec/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/nec/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_NEC choice prompt "Mainboard model" - depends on VENDOR_NEC -source "src/mainboard/nec/powermate2000/Kconfig" +config BOARD_NEC_POWERMATE_2000 + bool "PowerMate 2000" endchoice +source "src/mainboard/nec/powermate2000/Kconfig" + +config MAINBOARD_VENDOR + string + default "NEC" + +endif # VENDOR_NEC Modified: trunk/src/mainboard/nec/powermate2000/Kconfig ============================================================================== --- trunk/src/mainboard/nec/powermate2000/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/nec/powermate2000/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_NEC_POWERMATE_2000 -config BOARD_NEC_POWERMATE_2000 - bool "PowerMate 2000" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I82810 @@ -34,15 +35,13 @@ config MAINBOARD_DIR string default nec/powermate2000 - depends on BOARD_NEC_POWERMATE_2000 config MAINBOARD_PART_NUMBER string default "PowerMate 2000" - depends on BOARD_NEC_POWERMATE_2000 config IRQ_SLOT_COUNT int default 5 - depends on BOARD_NEC_POWERMATE_2000 +endif # BOARD_NEC_POWERMATE_2000 Modified: trunk/src/mainboard/newisys/Kconfig ============================================================================== --- trunk/src/mainboard/newisys/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/newisys/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -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 Modified: trunk/src/mainboard/newisys/khepri/Kconfig ============================================================================== --- trunk/src/mainboard/newisys/khepri/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/newisys/khepri/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -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 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 Modified: trunk/src/mainboard/nokia/Kconfig ============================================================================== --- trunk/src/mainboard/nokia/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/nokia/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_NOKIA choice prompt "Mainboard model" - depends on VENDOR_NOKIA -source "src/mainboard/nokia/ip530/Kconfig" +config BOARD_NOKIA_IP530 + bool "IP530" endchoice +source "src/mainboard/nokia/ip530/Kconfig" + +config MAINBOARD_VENDOR + string + default "Nokia" + +endif # VENDOR_NOKIA Modified: trunk/src/mainboard/nokia/ip530/Kconfig ============================================================================== --- trunk/src/mainboard/nokia/ip530/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/nokia/ip530/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_NOKIA_IP530 -config BOARD_NOKIA_IP530 - bool "IP530" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_PGA370 select NORTHBRIDGE_INTEL_I440BX @@ -35,61 +36,51 @@ config MAINBOARD_DIR string default nokia/ip530 - depends on BOARD_NOKIA_IP530 config MAINBOARD_PART_NUMBER string default "IP530" - depends on BOARD_NOKIA_IP530 config IRQ_SLOT_COUNT int default 22 - depends on BOARD_NOKIA_IP530 ## Configuration items for the ethernet adaptors config DEC21143_CACHE_LINE_SIZE hex default 0x00000000 - depends on BOARD_NOKIA_IP530 config DEC21143_EXPANSION_ROM_BASE_ADDRESS hex default 0x00000000 - depends on BOARD_NOKIA_IP530 config DEC21143_COMMAND_AND_STATUS_CONFIGURATION hex default 0x02800107 - depends on BOARD_NOKIA_IP530 ## Configuration for the PCMCIA-Cardbus controller. config TI_PCMCIA_CARDBUS_CMDR hex default 0x0107 - depends on BOARD_NOKIA_IP530 config TI_PCMCIA_CARDBUS_CLSR hex default 0x00 - depends on BOARD_NOKIA_IP530 config TI_PCMCIA_CARDBUS_CLTR hex default 0x40 - depends on BOARD_NOKIA_IP530 config TI_PCMCIA_CARDBUS_BCR hex default 0x07C0 - depends on BOARD_NOKIA_IP530 config TI_PCMCIA_CARDBUS_SCR hex default 0x08449060 - depends on BOARD_NOKIA_IP530 config TI_PCMCIA_CARDBUS_MRR hex default 0x00007522 - depends on BOARD_NOKIA_IP530 + +endif # BOARD_NOKIA_IP530 Modified: trunk/src/mainboard/nvidia/Kconfig ============================================================================== --- trunk/src/mainboard/nvidia/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/nvidia/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_NVIDIA + choice prompt "Mainboard model" - depends on VENDOR_NVIDIA -source "src/mainboard/nvidia/l1_2pvv/Kconfig" +config BOARD_NVIDIA_L1_2PVV + bool "l1_2pvv" endchoice +source "src/mainboard/nvidia/l1_2pvv/Kconfig" + +config MAINBOARD_VENDOR + string + default "NVIDIA" + +endif # VENDOR_NVIDIA Modified: trunk/src/mainboard/nvidia/l1_2pvv/Kconfig ============================================================================== --- trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/nvidia/l1_2pvv/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_NVIDIA_L1_2PVV - bool "l1_2pvv" +if BOARD_NVIDIA_L1_2PVV + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -19,94 +21,77 @@ config MAINBOARD_DIR string default nvidia/l1_2pvv - depends on BOARD_NVIDIA_L1_2PVV config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_NVIDIA_L1_2PVV config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_NVIDIA_L1_2PVV config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_NVIDIA_L1_2PVV config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_NVIDIA_L1_2PVV config MEM_TRAIN_SEQ int default 1 - depends on BOARD_NVIDIA_L1_2PVV config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_NVIDIA_L1_2PVV config MAINBOARD_PART_NUMBER string default "l1_2pvv" - depends on BOARD_NVIDIA_L1_2PVV config PCI_64BIT_PREF_MEM bool - default n - depends on BOARD_NVIDIA_L1_2PVV + default n config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_NVIDIA_L1_2PVV config MAX_CPUS int default 4 - depends on BOARD_NVIDIA_L1_2PVV config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_NVIDIA_L1_2PVV config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_NVIDIA_L1_2PVV config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_NVIDIA_L1_2PVV config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_NVIDIA_L1_2PVV config SERIAL_CPU_INIT bool default n - depends on BOARD_NVIDIA_L1_2PVV config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_NVIDIA_L1_2PVV config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2b80 - depends on BOARD_NVIDIA_L1_2PVV config IRQ_SLOT_COUNT int default 11 - depends on BOARD_NVIDIA_L1_2PVV + +endif # BOARD_NVIDIA_L1_2PVV Modified: trunk/src/mainboard/olpc/Kconfig ============================================================================== --- trunk/src/mainboard/olpc/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/olpc/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,9 +1,20 @@ +if VENDOR_OLPC + choice prompt "Mainboard model" - depends on VENDOR_OLPC -source "src/mainboard/olpc/rev_a/Kconfig" -source "src/mainboard/olpc/btest/Kconfig" +config BOARD_OLPC_BTEST + bool "btest" +config BOARD_OLPC_REV_A + bool "rev_a" endchoice +source "src/mainboard/olpc/btest/Kconfig" +source "src/mainboard/olpc/rev_a/Kconfig" + +config MAINBOARD_VENDOR + string + default "OLPC" + +endif # VENDOR_OLPC Modified: trunk/src/mainboard/olpc/btest/Kconfig ============================================================================== --- trunk/src/mainboard/olpc/btest/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/olpc/btest/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_OLPC_BTEST - bool "btest" +if BOARD_OLPC_BTEST + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -12,14 +14,13 @@ config MAINBOARD_DIR string default olpc/btest - depends on BOARD_OLPC_BTEST config MAINBOARD_PART_NUMBER string default "btest" - depends on BOARD_OLPC_BTEST config IRQ_SLOT_COUNT int default 2 - depends on BOARD_OLPC_BTEST + +endif # BOARD_OLPC_BTEST Modified: trunk/src/mainboard/olpc/rev_a/Kconfig ============================================================================== --- trunk/src/mainboard/olpc/rev_a/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/olpc/rev_a/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_OLPC_REV_A - bool "rev_a" +if BOARD_OLPC_REV_A + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -12,14 +14,13 @@ config MAINBOARD_DIR string default olpc/rev_a - depends on BOARD_OLPC_REV_A config MAINBOARD_PART_NUMBER string default "rev_a" - depends on BOARD_OLPC_REV_A config IRQ_SLOT_COUNT int default 2 - depends on BOARD_OLPC_REV_A + +endif # BOARD_OLPC_REV_A Modified: trunk/src/mainboard/pcengines/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/pcengines/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,9 +1,20 @@ +if VENDOR_PC_ENGINES + choice prompt "Mainboard model" - depends on VENDOR_PC_ENGINES + +config BOARD_PCENGINES_ALIX1C + bool "ALIX.1C" +config BOARD_PCENGINES_ALIX2D3 + bool "ALIX.2D3" + +endchoice source "src/mainboard/pcengines/alix1c/Kconfig" source "src/mainboard/pcengines/alix2d3/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "PC Engines" +endif # VENDOR_PC_ENGINES Modified: trunk/src/mainboard/pcengines/alix1c/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/alix1c/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/pcengines/alix1c/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_PCENGINES_ALIX1C - bool "ALIX.1C" +if BOARD_PCENGINES_ALIX1C + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -14,19 +16,17 @@ config MAINBOARD_DIR string default pcengines/alix1c - depends on BOARD_PCENGINES_ALIX1C config MAINBOARD_PART_NUMBER string default "ALIX.1C" - depends on BOARD_PCENGINES_ALIX1C config IRQ_SLOT_COUNT int default 5 - depends on BOARD_PCENGINES_ALIX1C config RAMBASE hex default 0x4000 - depends on BOARD_PCENGINES_ALIX1C + +endif # BOARD_PCENGINES_ALIX1C Modified: trunk/src/mainboard/pcengines/alix2d3/Kconfig ============================================================================== --- trunk/src/mainboard/pcengines/alix2d3/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/pcengines/alix2d3/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_PCENGINES_ALIX2D3 - bool "ALIX.2D3" +if BOARD_PCENGINES_ALIX2D3 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,19 +15,17 @@ config MAINBOARD_DIR string default pcengines/alix2d3 - depends on BOARD_PCENGINES_ALIX2D3 config MAINBOARD_PART_NUMBER string default "ALIX.2D3" - depends on BOARD_PCENGINES_ALIX2D3 config IRQ_SLOT_COUNT int default 6 - depends on BOARD_PCENGINES_ALIX2D3 config RAMBASE hex default 0x4000 - depends on BOARD_PCENGINES_ALIX2D3 + +endif # BOARD_PCENGINES_ALIX2D3 Modified: trunk/src/mainboard/rca/Kconfig ============================================================================== --- trunk/src/mainboard/rca/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/rca/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_RCA + choice prompt "Mainboard model" - depends on VENDOR_RCA -source "src/mainboard/rca/rm4100/Kconfig" +config BOARD_RCA_RM4100 + bool "RM4100" endchoice +source "src/mainboard/rca/rm4100/Kconfig" + +config MAINBOARD_VENDOR + string + default "RCA" + +endif # VENDOR_RCA Modified: trunk/src/mainboard/rca/rm4100/Kconfig ============================================================================== --- trunk/src/mainboard/rca/rm4100/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/rca/rm4100/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_RCA_RM4100 - bool "RM4100" +if BOARD_RCA_RM4100 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MFCBGA479 select NORTHBRIDGE_INTEL_I82830 @@ -18,25 +20,21 @@ config MAINBOARD_DIR string default rca/rm4100 - depends on BOARD_RCA_RM4100 config MAINBOARD_PART_NUMBER string default "RM4100" - depends on BOARD_RCA_RM4100 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_RCA_RM4100 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_RCA_RM4100 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_RCA_RM4100 +endif # BOARD_RCA_RM4100 Modified: trunk/src/mainboard/roda/Kconfig ============================================================================== --- trunk/src/mainboard/roda/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/roda/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,7 +1,21 @@ +if VENDOR_RODA + choice prompt "Mainboard model" - depends on VENDOR_RODA -source "src/mainboard/roda/rk886ex/Kconfig" +config BOARD_RODA_RK886EX + bool "RK886EX" endchoice + +source "src/mainboard/roda/rk886ex/Kconfig" + +config MAINBOARD_VENDOR + string + default "Roda" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x4352 + +endif # VENDOR_RODA Modified: trunk/src/mainboard/roda/rk886ex/Kconfig ============================================================================== --- trunk/src/mainboard/roda/rk886ex/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/roda/rk886ex/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_RODA_RK886EX - bool "RK886EX" +if BOARD_RODA_RK886EX + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_CORE select CPU_INTEL_SOCKET_MFCPGA478 @@ -21,45 +23,37 @@ config MAINBOARD_DIR string default roda/rk886ex - depends on BOARD_RODA_RK886EX config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_RODA_RK886EX config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_RODA_RK886EX config MAINBOARD_PART_NUMBER string default "RK886EX" - depends on BOARD_RODA_RK886EX config MMCONF_BASE_ADDRESS hex default 0xf0000000 - depends on BOARD_RODA_RK886EX config IRQ_SLOT_COUNT int default 18 - depends on BOARD_RODA_RK886EX config MAX_CPUS int default 4 - depends on BOARD_RODA_RK886EX config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_RODA_RK886EX config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x6886 - depends on BOARD_RODA_RK886EX +endif # BOARD_RODA_RK886EX Modified: trunk/src/mainboard/soyo/Kconfig ============================================================================== --- trunk/src/mainboard/soyo/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/soyo/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_SOYO choice prompt "Mainboard model" - depends on VENDOR_SOYO -source "src/mainboard/soyo/sy-6ba-plus-iii/Kconfig" +config BOARD_SOYO_SY_6BA_PLUS_III + bool "SY-6BA+ III" endchoice +source "src/mainboard/soyo/sy-6ba-plus-iii/Kconfig" + +config MAINBOARD_VENDOR + string + default "Soyo" + +endif # VENDOR_SOYO Modified: trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig ============================================================================== --- trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_SOYO_SY_6BA_PLUS_III -config BOARD_SOYO_SY_6BA_PLUS_III - bool "SY-6BA+ III" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -32,15 +33,13 @@ config MAINBOARD_DIR string default soyo/sy-6ba-plus-iii - depends on BOARD_SOYO_SY_6BA_PLUS_III config MAINBOARD_PART_NUMBER string default "SY-6BA+ III" - depends on BOARD_SOYO_SY_6BA_PLUS_III config IRQ_SLOT_COUNT int default 7 - depends on BOARD_SOYO_SY_6BA_PLUS_III +endif # BOARD_SOYO_SY_6BA_PLUS_III Modified: trunk/src/mainboard/sunw/Kconfig ============================================================================== --- trunk/src/mainboard/sunw/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/sunw/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_SUNW + choice prompt "Mainboard model" - depends on VENDOR_SUNW -source "src/mainboard/sunw/ultra40/Kconfig" +config BOARD_SUNW_ULTRA40 + bool "Ultra 40" endchoice +source "src/mainboard/sunw/ultra40/Kconfig" + +config MAINBOARD_VENDOR + string + default "Sun" + +endif # VENDOR_SUNW Modified: trunk/src/mainboard/sunw/ultra40/Kconfig ============================================================================== --- trunk/src/mainboard/sunw/ultra40/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/sunw/ultra40/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUNW_ULTRA40 - bool "Ultra 40" +if BOARD_SUNW_ULTRA40 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -17,80 +19,65 @@ config MAINBOARD_DIR string default sunw/ultra40 - depends on BOARD_SUNW_ULTRA40 config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_SUNW_ULTRA40 config DCACHE_RAM_SIZE hex default 0x01000 - depends on BOARD_SUNW_ULTRA40 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_SUNW_ULTRA40 config K8_REV_F_SUPPORT bool default n - depends on BOARD_SUNW_ULTRA40 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUNW_ULTRA40 config MAINBOARD_PART_NUMBER string default "Ultra 40" - depends on BOARD_SUNW_ULTRA40 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_SUNW_ULTRA40 config MAX_CPUS int default 4 - depends on BOARD_SUNW_ULTRA40 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_SUNW_ULTRA40 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_SUNW_ULTRA40 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_SUNW_ULTRA40 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUNW_ULTRA40 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_SUNW_ULTRA40 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x108e - depends on BOARD_SUNW_ULTRA40 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x40 - depends on BOARD_SUNW_ULTRA40 +endif # BOARD_SUNW_ULTRA40 Modified: trunk/src/mainboard/supermicro/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,16 +1,45 @@ +if VENDOR_SUPERMICRO + choice prompt "Mainboard model" - depends on VENDOR_SUPERMICRO + +config BOARD_SUPERMICRO_H8DME + bool "H8DME-2" +config BOARD_SUPERMICRO_H8DMR + bool "H8DMR-i2" +config BOARD_SUPERMICRO_H8DMR_FAM10 + bool "H8DMR-i2 (Fam10)" +config BOARD_SUPERMICRO_H8QME_FAM10 + bool "H8QME-2+ (Fam10)" +config BOARD_SUPERMICRO_X6DAI_G + bool "X6DAi-G" +config BOARD_SUPERMICRO_X6DHE_G2 + bool "X6DHE-G2" +config BOARD_SUPERMICRO_X6DHE_G + bool "X6DHE-G" +config BOARD_SUPERMICRO_X6DHR_IG2 + bool "X6DHR-iG2" +config BOARD_SUPERMICRO_X6DHR_IG + bool "X6DHR-iG" + +endchoice source "src/mainboard/supermicro/h8dme/Kconfig" source "src/mainboard/supermicro/h8dmr/Kconfig" source "src/mainboard/supermicro/h8dmr_fam10/Kconfig" source "src/mainboard/supermicro/h8qme_fam10/Kconfig" source "src/mainboard/supermicro/x6dai_g/Kconfig" -source "src/mainboard/supermicro/x6dhe_g/Kconfig" source "src/mainboard/supermicro/x6dhe_g2/Kconfig" -source "src/mainboard/supermicro/x6dhr_ig/Kconfig" +source "src/mainboard/supermicro/x6dhe_g/Kconfig" source "src/mainboard/supermicro/x6dhr_ig2/Kconfig" +source "src/mainboard/supermicro/x6dhr_ig/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Supermicro" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x15d9 +endif # VENDOR_SUPERMICRO Modified: trunk/src/mainboard/supermicro/h8dme/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dme/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/h8dme/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_H8DME - bool "H8DME-2" +if BOARD_SUPERMICRO_H8DME + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -19,85 +21,69 @@ config MAINBOARD_DIR string default supermicro/h8dme - depends on BOARD_SUPERMICRO_H8DME config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_SUPERMICRO_H8DME config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_SUPERMICRO_H8DME config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_SUPERMICRO_H8DME config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_SUPERMICRO_H8DME config MEM_TRAIN_SEQ int default 1 - depends on BOARD_SUPERMICRO_H8DME config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8DME config MAINBOARD_PART_NUMBER string default "H8DME-2" - depends on BOARD_SUPERMICRO_H8DME config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_SUPERMICRO_H8DME config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_H8DME config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_SUPERMICRO_H8DME config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_SUPERMICRO_H8DME config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_SUPERMICRO_H8DME config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8DME config IRQ_SLOT_COUNT int default 11 - depends on BOARD_SUPERMICRO_H8DME config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_H8DME config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1511 - depends on BOARD_SUPERMICRO_H8DME +endif # BOARD_SUPERMICRO_H8DME Modified: trunk/src/mainboard/supermicro/h8dmr/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/h8dmr/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_H8DMR - bool "H8DMR-i2" +if BOARD_SUPERMICRO_H8DMR + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -18,85 +20,69 @@ config MAINBOARD_DIR string default supermicro/h8dmr - depends on BOARD_SUPERMICRO_H8DMR config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_SUPERMICRO_H8DMR config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_SUPERMICRO_H8DMR config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_SUPERMICRO_H8DMR config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_SUPERMICRO_H8DMR config MEM_TRAIN_SEQ int default 1 - depends on BOARD_SUPERMICRO_H8DMR config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8DMR config MAINBOARD_PART_NUMBER string default "H8DMR-i2" - depends on BOARD_SUPERMICRO_H8DMR config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_SUPERMICRO_H8DMR config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_H8DMR config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_SUPERMICRO_H8DMR config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_SUPERMICRO_H8DMR config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_SUPERMICRO_H8DMR config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8DMR config IRQ_SLOT_COUNT int default 11 - depends on BOARD_SUPERMICRO_H8DMR config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_H8DMR config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1511 - depends on BOARD_SUPERMICRO_H8DMR +endif # BOARD_SUPERMICRO_H8DMR Modified: trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/h8dmr_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_H8DMR_FAM10 - bool "H8DMR-i2 (Fam10)" +if BOARD_SUPERMICRO_H8DMR_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F_1207 select NORTHBRIDGE_AMD_AMDFAM10 @@ -20,104 +22,85 @@ config MAINBOARD_DIR string default supermicro/h8dmr_fam10 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config DCACHE_RAM_BASE hex default 0xc4000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config DCACHE_RAM_SIZE hex default 0x0c000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x04000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config RAMBASE hex default 0x200000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config RAMTOP hex default 0x1000000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config HEAP_SIZE hex default 0xc0000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config MAINBOARD_PART_NUMBER string default "H8DMR-i2 (Fam10)" - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config MAX_CPUS int default 8 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_0100009f.h" - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config SERIAL_CPU_INIT bool default n - depends on BOARD_SUPERMICRO_H8DMR_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1511 - depends on BOARD_SUPERMICRO_H8DMR_FAM10 + +endif # BOARD_SUPERMICRO_H8DMR_FAM10 Modified: trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/h8qme_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_H8QME_FAM10 - bool "H8QME-2+ (Fam10)" +if BOARD_SUPERMICRO_H8QME_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F_1207 select NORTHBRIDGE_AMD_AMDFAM10 @@ -21,109 +23,89 @@ config MAINBOARD_DIR string default supermicro/h8qme_fam10 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config DCACHE_RAM_BASE hex default 0xc4000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config DCACHE_RAM_SIZE hex default 0x0c000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x04000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config RAMBASE hex default 0x200000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config RAMTOP hex default 0x1000000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config HEAP_SIZE hex default 0xff000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config MAINBOARD_PART_NUMBER string default "H8QME-2+ (Fam10)" - depends on BOARD_SUPERMICRO_H8QME_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config MAX_CPUS int default 16 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config MAX_PHYSICAL_CPUS int default 4 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_0100009f.h" - depends on BOARD_SUPERMICRO_H8QME_FAM10 config SERIAL_CPU_INIT bool default y - depends on BOARD_SUPERMICRO_H8QME_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x1511 - depends on BOARD_SUPERMICRO_H8QME_FAM10 config STACK_SIZE hex default 0x10000 - depends on BOARD_SUPERMICRO_H8QME_FAM10 + +endif # BOARD_SUPERMICRO_H8QME_FAM10 Modified: trunk/src/mainboard/supermicro/x6dai_g/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dai_g/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/x6dai_g/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_X6DAI_G - bool "X6DAi-G" +if BOARD_SUPERMICRO_X6DAI_G + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7525 @@ -16,29 +18,25 @@ config MAINBOARD_DIR string default supermicro/x6dai_g - depends on BOARD_SUPERMICRO_X6DAI_G config MAINBOARD_PART_NUMBER string default "X6DAi-G" - depends on BOARD_SUPERMICRO_X6DAI_G config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_X6DAI_G config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x6780 - depends on BOARD_SUPERMICRO_X6DAI_G config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_X6DAI_G config IRQ_SLOT_COUNT int default 15 - depends on BOARD_SUPERMICRO_X6DAI_G + +endif # BOARD_SUPERMICRO_X6DAI_G Modified: trunk/src/mainboard/supermicro/x6dhe_g/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/x6dhe_g/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_X6DHE_G - bool "X6DHE-G" +if BOARD_SUPERMICRO_X6DHE_G + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7520 @@ -18,30 +20,25 @@ config MAINBOARD_DIR string default supermicro/x6dhe_g - depends on BOARD_SUPERMICRO_X6DHE_G config MAINBOARD_PART_NUMBER string default "X6DHE-G" - depends on BOARD_SUPERMICRO_X6DHE_G config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_X6DHE_G config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x6080 - depends on BOARD_SUPERMICRO_X6DHE_G config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_X6DHE_G config IRQ_SLOT_COUNT int default 15 - depends on BOARD_SUPERMICRO_X6DHE_G +endif # BOARD_SUPERMICRO_X6DHE_G Modified: trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/x6dhe_g2/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_X6DHE_G2 - bool "X6DHE-G2" +if BOARD_SUPERMICRO_X6DHE_G2 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7520 @@ -19,30 +21,25 @@ config MAINBOARD_DIR string default supermicro/x6dhe_g2 - depends on BOARD_SUPERMICRO_X6DHE_G2 config MAINBOARD_PART_NUMBER string default "X6DHE-G2" - depends on BOARD_SUPERMICRO_X6DHE_G2 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_X6DHE_G2 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x6080 - depends on BOARD_SUPERMICRO_X6DHE_G2 config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_X6DHE_G2 config IRQ_SLOT_COUNT int default 15 - depends on BOARD_SUPERMICRO_X6DHE_G2 +endif # BOARD_SUPERMICRO_X6DHE_G2 Modified: trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/x6dhr_ig/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_X6DHR_IG - bool "X6DHR-iG" +if BOARD_SUPERMICRO_X6DHR_IG + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7520 @@ -18,29 +20,25 @@ config MAINBOARD_DIR string default supermicro/x6dhr_ig - depends on BOARD_SUPERMICRO_X6DHR_IG config MAINBOARD_PART_NUMBER string default "X6DHR-iG" - depends on BOARD_SUPERMICRO_X6DHR_IG config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_X6DHR_IG config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x5580 - depends on BOARD_SUPERMICRO_X6DHR_IG config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_X6DHR_IG config IRQ_SLOT_COUNT int default 15 - depends on BOARD_SUPERMICRO_X6DHR_IG + +endif # BOARD_SUPERMICRO_X6DHR_IG Modified: trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig ============================================================================== --- trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/supermicro/x6dhr_ig2/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_SUPERMICRO_X6DHR_IG2 - bool "X6DHR-iG2" +if BOARD_SUPERMICRO_X6DHR_IG2 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7520 @@ -18,29 +20,25 @@ config MAINBOARD_DIR string default supermicro/x6dhr_ig2 - depends on BOARD_SUPERMICRO_X6DHR_IG2 config MAINBOARD_PART_NUMBER string default "X6DHR-iG2" - depends on BOARD_SUPERMICRO_X6DHR_IG2 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x15d9 - depends on BOARD_SUPERMICRO_X6DHR_IG2 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x5580 - depends on BOARD_SUPERMICRO_X6DHR_IG2 config MAX_CPUS int default 4 - depends on BOARD_SUPERMICRO_X6DHR_IG2 config IRQ_SLOT_COUNT int default 15 - depends on BOARD_SUPERMICRO_X6DHR_IG2 + +endif # BOARD_SUPERMICRO_X6DHR_IG2 Modified: trunk/src/mainboard/technexion/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/technexion/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,9 +1,20 @@ +if VENDOR_TECHNEXION + choice prompt "Mainboard model" - depends on VENDOR_TECHNEXION -source "src/mainboard/technexion/tim8690/Kconfig" -source "src/mainboard/technexion/tim5690/Kconfig" +config BOARD_TECHNEXION_TIM5690 + bool "TIM-5690" +config BOARD_TECHNEXION_TIM8690 + bool "TIM-8690" endchoice +source "src/mainboard/technexion/tim5690/Kconfig" +source "src/mainboard/technexion/tim8690/Kconfig" + +config MAINBOARD_VENDOR + string + default "Technexion" + +endif # VENDOR_TECHNEXION Modified: trunk/src/mainboard/technexion/tim5690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim5690/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/technexion/tim5690/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TECHNEXION_TIM5690 - bool "TIM-5690" +if BOARD_TECHNEXION_TIM5690 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_S1G1 select NORTHBRIDGE_AMD_AMDK8 @@ -23,90 +25,73 @@ config MAINBOARD_DIR string default technexion/tim5690 - depends on BOARD_TECHNEXION_TIM5690 config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_TECHNEXION_TIM5690 config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_TECHNEXION_TIM5690 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_TECHNEXION_TIM5690 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TECHNEXION_TIM5690 config MAINBOARD_PART_NUMBER string default "TIM-5690" - depends on BOARD_TECHNEXION_TIM5690 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TECHNEXION_TIM5690 config MAX_CPUS int default 2 - depends on BOARD_TECHNEXION_TIM5690 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_TECHNEXION_TIM5690 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TECHNEXION_TIM5690 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_TECHNEXION_TIM5690 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_TECHNEXION_TIM5690 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_TECHNEXION_TIM5690 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TECHNEXION_TIM5690 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_TECHNEXION_TIM5690 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3050 - depends on BOARD_TECHNEXION_TIM5690 config STACK_SIZE hex default 0x2000 - depends on BOARD_TECHNEXION_TIM5690 config HEAP_SIZE hex default 0x4000 - depends on BOARD_TECHNEXION_TIM5690 +endif # BOARD_TECHNEXION_TIM5690 Modified: trunk/src/mainboard/technexion/tim8690/Kconfig ============================================================================== --- trunk/src/mainboard/technexion/tim8690/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/technexion/tim8690/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TECHNEXION_TIM8690 - bool "TIM-8690" +if BOARD_TECHNEXION_TIM8690 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_S1G1 select NORTHBRIDGE_AMD_AMDK8 @@ -22,79 +24,65 @@ config MAINBOARD_DIR string default technexion/tim8690 - depends on BOARD_TECHNEXION_TIM8690 config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_TECHNEXION_TIM8690 config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_TECHNEXION_TIM8690 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_TECHNEXION_TIM8690 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TECHNEXION_TIM8690 config MAINBOARD_PART_NUMBER string default "TIM-8690" - depends on BOARD_TECHNEXION_TIM8690 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TECHNEXION_TIM8690 config MAX_CPUS int default 2 - depends on BOARD_TECHNEXION_TIM8690 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_TECHNEXION_TIM8690 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TECHNEXION_TIM8690 config SB_HT_CHAIN_ON_BUS0 int default 1 - depends on BOARD_TECHNEXION_TIM8690 config HT_CHAIN_END_UNITID_BASE hex default 0x1 - depends on BOARD_TECHNEXION_TIM8690 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_TECHNEXION_TIM8690 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TECHNEXION_TIM8690 config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1022 - depends on BOARD_TECHNEXION_TIM8690 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x3050 - depends on BOARD_TECHNEXION_TIM8690 + +endif # BOARD_TECHNEXION_TIM8690 Modified: trunk/src/mainboard/technologic/Kconfig ============================================================================== --- trunk/src/mainboard/technologic/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/technologic/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,8 +1,17 @@ +if VENDOR_TECHNOLOGIC + choice prompt "Mainboard model" - depends on VENDOR_TECHNOLOGIC -source "src/mainboard/technologic/ts5300/Kconfig" +config BOARD_TECHNOLOGIC_TS5300 + bool "TS-5300" endchoice +source "src/mainboard/technologic/ts5300/Kconfig" + +config MAINBOARD_VENDOR + string + default "Technologic" + +endif # VENDOR_TECHNOLOGIC Modified: trunk/src/mainboard/technologic/ts5300/Kconfig ============================================================================== --- trunk/src/mainboard/technologic/ts5300/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/technologic/ts5300/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TECHNOLOGIC_TS5300 - bool "TS-5300" +if BOARD_TECHNOLOGIC_TS5300 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SC520 select ROMCC @@ -10,14 +12,13 @@ config MAINBOARD_DIR string default technologic/ts5300 - depends on BOARD_TECHNOLOGIC_TS5300 config MAINBOARD_PART_NUMBER string default "TS-5300" - depends on BOARD_TECHNOLOGIC_TS5300 config IRQ_SLOT_COUNT int default 2 - depends on BOARD_TECHNOLOGIC_TS5300 + +endif # BOARD_TECHNOLOGIC_TS5300 Modified: trunk/src/mainboard/televideo/Kconfig ============================================================================== --- trunk/src/mainboard/televideo/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/televideo/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_TELEVIDEO choice prompt "Mainboard model" - depends on VENDOR_TELEVIDEO -source "src/mainboard/televideo/tc7020/Kconfig" +config BOARD_TELEVIDEO_TC7020 + bool "TC7020" endchoice +source "src/mainboard/televideo/tc7020/Kconfig" + +config MAINBOARD_VENDOR + string + default "TeleVideo" + +endif # VENDOR_TELEVIDEO Modified: trunk/src/mainboard/televideo/tc7020/Kconfig ============================================================================== --- trunk/src/mainboard/televideo/tc7020/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/televideo/tc7020/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_TELEVIDEO_TC7020 -config BOARD_TELEVIDEO_TC7020 - bool "TC7020" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX1 select NORTHBRIDGE_AMD_GX1 @@ -33,15 +34,13 @@ config MAINBOARD_DIR string default televideo/tc7020 - depends on BOARD_TELEVIDEO_TC7020 config MAINBOARD_PART_NUMBER string default "TC7020" - depends on BOARD_TELEVIDEO_TC7020 config IRQ_SLOT_COUNT int default 3 - depends on BOARD_TELEVIDEO_TC7020 +endif # BOARD_TELEVIDEO_TC7020 Modified: trunk/src/mainboard/thomson/Kconfig ============================================================================== --- trunk/src/mainboard/thomson/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/thomson/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,20 +1,17 @@ +if VENDOR_THOMSON + choice prompt "Mainboard model" - depends on VENDOR_THOMSON -source "src/mainboard/thomson/ip1000/Kconfig" +config BOARD_THOMSON_IP1000 + bool "IP1000" endchoice -choice - prompt "IP1000 Onboard Memory" - default ONBOARD_MEMORY_64MB - depends on BOARD_THOMSON_IP1000 - -config ONBOARD_MEMORY_64MB - bool "IP1000-64MB" -config ONBOARD_MEMORY_128MB - bool "IP1000T-128MB" +source "src/mainboard/thomson/ip1000/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Thomson" +endif # VENDOR_THOMSON Modified: trunk/src/mainboard/thomson/ip1000/Kconfig ============================================================================== --- trunk/src/mainboard/thomson/ip1000/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/thomson/ip1000/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_THOMSON_IP1000 - bool "IP1000" +if BOARD_THOMSON_IP1000 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MFCBGA479 select NORTHBRIDGE_INTEL_I82830 @@ -18,24 +20,32 @@ config MAINBOARD_DIR string default thomson/ip1000 - depends on BOARD_THOMSON_IP1000 config MAINBOARD_PART_NUMBER string default "IP1000" - depends on BOARD_THOMSON_IP1000 config DCACHE_RAM_BASE hex default 0xffdf8000 - depends on BOARD_THOMSON_IP1000 config DCACHE_RAM_SIZE hex default 0x8000 - depends on BOARD_THOMSON_IP1000 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_THOMSON_IP1000 + +choice + prompt "IP1000 Onboard Memory" + default ONBOARD_MEMORY_64MB + +config ONBOARD_MEMORY_64MB + bool "IP1000-64MB" +config ONBOARD_MEMORY_128MB + bool "IP1000T-128MB" + +endchoice + +endif # BOARD_THOMSON_IP1000 Modified: trunk/src/mainboard/traverse/Kconfig ============================================================================== --- trunk/src/mainboard/traverse/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/traverse/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,7 +1,17 @@ +if VENDOR_TRAVERSE + choice prompt "Mainboard model" - depends on VENDOR_TRAVERSE -source "src/mainboard/traverse/geos/Kconfig" +config BOARD_TRAVERSE_GEOS + bool "Geos" endchoice + +source "src/mainboard/traverse/geos/Kconfig" + +config MAINBOARD_VENDOR + string + default "Traverse Technologies" + +endif # VENDOR_TRAVERSE Modified: trunk/src/mainboard/traverse/geos/Kconfig ============================================================================== --- trunk/src/mainboard/traverse/geos/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/traverse/geos/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TRAVERSE_GEOS - bool "Geos" +if BOARD_TRAVERSE_GEOS + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -13,19 +15,17 @@ config MAINBOARD_DIR string default traverse/geos - depends on BOARD_TRAVERSE_GEOS config MAINBOARD_PART_NUMBER string default "Geos" - depends on BOARD_TRAVERSE_GEOS config IRQ_SLOT_COUNT int default 6 - depends on BOARD_TRAVERSE_GEOS config RAMBASE hex default 0x4000 - depends on BOARD_TRAVERSE_GEOS + +endif # BOARD_TRAVERSE_GEOS Modified: trunk/src/mainboard/tyan/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,10 +16,43 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_TYAN choice prompt "Mainboard model" - depends on VENDOR_TYAN + +config BOARD_TYAN_S1846 + bool "S1846 (Tsunami ATX)" +config BOARD_TYAN_S2735 + bool "S2735 (Tiger i7501R)" +config BOARD_TYAN_S2850 + bool "S2850 (Tomcat K8S)" +config BOARD_TYAN_S2875 + bool "S2875 (Tiger K8W)" +config BOARD_TYAN_S2880 + bool "S2880 (Thunder K8S)" +config BOARD_TYAN_S2881 + bool "S2881 (Thunder K8SR)" +config BOARD_TYAN_S2882 + bool "S2882 (Thunder K8S Pro)" +config BOARD_TYAN_S2885 + bool "S2885 (Thunder K8W)" +config BOARD_TYAN_S2891 + bool "S2891 (Thunder K8SRE)" +config BOARD_TYAN_S2892 + bool "S2892 (Thunder K8SE)" +config BOARD_TYAN_S2895 + bool "S2895 (Thunder K8WE)" +config BOARD_TYAN_S2912 + bool "S2912 (Thunder n3600R)" +config BOARD_TYAN_S2912_FAM10 + bool "S2912 Fam10 (Thunder n3600R)" +config BOARD_TYAN_S4880 + bool "S4880 (Thunder K8QS)" +config BOARD_TYAN_S4882 + bool "S4882 (Thunder K8QS Pro)" + +endchoice source "src/mainboard/tyan/s1846/Kconfig" source "src/mainboard/tyan/s2735/Kconfig" @@ -37,5 +70,12 @@ source "src/mainboard/tyan/s4880/Kconfig" source "src/mainboard/tyan/s4882/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "Tyan" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x10f1 +endif # VENDOR_TYAN Modified: trunk/src/mainboard/tyan/s1846/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s1846/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s1846/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_TYAN_S1846 -config BOARD_TYAN_S1846 - bool "S1846 (Tsunami ATX)" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SLOT_1 select NORTHBRIDGE_INTEL_I440BX @@ -31,10 +32,9 @@ config MAINBOARD_DIR string default tyan/s1846 - depends on BOARD_TYAN_S1846 config MAINBOARD_PART_NUMBER string default "S1846" - depends on BOARD_TYAN_S1846 +endif # BOARD_TYAN_S1846 Modified: trunk/src/mainboard/tyan/s2735/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2735/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2735/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2735 - bool "S2735 (Tiger i7501R)" +if BOARD_TYAN_S2735 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_INTEL_SOCKET_MPGA604 select NORTHBRIDGE_INTEL_E7501 @@ -19,40 +21,33 @@ config MAINBOARD_DIR string default tyan/s2735 - depends on BOARD_TYAN_S2735 config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_TYAN_S2735 config DCACHE_RAM_SIZE hex default 0x1000 - depends on BOARD_TYAN_S2735 config MAINBOARD_PART_NUMBER string default "S2735" - depends on BOARD_TYAN_S2735 config IRQ_SLOT_COUNT int default 15 - depends on BOARD_TYAN_S2735 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2735 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2735 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2735 - depends on BOARD_TYAN_S2735 +endif # BOARD_TYAN_S2735 Modified: trunk/src/mainboard/tyan/s2850/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2850/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2850/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2850 - bool "S2850 (Tomcat K8S)" +if BOARD_TYAN_S2850 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -16,55 +18,45 @@ config MAINBOARD_DIR string default tyan/s2850 - depends on BOARD_TYAN_S2850 config MAINBOARD_PART_NUMBER string default "S2850" - depends on BOARD_TYAN_S2850 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2850 - depends on BOARD_TYAN_S2850 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2850 config MAX_CPUS int default 2 - depends on BOARD_TYAN_S2850 config MAX_PHYSICAL_CPUS int default 1 - depends on BOARD_TYAN_S2850 config IRQ_SLOT_COUNT int default 12 - depends on BOARD_TYAN_S2850 config HT_CHAIN_UNITID_BASE hex default 1 - depends on BOARD_TYAN_S2850 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2850 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_TYAN_S2850 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TYAN_S2850 +endif # BOARD_TYAN_S2850 Modified: trunk/src/mainboard/tyan/s2875/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2875/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2875/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2875 - bool "S2875 (Tiger K8W)" +if BOARD_TYAN_S2875 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -17,60 +19,49 @@ config MAINBOARD_DIR string default tyan/s2875 - depends on BOARD_TYAN_S2875 config MAINBOARD_PART_NUMBER string default "S2875" - depends on BOARD_TYAN_S2875 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2875 - depends on BOARD_TYAN_S2875 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2875 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2875 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2875 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2875 config IRQ_SLOT_COUNT int default 13 - depends on BOARD_TYAN_S2875 config HT_CHAIN_UNITID_BASE hex - default 1 - depends on BOARD_TYAN_S2875 + default 1 config HT_CHAIN_END_UNITID_BASE hex - default 0x20 - depends on BOARD_TYAN_S2875 + default 0x20 config SB_HT_CHAIN_ON_BUS0 - int - default 0 - depends on BOARD_TYAN_S2875 + int + default 0 config APIC_ID_OFFSET hex - default 0x0 - depends on BOARD_TYAN_S2875 + default 0x0 +endif # BOARD_TYAN_S2875 Modified: trunk/src/mainboard/tyan/s2880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2880/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2880/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2880 - bool "S2880 (Thunder K8S)" +if BOARD_TYAN_S2880 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -17,59 +19,49 @@ config MAINBOARD_DIR string default tyan/s2880 - depends on BOARD_TYAN_S2880 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TYAN_S2880 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_TYAN_S2880 config MAINBOARD_PART_NUMBER string default "S2880" - depends on BOARD_TYAN_S2880 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2880 - depends on BOARD_TYAN_S2880 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2880 config MAX_CPUS int default 2 - depends on BOARD_TYAN_S2880 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2880 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2880 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_TYAN_S2880 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2880 config IRQ_SLOT_COUNT int default 13 - depends on BOARD_TYAN_S2880 + +endif # BOARD_TYAN_S2880 Modified: trunk/src/mainboard/tyan/s2881/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2881/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2881/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2881 - bool "S2881 (Thunder K8SR)" +if BOARD_TYAN_S2881 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,59 +21,49 @@ config MAINBOARD_DIR string default tyan/s2881 - depends on BOARD_TYAN_S2881 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TYAN_S2881 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2881 config MAINBOARD_PART_NUMBER string default "S2881" - depends on BOARD_TYAN_S2881 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2881 - depends on BOARD_TYAN_S2881 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2881 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2881 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2881 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2881 config HT_CHAIN_UNITID_BASE hex default 0xa - depends on BOARD_TYAN_S2881 config HT_CHAIN_END_UNITID_BASE hex default 0x6 - depends on BOARD_TYAN_S2881 config IRQ_SLOT_COUNT int default 9 - depends on BOARD_TYAN_S2881 + +endif # BOARD_TYAN_S2881 Modified: trunk/src/mainboard/tyan/s2882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2882/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2882/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2882 - bool "S2882 (Thunder K8S Pro)" +if BOARD_TYAN_S2882 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -18,59 +20,49 @@ config MAINBOARD_DIR string default tyan/s2882 - depends on BOARD_TYAN_S2882 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TYAN_S2882 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_TYAN_S2882 config MAINBOARD_PART_NUMBER string default "S2882" - depends on BOARD_TYAN_S2882 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2882 - depends on BOARD_TYAN_S2882 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2882 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2882 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2882 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2882 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_TYAN_S2882 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2882 config IRQ_SLOT_COUNT int default 15 - depends on BOARD_TYAN_S2882 + +endif # BOARD_TYAN_S2882 Modified: trunk/src/mainboard/tyan/s2885/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2885/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2885/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2885 - bool "S2885 (Thunder K8W)" +if BOARD_TYAN_S2885 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,59 +21,49 @@ config MAINBOARD_DIR string default tyan/s2885 - depends on BOARD_TYAN_S2885 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_TYAN_S2885 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2885 config MAINBOARD_PART_NUMBER string default "S2885" - depends on BOARD_TYAN_S2885 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2885 - depends on BOARD_TYAN_S2885 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2885 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2885 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2885 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2885 config HT_CHAIN_UNITID_BASE hex default 0xa - depends on BOARD_TYAN_S2885 config HT_CHAIN_END_UNITID_BASE hex default 0x6 - depends on BOARD_TYAN_S2885 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TYAN_S2885 + +endif # BOARD_TYAN_S2885 Modified: trunk/src/mainboard/tyan/s2891/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2891/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2891/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2891 - bool "S2891 (Thunder K8SRE)" +if BOARD_TYAN_S2891 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -20,59 +22,49 @@ config MAINBOARD_DIR string default tyan/s2891 - depends on BOARD_TYAN_S2891 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_TYAN_S2891 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2891 config MAINBOARD_PART_NUMBER string default "S2891" - depends on BOARD_TYAN_S2891 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2891 - depends on BOARD_TYAN_S2891 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2891 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2891 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2891 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2891 config HT_CHAIN_UNITID_BASE hex default 0 - depends on BOARD_TYAN_S2891 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2891 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TYAN_S2891 + +endif # BOARD_TYAN_S2891 Modified: trunk/src/mainboard/tyan/s2892/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2892/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2892/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2892 - bool "S2892 (Thunder K8SE)" +if BOARD_TYAN_S2892 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,64 +21,53 @@ config MAINBOARD_DIR string default tyan/s2892 - depends on BOARD_TYAN_S2892 config APIC_ID_OFFSET hex default 0x0 - depends on BOARD_TYAN_S2892 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2892 config MAINBOARD_PART_NUMBER string default "S2892" - depends on BOARD_TYAN_S2892 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2892 - depends on BOARD_TYAN_S2892 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2892 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2892 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2892 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2892 config HT_CHAIN_UNITID_BASE hex default 0 - depends on BOARD_TYAN_S2892 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2892 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2892 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TYAN_S2892 + +endif # BOARD_TYAN_S2892 Modified: trunk/src/mainboard/tyan/s2895/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2895/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2895/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2895 - bool "S2895 (Thunder K8WE)" +if BOARD_TYAN_S2895 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -19,64 +21,53 @@ config MAINBOARD_DIR string default tyan/s2895 - depends on BOARD_TYAN_S2895 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_TYAN_S2895 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2895 config MAINBOARD_PART_NUMBER string default "S2895" - depends on BOARD_TYAN_S2895 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2895 - depends on BOARD_TYAN_S2895 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2895 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2895 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2895 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2895 config HT_CHAIN_UNITID_BASE hex default 0 - depends on BOARD_TYAN_S2895 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2895 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2895 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TYAN_S2895 + +endif # BOARD_TYAN_S2895 Modified: trunk/src/mainboard/tyan/s2912/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2912/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2912 - bool "S2912 (Thunder n3600R)" +if BOARD_TYAN_S2912 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F select NORTHBRIDGE_AMD_AMDK8 @@ -19,89 +21,73 @@ config MAINBOARD_DIR string default tyan/s2912 - depends on BOARD_TYAN_S2912 config DCACHE_RAM_BASE hex default 0xc8000 - depends on BOARD_TYAN_S2912 config DCACHE_RAM_SIZE hex default 0x08000 - depends on BOARD_TYAN_S2912 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x01000 - depends on BOARD_TYAN_S2912 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_TYAN_S2912 config MEM_TRAIN_SEQ int default 1 - depends on BOARD_TYAN_S2912 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2912 config MAINBOARD_PART_NUMBER string default "S2912" - depends on BOARD_TYAN_S2912 config PCI_64BIT_PREF_MEM bool - default n - depends on BOARD_TYAN_S2912 + default n config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2912 config MAX_CPUS int default 4 - depends on BOARD_TYAN_S2912 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2912 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2912 config HT_CHAIN_UNITID_BASE hex default 0x0 - depends on BOARD_TYAN_S2912 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2912 config SERIAL_CPU_INIT bool default n - depends on BOARD_TYAN_S2912 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2912 - depends on BOARD_TYAN_S2912 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TYAN_S2912 + +endif # BOARD_TYAN_S2912 Modified: trunk/src/mainboard/tyan/s2912_fam10/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s2912_fam10/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s2912_fam10/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S2912_FAM10 - bool "S2912 Fam10 (Thunder n3600R)" +if BOARD_TYAN_S2912_FAM10 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_F_1207 select NORTHBRIDGE_AMD_AMDFAM10 @@ -20,109 +22,89 @@ config MAINBOARD_DIR string default tyan/s2912_fam10 - depends on BOARD_TYAN_S2912_FAM10 config DCACHE_RAM_BASE hex default 0xc4000 - depends on BOARD_TYAN_S2912_FAM10 config DCACHE_RAM_SIZE hex default 0x0c000 - depends on BOARD_TYAN_S2912_FAM10 config DCACHE_RAM_GLOBAL_VAR_SIZE hex default 0x04000 - depends on BOARD_TYAN_S2912_FAM10 config APIC_ID_OFFSET hex default 0 - depends on BOARD_TYAN_S2912_FAM10 config MEM_TRAIN_SEQ int default 2 - depends on BOARD_TYAN_S2912_FAM10 config SB_HT_CHAIN_ON_BUS0 int default 2 - depends on BOARD_TYAN_S2912_FAM10 config MAINBOARD_PART_NUMBER string default "S2912 (Fam10)" - depends on BOARD_TYAN_S2912_FAM10 config PCI_64BIT_PREF_MEM bool default n - depends on BOARD_TYAN_S2912_FAM10 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S2912_FAM10 config MAX_CPUS int default 12 - depends on BOARD_TYAN_S2912_FAM10 config MAX_PHYSICAL_CPUS int default 2 - depends on BOARD_TYAN_S2912_FAM10 config HW_MEM_HOLE_SIZE_AUTO_INC bool default n - depends on BOARD_TYAN_S2912_FAM10 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_TYAN_S2912_FAM10 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S2912_FAM10 config SERIAL_CPU_INIT bool default n - depends on BOARD_TYAN_S2912_FAM10 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2912 - depends on BOARD_TYAN_S2912_FAM10 config IRQ_SLOT_COUNT int default 11 - depends on BOARD_TYAN_S2912_FAM10 config AMD_UCODE_PATCH_FILE string default "mc_patch_01000095.h" - depends on BOARD_TYAN_S2912_FAM10 config RAMBASE hex default 0x200000 - depends on BOARD_TYAN_S2912_FAM10 config RAMTOP hex default 0x1000000 - depends on BOARD_TYAN_S2912_FAM10 config HEAP_SIZE hex default 0xc0000 - depends on BOARD_TYAN_S2912_FAM10 + +endif # BOARD_TYAN_S2912_FAM10 Modified: trunk/src/mainboard/tyan/s4880/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4880/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s4880/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S4880 - bool "S4880 (Thunder K8QS)" +if BOARD_TYAN_S4880 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -18,70 +20,57 @@ config MAINBOARD_DIR string default tyan/s4880 - depends on BOARD_TYAN_S4880 config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_TYAN_S4880 config DCACHE_RAM_SIZE hex default 0x01000 - depends on BOARD_TYAN_S4880 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_TYAN_S4880 config K8_REV_F_SUPPORT bool default n - depends on BOARD_TYAN_S4880 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_TYAN_S4880 config MAINBOARD_PART_NUMBER string default "S4880" - depends on BOARD_TYAN_S4880 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S4880 config MAX_CPUS int default 8 - depends on BOARD_TYAN_S4880 config MAX_PHYSICAL_CPUS int default 4 - depends on BOARD_TYAN_S4880 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S4880 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_TYAN_S4880 config IRQ_SLOT_COUNT int default 22 - depends on BOARD_TYAN_S4880 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x4880 - depends on BOARD_TYAN_S4880 +endif # BOARD_TYAN_S4880 Modified: trunk/src/mainboard/tyan/s4882/Kconfig ============================================================================== --- trunk/src/mainboard/tyan/s4882/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/tyan/s4882/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_TYAN_S4882 - bool "S4882 (Thunder K8QS Pro)" +if BOARD_TYAN_S4882 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_SOCKET_940 select NORTHBRIDGE_AMD_AMDK8 @@ -18,70 +20,57 @@ config MAINBOARD_DIR string default tyan/s4882 - depends on BOARD_TYAN_S4882 config DCACHE_RAM_BASE hex default 0xcf000 - depends on BOARD_TYAN_S4882 config DCACHE_RAM_SIZE hex default 0x01000 - depends on BOARD_TYAN_S4882 config APIC_ID_OFFSET hex default 0x10 - depends on BOARD_TYAN_S4882 config K8_REV_F_SUPPORT bool default n - depends on BOARD_TYAN_S4882 config SB_HT_CHAIN_ON_BUS0 int default 0 - depends on BOARD_TYAN_S4882 config MAINBOARD_PART_NUMBER string default "S4882" - depends on BOARD_TYAN_S4882 config HW_MEM_HOLE_SIZEK hex default 0x100000 - depends on BOARD_TYAN_S4882 config MAX_CPUS int default 8 - depends on BOARD_TYAN_S4882 config MAX_PHYSICAL_CPUS int default 4 - depends on BOARD_TYAN_S4882 config HT_CHAIN_END_UNITID_BASE hex default 0x20 - depends on BOARD_TYAN_S4882 config HT_CHAIN_UNITID_BASE hex default 0x1 - depends on BOARD_TYAN_S4882 config IRQ_SLOT_COUNT int default 22 - depends on BOARD_TYAN_S4882 config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x4882 - depends on BOARD_TYAN_S4882 +endif # BOARD_TYAN_S4882 Modified: trunk/src/mainboard/via/Kconfig ============================================================================== --- trunk/src/mainboard/via/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,14 +1,39 @@ +if VENDOR_VIA + choice prompt "Mainboard model" - depends on VENDOR_VIA + +config BOARD_VIA_EPIA + bool "EPIA" +config BOARD_VIA_EPIA_CN + bool "EPIA-CN" +config BOARD_VIA_EPIA_M700 + bool "EPIA-M700" +config BOARD_VIA_EPIA_M + bool "EPIA-M" +config BOARD_VIA_EPIA_N + bool "EPIA-N" +config BOARD_VIA_PC2500E + bool "pc2500e" +config BOARD_VIA_VT8454C + bool "VT8454c" + +endchoice source "src/mainboard/via/epia/Kconfig" source "src/mainboard/via/epia-cn/Kconfig" -source "src/mainboard/via/epia-m/Kconfig" source "src/mainboard/via/epia-m700/Kconfig" +source "src/mainboard/via/epia-m/Kconfig" source "src/mainboard/via/epia-n/Kconfig" source "src/mainboard/via/pc2500e/Kconfig" source "src/mainboard/via/vt8454c/Kconfig" -endchoice +config MAINBOARD_VENDOR + string + default "VIA" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x1019 +endif # VENDOR_VIA Modified: trunk/src/mainboard/via/epia-cn/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-cn/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/epia-cn/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_EPIA_CN - bool "EPIA-CN" +if BOARD_VIA_EPIA_CN + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_CN700 @@ -12,19 +14,17 @@ config MAINBOARD_DIR string default via/epia-cn - depends on BOARD_VIA_EPIA_CN config MAINBOARD_PART_NUMBER string default "EPIA-CN" - depends on BOARD_VIA_EPIA_CN config RAMBASE hex default 0x4000 - depends on BOARD_VIA_EPIA_CN config IRQ_SLOT_COUNT int default 9 - depends on BOARD_VIA_EPIA_CN + +endif # BOARD_VIA_EPIA_CN Modified: trunk/src/mainboard/via/epia-m/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-m/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/epia-m/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_EPIA_M - bool "EPIA-M" +if BOARD_VIA_EPIA_M + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C3 select NORTHBRIDGE_VIA_VT8623 @@ -16,15 +18,13 @@ config MAINBOARD_DIR string default via/epia-m - depends on BOARD_VIA_EPIA_M config MAINBOARD_PART_NUMBER string default "EPIA-M" - depends on BOARD_VIA_EPIA_M config IRQ_SLOT_COUNT int default 5 - depends on BOARD_VIA_EPIA_M +endif # BOARD_VIA_EPIA_M Modified: trunk/src/mainboard/via/epia-m700/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-m700/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/epia-m700/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_EPIA_M700 - bool "EPIA-M700" +if BOARD_VIA_EPIA_M700 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_VX800 @@ -12,19 +14,17 @@ config MAINBOARD_DIR string default via/epia-m700 - depends on BOARD_VIA_EPIA_M700 config MAINBOARD_PART_NUMBER string default "EPIA-M700" - depends on BOARD_VIA_EPIA_M700 config RAMBASE hex default 0x4000 - depends on BOARD_VIA_EPIA_M700 config IRQ_SLOT_COUNT int default 13 - depends on BOARD_VIA_EPIA_M700 + +endif # BOARD_VIA_EPIA_M700 Modified: trunk/src/mainboard/via/epia-n/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia-n/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/epia-n/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_EPIA_N - bool "EPIA-N" +if BOARD_VIA_EPIA_N + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C3 select NORTHBRIDGE_VIA_CN400 @@ -17,20 +19,17 @@ config MAINBOARD_DIR string default via/epia-n - depends on BOARD_VIA_EPIA_N config MAINBOARD_PART_NUMBER string default "EPIA-N" - depends on BOARD_VIA_EPIA_N config RAMBASE hex default 0x4000 - depends on BOARD_VIA_EPIA_N config IRQ_SLOT_COUNT int default 7 - depends on BOARD_VIA_EPIA_N +endif # BOARD_VIA_EPIA_N Modified: trunk/src/mainboard/via/epia/Kconfig ============================================================================== --- trunk/src/mainboard/via/epia/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/epia/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_EPIA - bool "EPIA" +if BOARD_VIA_EPIA + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C3 select NORTHBRIDGE_VIA_VT8601 @@ -13,19 +15,17 @@ config MAINBOARD_DIR string default via/epia - depends on BOARD_VIA_EPIA config MAINBOARD_PART_NUMBER string default "EPIA" - depends on BOARD_VIA_EPIA config RAMBASE hex default 0x4000 - depends on BOARD_VIA_EPIA config IRQ_SLOT_COUNT int default 5 - depends on BOARD_VIA_EPIA + +endif # BOARD_VIA_EPIA Modified: trunk/src/mainboard/via/pc2500e/Kconfig ============================================================================== --- trunk/src/mainboard/via/pc2500e/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/pc2500e/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_PC2500E - bool "pc2500e" +if BOARD_VIA_PC2500E + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_CN700 @@ -15,40 +17,33 @@ config MAINBOARD_DIR string default via/pc2500e - depends on BOARD_VIA_PC2500E config MAINBOARD_PART_NUMBER string default "pc2500e" - depends on BOARD_VIA_PC2500E config RAMBASE hex default 0x4000 - depends on BOARD_VIA_PC2500E config IRQ_SLOT_COUNT int default 10 - depends on BOARD_VIA_PC2500E config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID hex default 0x1019 - depends on BOARD_VIA_PC2500E config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0xaa51 - depends on BOARD_VIA_PC2500E config FALLBACK_VGA_BIOS_FILE string default "M14CRT.ROM" - depends on BOARD_VIA_PC2500E config FALLBACK_VGA_BIOS_ID string default "1106,3344" - depends on BOARD_VIA_PC2500E +endif # BOARD_VIA_PC2500E Modified: trunk/src/mainboard/via/vt8454c/Kconfig ============================================================================== --- trunk/src/mainboard/via/vt8454c/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/via/vt8454c/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_VIA_VT8454C - bool "VT8454c" +if BOARD_VIA_VT8454C + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_VIA_C7 select NORTHBRIDGE_VIA_CX700 @@ -18,19 +20,17 @@ config MAINBOARD_DIR string default via/vt8454c - depends on BOARD_VIA_VT8454C config MAINBOARD_PART_NUMBER string default "VT8454c" - depends on BOARD_VIA_VT8454C config IRQ_SLOT_COUNT int default 15 - depends on BOARD_VIA_VT8454C config RAMBASE hex default 0x4000 - depends on BOARD_VIA_VT8454C + +endif # BOARD_VIA_VT8454C Modified: trunk/src/mainboard/winent/Kconfig ============================================================================== --- trunk/src/mainboard/winent/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/winent/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,20 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_WINENT choice prompt "Mainboard model" - depends on VENDOR_WINENT -source "src/mainboard/winent/pl6064/Kconfig" +config BOARD_WINENT_PL6064 + bool "PL6064" endchoice +source "src/mainboard/winent/pl6064/Kconfig" + +config MAINBOARD_VENDOR + string + default "Win Enterprise" + +endif # VENDOR_WINENT Modified: trunk/src/mainboard/winent/pl6064/Kconfig ============================================================================== --- trunk/src/mainboard/winent/pl6064/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/winent/pl6064/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -1,5 +1,7 @@ -config BOARD_WINENT_PL6064 - bool "PL6064" +if BOARD_WINENT_PL6064 + +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_LX select NORTHBRIDGE_AMD_LX @@ -14,19 +16,17 @@ config MAINBOARD_DIR string default winent/pl6064 - depends on BOARD_WINENT_PL6064 config MAINBOARD_PART_NUMBER string default "PL6064" - depends on BOARD_WINENT_PL6064 config IRQ_SLOT_COUNT int default 7 - depends on BOARD_WINENT_PL6064 config RAMBASE hex default 0x4000 - depends on BOARD_WINENT_PL6064 + +endif # BOARD_WINENT_PL6064 Modified: trunk/src/mainboard/wyse/Kconfig ============================================================================== --- trunk/src/mainboard/wyse/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/wyse/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,12 +16,24 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if VENDOR_WYSE choice prompt "Mainboard model" - depends on VENDOR_WYSE -source "src/mainboard/wyse/s50/Kconfig" +config BOARD_WYSE_S50 + bool "S50" endchoice +source "src/mainboard/wyse/s50/Kconfig" + +config MAINBOARD_VENDOR + string + default "Wyse" + +config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID + hex + default 0x102d + +endif # VENDOR_WYSE Modified: trunk/src/mainboard/wyse/s50/Kconfig ============================================================================== --- trunk/src/mainboard/wyse/s50/Kconfig Mon Aug 30 18:32:23 2010 (r5753) +++ trunk/src/mainboard/wyse/s50/Kconfig Mon Aug 30 18:36:51 2010 (r5754) @@ -16,9 +16,10 @@ ## along with this program; if not, write to the Free Software ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## +if BOARD_WYSE_S50 -config BOARD_WYSE_S50 - bool "S50" +config BOARD_SPECIFIC_OPTIONS # dummy + def_bool y select ARCH_X86 select CPU_AMD_GX2 select NORTHBRIDGE_AMD_GX2 @@ -32,19 +33,17 @@ config MAINBOARD_DIR string default wyse/s50 - depends on BOARD_WYSE_S50 config MAINBOARD_PART_NUMBER string default "s50" - depends on BOARD_WYSE_S50 config IRQ_SLOT_COUNT int default 3 - depends on BOARD_WYSE_S50 config RAMBASE hex default 0x4000 - depends on BOARD_WYSE_S50 + +endif # BOARD_WYSE_S50

1 0

[commit] r5753 - trunk/src/northbridge/intel/i855
by repository service 30 Aug '10

30 Aug '10

Author: stepan Date: Mon Aug 30 18:32:23 2010 New Revision: 5753 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5753 Log: This file was missing from r5751. Signed-off-by: Andreas Schultz <aschultz(a)tpip.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Added: trunk/src/northbridge/intel/i855/i855.h Added: trunk/src/northbridge/intel/i855/i855.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/northbridge/intel/i855/i855.h Mon Aug 30 18:32:23 2010 (r5753) @@ -0,0 +1,76 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Travelping GmbH <info(a)travelping.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ + +/* Host-Hub Interface Bridge */ +#define GMC 0x50 /* GMCH Misc. Control (0x0000) */ +#define GGC 0x52 /* GMCH Graphics Control (0x0030) */ +#define DAFC 0x54 /* Device and Function Control (0x0000) */ +#define FDHC 0x58 /* Fixed Dram Hole Control */ +#define PAM0 0x59 /* Programmable Attribute Map #0 (0x00) */ +#define PAM1 0x5a /* Programmable Attribute Map #1 (0x00) */ +#define PAM2 0x5b /* Programmable Attribute Map #2 (0x00) */ +#define PAM3 0x5c /* Programmable Attribute Map #3 (0x00) */ +#define PAM4 0x5d /* Programmable Attribute Map #4 (0x00) */ +#define PAM5 0x5e /* Programmable Attribute Map #5 (0x00) */ +#define PAM6 0x5f /* Programmable Attribute Map #6 (0x00) */ +#define SMRAM 0x60 /* System Management RAM Control (0x02) */ +#define ESMRAMC 0x61 /* Extended System Management RAM Control (0x38) */ +#define ERRSTS 0x62 /* Error Status (0x0000) */ +#define ERRCMD 0x64 /* Error Command (0x0000) */ +#define SMICMD 0x66 /* SMI Command (0x00) */ +#define SCICMD 0x67 /* SCI Command (0x00) */ +#define SHIC 0x74 /* Secondary Host Interface Control Register (0x00006010) */ +#define ACAPID 0xA0 /* AGP Capability Identifier (0x00200002) */ +#define AGPSTAT 0xA4 /* AGP Status Register (0x1f000217) */ +#define AGPCMD 0xA8 /* AGP Command (0x0000) */ +#define AGPCTRL 0xB0 /* AGP Control (0x0000) */ +#define AFT 0xB2 /* AGP Functional Test (0xe9f0) */ +#define ATTBASE 0xB8 /* Aperture Translation Table Base (0x00000000) */ +#define AMTT 0xBC /* AGP Interface Multi Transaction Timer (0x00) */ +#define LPTT 0xBD /* Low Priority Transaction Timer (0x00) */ +#define HEM 0xF0 /* Host Error Control/Status/Obs (0x00000000) */ + +/* Main Memory Control */ +#define DRB 0x40 /* DRAM Row 0-3 Boundary (0x00000000) */ +#define DRA 0x50 /* DRAM Row 0-3 Attribute (0x7777) */ +#define DRT 0x60 /* DRAM Timing (0x18004425) */ +#define PWRMG 0x68 /* DRAM Controller Power Management Control (0x00000000) */ +#define DRC 0x70 /* DRAM Controller Mode (0x00000081) */ +#define DTC 0xA0 /* DRAM Throttling Control (0x00000000) */ + +#define DRT_CAS_MASK (3 << 5) +#define DRT_CAS_2_0 (1 << 5) +#define DRT_CAS_2_5 (0 << 5) + +#define DRT_TRP_MASK 3 +#define DRT_TRP_4 0 +#define DRT_TRP_3 1 +#define DRT_TRP_2 2 + +#define DRT_RCD_MASK (3 << 2) +#define DRT_RCD_4 (0 << 2) +#define DRT_RCD_3 (1 << 2) +#define DRT_RCD_2 (2 << 2) + +#define DRT_TRAS_MIN_MASK (3 << 9) +#define DRT_TRAS_MIN_8 (0 << 9) +#define DRT_TRAS_MIN_7 (1 << 9) +#define DRT_TRAS_MIN_6 (2 << 9) +#define DRT_TRAS_MIN_5 (3 << 9)

1 0

Building coreboot BIOS on a Windows computer
by Scott 30 Aug '10

30 Aug '10

Hello coreboot folks, I know the developers here use linux, but many other bios developers are more comfortable with windows. Fortunately, it is easy to build coreboot using a Windows machine. The example below demonstrates using the current coreboot version, 5740. http://notabs.org/coreboot/corebootWindowsBuild.htm Thanks, Scott

3 3

build service results for r5750
by repository service 30 Aug '10

30 Aug '10

Dear coreboot readers! This is the automatic build system of coreboot. The developer "stepan" checked in revision 5750 to the coreboot repository. This caused the following changes: Change Log: mPGA479M Sockets can take Intel Mobile Celeron. The 1.2GHz model has CPUID F29. This adds them to the list of CPUs for that socket. Signed-off-by: Andreas Schultz <aschultz(a)tpip.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> This patch likely breaks the following two boards since it unconditionally activates CAR code for this socket: * digitallogic/adl855pc * intel/mtarvon stepan suggests moving those two boards over to CAR, too, so we don't have to worry. --- src/cpu/intel/socket_mPGA479M/Kconfig | 1 + src/cpu/intel/socket_mPGA479M/Makefile.inc | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) Build Log: Compilation of intel:mtarvon has been broken See the error log at http://qa.coreboot.org/log_buildbrd.php?revision=5750&device=mtarvon&vendor… If something broke during this checkin please be a pain in stepan's neck until the issue is fixed. If this issue is not fixed within 24h the revision should be backed out. Best regards, coreboot automatic build system

1 0

[commit] r5752 - in trunk/src/mainboard: . lanner lanner/em8510
by repository service 30 Aug '10

30 Aug '10

Author: stepan Date: Mon Aug 30 18:22:22 2010 New Revision: 5752 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5752 Log: Support for Lanner EM-8510 Board Signed-off-by: Andreas Schultz <aschultz(a)tpip.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> --- src/mainboard/Kconfig | 8 ++ src/mainboard/lanner/Kconfig | 8 ++ src/mainboard/lanner/em8510/Kconfig | 38 +++++++++++ src/mainboard/lanner/em8510/Makefile.inc | 21 ++++++ src/mainboard/lanner/em8510/chip.h | 23 +++++++ src/mainboard/lanner/em8510/cmos.layout | 74 +++++++++++++++++++++ src/mainboard/lanner/em8510/devicetree.cb | 60 +++++++++++++++++ src/mainboard/lanner/em8510/irq_tables.c | 56 ++++++++++++++++ src/mainboard/lanner/em8510/mainboard.c | 27 ++++++++ src/mainboard/lanner/em8510/romstage.c | 103 +++++++++++++++++++++++++++++ 10 files changed, 418 insertions(+), 0 deletions(-) create mode 100644 src/mainboard/lanner/Kconfig create mode 100644 src/mainboard/lanner/em8510/Kconfig create mode 100644 src/mainboard/lanner/em8510/Makefile.inc create mode 100644 src/mainboard/lanner/em8510/chip.h create mode 100644 src/mainboard/lanner/em8510/cmos.layout create mode 100644 src/mainboard/lanner/em8510/devicetree.cb create mode 100644 src/mainboard/lanner/em8510/irq_tables.c create mode 100644 src/mainboard/lanner/em8510/mainboard.c create mode 100644 src/mainboard/lanner/em8510/romstage.c Added: trunk/src/mainboard/lanner/ trunk/src/mainboard/lanner/Kconfig trunk/src/mainboard/lanner/em8510/ trunk/src/mainboard/lanner/em8510/Kconfig trunk/src/mainboard/lanner/em8510/Makefile.inc trunk/src/mainboard/lanner/em8510/chip.h trunk/src/mainboard/lanner/em8510/cmos.layout trunk/src/mainboard/lanner/em8510/devicetree.cb trunk/src/mainboard/lanner/em8510/irq_tables.c trunk/src/mainboard/lanner/em8510/mainboard.c trunk/src/mainboard/lanner/em8510/romstage.c Modified: trunk/src/mainboard/Kconfig Modified: trunk/src/mainboard/Kconfig ============================================================================== --- trunk/src/mainboard/Kconfig Mon Aug 30 18:19:04 2010 (r5751) +++ trunk/src/mainboard/Kconfig Mon Aug 30 18:22:22 2010 (r5752) @@ -64,6 +64,8 @@ bool "Jetway" config VENDOR_KONTRON bool "Kontron" +config VENDOR_LANNER + bool "Lanner" config VENDOR_LIPPERT bool "Lippert" config VENDOR_MITAC @@ -270,6 +272,11 @@ config MAINBOARD_VENDOR string + default "Lanner" + depends on VENDOR_LANNER + +config MAINBOARD_VENDOR + string default "Lippert" depends on VENDOR_LIPPERT @@ -443,6 +450,7 @@ source "src/mainboard/iwill/Kconfig" source "src/mainboard/jetway/Kconfig" source "src/mainboard/kontron/Kconfig" +source "src/mainboard/lanner/Kconfig" source "src/mainboard/lippert/Kconfig" source "src/mainboard/mitac/Kconfig" source "src/mainboard/msi/Kconfig" Added: trunk/src/mainboard/lanner/Kconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/Kconfig Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,8 @@ +choice + prompt "Mainboard model" + depends on VENDOR_LANNER + +source "src/mainboard/lanner/em8510/Kconfig" + +endchoice + Added: trunk/src/mainboard/lanner/em8510/Kconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/Kconfig Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,38 @@ +config BOARD_LANNER_EM8510 + bool "EM-8510" + select ARCH_X86 + select CPU_INTEL_SOCKET_MPGA479M + select NORTHBRIDGE_INTEL_I855 + select SOUTHBRIDGE_INTEL_I82801DX + select SUPERIO_WINBOND_W83627THF + select HAVE_OPTION_TABLE + select HAVE_PIRQ_TABLE + select HAVE_HARD_RESET + select BOARD_ROMSIZE_KB_512 + select USE_DCACHE_RAM + select TINY_BOOTBLOCK + +config MAINBOARD_DIR + string + default lanner/em8510 + depends on BOARD_LANNER_EM8510 + +config MAINBOARD_PART_NUMBER + string + default "EM-8510" + depends on BOARD_LANNER_EM8510 + +config DCACHE_RAM_BASE + hex + default 0xffdf8000 + depends on BOARD_LANNER_EM8510 + +config DCACHE_RAM_SIZE + hex + default 0x8000 + depends on BOARD_LANNER_EM8510 + +config IRQ_SLOT_COUNT + int + default 10 + depends on BOARD_LANNER_EM8510 Added: trunk/src/mainboard/lanner/em8510/Makefile.inc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/Makefile.inc Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2010 Travelping GmbH <info(a)travelping.com> +## +## 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; either version 2 of the License, or +## (at your option) any later version. +## +## 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 +## + +ROMCCFLAGS := -mcpu=p3 -O Added: trunk/src/mainboard/lanner/em8510/chip.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/chip.h Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,23 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Travelping GmbH <info(a)travelping.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ + +extern struct chip_operations mainboard_ops; + +struct mainboard_config {}; Added: trunk/src/mainboard/lanner/em8510/cmos.layout ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/cmos.layout Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,74 @@ +entries + +#start-bit length config config-ID name +#0 8 r 0 seconds +#8 8 r 0 alarm_seconds +#16 8 r 0 minutes +#24 8 r 0 alarm_minutes +#32 8 r 0 hours +#40 8 r 0 alarm_hours +#48 8 r 0 day_of_week +#56 8 r 0 day_of_month +#64 8 r 0 month +#72 8 r 0 year +#80 4 r 0 rate_select +#84 3 r 0 REF_Clock +#87 1 r 0 UIP +#88 1 r 0 auto_switch_DST +#89 1 r 0 24_hour_mode +#90 1 r 0 binary_values_enable +#91 1 r 0 square-wave_out_enable +#92 1 r 0 update_finished_enable +#93 1 r 0 alarm_interrupt_enable +#94 1 r 0 periodic_interrupt_enable +#95 1 r 0 disable_clock_updates +#96 288 r 0 temporary_filler +0 384 r 0 reserved_memory +384 1 e 4 boot_option +385 1 e 4 last_boot +386 1 e 1 ECC_memory +388 4 r 0 reboot_bits +392 3 e 5 baud_rate +400 1 e 1 power_on_after_fail +412 4 e 6 debug_level +416 4 e 7 boot_first +420 4 e 7 boot_second +424 4 e 7 boot_third +428 4 h 0 boot_index +432 8 h 0 boot_countdown +1008 16 h 0 check_sum + +enumerations + +#ID value text +1 0 Disable +1 1 Enable +2 0 Enable +2 1 Disable +4 0 Fallback +4 1 Normal +5 0 115200 +5 1 57600 +5 2 38400 +5 3 19200 +5 4 9600 +5 5 4800 +5 6 2400 +5 7 1200 +6 6 Notice +6 7 Info +6 8 Debug +6 9 Spew +7 0 Network +7 1 HDD +7 2 Floppy +7 8 Fallback_Network +7 9 Fallback_HDD +7 10 Fallback_Floppy +#7 3 ROM + +checksums + +checksum 392 1007 1008 + + Added: trunk/src/mainboard/lanner/em8510/devicetree.cb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/devicetree.cb Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,60 @@ +chip northbridge/intel/i855 + device pci_domain 0 on + device pci 0.0 on end + chip southbridge/intel/i82801dx +# pci 11.0 on end +# pci 11.1 on end +# pci 11.2 on end +# pci 11.3 on end +# pci 11.4 on end +# pci 11.5 on end +# pci 11.6 on end +# pci 12.0 on end + register "enable_usb" = "0" + register "enable_native_ide" = "0" + device pci 1f.0 on + chip superio/winbond/w83627thf # link 1 + device pnp 2e.0 on # Floppy + io 0x60 = 0x3f0 + irq 0x70 = 6 + drq 0x74 = 2 + end + device pnp 2e.1 on # Parallel Port + io 0x60 = 0x378 + irq 0x70 = 7 + end + device pnp 2e.2 on # Com1 + io 0x60 = 0x3f8 + irq 0x70 = 4 + end + device pnp 2e.3 on # Com2 + io 0x60 = 0x2f8 + irq 0x70 = 3 + end + device pnp 2e.5 on # Keyboard + io 0x60 = 0x60 + io 0x62 = 0x64 + irq 0x70 = 1 + irq 0x72 = 12 + end + device pnp 2e.6 off end # CIR + device pnp 2e.7 off end # GAME_MIDI_GIPO1 + device pnp 2e.8 off end # GPIO2 + device pnp 2e.9 off end # GPIO3 + device pnp 2e.a off end # ACPI + device pnp 2e.b on # HW Monitor + io 0x60 = 0x290 + end + register "com1" = "{1}" + # register "com1" = "{1, 0, 0x3f8, 4}" + # register "lpt" = "{1}" + end + end + end + end + device lapic_cluster 0 on + chip cpu/intel/socket_mPGA479M + device lapic 0 on end + end + end +end Added: trunk/src/mainboard/lanner/em8510/irq_tables.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/irq_tables.c Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,56 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Travelping GmbH <info(a)travelping.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ + +#include <arch/pirq_routing.h> + +const struct irq_routing_table intel_irq_routing_table = { + PIRQ_SIGNATURE, /* u32 signature */ + PIRQ_VERSION, /* u16 version */ + 32 + 16 * 10, /* Max. number of devices on the bus */ + 0x00, /* Interrupt router bus */ + (0x1f << 3) | 0x0, /* Interrupt router dev */ + 0x1e20, /* IRQs devoted exclusively to PCI usage */ + 0x8086, /* Vendor */ + 0x24cc, /* Device */ + 0, /* Miniport */ + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* u8 rfu[11] */ + 0x39, /* Checksum (has to be set to some value that + * would give 0 after the sum of all bytes + * for this structure (including checksum). + */ + { + /* bus, dev | fn, {link, bitmap}, {link, bitmap}, {link, bitmap}, {link, bitmap}, slot, rfu */ + {0x01, (0x0f << 3) | 0x0, {{0x62, 0xdeb8}, {0x63, 0xdeb8}, {0x60, 0xdeb8}, {0x61, 0xdeb8}}, 0x1, 0x0}, + {0x01, (0x0a << 3) | 0x0, {{0x62, 0xdeb8}, {0x63, 0xdeb8}, {0x60, 0xdeb8}, {0x61, 0xdeb8}}, 0x2, 0x0}, + {0x01, (0x05 << 3) | 0x0, {{0x68, 0xdeb8}, {0x69, 0xdeb8}, {0x6a, 0xdeb8}, {0x6b, 0xdeb8}}, 0x3, 0x0}, + {0x01, (0x06 << 3) | 0x0, {{0x69, 0xdeb8}, {0x6a, 0xdeb8}, {0x6b, 0xdeb8}, {0x68, 0xdeb8}}, 0x4, 0x0}, + {0x01, (0x07 << 3) | 0x0, {{0x6a, 0xdeb8}, {0x6b, 0xdeb8}, {0x68, 0xdeb8}, {0x69, 0xdeb8}}, 0x5, 0x0}, + {0x01, (0x09 << 3) | 0x0, {{0x6b, 0xdeb8}, {0x68, 0xdeb8}, {0x69, 0xdeb8}, {0x6a, 0xdeb8}}, 0x6, 0x0}, + {0x00, (0x1e << 3) | 0x0, {{0x60, 0xdeb8}, {0x61, 0xdeb8}, {0x62, 0xdeb8}, {0x63, 0xdeb8}}, 0x0, 0x0}, + {0x00, (0x02 << 3) | 0x0, {{0x60, 0xdeb8}, {0x60, 0xdeb8}, {0x60, 0xdeb8}, {0x60, 0xdeb8}}, 0x0, 0x0}, + {0x00, (0x1f << 3) | 0x0, {{0x62, 0xdeb8}, {0x61, 0xdeb8}, {0x60, 0xdeb8}, {0x63, 0xdeb8}}, 0x0, 0x0}, + {0x00, (0x1d << 3) | 0x0, {{0x60, 0xdeb8}, {0x63, 0xdeb8}, {0x62, 0xdeb8}, {0x6b, 0xdeb8}}, 0x0, 0x0}, + } +}; + +unsigned long write_pirq_routing_table(unsigned long addr) +{ + return copy_pirq_routing_table(addr); +} Added: trunk/src/mainboard/lanner/em8510/mainboard.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/mainboard.c Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,27 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2010 Travelping GmbH <info(a)travelping.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ + +#include <device/device.h> +#include "chip.h" + +struct chip_operations mainboard_ops = { + CHIP_NAME("LANNER EM-8510 Mainboard") +}; + Added: trunk/src/mainboard/lanner/em8510/romstage.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/src/mainboard/lanner/em8510/romstage.c Mon Aug 30 18:22:22 2010 (r5752) @@ -0,0 +1,103 @@ +/* + * This file is part of the coreboot project. + * + * Original take from digitallogic/adl855pc + * + * Copyright (C) 2010 Travelping GmbH <info(a)travelping.com> + * + * 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; either version 2 of the License, or + * (at your option) any later version. + * + * 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 + */ + +#include <stdint.h> +#include <device/pci_def.h> +#include <arch/io.h> +#include <device/pnp_def.h> +#include <arch/romcc_io.h> +#include <arch/hlt.h> +#include <stdlib.h> +#include "pc80/udelay_io.c" +#include <pc80/mc146818rtc.h> +#include <console/console.h> +#include "lib/ramtest.c" +#include "southbridge/intel/i82801dx/i82801dx.h" +#include "southbridge/intel/i82801dx/i82801dx_early_smbus.c" +#include "northbridge/intel/i855/raminit.h" +#include "northbridge/intel/i855/debug.c" +#include "superio/winbond/w83627thf/w83627thf_early_serial.c" +#include "cpu/x86/mtrr/earlymtrr.c" +#include "cpu/x86/bist.h" + +#define SERIAL_DEV PNP_DEV(0x2e, W83627THF_SP1) + +static inline int spd_read_byte(unsigned device, unsigned address) +{ + return smbus_read_byte(device, address); +} + +#include "northbridge/intel/i855/raminit.c" +#include "northbridge/intel/i855/reset_test.c" +#include "lib/generic_sdram.c" + +void main(unsigned long bist) +{ + static const struct mem_controller memctrl[] = { + { + .d0 = PCI_DEV(0, 0, 1), + .channel0 = { (0xa<<3)|0, 0 }, + }, + }; + + if (bist == 0) { +#if 0 + enable_lapic(); + init_timer(); +#endif + } + + w83627thf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + uart_init(); + console_init(); + + /* Halt if there was a built in self test failure */ + report_bist_failure(bist); + +#if 0 + print_pci_devices(); +#endif + + if(!bios_reset_detected()) { + enable_smbus(); +#if 1 + dump_spd_registers(&memctrl[0]); + dump_smbus_registers(); +#endif + + sdram_initialize(ARRAY_SIZE(memctrl), memctrl); + + } + +#if 0 + dump_pci_devices(); + dump_pci_device(PCI_DEV(0, 0, 0)); + + // Check all of memory + ram_check(0x00000000, msr.lo+(msr.hi<<32)); + // Check 16MB of memory @ 0 + ram_check(0x00000000, 0x01000000); + // Check 16MB of memory @ 2GB + ram_check(0x80000000, 0x81000000); +#endif +} +

1 0

[commit] r5751 - trunk/src/northbridge/intel/i855
by repository service 30 Aug '10

30 Aug '10

Author: stepan Date: Mon Aug 30 18:19:04 2010 New Revision: 5751 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5751 Log: Rework i855GM/i855GME support Signed-off-by: Andreas Schultz <aschultz(a)tpip.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> --- src/northbridge/intel/i855/Kconfig | 30 + src/northbridge/intel/i855/i855.h | 76 +++ src/northbridge/intel/i855/northbridge.c | 21 + src/northbridge/intel/i855/raminit.c | 1036 +++++++++++++++++++++++++----- src/northbridge/intel/i855/raminit.h | 14 +- 5 files changed, 1002 insertions(+), 175 deletions(-) create mode 100644 src/northbridge/intel/i855/i855.h Modified: trunk/src/northbridge/intel/i855/Kconfig trunk/src/northbridge/intel/i855/northbridge.c trunk/src/northbridge/intel/i855/raminit.c trunk/src/northbridge/intel/i855/raminit.h Modified: trunk/src/northbridge/intel/i855/Kconfig ============================================================================== --- trunk/src/northbridge/intel/i855/Kconfig Mon Aug 30 18:16:01 2010 (r5750) +++ trunk/src/northbridge/intel/i855/Kconfig Mon Aug 30 18:19:04 2010 (r5751) @@ -1,3 +1,33 @@ config NORTHBRIDGE_INTEL_I855 bool + select HAVE_DEBUG_RAM_SETUP +choice + prompt "Onboard graphics" + default I855_VIDEO_MB_8MB + depends on NORTHBRIDGE_INTEL_I855 + +config I855_VIDEO_MB_OFF + bool "Disabled, 0KB" +config I855_VIDEO_MB_1MB + bool "Enabled, 1MB" +config I855_VIDEO_MB_4MB + bool "Enabled, 4MB" +config I855_VIDEO_MB_8MB + bool "Enabled, 8MB" +config I855_VIDEO_MB_16MB + bool "Enabled, 16MB" +config I855_VIDEO_MB_32MB + bool "Enabled, 32MB" + +endchoice + +config VIDEO_MB + int + default 0 if I855_VIDEO_MB_OFF + default 1 if I855_VIDEO_MB_1MB + default 4 if I855_VIDEO_MB_4MB + default 8 if I855_VIDEO_MB_8MB + default 16 if I855_VIDEO_MB_16MB + default 32 if I855_VIDEO_MB_32MB + depends on NORTHBRIDGE_INTEL_I855 Modified: trunk/src/northbridge/intel/i855/northbridge.c ============================================================================== --- trunk/src/northbridge/intel/i855/northbridge.c Mon Aug 30 18:16:01 2010 (r5750) +++ trunk/src/northbridge/intel/i855/northbridge.c Mon Aug 30 18:19:04 2010 (r5751) @@ -25,6 +25,7 @@ #include <stdint.h> #include <device/device.h> #include <device/pci.h> +#include <device/pci_ids.h> #include <stdlib.h> #include <string.h> #include <bitops.h> @@ -32,6 +33,26 @@ #include <cpu/cpu.h> #include "chip.h" +static void northbridge_init(device_t dev) +{ + printk(BIOS_SPEW, "Northbridge init\n"); +} + +static struct device_operations northbridge_operations = { + .read_resources = pci_dev_read_resources, + .set_resources = pci_dev_set_resources, + .enable_resources = pci_dev_enable_resources, + .init = northbridge_init, + .enable = 0, + .ops_pci = 0, +}; + +static const struct pci_driver northbridge_driver __pci_driver = { + .ops = &northbridge_operations, + .vendor = PCI_VENDOR_ID_INTEL, + .device = 0x3580, +}; + static void ram_resource(device_t dev, unsigned long index, unsigned long basek, unsigned long sizek) { Modified: trunk/src/northbridge/intel/i855/raminit.c ============================================================================== --- trunk/src/northbridge/intel/i855/raminit.c Mon Aug 30 18:16:01 2010 (r5750) +++ trunk/src/northbridge/intel/i855/raminit.c Mon Aug 30 18:19:04 2010 (r5751) @@ -18,256 +18,452 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <assert.h> +#include <spd.h> #include <sdram_mode.h> +#include <stdlib.h> #include <delay.h> +#include "i855.h" -#define dumpnorth() dump_pci_device(PCI_DEV(0, 0, 1)) -#define VG85X_MODE (SDRAM_BURST_4 | SDRAM_BURST_INTERLEAVED | SDRAM_CAS_2_5) - -/** - * Set only what I need until it works, then make it figure things out on boot - * assumes only one dimm is populated - */ - -static void sdram_set_registers(const struct mem_controller *ctrl) -{ - /* - print_debug("Before configuration:\n"); - dump_pci_devices(); - */ -} +#define VALIDATE_DIMM_COMPATIBILITY -static void spd_set_row_attributes(const struct mem_controller *ctrl) -{ - uint16_t dra_reg; - - dra_reg = 0x7733; - pci_write_config16(ctrl->d0, 0x50, dra_reg); -} +/* Debugging macros. */ +#if CONFIG_DEBUG_RAM_SETUP +#define PRINTK_DEBUG(x...) printk(BIOS_DEBUG, x) +#define DUMPNORTH() dump_pci_device(NORTHBRIDGE_MMC) +#else +#define PRINTK_DEBUG(x...) +#define DUMPNORTH() +#endif -static void spd_set_dram_controller_mode(const struct mem_controller *ctrl) -{ - uint32_t drc_reg; - - /* drc_reg = 0x00009101; */ - drc_reg = 0x00009901; - pci_write_config32(ctrl->d0, 0x70, drc_reg); -} +#define delay() udelay(200) -static void spd_set_dram_timing(const struct mem_controller *ctrl) -{ - uint32_t drt_reg; +#define VG85X_MODE (SDRAM_BURST_4 | SDRAM_BURST_INTERLEAVED | SDRAM_CAS_2_5) - drt_reg = 0x2a004405; - pci_write_config32(ctrl->d0, 0x60, drt_reg); -} +/* DRC[10:8] - Refresh Mode Select (RMS). + * 0x0 for Refresh Disabled (Self Refresh) + * 0x1 for Refresh interval 15.6 us for 133MHz + * 0x2 for Refresh interval 7.8 us for 133MHz + * 0x7 for Refresh interval 64 Clocks. (Fast Refresh Mode) + */ +#define RAM_COMMAND_REFRESH 0x1 -static void spd_set_dram_size(const struct mem_controller *ctrl) -{ - uint32_t drb_reg; +/* DRC[6:4] - SDRAM Mode Select (SMS). */ +#define RAM_COMMAND_SELF_REFRESH 0x0 +#define RAM_COMMAND_NOP 0x1 +#define RAM_COMMAND_PRECHARGE 0x2 +#define RAM_COMMAND_MRS 0x3 +#define RAM_COMMAND_EMRS 0x4 +#define RAM_COMMAND_CBR 0x6 +#define RAM_COMMAND_NORMAL 0x7 + +/* DRC[29] - Initialization Complete (IC). */ +#define RAM_COMMAND_IC 0x1 + +struct dimm_size { + unsigned int side1; + unsigned int side2; +}; + +/*^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/ +/* DEFINITIONS */ +/**********************************************************************************/ + +static const uint32_t refresh_frequency[] = { + /* Relative frequency (array value) of each E7501 Refresh Mode Select + * (RMS) value (array index) + * 0 == least frequent refresh (longest interval between refreshes) + * [0] disabled -> 0 + * [1] 15.6 usec -> 2 + * [2] 7.8 usec -> 3 + * [3] 64 usec -> 1 + * [4] reserved -> 0 + * [5] reserved -> 0 + * [6] reserved -> 0 + * [7] 64 clocks -> 4 + */ + 0, 2, 3, 1, 0, 0, 0, 4 +}; + +static const uint32_t refresh_rate_map[] = { + /* Map the JEDEC spd refresh rates (array index) to i855 Refresh Mode + * Select values (array value) + * These are all the rates defined by JESD21-C Appendix D, Rev. 1.0 + * The i855 supports only 15.6 us (1), 7.8 us (2) and + * 64 clock (481 ns) (7) refresh. + * [0] == 15.625 us -> 15.6 us + * [1] == 3.9 us -> 481 ns + * [2] == 7.8 us -> 7.8 us + * [3] == 31.3 us -> 15.6 us + * [4] == 62.5 us -> 15.6 us + * [5] == 125 us -> 15.6 us + */ + 1, 7, 2, 1, 1, 1 +}; + +#define MAX_SPD_REFRESH_RATE ((sizeof(refresh_rate_map) / sizeof(uint32_t)) - 1) + +/*----------------------------------------------------------------------------- +SPD functions. +-----------------------------------------------------------------------------*/ + +static void die_on_spd_error(int spd_return_value) +{ + if (spd_return_value < 0) + PRINTK_DEBUG("Error reading SPD info: got %d\n", spd_return_value); +/* + if (spd_return_value < 0) + die("Error reading SPD info\n"); +*/ +} + +//---------------------------------------------------------------------------------- +// Function: sdram_spd_get_page_size +// Parameters: dimm_socket_address - SMBus address of DIMM socket to interrogate +// Return Value: struct dimm_size - log2(page size) for each side of the DIMM. +// Description: Calculate the page size for each physical bank of the DIMM: +// log2(page size) = (# columns) + log2(data width) +// +// NOTE: page size is the total number of data bits in a row. +// +static struct dimm_size sdram_spd_get_page_size(uint16_t dimm_socket_address) +{ + uint16_t module_data_width; + int value; + struct dimm_size pgsz; + + pgsz.side1 = 0; + pgsz.side2 = 0; + + // Side 1 + value = spd_read_byte(dimm_socket_address, SPD_NUM_COLUMNS); + die_on_spd_error(value); + + pgsz.side1 = value & 0xf; // # columns in bank 1 + + /* Get the module data width and convert it to a power of two */ + value = spd_read_byte(dimm_socket_address, SPD_MODULE_DATA_WIDTH_MSB); + die_on_spd_error(value); + + module_data_width = (value & 0xff) << 8; + + value = spd_read_byte(dimm_socket_address, SPD_MODULE_DATA_WIDTH_LSB); + die_on_spd_error(value); + + module_data_width |= (value & 0xff); + + pgsz.side1 += log2(module_data_width); + + /* side two */ + value = spd_read_byte(dimm_socket_address, SPD_NUM_DIMM_BANKS); + die_on_spd_error(value); + +/* + if (value > 2) + die("Bad SPD value\n"); +*/ + if (value > 2) + PRINTK_DEBUG("Bad SPD value\n"); + + if (value == 2) { + pgsz.side2 = pgsz.side1; // Assume symmetric banks until we know differently + value = spd_read_byte(dimm_socket_address, SPD_NUM_COLUMNS); + die_on_spd_error(value); + + if ((value & 0xf0) != 0) { + // Asymmetric banks + pgsz.side2 -= value & 0xf; /* Subtract out columns on side 1 */ + pgsz.side2 += (value >> 4) & 0xf; /* Add in columns on side 2 */ + } + } - drb_reg = 0x20202010; - pci_write_config32(ctrl->d0, 0x40, drb_reg); + return pgsz; } -static void spd_set_dram_pwr_management(const struct mem_controller *ctrl) -{ - uint32_t pwrmg_reg; +//---------------------------------------------------------------------------------- +// Function: sdram_spd_get_width +// Parameters: dimm_socket_address - SMBus address of DIMM socket to interrogate +// Return Value: dimm_size - width in bits of each DIMM side's DRAMs. +// Description: Read the width in bits of each DIMM side's DRAMs via SPD. +// (i.e. 4, 8, 16) +// +static struct dimm_size sdram_spd_get_width(uint16_t dimm_socket_address) +{ + int value; + struct dimm_size width; + + width.side1 = 0; + width.side2 = 0; + + value = spd_read_byte(dimm_socket_address, SPD_PRIMARY_SDRAM_WIDTH); + die_on_spd_error(value); + + width.side1 = value & 0x7f; // Mask off bank 2 flag + + if (value & 0x80) { + width.side2 = width.side1 << 1; // Bank 2 exists and is double-width + } else { + // If bank 2 exists, it's the same width as bank 1 + value = spd_read_byte(dimm_socket_address, SPD_NUM_DIMM_BANKS); + die_on_spd_error(value); + +#ifdef ROMCC_IF_BUG_FIXED + if (value == 2) + width.side2 = width.side1; +#else + switch (value) { + case 2: + width.side2 = width.side1; + break; + + default: + break; + } +#endif + } - pwrmg_reg = 0x10f10430; - pci_write_config32(ctrl->d0, 0x68, pwrmg_reg); + return width; } -static void spd_set_dram_throttle_control(const struct mem_controller *ctrl) -{ - uint32_t dtc_reg; +//---------------------------------------------------------------------------------- +// Function: spd_get_dimm_size +// Parameters: dimm_socket_address - SMBus address of DIMM socket to interrogate +// Return Value: dimm_size - log2(number of bits) for each side of the DIMM +// Description: Calculate the log base 2 size in bits of both DIMM sides. +// log2(# bits) = (# columns) + log2(data width) + +// (# rows) + log2(banks per SDRAM) +// +// Note that it might be easier to use SPD byte 31 here, it has the +// DIMM size as a multiple of 4MB. The way we do it now we can size +// both sides of an asymmetric dimm. +// +static struct dimm_size spd_get_dimm_size(unsigned dimm) +{ + int value; + + // Start with log2(page size) + struct dimm_size sz = sdram_spd_get_page_size(dimm); + + if (sz.side1 > 0) { + value = spd_read_byte(dimm, SPD_NUM_ROWS); + die_on_spd_error(value); + + sz.side1 += value & 0xf; + + if (sz.side2 > 0) { + // Double-sided DIMM + if (value & 0xF0) + sz.side2 += value >> 4; // Asymmetric + else + sz.side2 += value; // Symmetric + } + + value = spd_read_byte(dimm, SPD_NUM_BANKS_PER_SDRAM); + die_on_spd_error(value); + + value = log2(value); + sz.side1 += value; + if (sz.side2 > 0) + sz.side2 += value; + } - dtc_reg = 0x300aa2ff; - pci_write_config32(ctrl->d0, 0xa0, dtc_reg); + return sz; } -#define delay() udelay(200) - -/* if ram still doesn't work do this function */ -static void spd_set_undocumented_registers(const struct mem_controller *ctrl) +//---------------------------------------------------------------------------------- +// Function: spd_get_supported_dimms +// Parameters: ctrl - PCI addresses of memory controller functions, and +// SMBus addresses of DIMM slots on the mainboard +// Return Value: uint8_t - a bitmask indicating which sockets contain a compatible DIMM. +// Description: Scan for compatible DIMMs. +// +static uint8_t spd_get_supported_dimms(const struct mem_controller *ctrl) { - /* 0:0.0 */ - /* - pci_write_config32(PCI_DEV(0, 0, 0), 0x10, 0xe0000008); - pci_write_config32(PCI_DEV(0, 0, 0), 0x2c, 0x35808086); - pci_write_config32(PCI_DEV(0, 0, 0), 0x48, 0xfec10000); - pci_write_config32(PCI_DEV(0, 0, 0), 0x50, 0x00440100); - - pci_write_config32(PCI_DEV(0, 0, 0), 0x58, 0x11111000); - - pci_write_config16(PCI_DEV(0, 0, 0), 0x52, 0x0002); - */ - pci_write_config16(PCI_DEV(0, 0, 0), 0x52, 0x0044); - /* - pci_write_config16(PCI_DEV(0, 0, 0), 0x52, 0x0000); - */ - pci_write_config32(PCI_DEV(0, 0, 0), 0x58, 0x33333000); - pci_write_config32(PCI_DEV(0, 0, 0), 0x5c, 0x33333333); - /* - pci_write_config32(PCI_DEV(0, 0, 0), 0x60, 0x0000390a); - pci_write_config32(PCI_DEV(0, 0, 0), 0x74, 0x02006056); - pci_write_config32(PCI_DEV(0, 0, 0), 0x78, 0x00800001); - */ - pci_write_config32(PCI_DEV(0, 0, 0), 0xa8, 0x00000001); - - pci_write_config32(PCI_DEV(0, 0, 0), 0xbc, 0x00001020); - /* - pci_write_config32(PCI_DEV(0, 0, 0), 0xfc, 0x00000109); - */ - - /* 0:0.1 */ - pci_write_config32(ctrl->d0, 0x74, 0x00000001); - pci_write_config32(ctrl->d0, 0x78, 0x001fe974); - pci_write_config32(ctrl->d0, 0x80, 0x00af0039); - pci_write_config32(ctrl->d0, 0x84, 0x0000033c); - pci_write_config32(ctrl->d0, 0x88, 0x00000010); - pci_write_config32(ctrl->d0, 0x98, 0xde5a868c); - pci_write_config32(ctrl->d0, 0x9c, 0x404e0046); - pci_write_config32(ctrl->d0, 0xa8, 0x00020e1a); - pci_write_config32(ctrl->d0, 0xb4, 0x0044cdac); - pci_write_config32(ctrl->d0, 0xb8, 0x000055d4); - pci_write_config32(ctrl->d0, 0xbc, 0x024acd38); - pci_write_config32(ctrl->d0, 0xc0, 0x00000003); - - /* 0:0.3 */ - /* - pci_write_config32(PCI_DEV(0, 0, 3), 0x2c, 0x35858086); - pci_write_config32(PCI_DEV(0, 0, 3), 0x44, 0x11110000); - pci_write_config32(PCI_DEV(0, 0, 3), 0x48, 0x09614a3c); - pci_write_config32(PCI_DEV(0, 0, 3), 0x4c, 0x4b09604a); - pci_write_config32(PCI_DEV(0, 0, 3), 0x50, 0x00000962); - pci_write_config32(PCI_DEV(0, 0, 3), 0x5c, 0x0b023331); - pci_write_config32(PCI_DEV(0, 0, 3), 0x6c, 0x0000402e); - pci_write_config32(PCI_DEV(0, 0, 3), 0x78, 0xe7c70f7f); - pci_write_config32(PCI_DEV(0, 0, 3), 0x7c, 0x0284007f); - pci_write_config32(PCI_DEV(0, 0, 3), 0x84, 0x000000ef); - */ - - /* - pci_write_config16(PCI_DEV(0, 0, 3), 0xc0, 0x0200); - pci_write_config16(PCI_DEV(0, 0, 3), 0xc0, 0x0400); - */ - - /* - pci_write_config32(PCI_DEV(0, 0, 3), 0xc4, 0x00000000); - pci_write_config32(PCI_DEV(0, 0, 3), 0xd8, 0xff00c308); - pci_write_config32(PCI_DEV(0, 0, 3), 0xdc, 0x00000025); - pci_write_config32(PCI_DEV(0, 0, 3), 0xe0, 0x001f002a); - pci_write_config32(PCI_DEV(0, 0, 3), 0xe4, 0x009f0098); - pci_write_config32(PCI_DEV(0, 0, 3), 0xec, 0x00000400); - pci_write_config32(PCI_DEV(0, 0, 3), 0xf0, 0xc0000000); - */ -} + int i; + uint8_t dimm_mask = 0; -static void sdram_set_spd_registers(const struct mem_controller *ctrl) -{ - spd_set_row_attributes(ctrl); - spd_set_dram_controller_mode(ctrl); - spd_set_dram_timing(ctrl); - spd_set_dram_size(ctrl); - spd_set_dram_pwr_management(ctrl); - spd_set_dram_throttle_control(ctrl); - spd_set_undocumented_registers(ctrl); -} + for (i = 0; i < DIMM_SOCKETS; i++) { + uint16_t dimm = ctrl->channel0[i]; -static void ram_command(const struct mem_controller *ctrl, - uint8_t command, - uint32_t addr) -{ - uint32_t drc_reg; +#ifdef VALIDATE_DIMM_COMPATIBILITY + struct dimm_size page_size; + struct dimm_size sdram_width; +#endif + int spd_value; + + if (dimm == 0) + continue; // No such socket on this mainboard + + if (spd_read_byte(dimm, SPD_MEMORY_TYPE) != SPD_MEMORY_TYPE_SDRAM_DDR) + continue; + +#ifdef VALIDATE_DIMM_COMPATIBILITY + if ((spd_value = spd_read_byte(dimm, SPD_MODULE_VOLTAGE)) != SPD_VOLTAGE_SSTL2) { + PRINTK_DEBUG("Skipping DIMM with unsupported voltage: %02x\n", spd_value); + continue; // Unsupported voltage + } + +/* + // E7501 does not support unregistered DIMMs + spd_value = spd_read_byte(dimm, SPD_MODULE_ATTRIBUTES); + if (!(spd_value & MODULE_REGISTERED) || (spd_value < 0)) { + PRINTK_DEBUG("Skipping unregistered DIMM: %02x\n", spd_value); + continue; + } +*/ + + page_size = sdram_spd_get_page_size(dimm); + sdram_width = sdram_spd_get_width(dimm); + + // Validate DIMM page size + // The i855 only supports page sizes of 4, 8, 16 KB per channel + // NOTE: 4 KB = 32 Kb = 2^15 + // 16 KB = 128 Kb = 2^17 + + if ((page_size.side1 < 15) || (page_size.side1 > 17)) { + PRINTK_DEBUG("Skipping DIMM with unsupported page size: %d\n", page_size.side1); + continue; + } + + // If DIMM is double-sided, verify side2 page size + if (page_size.side2 != 0) { + if ((page_size.side2 < 15) || (page_size.side2 > 17)) { + PRINTK_DEBUG("Skipping DIMM with unsupported page size: %d\n", page_size.side2); + continue; + } + } + // Validate SDRAM width + // The i855 only supports x8 and x16 devices + if ((sdram_width.side1 != 8) && (sdram_width.side1 != 16)) { + PRINTK_DEBUG("Skipping DIMM with unsupported width: %d\n", sdram_width.side2); + continue; + } + + // If DIMM is double-sided, verify side2 width + if (sdram_width.side2 != 0) { + if ((sdram_width.side2 != 8) + && (sdram_width.side2 != 16)) { + PRINTK_DEBUG("Skipping DIMM with unsupported width: %d\n", sdram_width.side2); + continue; + } + } +#endif + // Made it through all the checks, this DIMM is usable + dimm_mask |= (1 << i); + } - drc_reg = pci_read_config32(ctrl->d0, 0x70); - drc_reg &= ~(7 << 4); - drc_reg |= (command << 4); - pci_write_config8(ctrl->d0, 0x70, drc_reg); - read32(addr); + return dimm_mask; } -static void ram_command_mrs(const struct mem_controller *ctrl, - uint8_t command, - uint32_t mode, - uint32_t addr) +/*----------------------------------------------------------------------------- +DIMM-initialization functions. +-----------------------------------------------------------------------------*/ +static void do_ram_command(uint8_t command, uint16_t jedec_mode_bits) { - uint32_t drc_reg; - uint32_t adjusted_mode; - - drc_reg = pci_read_config32(ctrl->d0, 0x70); - drc_reg &= ~(7 << 4); - drc_reg |= (command << 4); - pci_write_config8(ctrl->d0, 0x70, drc_reg); - /* Host address lines [13:3] map to DIMM address lines [11, 9:0] */ - adjusted_mode = ((mode & 0x800) << (13 - 11)) | ((mode & 0x3ff) << (12 - 9)); - print_debug("Setting mode: "); - print_debug_hex32(adjusted_mode + addr); - print_debug("\n"); - read32(adjusted_mode + addr); + int i; + u32 reg32; + uint8_t dimm_start_32M_multiple = 0; + uint16_t i855_mode_bits = jedec_mode_bits; + + /* Configure the RAM command. */ + reg32 = pci_read_config32(NORTHBRIDGE_MMC, DRC); + reg32 &= ~(7 << 4); + reg32 |= (command << 4); + PRINTK_DEBUG(" Sending RAM command 0x%08x\n", reg32); + pci_write_config32(NORTHBRIDGE_MMC, DRC, reg32); + + // RAM_COMMAND_NORMAL is an exception. + // It affects only the memory controller and does not need to be "sent" to the DIMMs. + + if (command != RAM_COMMAND_NORMAL) { + + // Send the command to all DIMMs by accessing a memory location within each + // NOTE: for mode select commands, some of the location address bits + // are part of the command + + // Map JEDEC mode bits to i855 + if (command == RAM_COMMAND_MRS || command == RAM_COMMAND_EMRS) { + /* Host address lines [13:3] map to DIMM address lines [11, 9:0] */ + i855_mode_bits = ((jedec_mode_bits & 0x800) << (13 - 11)) | ((jedec_mode_bits & 0x3ff) << (12 - 9)); + } + + for (i = 0; i < (DIMM_SOCKETS * 2); ++i) { + uint8_t dimm_end_32M_multiple = pci_read_config8(NORTHBRIDGE_MMC, DRB + i); + if (dimm_end_32M_multiple > dimm_start_32M_multiple) { + + uint32_t dimm_start_address = dimm_start_32M_multiple << 25; + PRINTK_DEBUG(" Sending RAM command to 0x%08x\n", dimm_start_address + i855_mode_bits); + read32(dimm_start_address + i855_mode_bits); + + // Set the start of the next DIMM + dimm_start_32M_multiple = dimm_end_32M_multiple; + } + } + } } static void set_initialize_complete(const struct mem_controller *ctrl) { uint32_t drc_reg; - drc_reg = pci_read_config32(ctrl->d0, 0x70); + drc_reg = pci_read_config32(NORTHBRIDGE_MMC, DRC); drc_reg |= (1 << 29); - pci_write_config32(ctrl->d0, 0x70, drc_reg); + pci_write_config32(NORTHBRIDGE_MMC, DRC, drc_reg); } static void sdram_enable(int controllers, const struct mem_controller *ctrl) { int i; - uint32_t rank1 = (1 << 30) / 2; + print_debug("Ram enable 1\n"); delay(); delay(); - print_debug("Ram enable 2\n"); - ram_command(ctrl, 1, 0); - ram_command(ctrl, 1, rank1); + /* NOP command */ + PRINTK_DEBUG(" NOP\n"); + do_ram_command(RAM_COMMAND_NOP, 0); + delay(); delay(); delay(); - print_debug("Ram enable 3\n"); - ram_command(ctrl, 2, 0); - ram_command(ctrl, 2, rank1); + /* Pre-charge all banks (at least 200 us after NOP) */ + PRINTK_DEBUG(" Pre-charging all banks\n"); + do_ram_command(RAM_COMMAND_PRECHARGE, 0); + delay(); delay(); delay(); print_debug("Ram enable 4\n"); - ram_command_mrs(ctrl, 4, SDRAM_EXTMODE_DLL_ENABLE, 0); - ram_command_mrs(ctrl, 4, SDRAM_EXTMODE_DLL_ENABLE, rank1); + do_ram_command(RAM_COMMAND_EMRS, SDRAM_EXTMODE_DLL_ENABLE); + delay(); delay(); delay(); print_debug("Ram enable 5\n"); - ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_DLL_RESET, 0); - ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_DLL_RESET, rank1); + do_ram_command(RAM_COMMAND_MRS, VG85X_MODE | SDRAM_MODE_DLL_RESET); print_debug("Ram enable 6\n"); - ram_command(ctrl, 2, 0); - ram_command(ctrl, 2, rank1); + do_ram_command(RAM_COMMAND_PRECHARGE, 0); + delay(); delay(); delay(); - print_debug("Ram enable 7\n"); + /* 8 CBR refreshes (Auto Refresh) */ + PRINTK_DEBUG(" 8 CBR refreshes\n"); for(i = 0; i < 8; i++) { - ram_command(ctrl, 6, 0); - ram_command(ctrl, 6, rank1); + do_ram_command(RAM_COMMAND_CBR, 0); + delay(); delay(); delay(); } print_debug("Ram enable 8\n"); - ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_NORMAL, 0); - ram_command_mrs(ctrl, 3, VG85X_MODE | SDRAM_MODE_NORMAL, rank1); + do_ram_command(RAM_COMMAND_MRS, VG85X_MODE | SDRAM_MODE_NORMAL); - print_debug("Ram enable 9\n"); - ram_command(ctrl, 7, 0); - ram_command(ctrl, 7, rank1); + /* Set GME-M Mode Select bits back to NORMAL operation mode */ + PRINTK_DEBUG(" Normal operation mode\n"); + do_ram_command(RAM_COMMAND_NORMAL, 0); + delay(); delay(); delay(); @@ -277,6 +473,8 @@ delay(); delay(); delay(); + delay(); + delay(); print_debug("After configuration:\n"); /* dump_pci_devices(); */ @@ -287,3 +485,497 @@ ram_check(0x100000, 0x40000000); */ } + +/*----------------------------------------------------------------------------- +DIMM-independant configuration functions. +-----------------------------------------------------------------------------*/ + +/** + * Set only what I need until it works, then make it figure things out on boot + * assumes only one dimm is populated + */ + +static void sdram_set_registers(const struct mem_controller *ctrl) +{ + /* + print_debug("Before configuration:\n"); + dump_pci_devices(); + */ +} + +static void spd_set_row_attributes(const struct mem_controller *ctrl, uint8_t dimm_mask) +{ + int i; + uint16_t row_attributes = 0; + + for (i = 0; i < DIMM_SOCKETS; i++) { + uint16_t dimm = ctrl->channel0[i]; + struct dimm_size page_size; + struct dimm_size sdram_width; + + if (!(dimm_mask & (1 << i))) { + row_attributes |= 0x77 << (i << 3); + continue; // This DIMM not usable + } + + // Get the relevant parameters via SPD + page_size = sdram_spd_get_page_size(dimm); + sdram_width = sdram_spd_get_width(dimm); + + // Update the DRAM Row Attributes. + // Page size is encoded as log2(page size in bits) - log2(2 KB) or 4 KB == 1, 8 KB == 3, 16KB == 3 + // NOTE: 2 KB = 16 Kb = 2^14 + row_attributes |= (page_size.side1 - 14) << (i << 3); // Side 1 of each DIMM is an EVEN row + + if (sdram_width.side2 > 0) + row_attributes |= (page_size.side2 - 14) << ((i << 3) + 4); // Side 2 is ODD + else + row_attributes |= 7 << ((i << 3) + 4); + /* go to the next DIMM */ + } + + PRINTK_DEBUG("DRA: %04x\n", row_attributes); + + /* Write the new row attributes register */ + pci_write_config16(NORTHBRIDGE_MMC, DRA, row_attributes); +} + +static void spd_set_dram_controller_mode(const struct mem_controller *ctrl, uint8_t dimm_mask) +{ + int i; + + // Initial settings + u32 controller_mode = pci_read_config32(NORTHBRIDGE_MMC, DRC); + u32 system_refresh_mode = (controller_mode >> 7) & 7; + + controller_mode |= (1 << 20); // ECC + controller_mode |= (1 << 15); // RAS lockout + controller_mode |= (1 << 12); // Address Tri-state enable (ADRTRIEN), FIXME: how is this detected????? + controller_mode |= (2 << 10); // FIXME: Undocumented, really needed????? + + for (i = 0; i < DIMM_SOCKETS; i++) { + uint16_t dimm = ctrl->channel0[i]; + uint32_t dimm_refresh_mode; + int value; + u8 tRCD, tRP; + + if (!(dimm_mask & (1 << i))) { + continue; // This DIMM not usable + } + + // Disable ECC mode if any one of the DIMMs does not support ECC + value = spd_read_byte(dimm, SPD_DIMM_CONFIG_TYPE); + die_on_spd_error(value); + if (value != ERROR_SCHEME_ECC) + controller_mode &= ~(3 << 20); + + value = spd_read_byte(dimm, SPD_REFRESH); + die_on_spd_error(value); + value &= 0x7f; // Mask off self-refresh bit + if (value > MAX_SPD_REFRESH_RATE) { + print_err("unsupported refresh rate\n"); + continue; + } + // Get the appropriate i855 refresh mode for this DIMM + dimm_refresh_mode = refresh_rate_map[value]; + if (dimm_refresh_mode > 7) { + print_err("unsupported refresh rate\n"); + continue; + } + // If this DIMM requires more frequent refresh than others, + // update the system setting + if (refresh_frequency[dimm_refresh_mode] > + refresh_frequency[system_refresh_mode]) + system_refresh_mode = dimm_refresh_mode; + + /* FIXME: is this correct? */ + tRCD = spd_read_byte(dimm, SPD_tRCD); + tRP = spd_read_byte(dimm, SPD_tRP); + if (tRCD != tRP) { + PRINTK_DEBUG(" Disabling RAS lockouk due to tRCD (%d) != tRP (%d)\n", tRCD, tRP); + controller_mode &= ~(1 << 15); + } + + /* go to the next DIMM */ + } + + controller_mode &= ~(7 << 7); + controller_mode |= (system_refresh_mode << 7); + PRINTK_DEBUG("DRC: %08x\n", controller_mode); + + pci_write_config32(NORTHBRIDGE_MMC, DRC, controller_mode); +} + +static void spd_set_dram_timing(const struct mem_controller *ctrl, uint8_t dimm_mask) +{ + int i; + u32 dram_timing; + + // CAS# latency bitmasks in SPD_ACCEPTABLE_CAS_LATENCIES format + // NOTE: i82822 supports only 2.0 and 2.5 + uint32_t system_compatible_cas_latencies = SPD_CAS_LATENCY_2_0 | SPD_CAS_LATENCY_2_5; + uint8_t slowest_row_precharge = 0; + uint8_t slowest_ras_cas_delay = 0; + uint8_t slowest_active_to_precharge_delay = 0; + + for (i = 0; i < DIMM_SOCKETS; i++) { + uint16_t dimm = ctrl->channel0[i]; + int value; + uint32_t current_cas_latency; + uint32_t dimm_compatible_cas_latencies; + if (!(dimm_mask & (1 << i))) + continue; // This DIMM not usable + + value = spd_read_byte(dimm, SPD_ACCEPTABLE_CAS_LATENCIES); + PRINTK_DEBUG("SPD_ACCEPTABLE_CAS_LATENCIES: %d\n", value); + die_on_spd_error(value); + + dimm_compatible_cas_latencies = value & 0x7f; // Start with all supported by DIMM + PRINTK_DEBUG("dimm_compatible_cas_latencies #1: %d\n", dimm_compatible_cas_latencies); + + current_cas_latency = 1 << log2(dimm_compatible_cas_latencies); // Max supported by DIMM + PRINTK_DEBUG("current_cas_latency: %d\n", current_cas_latency); + + // Can we support the highest CAS# latency? + value = spd_read_byte(dimm, SPD_MIN_CYCLE_TIME_AT_CAS_MAX); + die_on_spd_error(value); + PRINTK_DEBUG("SPD_MIN_CYCLE_TIME_AT_CAS_MAX: %d.%d\n", value >> 4, value & 0xf); + + // NOTE: At 133 MHz, 1 clock == 7.52 ns + if (value > 0x75) { + // Our bus is too fast for this CAS# latency + // Remove it from the bitmask of those supported by the DIMM that are compatible + dimm_compatible_cas_latencies &= ~current_cas_latency; + PRINTK_DEBUG("dimm_compatible_cas_latencies #2: %d\n", dimm_compatible_cas_latencies); + } + // Can we support the next-highest CAS# latency (max - 0.5)? + + current_cas_latency >>= 1; + if (current_cas_latency != 0) { + value = spd_read_byte(dimm, SPD_SDRAM_CYCLE_TIME_2ND); + die_on_spd_error(value); + PRINTK_DEBUG("SPD_SDRAM_CYCLE_TIME_2ND: %d.%d\n", value >> 4, value & 0xf); + if (value > 0x75) { + dimm_compatible_cas_latencies &= ~current_cas_latency; + PRINTK_DEBUG("dimm_compatible_cas_latencies #2: %d\n", dimm_compatible_cas_latencies); + } + } + // Can we support the next-highest CAS# latency (max - 1.0)? + current_cas_latency >>= 1; + if (current_cas_latency != 0) { + value = spd_read_byte(dimm, SPD_SDRAM_CYCLE_TIME_3RD); + PRINTK_DEBUG("SPD_SDRAM_CYCLE_TIME_3RD: %d.%d\n", value >> 4, value & 0xf); + die_on_spd_error(value); + if (value > 0x75) { + dimm_compatible_cas_latencies &= ~current_cas_latency; + PRINTK_DEBUG("dimm_compatible_cas_latencies #2: %d\n", dimm_compatible_cas_latencies); + } + } + // Restrict the system to CAS# latencies compatible with this DIMM + system_compatible_cas_latencies &= dimm_compatible_cas_latencies; + + value = spd_read_byte(dimm, SPD_MIN_ROW_PRECHARGE_TIME); + die_on_spd_error(value); + if (value > slowest_row_precharge) + slowest_row_precharge = value; + + value = spd_read_byte(dimm, SPD_MIN_RAS_TO_CAS_DELAY); + die_on_spd_error(value); + if (value > slowest_ras_cas_delay) + slowest_ras_cas_delay = value; + + value = spd_read_byte(dimm, SPD_MIN_ACTIVE_TO_PRECHARGE_DELAY); + die_on_spd_error(value); + if (value > slowest_active_to_precharge_delay) + slowest_active_to_precharge_delay = value; + + /* go to the next DIMM */ + } + PRINTK_DEBUG("CAS latency: %d\n", system_compatible_cas_latencies); + + dram_timing = pci_read_config32(NORTHBRIDGE_MMC, DRT); + dram_timing &= ~(DRT_CAS_MASK | DRT_TRP_MASK | DRT_RCD_MASK); + PRINTK_DEBUG("DRT: %08x\n", dram_timing); + + if (system_compatible_cas_latencies & SPD_CAS_LATENCY_2_0) { + dram_timing |= DRT_CAS_2_0; + } else if (system_compatible_cas_latencies & SPD_CAS_LATENCY_2_5) { + dram_timing |= DRT_CAS_2_5; + } else + die("No CAS# latencies compatible with all DIMMs!!\n"); + + uint32_t current_cas_latency = dram_timing & DRT_CAS_MASK; + + /* tRP */ + + PRINTK_DEBUG("slowest_row_precharge: %d.%d\n", slowest_row_precharge >> 2, slowest_row_precharge & 0x3); + // i855 supports only 2, 3 or 4 clocks for tRP + if (slowest_row_precharge > ((30 << 2))) + die("unsupported DIMM tRP"); // > 30.0 ns: 5 or more clocks + else if (slowest_row_precharge > ((22 << 2) | (2 << 0))) + dram_timing |= DRT_TRP_4; // > 22.5 ns: 4 or more clocks + else if (slowest_row_precharge > (15 << 2)) + dram_timing |= DRT_TRP_3; // > 15.0 ns: 3 clocks + else + dram_timing |= DRT_TRP_2; // <= 15.0 ns: 2 clocks + + /* tRCD */ + + PRINTK_DEBUG("slowest_ras_cas_delay: %d.%d\n", slowest_ras_cas_delay >> 2, slowest_ras_cas_delay & 0x3); + // i855 supports only 2, 3 or 4 clocks for tRCD + if (slowest_ras_cas_delay > ((30 << 2))) + die("unsupported DIMM tRCD"); // > 30.0 ns: 5 or more clocks + else if (slowest_ras_cas_delay > ((22 << 2) | (2 << 0))) + dram_timing |= DRT_RCD_4; // > 22.5 ns: 4 or more clocks + else if (slowest_ras_cas_delay > (15 << 2)) + dram_timing |= DRT_RCD_3; // > 15.0 ns: 3 clocks + else + dram_timing |= DRT_RCD_2; // <= 15.0 ns: 2 clocks + + /* tRAS, min */ + + PRINTK_DEBUG("slowest_active_to_precharge_delay: %d\n", slowest_active_to_precharge_delay); + // i855 supports only 5, 6, 7 or 8 clocks for tRAS + // 5 clocks ~= 37.6 ns, 6 clocks ~= 45.1 ns, 7 clocks ~= 52.6 ns, 8 clocks ~= 60.1 ns + if (slowest_active_to_precharge_delay > 60) + die("unsupported DIMM tRAS"); // > 52 ns: 8 or more clocks + else if (slowest_active_to_precharge_delay > 52) + dram_timing |= DRT_TRAS_MIN_8; // 46-52 ns: 7 clocks + else if (slowest_active_to_precharge_delay > 45) + dram_timing |= DRT_TRAS_MIN_7; // 46-52 ns: 7 clocks + else if (slowest_active_to_precharge_delay > 37) + dram_timing |= DRT_TRAS_MIN_6; // 38-45 ns: 6 clocks + else + dram_timing |= DRT_TRAS_MIN_5; // < 38 ns: 5 clocks + + /* FIXME: guess work starts here... + * + * Intel refers to DQ turn-arround values for back to calculate the values, + * but i have no idea what this means + */ + + /* + * Back to Back Read-Write command spaceing (DDR, different Rows/Bank) + */ + /* Set to a 3 clock back to back read to write turn around. + * 2 is a good delay if the CAS latency is 2.0 */ + dram_timing &= ~(3 << 28); + if (current_cas_latency == DRT_CAS_2_0) + dram_timing |= (2 << 28); // 2 clocks + else + dram_timing |= (1 << 28); // 3 clocks + + /* + * Back to Back Read-Write command spaceing (DDR, same or different Rows/Bank) + */ + dram_timing &= ~(3 << 26); + if (current_cas_latency == DRT_CAS_2_0) + dram_timing |= (2 << 26); // 5 clocks + else + dram_timing |= (1 << 26); // 6 clocks + + /* + * Back To Back Read-Read commands spacing (DDR, different Rows): + */ + dram_timing &= ~(1 << 25); + dram_timing |= (1 << 25); // 3 clocks + + PRINTK_DEBUG("DRT: %08x\n", dram_timing); + pci_write_config32(NORTHBRIDGE_MMC, DRT, dram_timing); +} + +static void spd_set_dram_size(const struct mem_controller *ctrl, uint8_t dimm_mask) +{ + int i; + int total_dram = 0; + uint32_t drb_reg = 0; + + for (i = 0; i < DIMM_SOCKETS; i++) { + uint16_t dimm = ctrl->channel0[i]; + struct dimm_size sz; + + if (!(dimm_mask & (1 << i))) { + /* fill values even for not present DIMMs */ + drb_reg |= (total_dram << (i * 16)); + drb_reg |= (total_dram << ((i * 16) + 8)); + + continue; // This DIMM not usable + } + sz = spd_get_dimm_size(dimm); + + total_dram += (1 << (sz.side1 - 28)); + drb_reg |= (total_dram << (i * 16)); + + total_dram += (1 << (sz.side2 - 28)); + drb_reg |= (total_dram << ((i * 16) + 8)); + } + PRINTK_DEBUG("DRB: %08x\n", drb_reg); + pci_write_config32(NORTHBRIDGE_MMC, DRB, drb_reg); +} + + +static void spd_set_dram_pwr_management(const struct mem_controller *ctrl) +{ + uint32_t pwrmg_reg; + + pwrmg_reg = 0x10f10430; + pci_write_config32(NORTHBRIDGE_MMC, PWRMG, pwrmg_reg); +} + +static void spd_set_dram_throttle_control(const struct mem_controller *ctrl) +{ + uint32_t dtc_reg = 0; + + /* DDR SDRAM Throttle Mode (TMODE): + * 0011 = Both Rank and GMCH Thermal Sensor based throttling is enabled. When the external SO- + * DIMM Thermal Sensor is Tripped DDR SDRAM Throttling begins based on the setting in RTT + */ + dtc_reg |= (3 << 28); + + /* Read Counter Based Power Throttle Control (RCTC): + * 0 = 85% + */ + dtc_reg |= (0 << 24); + + /* Write Counter Based Power Throttle Control (WCTC): + * 0 = 85% + */ + dtc_reg |= (0 << 20); + + /* Read Thermal Based Power Throttle Control (RTTC): + * 0xA = 20% + */ + dtc_reg |= (0xA << 16); + + /* Write Thermal Based Power Throttle Control (WTTC): + * 0xA = 20% + */ + dtc_reg |= (0xA << 12); + + /* Counter Based Throttle Lock (CTLOCK): */ + dtc_reg |= (0 << 11); + + /* Thermal Throttle Lock (TTLOCK): */ + dtc_reg |= (0 << 10); + + /* Thermal Power Throttle Control fields Enable: */ + dtc_reg |= (1 << 9); + + /* High Priority Stream Throttling Enable: */ + dtc_reg |= (0 << 8); + + /* Global DDR SDRAM Sampling Window (GDSW): */ + dtc_reg |= 0xff; + PRINTK_DEBUG("DTC: %08x\n", dtc_reg); + pci_write_config32(NORTHBRIDGE_MMC, DTC, dtc_reg); +} + +static void spd_update(const struct mem_controller *ctrl, u8 reg, u32 new_value) +{ + u32 value1 = pci_read_config32(ctrl->d0, reg); + pci_write_config32(ctrl->d0, reg, new_value); + u32 value2 = pci_read_config32(ctrl->d0, reg); + PRINTK_DEBUG("update reg %02x, old: %08x, new: %08x, read back: %08x\n", reg, value1, new_value, value2); +} + +/* if ram still doesn't work do this function */ +static void spd_set_undocumented_registers(const struct mem_controller *ctrl) +{ + spd_update(ctrl, 0x74, 0x00000001); + spd_update(ctrl, 0x78, 0x001fe974); + spd_update(ctrl, 0x80, 0x00af0039); + spd_update(ctrl, 0x84, 0x0000033c); + spd_update(ctrl, 0x88, 0x00000010); + + spd_update(ctrl, 0xc0, 0x00000003); +} + +static void northbridge_set_registers(void) +{ + u16 value; + int video_memory = 0; + + printk(BIOS_DEBUG, "Setting initial Northbridge registers....\n"); + + /* Set the value for Fixed DRAM Hole Control Register */ + pci_write_config8(NORTHBRIDGE, FDHC, 0x00); + + /* Set the value for Programable Attribute Map Registers + * Ideally, this should be R/W for as many ranges as possible. + */ + pci_write_config8(NORTHBRIDGE, PAM0, 0x30); + pci_write_config8(NORTHBRIDGE, PAM1, 0x33); + pci_write_config8(NORTHBRIDGE, PAM2, 0x33); + pci_write_config8(NORTHBRIDGE, PAM3, 0x33); + pci_write_config8(NORTHBRIDGE, PAM4, 0x33); + pci_write_config8(NORTHBRIDGE, PAM5, 0x33); + pci_write_config8(NORTHBRIDGE, PAM6, 0x33); + + /* Set the value for System Management RAM Control Register */ + pci_write_config8(NORTHBRIDGE, SMRAM, 0x02); + + /* Set the value for GMCH Control Register #1 */ + switch (CONFIG_VIDEO_MB) { + case 1: /* 1M of memory */ + video_memory = 0x1; + break; + case 4: /* 4M of memory */ + video_memory = 0x2; + break; + case 8: /* 8M of memory */ + video_memory = 0x3; + break; + case 16: /* 16M of memory */ + video_memory = 0x4; + break; + case 32: /* 32M of memory */ + video_memory = 0x5; + break; + default: /* No memory */ + pci_write_config16(NORTHBRIDGE, GMC, pci_read_config16(NORTHBRIDGE, GMC) | 1); + video_memory = 0x0; + } + + value = pci_read_config16(NORTHBRIDGE, GGC); + value |= video_memory << 4; + if (video_memory == 0) { + value &= ~(1 < 1); + } else + value |= (1 < 1); + pci_write_config16(NORTHBRIDGE, GGC, value); + + /* AGPCMD: disable AGP, Data-Rate: 1x */ + pci_write_config32(NORTHBRIDGE, AGPCMD, 0x00000001); + + pci_write_config8(NORTHBRIDGE, AMTT, 0x20); + pci_write_config8(NORTHBRIDGE, LPTT, 0x10); + + printk(BIOS_DEBUG, "Initial Northbridge registers have been set.\n"); +} + +static void sdram_set_spd_registers(const struct mem_controller *ctrl) +{ + uint8_t dimm_mask; + + PRINTK_DEBUG("Reading SPD data...\n"); + + dimm_mask = spd_get_supported_dimms(ctrl); + + if (dimm_mask == 0) { + print_debug("No usable memory for this controller\n"); + } else { + PRINTK_DEBUG("DIMM MASK: %02x\n", dimm_mask); + + spd_set_row_attributes(ctrl, dimm_mask); + spd_set_dram_controller_mode(ctrl, dimm_mask); + spd_set_dram_timing(ctrl, dimm_mask); + spd_set_dram_size(ctrl, dimm_mask); + spd_set_dram_pwr_management(ctrl); + spd_set_dram_throttle_control(ctrl); + spd_set_undocumented_registers(ctrl); + } + + /* Setup Initial Northbridge Registers */ + northbridge_set_registers(); +} + Modified: trunk/src/northbridge/intel/i855/raminit.h ============================================================================== --- trunk/src/northbridge/intel/i855/raminit.h Mon Aug 30 18:16:01 2010 (r5750) +++ trunk/src/northbridge/intel/i855/raminit.h Mon Aug 30 18:19:04 2010 (r5751) @@ -18,11 +18,19 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef RAMINIT_H -#define RAMINIT_H +#ifndef NORTHBRIDGE_INTEL_I855_RAMINIT_H +#define NORTHBRIDGE_INTEL_I855_RAMINIT_H +/* i855 Northbridge PCI device */ +#define NORTHBRIDGE PCI_DEV(0, 0, 0) +#define NORTHBRIDGE_MMC PCI_DEV(0, 0, 1) + +/* The i855 supports max. 2 dual-sided SO-DIMMs. */ #define DIMM_SOCKETS 2 +/* DIMM0 is at 0x50, DIMM1 is at 0x51. */ +#define DIMM_SPD_BASE 0x50 + struct mem_controller { device_t d0; uint16_t channel0[DIMM_SOCKETS]; @@ -31,4 +39,4 @@ void sdram_initialize(int controllers, const struct mem_controller *ctrl); -#endif /* RAMINIT_H */ +#endif /* NORTHBRIDGE_INTEL_I855_RAMINIT_H */

1 0

[commit] r5750 - trunk/src/cpu/intel/socket_mPGA479M
by repository service 30 Aug '10

30 Aug '10

Author: stepan Date: Mon Aug 30 18:16:01 2010 New Revision: 5750 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5750 Log: mPGA479M Sockets can take Intel Mobile Celeron. The 1.2GHz model has CPUID F29. This adds them to the list of CPUs for that socket. Signed-off-by: Andreas Schultz <aschultz(a)tpip.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> This patch likely breaks the following two boards since it unconditionally activates CAR code for this socket: * digitallogic/adl855pc * intel/mtarvon stepan suggests moving those two boards over to CAR, too, so we don't have to worry. --- src/cpu/intel/socket_mPGA479M/Kconfig | 1 + src/cpu/intel/socket_mPGA479M/Makefile.inc | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) Modified: trunk/src/cpu/intel/socket_mPGA479M/Kconfig trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc Modified: trunk/src/cpu/intel/socket_mPGA479M/Kconfig ============================================================================== --- trunk/src/cpu/intel/socket_mPGA479M/Kconfig Mon Aug 30 11:40:41 2010 (r5749) +++ trunk/src/cpu/intel/socket_mPGA479M/Kconfig Mon Aug 30 18:16:01 2010 (r5750) @@ -3,5 +3,6 @@ select CPU_INTEL_MODEL_69X select CPU_INTEL_MODEL_6BX select CPU_INTEL_MODEL_6DX + select CPU_INTEL_MODEL_F2X select MMX select SSE Modified: trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc ============================================================================== --- trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc Mon Aug 30 11:40:41 2010 (r5749) +++ trunk/src/cpu/intel/socket_mPGA479M/Makefile.inc Mon Aug 30 18:16:01 2010 (r5750) @@ -1,6 +1,7 @@ obj-y += socket_mPGA479M.o subdirs-y += ../model_69x subdirs-y += ../model_6dx +subdirs-y += ../model_f2x subdirs-y += ../../x86/tsc subdirs-y += ../../x86/mtrr subdirs-y += ../../x86/lapic @@ -9,3 +10,4 @@ subdirs-y += ../microcode subdirs-y += ../hyperthreading +cpu_incs += $(src)/cpu/intel/car/cache_as_ram.inc \ No newline at end of file

1 0

Trac reminder: list of new ticket(s)
by coreboot tracker 30 Aug '10

30 Aug '10

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot August 2010