[coreboot-gerrit] Patch set updated for coreboot: dfa3dc1 board_info.txt: Move category to Kconfig for SMBIOS benefit.

Sun Jan 19 19:22:51 CET 2014

Vladimir Serbinenko (phcoder at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4752

-gerrit

commit dfa3dc1fb5a8130da8251e738194d21e112c6129
Author: Vladimir Serbinenko <phcoder at gmail.com>
Date:   Sun Jan 19 19:20:03 2014 +0100

    board_info.txt: Move category to Kconfig for SMBIOS benefit.
    
    Change-Id: I3d4a2d6ebd9b85fbe1d8ee6403c8a11c694becc6
    Signed-off-by: Vladimir Serbinenko <phcoder at gmail.com>
---
 src/mainboard/a-trend/atc-6220/Kconfig                   | 1 +
 src/mainboard/a-trend/atc-6220/board_info.txt            | 1 -
 src/mainboard/a-trend/atc-6240/Kconfig                   | 1 +
 src/mainboard/a-trend/atc-6240/board_info.txt            | 1 -
 src/mainboard/abit/be6-ii_v2_0/Kconfig                   | 1 +
 src/mainboard/abit/be6-ii_v2_0/board_info.txt            | 1 -
 src/mainboard/advansus/a785e-i/Kconfig                   | 1 +
 src/mainboard/advansus/a785e-i/board_info.txt            | 1 -
 src/mainboard/advantech/pcm-5820/Kconfig                 | 1 +
 src/mainboard/advantech/pcm-5820/board_info.txt          | 1 -
 src/mainboard/amd/bimini_fam10/Kconfig                   | 1 +
 src/mainboard/amd/bimini_fam10/board_info.txt            | 1 -
 src/mainboard/amd/db800/Kconfig                          | 1 +
 src/mainboard/amd/db800/board_info.txt                   | 1 -
 src/mainboard/amd/dbm690t/Kconfig                        | 1 +
 src/mainboard/amd/dbm690t/board_info.txt                 | 1 -
 src/mainboard/amd/mahogany/Kconfig                       | 1 +
 src/mainboard/amd/mahogany/board_info.txt                | 1 -
 src/mainboard/amd/norwich/Kconfig                        | 1 +
 src/mainboard/amd/norwich/board_info.txt                 | 1 -
 src/mainboard/amd/parmer/Kconfig                         | 1 +
 src/mainboard/amd/parmer/board_info.txt                  | 1 -
 src/mainboard/amd/persimmon/Kconfig                      | 1 +
 src/mainboard/amd/persimmon/board_info.txt               | 1 -
 src/mainboard/amd/pistachio/Kconfig                      | 1 +
 src/mainboard/amd/pistachio/board_info.txt               | 1 -
 src/mainboard/amd/rumba/Kconfig                          | 1 +
 src/mainboard/amd/rumba/board_info.txt                   | 1 -
 src/mainboard/amd/serengeti_cheetah/Kconfig              | 1 +
 src/mainboard/amd/serengeti_cheetah/board_info.txt       | 1 -
 src/mainboard/amd/serengeti_cheetah_fam10/Kconfig        | 1 +
 src/mainboard/amd/serengeti_cheetah_fam10/board_info.txt | 1 -
 src/mainboard/amd/south_station/Kconfig                  | 1 +
 src/mainboard/amd/south_station/board_info.txt           | 1 -
 src/mainboard/amd/thatcher/Kconfig                       | 1 +
 src/mainboard/amd/thatcher/board_info.txt                | 1 -
 src/mainboard/amd/tilapia_fam10/Kconfig                  | 1 +
 src/mainboard/amd/tilapia_fam10/board_info.txt           | 1 -
 src/mainboard/amd/union_station/Kconfig                  | 1 +
 src/mainboard/amd/union_station/board_info.txt           | 1 -
 src/mainboard/aopen/dxplplusu/Kconfig                    | 1 +
 src/mainboard/aopen/dxplplusu/board_info.txt             | 1 -
 src/mainboard/arima/hdama/Kconfig                        | 1 +
 src/mainboard/arima/hdama/board_info.txt                 | 1 -
 src/mainboard/artecgroup/dbe61/Kconfig                   | 1 +
 src/mainboard/artecgroup/dbe61/board_info.txt            | 1 -
 src/mainboard/asi/mb_5blgp/Kconfig                       | 1 +
 src/mainboard/asi/mb_5blgp/board_info.txt                | 1 -
 src/mainboard/asi/mb_5blmp/Kconfig                       | 1 +
 src/mainboard/asi/mb_5blmp/board_info.txt                | 1 -
 src/mainboard/asrock/939a785gmh/Kconfig                  | 1 +
 src/mainboard/asrock/939a785gmh/board_info.txt           | 1 -
 src/mainboard/asrock/e350m1/Kconfig                      | 1 +
 src/mainboard/asrock/e350m1/board_info.txt               | 1 -
 src/mainboard/asus/a8n_e/Kconfig                         | 1 +
 src/mainboard/asus/a8n_e/board_info.txt                  | 1 -
 src/mainboard/asus/a8n_sli/board_info.txt                | 1 -
 src/mainboard/asus/a8v-e_deluxe/Kconfig                  | 1 +
 src/mainboard/asus/a8v-e_deluxe/board_info.txt           | 1 -
 src/mainboard/asus/a8v-e_se/Kconfig                      | 1 +
 src/mainboard/asus/a8v-e_se/board_info.txt               | 1 -
 src/mainboard/asus/f2a85-m/Kconfig                       | 1 +
 src/mainboard/asus/f2a85-m/board_info.txt                | 1 -
 src/mainboard/asus/m2n-e/Kconfig                         | 1 +
 src/mainboard/asus/m2n-e/board_info.txt                  | 1 -
 src/mainboard/asus/m2v-mx_se/Kconfig                     | 1 +
 src/mainboard/asus/m2v-mx_se/board_info.txt              | 1 -
 src/mainboard/asus/m2v/Kconfig                           | 1 +
 src/mainboard/asus/m2v/board_info.txt                    | 1 -
 src/mainboard/asus/m4a78-em/Kconfig                      | 1 +
 src/mainboard/asus/m4a78-em/board_info.txt               | 1 -
 src/mainboard/asus/m4a785-m/Kconfig                      | 1 +
 src/mainboard/asus/m4a785-m/board_info.txt               | 1 -
 src/mainboard/asus/m4a785t-m/Kconfig                     | 1 +
 src/mainboard/asus/m4a785t-m/board_info.txt              | 1 -
 src/mainboard/asus/m5a88-v/Kconfig                       | 1 +
 src/mainboard/asus/m5a88-v/board_info.txt                | 1 -
 src/mainboard/asus/mew-am/Kconfig                        | 1 +
 src/mainboard/asus/mew-am/board_info.txt                 | 1 -
 src/mainboard/asus/mew-vm/Kconfig                        | 1 +
 src/mainboard/asus/mew-vm/board_info.txt                 | 1 -
 src/mainboard/asus/p2b-d/Kconfig                         | 1 +
 src/mainboard/asus/p2b-d/board_info.txt                  | 1 -
 src/mainboard/asus/p2b-ds/Kconfig                        | 1 +
 src/mainboard/asus/p2b-ds/board_info.txt                 | 1 -
 src/mainboard/asus/p2b-f/Kconfig                         | 1 +
 src/mainboard/asus/p2b-f/board_info.txt                  | 1 -
 src/mainboard/asus/p2b-ls/Kconfig                        | 1 +
 src/mainboard/asus/p2b-ls/board_info.txt                 | 1 -
 src/mainboard/asus/p2b/Kconfig                           | 1 +
 src/mainboard/asus/p2b/board_info.txt                    | 1 -
 src/mainboard/asus/p3b-f/Kconfig                         | 1 +
 src/mainboard/asus/p3b-f/board_info.txt                  | 1 -
 src/mainboard/avalue/eax-785e/Kconfig                    | 1 +
 src/mainboard/avalue/eax-785e/board_info.txt             | 1 -
 src/mainboard/axus/tc320/Kconfig                         | 1 +
 src/mainboard/axus/tc320/board_info.txt                  | 1 -
 src/mainboard/azza/pt-6ibd/Kconfig                       | 1 +
 src/mainboard/azza/pt-6ibd/board_info.txt                | 1 -
 src/mainboard/bcom/winnet100/Kconfig                     | 1 +
 src/mainboard/bcom/winnet100/board_info.txt              | 1 -
 src/mainboard/bcom/winnetp680/Kconfig                    | 1 +
 src/mainboard/bcom/winnetp680/board_info.txt             | 1 -
 src/mainboard/bifferos/bifferboard/Kconfig               | 1 +
 src/mainboard/bifferos/bifferboard/board_info.txt        | 1 -
 src/mainboard/biostar/m6tba/Kconfig                      | 1 +
 src/mainboard/biostar/m6tba/board_info.txt               | 1 -
 src/mainboard/broadcom/blast/Kconfig                     | 1 +
 src/mainboard/broadcom/blast/board_info.txt              | 1 -
 src/mainboard/compaq/deskpro_en_sff_p600/Kconfig         | 1 +
 src/mainboard/compaq/deskpro_en_sff_p600/board_info.txt  | 1 -
 src/mainboard/cubietech/cubieboard/Kconfig               | 1 +
 src/mainboard/cubietech/cubieboard/board_info.txt        | 1 -
 src/mainboard/digitallogic/msm586seg/Kconfig             | 1 +
 src/mainboard/digitallogic/msm586seg/board_info.txt      | 1 -
 src/mainboard/digitallogic/msm800sev/Kconfig             | 1 +
 src/mainboard/digitallogic/msm800sev/board_info.txt      | 1 -
 src/mainboard/eaglelion/5bcm/Kconfig                     | 1 +
 src/mainboard/eaglelion/5bcm/board_info.txt              | 1 -
 src/mainboard/ecs/p6iwp-fe/Kconfig                       | 1 +
 src/mainboard/ecs/p6iwp-fe/board_info.txt                | 1 -
 src/mainboard/emulation/qemu-armv7/Kconfig               | 1 +
 src/mainboard/emulation/qemu-armv7/board_info.txt        | 1 -
 src/mainboard/emulation/qemu-i440fx/Kconfig              | 1 +
 src/mainboard/emulation/qemu-i440fx/board_info.txt       | 1 -
 src/mainboard/emulation/qemu-q35/Kconfig                 | 1 +
 src/mainboard/emulation/qemu-q35/board_info.txt          | 1 -
 src/mainboard/getac/p470/Kconfig                         | 1 +
 src/mainboard/getac/p470/board_info.txt                  | 1 -
 src/mainboard/gigabyte/ga-6bxc/Kconfig                   | 1 +
 src/mainboard/gigabyte/ga-6bxc/board_info.txt            | 1 -
 src/mainboard/gigabyte/ga-6bxe/Kconfig                   | 1 +
 src/mainboard/gigabyte/ga-6bxe/board_info.txt            | 1 -
 src/mainboard/gigabyte/ga_2761gxdk/Kconfig               | 1 +
 src/mainboard/gigabyte/ga_2761gxdk/board_info.txt        | 1 -
 src/mainboard/gigabyte/m57sli/Kconfig                    | 1 +
 src/mainboard/gigabyte/m57sli/board_info.txt             | 1 -
 src/mainboard/gigabyte/ma785gmt/Kconfig                  | 1 +
 src/mainboard/gigabyte/ma785gmt/board_info.txt           | 1 -
 src/mainboard/gigabyte/ma78gm/Kconfig                    | 1 +
 src/mainboard/gigabyte/ma78gm/board_info.txt             | 1 -
 src/mainboard/google/butterfly/Kconfig                   | 1 +
 src/mainboard/google/butterfly/board_info.txt            | 1 -
 src/mainboard/google/link/Kconfig                        | 1 +
 src/mainboard/google/link/board_info.txt                 | 1 -
 src/mainboard/google/parrot/Kconfig                      | 1 +
 src/mainboard/google/parrot/board_info.txt               | 1 -
 src/mainboard/google/snow/Kconfig                        | 1 +
 src/mainboard/google/snow/board_info.txt                 | 1 -
 src/mainboard/google/stout/Kconfig                       | 1 +
 src/mainboard/google/stout/board_info.txt                | 1 -
 src/mainboard/hp/dl145_g1/Kconfig                        | 1 +
 src/mainboard/hp/dl145_g1/board_info.txt                 | 1 -
 src/mainboard/hp/dl145_g3/Kconfig                        | 1 +
 src/mainboard/hp/dl145_g3/board_info.txt                 | 1 -
 src/mainboard/hp/dl165_g6_fam10/Kconfig                  | 1 +
 src/mainboard/hp/dl165_g6_fam10/board_info.txt           | 1 -
 src/mainboard/hp/e_vectra_p2706t/Kconfig                 | 1 +
 src/mainboard/hp/e_vectra_p2706t/board_info.txt          | 1 -
 src/mainboard/ibase/mb899/Kconfig                        | 1 +
 src/mainboard/ibase/mb899/board_info.txt                 | 1 -
 src/mainboard/ibm/e325/Kconfig                           | 1 +
 src/mainboard/ibm/e325/board_info.txt                    | 1 -
 src/mainboard/ibm/e326/Kconfig                           | 1 +
 src/mainboard/ibm/e326/board_info.txt                    | 1 -
 src/mainboard/iei/juki-511p/Kconfig                      | 1 +
 src/mainboard/iei/juki-511p/board_info.txt               | 1 -
 src/mainboard/iei/kino-780am2-fam10/Kconfig              | 1 +
 src/mainboard/iei/kino-780am2-fam10/board_info.txt       | 1 -
 src/mainboard/iei/nova4899r/Kconfig                      | 1 +
 src/mainboard/iei/nova4899r/board_info.txt               | 1 -
 src/mainboard/iei/pcisa-lx-800-r10/Kconfig               | 1 +
 src/mainboard/iei/pcisa-lx-800-r10/board_info.txt        | 1 -
 src/mainboard/iei/pm-lx-800-r11/Kconfig                  | 1 +
 src/mainboard/iei/pm-lx-800-r11/board_info.txt           | 1 -
 src/mainboard/iei/pm-lx2-800-r10/Kconfig                 | 1 +
 src/mainboard/iei/pm-lx2-800-r10/board_info.txt          | 1 -
 src/mainboard/iei/rocky-512/board_info.txt               | 1 -
 src/mainboard/intel/d810e2cb/Kconfig                     | 1 +
 src/mainboard/intel/d810e2cb/board_info.txt              | 1 -
 src/mainboard/intel/d945gclf/Kconfig                     | 1 +
 src/mainboard/intel/d945gclf/board_info.txt              | 1 -
 src/mainboard/intel/eagleheights/Kconfig                 | 1 +
 src/mainboard/intel/eagleheights/board_info.txt          | 1 -
 src/mainboard/intel/jarrell/Kconfig                      | 1 +
 src/mainboard/intel/jarrell/board_info.txt               | 1 -
 src/mainboard/intel/mtarvon/Kconfig                      | 1 +
 src/mainboard/intel/mtarvon/board_info.txt               | 1 -
 src/mainboard/intel/truxton/Kconfig                      | 1 +
 src/mainboard/intel/truxton/board_info.txt               | 1 -
 src/mainboard/intel/xe7501devkit/Kconfig                 | 1 +
 src/mainboard/intel/xe7501devkit/board_info.txt          | 1 -
 src/mainboard/iwave/iWRainbowG6/Kconfig                  | 1 +
 src/mainboard/iwave/iWRainbowG6/board_info.txt           | 1 -
 src/mainboard/iwill/dk8_htx/Kconfig                      | 1 +
 src/mainboard/iwill/dk8_htx/board_info.txt               | 1 -
 src/mainboard/iwill/dk8s2/Kconfig                        | 1 +
 src/mainboard/iwill/dk8s2/board_info.txt                 | 1 -
 src/mainboard/iwill/dk8x/Kconfig                         | 1 +
 src/mainboard/iwill/dk8x/board_info.txt                  | 1 -
 src/mainboard/jetway/j7f2/Kconfig                        | 1 +
 src/mainboard/jetway/j7f2/board_info.txt                 | 1 -
 src/mainboard/jetway/j7f4k1g2e/board_info.txt            | 1 -
 src/mainboard/jetway/j7f4k1g5d/board_info.txt            | 1 -
 src/mainboard/jetway/pa78vm5/Kconfig                     | 1 +
 src/mainboard/jetway/pa78vm5/board_info.txt              | 1 -
 src/mainboard/kontron/986lcd-m/Kconfig                   | 1 +
 src/mainboard/kontron/986lcd-m/board_info.txt            | 1 -
 src/mainboard/kontron/kt690/Kconfig                      | 1 +
 src/mainboard/kontron/kt690/board_info.txt               | 1 -
 src/mainboard/lanner/em8510/Kconfig                      | 1 +
 src/mainboard/lanner/em8510/board_info.txt               | 1 -
 src/mainboard/lenovo/t60/Kconfig                         | 1 +
 src/mainboard/lenovo/t60/board_info.txt                  | 1 -
 src/mainboard/lenovo/x201/Kconfig                        | 1 +
 src/mainboard/lenovo/x201/board_info.txt                 | 1 -
 src/mainboard/lenovo/x60/Kconfig                         | 1 +
 src/mainboard/lenovo/x60/board_info.txt                  | 1 -
 src/mainboard/linutop/linutop1/board_info.txt            | 1 -
 src/mainboard/lippert/frontrunner-af/Kconfig             | 1 +
 src/mainboard/lippert/frontrunner-af/board_info.txt      | 1 -
 src/mainboard/lippert/frontrunner/Kconfig                | 1 +
 src/mainboard/lippert/frontrunner/board_info.txt         | 1 -
 src/mainboard/lippert/hurricane-lx/Kconfig               | 1 +
 src/mainboard/lippert/hurricane-lx/board_info.txt        | 1 -
 src/mainboard/lippert/literunner-lx/Kconfig              | 1 +
 src/mainboard/lippert/literunner-lx/board_info.txt       | 1 -
 src/mainboard/lippert/roadrunner-lx/Kconfig              | 1 +
 src/mainboard/lippert/roadrunner-lx/board_info.txt       | 1 -
 src/mainboard/lippert/spacerunner-lx/Kconfig             | 1 +
 src/mainboard/lippert/spacerunner-lx/board_info.txt      | 1 -
 src/mainboard/lippert/toucan-af/Kconfig                  | 1 +
 src/mainboard/lippert/toucan-af/board_info.txt           | 1 -
 src/mainboard/mitac/6513wu/Kconfig                       | 1 +
 src/mainboard/mitac/6513wu/board_info.txt                | 1 -
 src/mainboard/msi/ms6119/Kconfig                         | 1 +
 src/mainboard/msi/ms6119/board_info.txt                  | 1 -
 src/mainboard/msi/ms6147/Kconfig                         | 1 +
 src/mainboard/msi/ms6147/board_info.txt                  | 1 -
 src/mainboard/msi/ms6156/Kconfig                         | 1 +
 src/mainboard/msi/ms6156/board_info.txt                  | 1 -
 src/mainboard/msi/ms6178/Kconfig                         | 1 +
 src/mainboard/msi/ms6178/board_info.txt                  | 1 -
 src/mainboard/msi/ms7135/Kconfig                         | 1 +
 src/mainboard/msi/ms7135/board_info.txt                  | 1 -
 src/mainboard/msi/ms7260/Kconfig                         | 1 +
 src/mainboard/msi/ms7260/board_info.txt                  | 1 -
 src/mainboard/msi/ms9185/Kconfig                         | 1 +
 src/mainboard/msi/ms9185/board_info.txt                  | 1 -
 src/mainboard/msi/ms9282/Kconfig                         | 1 +
 src/mainboard/msi/ms9282/board_info.txt                  | 1 -
 src/mainboard/nec/powermate2000/Kconfig                  | 1 +
 src/mainboard/nec/powermate2000/board_info.txt           | 1 -
 src/mainboard/newisys/khepri/Kconfig                     | 1 +
 src/mainboard/newisys/khepri/board_info.txt              | 1 -
 src/mainboard/nokia/ip530/Kconfig                        | 1 +
 src/mainboard/nokia/ip530/board_info.txt                 | 1 -
 src/mainboard/nvidia/l1_2pvv/Kconfig                     | 1 +
 src/mainboard/nvidia/l1_2pvv/board_info.txt              | 1 -
 src/mainboard/pcengines/alix1c/Kconfig                   | 1 +
 src/mainboard/pcengines/alix1c/board_info.txt            | 1 -
 src/mainboard/pcengines/alix2d/Kconfig                   | 1 +
 src/mainboard/pcengines/alix2d/board_info.txt            | 1 -
 src/mainboard/rca/rm4100/Kconfig                         | 1 +
 src/mainboard/rca/rm4100/board_info.txt                  | 1 -
 src/mainboard/roda/rk886ex/Kconfig                       | 1 +
 src/mainboard/roda/rk886ex/board_info.txt                | 1 -
 src/mainboard/roda/rk9/Kconfig                           | 1 +
 src/mainboard/roda/rk9/board_info.txt                    | 1 -
 src/mainboard/samsung/lumpy/Kconfig                      | 1 +
 src/mainboard/samsung/lumpy/board_info.txt               | 1 -
 src/mainboard/soyo/sy-6ba-plus-iii/Kconfig               | 1 +
 src/mainboard/soyo/sy-6ba-plus-iii/board_info.txt        | 1 -
 src/mainboard/sunw/ultra40/Kconfig                       | 1 +
 src/mainboard/sunw/ultra40/board_info.txt                | 1 -
 src/mainboard/supermicro/h8dme/Kconfig                   | 1 +
 src/mainboard/supermicro/h8dme/board_info.txt            | 1 -
 src/mainboard/supermicro/h8dmr/Kconfig                   | 1 +
 src/mainboard/supermicro/h8dmr/board_info.txt            | 1 -
 src/mainboard/supermicro/h8dmr_fam10/Kconfig             | 1 +
 src/mainboard/supermicro/h8dmr_fam10/board_info.txt      | 1 -
 src/mainboard/supermicro/h8qgi/Kconfig                   | 1 +
 src/mainboard/supermicro/h8qgi/board_info.txt            | 1 -
 src/mainboard/supermicro/h8qme_fam10/Kconfig             | 1 +
 src/mainboard/supermicro/h8qme_fam10/board_info.txt      | 1 -
 src/mainboard/supermicro/h8scm/Kconfig                   | 1 +
 src/mainboard/supermicro/h8scm/board_info.txt            | 1 -
 src/mainboard/supermicro/h8scm_fam10/Kconfig             | 1 +
 src/mainboard/supermicro/h8scm_fam10/board_info.txt      | 1 -
 src/mainboard/supermicro/x6dai_g/Kconfig                 | 1 +
 src/mainboard/supermicro/x6dai_g/board_info.txt          | 1 -
 src/mainboard/supermicro/x6dhe_g/Kconfig                 | 1 +
 src/mainboard/supermicro/x6dhe_g/board_info.txt          | 1 -
 src/mainboard/supermicro/x6dhe_g2/Kconfig                | 1 +
 src/mainboard/supermicro/x6dhe_g2/board_info.txt         | 1 -
 src/mainboard/supermicro/x6dhr_ig/Kconfig                | 1 +
 src/mainboard/supermicro/x6dhr_ig/board_info.txt         | 1 -
 src/mainboard/supermicro/x6dhr_ig2/Kconfig               | 1 +
 src/mainboard/supermicro/x6dhr_ig2/board_info.txt        | 1 -
 src/mainboard/supermicro/x7db8/Kconfig                   | 1 +
 src/mainboard/supermicro/x7db8/board_info.txt            | 1 -
 src/mainboard/technexion/tim5690/Kconfig                 | 1 +
 src/mainboard/technexion/tim5690/board_info.txt          | 1 -
 src/mainboard/technexion/tim8690/Kconfig                 | 1 +
 src/mainboard/technexion/tim8690/board_info.txt          | 1 -
 src/mainboard/technologic/ts5300/Kconfig                 | 1 +
 src/mainboard/technologic/ts5300/board_info.txt          | 1 -
 src/mainboard/televideo/tc7020/Kconfig                   | 1 +
 src/mainboard/televideo/tc7020/board_info.txt            | 1 -
 src/mainboard/thomson/ip1000/Kconfig                     | 1 +
 src/mainboard/thomson/ip1000/board_info.txt              | 1 -
 src/mainboard/traverse/geos/Kconfig                      | 1 +
 src/mainboard/traverse/geos/board_info.txt               | 1 -
 src/mainboard/tyan/s1846/Kconfig                         | 1 +
 src/mainboard/tyan/s1846/board_info.txt                  | 1 -
 src/mainboard/tyan/s2735/Kconfig                         | 1 +
 src/mainboard/tyan/s2735/board_info.txt                  | 1 -
 src/mainboard/tyan/s2850/Kconfig                         | 1 +
 src/mainboard/tyan/s2850/board_info.txt                  | 1 -
 src/mainboard/tyan/s2875/Kconfig                         | 1 +
 src/mainboard/tyan/s2875/board_info.txt                  | 1 -
 src/mainboard/tyan/s2880/Kconfig                         | 1 +
 src/mainboard/tyan/s2880/board_info.txt                  | 1 -
 src/mainboard/tyan/s2881/Kconfig                         | 1 +
 src/mainboard/tyan/s2881/board_info.txt                  | 1 -
 src/mainboard/tyan/s2882/Kconfig                         | 1 +
 src/mainboard/tyan/s2882/board_info.txt                  | 1 -
 src/mainboard/tyan/s2885/Kconfig                         | 1 +
 src/mainboard/tyan/s2885/board_info.txt                  | 1 -
 src/mainboard/tyan/s2891/Kconfig                         | 1 +
 src/mainboard/tyan/s2891/board_info.txt                  | 1 -
 src/mainboard/tyan/s2892/Kconfig                         | 1 +
 src/mainboard/tyan/s2892/board_info.txt                  | 1 -
 src/mainboard/tyan/s2895/Kconfig                         | 1 +
 src/mainboard/tyan/s2895/board_info.txt                  | 1 -
 src/mainboard/tyan/s2912/Kconfig                         | 1 +
 src/mainboard/tyan/s2912/board_info.txt                  | 1 -
 src/mainboard/tyan/s2912_fam10/Kconfig                   | 1 +
 src/mainboard/tyan/s2912_fam10/board_info.txt            | 1 -
 src/mainboard/tyan/s4880/Kconfig                         | 1 +
 src/mainboard/tyan/s4880/board_info.txt                  | 1 -
 src/mainboard/tyan/s4882/Kconfig                         | 1 +
 src/mainboard/tyan/s4882/board_info.txt                  | 1 -
 src/mainboard/tyan/s8226/Kconfig                         | 1 +
 src/mainboard/tyan/s8226/board_info.txt                  | 1 -
 src/mainboard/via/epia-cn/Kconfig                        | 1 +
 src/mainboard/via/epia-cn/board_info.txt                 | 1 -
 src/mainboard/via/epia-m/Kconfig                         | 1 +
 src/mainboard/via/epia-m/board_info.txt                  | 1 -
 src/mainboard/via/epia-m700/Kconfig                      | 1 +
 src/mainboard/via/epia-m700/board_info.txt               | 1 -
 src/mainboard/via/epia-m850/Kconfig                      | 1 +
 src/mainboard/via/epia-m850/board_info.txt               | 1 -
 src/mainboard/via/epia-mii/board_info.txt                | 1 -
 src/mainboard/via/epia-ml/board_info.txt                 | 1 -
 src/mainboard/via/epia-n/Kconfig                         | 1 +
 src/mainboard/via/epia-n/board_info.txt                  | 1 -
 src/mainboard/via/epia/Kconfig                           | 1 +
 src/mainboard/via/epia/board_info.txt                    | 1 -
 src/mainboard/via/pc2500e/Kconfig                        | 1 +
 src/mainboard/via/pc2500e/board_info.txt                 | 1 -
 src/mainboard/via/vt8454c/Kconfig                        | 1 +
 src/mainboard/via/vt8454c/board_info.txt                 | 1 -
 src/mainboard/winent/pl6064/Kconfig                      | 1 +
 src/mainboard/winent/pl6064/board_info.txt               | 1 -
 src/mainboard/wyse/s50/Kconfig                           | 1 +
 src/mainboard/wyse/s50/board_info.txt                    | 1 -
 367 files changed, 180 insertions(+), 187 deletions(-)

diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig
index 81c23a8..048be04 100644
--- a/src/mainboard/a-trend/atc-6220/Kconfig
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -21,6 +21,7 @@ if BOARD_A_TREND_ATC_6220
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/a-trend/atc-6220/board_info.txt b/src/mainboard/a-trend/atc-6220/board_info.txt
index a56cca3..604ed4a 100644
--- a/src/mainboard/a-trend/atc-6220/board_info.txt
+++ b/src/mainboard/a-trend/atc-6220/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.motherboard.cz/mb/atrend/atc6220.htm
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig
index da94c7f..a192f18 100644
--- a/src/mainboard/a-trend/atc-6240/Kconfig
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -21,6 +21,7 @@ if BOARD_A_TREND_ATC_6240
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/a-trend/atc-6240/board_info.txt b/src/mainboard/a-trend/atc-6240/board_info.txt
index 1acf41b..50eac6c 100644
--- a/src/mainboard/a-trend/atc-6240/board_info.txt
+++ b/src/mainboard/a-trend/atc-6240/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://active-hardware.com/english/reviews/mainboard/atc6240.htm
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig
index feb00de..04279a8 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Kconfig
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ABIT_BE6_II_V2_0
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/abit/be6-ii_v2_0/board_info.txt b/src/mainboard/abit/be6-ii_v2_0/board_info.txt
index 078ab8f..0a8ec00 100644
--- a/src/mainboard/abit/be6-ii_v2_0/board_info.txt
+++ b/src/mainboard/abit/be6-ii_v2_0/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.extremeoverclocking.com/reviews/motherboards/BE6-II_v2_1.html
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index 32500d6..e6ce57b 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ADVANSUS_A785E_I
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_AMD_SOCKET_ASB2
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/advansus/a785e-i/board_info.txt b/src/mainboard/advansus/a785e-i/board_info.txt
index 3c865ec..9d5671f 100644
--- a/src/mainboard/advansus/a785e-i/board_info.txt
+++ b/src/mainboard/advansus/a785e-i/board_info.txt
@@ -1,4 +1,3 @@
-Category: mini
 Board URL: http://www.advansus.com.tw/products/247/A785E-I
 ROM package: SOIC-8
 ROM protocol: SPI
diff --git a/src/mainboard/advantech/pcm-5820/Kconfig b/src/mainboard/advantech/pcm-5820/Kconfig
index 25ff69c..f972c64 100644
--- a/src/mainboard/advantech/pcm-5820/Kconfig
+++ b/src/mainboard/advantech/pcm-5820/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ADVANTECH_PCM_5820
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/advantech/pcm-5820/board_info.txt b/src/mainboard/advantech/pcm-5820/board_info.txt
index 84b3c8d..b7db3eb 100644
--- a/src/mainboard/advantech/pcm-5820/board_info.txt
+++ b/src/mainboard/advantech/pcm-5820/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://taiwan.advantech.com.tw/products/Model_Detail.asp?model_id=1-1TGZL8
 ROM package: PLCC32
 ROM socketed: y
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index a04c131..a1b1e89 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_BIMINI_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_ASB2
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/amd/bimini_fam10/board_info.txt b/src/mainboard/amd/bimini_fam10/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/amd/bimini_fam10/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig
index ee2aa0f..171199b 100644
--- a/src/mainboard/amd/db800/Kconfig
+++ b/src/mainboard/amd/db800/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_DB800
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/db800/board_info.txt b/src/mainboard/amd/db800/board_info.txt
index 079c99f..62c6339 100644
--- a/src/mainboard/amd/db800/board_info.txt
+++ b/src/mainboard/amd/db800/board_info.txt
@@ -1,3 +1,2 @@
 Board name: DB800 (Salsa)
-Category: eval
 Board URL: http://www.amd.com/us/products/embedded/develop-and-design/Pages/development-boards-lx.aspx
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index ba68a54..4028717 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_DBM690T
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/amd/dbm690t/board_info.txt b/src/mainboard/amd/dbm690t/board_info.txt
index f6b1ab1..3a3b723 100644
--- a/src/mainboard/amd/dbm690t/board_info.txt
+++ b/src/mainboard/amd/dbm690t/board_info.txt
@@ -1,3 +1,2 @@
 Board name: dbM690T (Herring)
-Category: eval
 Board URL: http://support.amd.com/us/ChipsetMotherboard_TechDocs/42655A_S1DBM680T_PB.pdf
diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index 7e3486f..0a5872b 100644
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_MAHOGANY
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/amd/mahogany/board_info.txt b/src/mainboard/amd/mahogany/board_info.txt
index 979c7c2..7215064 100644
--- a/src/mainboard/amd/mahogany/board_info.txt
+++ b/src/mainboard/amd/mahogany/board_info.txt
@@ -1,3 +1,2 @@
 Board name: DB780E (Mahogany)
-Category: eval
 ROM protocol: SPI
diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig
index dec8e01..1c63b12 100644
--- a/src/mainboard/amd/norwich/Kconfig
+++ b/src/mainboard/amd/norwich/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_NORWICH
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/norwich/board_info.txt b/src/mainboard/amd/norwich/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/amd/norwich/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index a772d50..2aa7132 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -22,6 +22,7 @@ if BOARD_AMD_PARMER
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/parmer/board_info.txt b/src/mainboard/amd/parmer/board_info.txt
index 4ed37bc..a64b283 100644
--- a/src/mainboard/amd/parmer/board_info.txt
+++ b/src/mainboard/amd/parmer/board_info.txt
@@ -1,5 +1,4 @@
 Board name: DB-FS1r2 (Parmer)
-Category: eval
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index febd8dd..97cac60 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -22,6 +22,7 @@ if BOARD_AMD_PERSIMMON
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/persimmon/board_info.txt b/src/mainboard/amd/persimmon/board_info.txt
index 85cb19a..ea79521 100644
--- a/src/mainboard/amd/persimmon/board_info.txt
+++ b/src/mainboard/amd/persimmon/board_info.txt
@@ -1,5 +1,4 @@
 Board name: DBFT1-00-EVAL-KT (Persimmon)
-Category: eval
 ROM protocol: SPI
 ROM socketed: n
 Flashrom support: y
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index 2eb6612..3dd1dea 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_PISTACHIO
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/amd/pistachio/board_info.txt b/src/mainboard/amd/pistachio/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/amd/pistachio/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index d600a58..2608e60 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -21,6 +21,7 @@ if BOARD_AMD_RUMBA
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/rumba/board_info.txt b/src/mainboard/amd/rumba/board_info.txt
deleted file mode 100644
index 7680e6f..0000000
--- a/src/mainboard/amd/rumba/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: half
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index 5a6f022..69176bc 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_SERENGETI_CHEETAH
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select SOUTHBRIDGE_AMD_AMD8132
 	select SOUTHBRIDGE_AMD_AMD8151
 	select CPU_AMD_SOCKET_F
diff --git a/src/mainboard/amd/serengeti_cheetah/board_info.txt b/src/mainboard/amd/serengeti_cheetah/board_info.txt
deleted file mode 100644
index 3d902b6..0000000
--- a/src/mainboard/amd/serengeti_cheetah/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: server
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 37cbfa4..6c0daba 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_SERENGETI_CHEETAH_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F_1207
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/board_info.txt b/src/mainboard/amd/serengeti_cheetah_fam10/board_info.txt
deleted file mode 100644
index 3d902b6..0000000
--- a/src/mainboard/amd/serengeti_cheetah_fam10/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: server
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 08298f0..50d7d3a 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -22,6 +22,7 @@ if BOARD_AMD_SOUTHSTATION
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/south_station/board_info.txt b/src/mainboard/amd/south_station/board_info.txt
index 6391228..bf308b4 100644
--- a/src/mainboard/amd/south_station/board_info.txt
+++ b/src/mainboard/amd/south_station/board_info.txt
@@ -1,5 +1,4 @@
 Board name: South Station
-Category: eval
 ROM package: SOIC8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index 11d2d9b..15317e9 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -22,6 +22,7 @@ if BOARD_AMD_THATCHER
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/thatcher/board_info.txt b/src/mainboard/amd/thatcher/board_info.txt
index e0ff2e3..a59385d 100644
--- a/src/mainboard/amd/thatcher/board_info.txt
+++ b/src/mainboard/amd/thatcher/board_info.txt
@@ -1,5 +1,4 @@
 Board name: DB-FP2 (Thatcher)
-Category: eval
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 111ac29..d3e6abb 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AMD_TILAPIA_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/amd/tilapia_fam10/board_info.txt b/src/mainboard/amd/tilapia_fam10/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/amd/tilapia_fam10/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 5047793..c74e4d0 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -22,6 +22,7 @@ if BOARD_AMD_UNIONSTATION
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/union_station/board_info.txt b/src/mainboard/amd/union_station/board_info.txt
index 23fc323..e6c0157 100644
--- a/src/mainboard/amd/union_station/board_info.txt
+++ b/src/mainboard/amd/union_station/board_info.txt
@@ -1,5 +1,4 @@
 Board name: Union Station
-Category: eval
 ROM package: SOIC8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig
index c620c9a..f593e83 100644
--- a/src/mainboard/aopen/dxplplusu/Kconfig
+++ b/src/mainboard/aopen/dxplplusu/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AOPEN_DXPLPLUSU
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7505
 	select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/aopen/dxplplusu/board_info.txt b/src/mainboard/aopen/dxplplusu/board_info.txt
index 4e50628..e48a2b3 100644
--- a/src/mainboard/aopen/dxplplusu/board_info.txt
+++ b/src/mainboard/aopen/dxplplusu/board_info.txt
@@ -1,4 +1,3 @@
-Category: server
 Board URL: ftp://ftp.aopen.com/pub/server/motherboard/dxplpu/manual/dxplpu-ol-e.pdf
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig
index 2b6f758..525b74e 100644
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ARIMA_HDAMA
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/arima/hdama/board_info.txt b/src/mainboard/arima/hdama/board_info.txt
index df4d016..b737d8c 100644
--- a/src/mainboard/arima/hdama/board_info.txt
+++ b/src/mainboard/arima/hdama/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://web.archive.org/web/20080127024444/http://www.arima.com.tw/server/Product/ViewProduct.asp?View=HDAMA
diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig
index 99a6218..885aff9 100644
--- a/src/mainboard/artecgroup/dbe61/Kconfig
+++ b/src/mainboard/artecgroup/dbe61/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ARTECGROUP_DBE61 || BOARD_LINUTOP_LINUTOP1
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/artecgroup/dbe61/board_info.txt b/src/mainboard/artecgroup/dbe61/board_info.txt
index d059a75..e3b937b 100644
--- a/src/mainboard/artecgroup/dbe61/board_info.txt
+++ b/src/mainboard/artecgroup/dbe61/board_info.txt
@@ -1,3 +1,2 @@
-Category: settop
 Board URL: http://www.artecgroup.com/thincan/index.php?option=com_content&task=blogcategory&id=15&Itemid=34
 Flashrom support: y
diff --git a/src/mainboard/asi/mb_5blgp/Kconfig b/src/mainboard/asi/mb_5blgp/Kconfig
index 08ab2e0..4847ac1 100644
--- a/src/mainboard/asi/mb_5blgp/Kconfig
+++ b/src/mainboard/asi/mb_5blgp/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASI_MB_5BLGP
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/asi/mb_5blgp/board_info.txt b/src/mainboard/asi/mb_5blgp/board_info.txt
index 0dcbbea..715bc85 100644
--- a/src/mainboard/asi/mb_5blgp/board_info.txt
+++ b/src/mainboard/asi/mb_5blgp/board_info.txt
@@ -1,2 +1 @@
 Board name: MB-5BLGP (Neoware Eon 4000s)
-Category: settop
diff --git a/src/mainboard/asi/mb_5blmp/Kconfig b/src/mainboard/asi/mb_5blmp/Kconfig
index e8c8dde..e7d8854 100644
--- a/src/mainboard/asi/mb_5blmp/Kconfig
+++ b/src/mainboard/asi/mb_5blmp/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASI_MB_5BLMP
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/asi/mb_5blmp/board_info.txt b/src/mainboard/asi/mb_5blmp/board_info.txt
index da529cb..3784adf 100644
--- a/src/mainboard/asi/mb_5blmp/board_info.txt
+++ b/src/mainboard/asi/mb_5blmp/board_info.txt
@@ -1,4 +1,3 @@
 Board name: MB-5BLMP (IGEL WinNET III)
-Category: settop
 Board URL: http://www.hojerteknik.com/winnet.htm
 Flashrom support: y
diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig
index 9d3dd5c..9a47ffd 100644
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/src/mainboard/asrock/939a785gmh/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASROCK_939A785GMH
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_939
 	select K8_HT_FREQ_1G_SUPPORT
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asrock/939a785gmh/board_info.txt b/src/mainboard/asrock/939a785gmh/board_info.txt
index 8c8fcd5..dfd5d0b 100644
--- a/src/mainboard/asrock/939a785gmh/board_info.txt
+++ b/src/mainboard/asrock/939a785gmh/board_info.txt
@@ -1,5 +1,4 @@
 Board name: 939A785GMH/128M
-Category: desktop
 Board URL: http://www.asrock.com/mb/overview.asp?Model=939A785GMH/128M&s=939
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index a5a878b..98a9a67 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -22,6 +22,7 @@ if BOARD_ASROCK_E350M1
 config BOARD_SPECIFIC_OPTIONS # dummy
         def_bool y
   select ARCH_X86
+	select BOARD_TYPE_MINI
   select CPU_AMD_AGESA_FAMILY14
   select NORTHBRIDGE_AMD_AGESA_FAMILY14
   select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/asrock/e350m1/board_info.txt b/src/mainboard/asrock/e350m1/board_info.txt
index 3d30b13..57e05c2 100644
--- a/src/mainboard/asrock/e350m1/board_info.txt
+++ b/src/mainboard/asrock/e350m1/board_info.txt
@@ -1,4 +1,3 @@
-Category: mini
 Board URL: http://www.asrock.com/mb/overview.asp?Model=E350M1
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 8f9411b..ffc922a 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_A8N_E || BOARD_ASUS_A8N_SLI
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_939
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/asus/a8n_e/board_info.txt b/src/mainboard/asus/a8n_e/board_info.txt
index bba9585..99209a0 100644
--- a/src/mainboard/asus/a8n_e/board_info.txt
+++ b/src/mainboard/asus/a8n_e/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_Socket_939/A8NE/
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/asus/a8n_sli/board_info.txt b/src/mainboard/asus/a8n_sli/board_info.txt
index a8014d9..fc0ab18 100644
--- a/src/mainboard/asus/a8n_sli/board_info.txt
+++ b/src/mainboard/asus/a8n_sli/board_info.txt
@@ -1,5 +1,4 @@
 Board URL: http://www.asus.com/Motherboards/AMD_Socket_939/A8NSLI/
-Category: desktop
 ROM package: PLCC
 ROM socketed: y
 Flashrom support: y
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index e953ed4..fd65e52 100644
--- a/src/mainboard/asus/a8v-e_deluxe/Kconfig
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_A8V_E_DELUXE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_939
 	select K8_HT_FREQ_1G_SUPPORT
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/a8v-e_deluxe/board_info.txt b/src/mainboard/asus/a8v-e_deluxe/board_info.txt
index 8246100..8269f6f 100644
--- a/src/mainboard/asus/a8v-e_deluxe/board_info.txt
+++ b/src/mainboard/asus/a8v-e_deluxe/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_Socket_939/A8VE_Deluxe/
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index c5b9374..ee1ffd7 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_A8V_E_SE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_939
 	select K8_HT_FREQ_1G_SUPPORT
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/a8v-e_se/board_info.txt b/src/mainboard/asus/a8v-e_se/board_info.txt
index c554519..66997c3 100644
--- a/src/mainboard/asus/a8v-e_se/board_info.txt
+++ b/src/mainboard/asus/a8v-e_se/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_Socket_939/A8VE_SE/
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index b4fdf50..a60c524 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -23,6 +23,7 @@ if BOARD_ASUS_F2A85_M
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_AGESA_FAMILY15_TN
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/asus/f2a85-m/board_info.txt b/src/mainboard/asus/f2a85-m/board_info.txt
index b68541c..2fb5e9e 100644
--- a/src/mainboard/asus/f2a85-m/board_info.txt
+++ b/src/mainboard/asus/f2a85-m/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_Socket_FM2/F2A85M/
 ROM package: DIP8
 ROM protocol: [http://www.winbond-usa.com/hq/enu/ProductAndSales/ProductLines/FlashMemory/SerialFlash/W25Q64BV.htm SPI]
diff --git a/src/mainboard/asus/m2n-e/Kconfig b/src/mainboard/asus/m2n-e/Kconfig
index 959ad6c..3cfc094 100644
--- a/src/mainboard/asus/m2n-e/Kconfig
+++ b/src/mainboard/asus/m2n-e/Kconfig
@@ -23,6 +23,7 @@ if BOARD_ASUS_M2N_E
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/m2n-e/board_info.txt b/src/mainboard/asus/m2n-e/board_info.txt
index 44a2b8c..426e92d 100644
--- a/src/mainboard/asus/m2n-e/board_info.txt
+++ b/src/mainboard/asus/m2n-e/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM2/M2NE/
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index f76ff7b..9c74850 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_M2V_MX_SE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/m2v-mx_se/board_info.txt b/src/mainboard/asus/m2v-mx_se/board_info.txt
index 739c351..28da256 100644
--- a/src/mainboard/asus/m2v-mx_se/board_info.txt
+++ b/src/mainboard/asus/m2v-mx_se/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM2/M2VMX_SE/
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig
index 263bad9..08b814b 100644
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_M2V
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/asus/m2v/board_info.txt b/src/mainboard/asus/m2v/board_info.txt
index 259814e..f98a4fb 100644
--- a/src/mainboard/asus/m2v/board_info.txt
+++ b/src/mainboard/asus/m2v/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM2/M2V/
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index 197b3a0..2cbe2f8 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_M4A78_EM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDFAM10
diff --git a/src/mainboard/asus/m4a78-em/board_info.txt b/src/mainboard/asus/m4a78-em/board_info.txt
index be683dd..5b7c1c5 100644
--- a/src/mainboard/asus/m4a78-em/board_info.txt
+++ b/src/mainboard/asus/m4a78-em/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM2Plus/M4A78EM/
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index f6ba242..8ba90af 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_M4A785M
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDFAM10
diff --git a/src/mainboard/asus/m4a785-m/board_info.txt b/src/mainboard/asus/m4a785-m/board_info.txt
index 3c5f145..dcdd5fd 100644
--- a/src/mainboard/asus/m4a785-m/board_info.txt
+++ b/src/mainboard/asus/m4a785-m/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM2Plus/M4A785M/
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index af4fb7c..a8b4738 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_M4A785TM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/asus/m4a785t-m/board_info.txt b/src/mainboard/asus/m4a785t-m/board_info.txt
index 375d74f..e07e2de 100644
--- a/src/mainboard/asus/m4a785t-m/board_info.txt
+++ b/src/mainboard/asus/m4a785t-m/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM3/M4A785TM/
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index 7ff25d4..0a02ae3 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -3,6 +3,7 @@ if BOARD_ASUS_M5A88_V
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/asus/m5a88-v/board_info.txt b/src/mainboard/asus/m5a88-v/board_info.txt
index 53f9b3f..f39b1b2 100644
--- a/src/mainboard/asus/m5a88-v/board_info.txt
+++ b/src/mainboard/asus/m5a88-v/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.asus.com/Motherboards/AMD_AM3Plus/M5A88V_EVO/
 ROM package: DIP8
 ROM protocol: SPI
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index ffd6e22..2dac61c 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_MEW_AM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/asus/mew-am/board_info.txt b/src/mainboard/asus/mew-am/board_info.txt
index 7b22f82..6054689 100644
--- a/src/mainboard/asus/mew-am/board_info.txt
+++ b/src/mainboard/asus/mew-am/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/sock370/810/mew-am/
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index 341c533..7108977 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_MEW_VM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/asus/mew-vm/board_info.txt b/src/mainboard/asus/mew-vm/board_info.txt
index 78640a0..00dc217 100644
--- a/src/mainboard/asus/mew-vm/board_info.txt
+++ b/src/mainboard/asus/mew-vm/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.elhvb.com/mboards/OEM/HP/manual/ASUS%20MEW-VM.htm
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index 54a1bae..bdf5c40 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_P2B_D
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-d/board_info.txt b/src/mainboard/asus/p2b-d/board_info.txt
index ee3ffa7..e088709 100644
--- a/src/mainboard/asus/p2b-d/board_info.txt
+++ b/src/mainboard/asus/p2b-d/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-d/
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 652b31a..8f4dd9e 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_P2B_DS
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-ds/board_info.txt b/src/mainboard/asus/p2b-ds/board_info.txt
index cf8f69c..3ad0942 100644
--- a/src/mainboard/asus/p2b-ds/board_info.txt
+++ b/src/mainboard/asus/p2b-ds/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-ds/
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index e0554ca..050f7a0 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_P2B_F
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-f/board_info.txt b/src/mainboard/asus/p2b-f/board_info.txt
index 7176770..726e8e0 100644
--- a/src/mainboard/asus/p2b-f/board_info.txt
+++ b/src/mainboard/asus/p2b-f/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-f/
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index f138463..6e21fa2 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_P2B_LS
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-ls/board_info.txt b/src/mainboard/asus/p2b-ls/board_info.txt
index 6a957c3..90c9b96 100644
--- a/src/mainboard/asus/p2b-ls/board_info.txt
+++ b/src/mainboard/asus/p2b-ls/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b-ls/
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index a57f7fb..34c4337 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_P2B
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b/board_info.txt b/src/mainboard/asus/p2b/board_info.txt
index 9ec8ad6..15e2ef4 100644
--- a/src/mainboard/asus/p2b/board_info.txt
+++ b/src/mainboard/asus/p2b/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p2b/
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index d47dfdb..91f256e 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -21,6 +21,7 @@ if BOARD_ASUS_P3B_F
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p3b-f/board_info.txt b/src/mainboard/asus/p3b-f/board_info.txt
index d6ded16..ba576c4 100644
--- a/src/mainboard/asus/p3b-f/board_info.txt
+++ b/src/mainboard/asus/p3b-f/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: ftp://ftp.asus.com.tw/pub/ASUS/mb/slot1/440bx/p3b-f/
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig
index abfaaec..88b7194 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -3,6 +3,7 @@ if BOARD_AVALUE_EAX_785E
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/avalue/eax-785e/board_info.txt b/src/mainboard/avalue/eax-785e/board_info.txt
index bf7e28a..e4ae5bb 100644
--- a/src/mainboard/avalue/eax-785e/board_info.txt
+++ b/src/mainboard/avalue/eax-785e/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.avalue.com.tw/en/product/detail.aspx?ccid=2&cid=9&id=68&zid=245
 ROM package: SOIC-8
 ROM protocol: SPI
diff --git a/src/mainboard/axus/tc320/Kconfig b/src/mainboard/axus/tc320/Kconfig
index 868c8d1..129af8f 100644
--- a/src/mainboard/axus/tc320/Kconfig
+++ b/src/mainboard/axus/tc320/Kconfig
@@ -21,6 +21,7 @@ if BOARD_AXUS_TC320
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/axus/tc320/board_info.txt b/src/mainboard/axus/tc320/board_info.txt
index 005c28d..b9ef2c4 100644
--- a/src/mainboard/axus/tc320/board_info.txt
+++ b/src/mainboard/axus/tc320/board_info.txt
@@ -1,2 +1 @@
-Category: settop
 Board URL: http://www.keyton.co.jp/products/UAXT/TC-320.html
diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig
index 50ac62b..29800cc 100644
--- a/src/mainboard/azza/pt-6ibd/Kconfig
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -21,6 +21,7 @@ if BOARD_AZZA_PT_6IBD
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/azza/pt-6ibd/board_info.txt b/src/mainboard/azza/pt-6ibd/board_info.txt
index 3a7ef4f..af6e92a 100644
--- a/src/mainboard/azza/pt-6ibd/board_info.txt
+++ b/src/mainboard/azza/pt-6ibd/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://web.tiscali.it/acorp/?http://web.archive.org/web/20050426181911/http://web.tiscali.it/acorp/mobo_spec/azza/pt-6ibd/pt-6ibd.htm
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/bcom/winnet100/Kconfig b/src/mainboard/bcom/winnet100/Kconfig
index d0a7807..e3dcd1b 100644
--- a/src/mainboard/bcom/winnet100/Kconfig
+++ b/src/mainboard/bcom/winnet100/Kconfig
@@ -21,6 +21,7 @@ if BOARD_BCOM_WINNET100
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/bcom/winnet100/board_info.txt b/src/mainboard/bcom/winnet100/board_info.txt
index 85e561a..cff9874 100644
--- a/src/mainboard/bcom/winnet100/board_info.txt
+++ b/src/mainboard/bcom/winnet100/board_info.txt
@@ -1,4 +1,3 @@
-Category: settop
 Board name: WinNET100 (IGEL-316)
 Board URL: http://web.archive.org/web/20031207003521/http://www.igel.co.za/igel_316_compact.htm
 Flashrom support: y
diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig
index 78e014e..6cbe182 100644
--- a/src/mainboard/bcom/winnetp680/Kconfig
+++ b/src/mainboard/bcom/winnetp680/Kconfig
@@ -3,6 +3,7 @@ if BOARD_BCOM_WINNETP680
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/bcom/winnetp680/board_info.txt b/src/mainboard/bcom/winnetp680/board_info.txt
deleted file mode 100644
index 0ba2657..0000000
--- a/src/mainboard/bcom/winnetp680/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: settop
diff --git a/src/mainboard/bifferos/bifferboard/Kconfig b/src/mainboard/bifferos/bifferboard/Kconfig
index 4ee9958..d8ab4a2 100644
--- a/src/mainboard/bifferos/bifferboard/Kconfig
+++ b/src/mainboard/bifferos/bifferboard/Kconfig
@@ -3,6 +3,7 @@ if BOARD_BIFFEROS_BIFFERBOARD
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select ROMCC
 	select BOARD_ROMSIZE_KB_128
 	select NORTHBRIDGE_RDC_R8610
diff --git a/src/mainboard/bifferos/bifferboard/board_info.txt b/src/mainboard/bifferos/bifferboard/board_info.txt
deleted file mode 100644
index 7680e6f..0000000
--- a/src/mainboard/bifferos/bifferboard/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: half
diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig
index 8d86ab4..1c9373c 100644
--- a/src/mainboard/biostar/m6tba/Kconfig
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -21,6 +21,7 @@ if BOARD_BIOSTAR_M6TBA
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/biostar/m6tba/board_info.txt b/src/mainboard/biostar/m6tba/board_info.txt
index a8fcc43..590f02c 100644
--- a/src/mainboard/biostar/m6tba/board_info.txt
+++ b/src/mainboard/biostar/m6tba/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.motherboard.cz/mb/biostar/M6TBA.htm
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig
index 502576c..2cbc538 100644
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -3,6 +3,7 @@ if BOARD_BROADCOM_BLAST
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_BROADCOM_BCM5780
diff --git a/src/mainboard/broadcom/blast/board_info.txt b/src/mainboard/broadcom/blast/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/broadcom/blast/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
index 1242a94..078c857 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -21,6 +21,7 @@ if BOARD_COMPAQ_DESKPRO_EN_SFF_P600
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/board_info.txt b/src/mainboard/compaq/deskpro_en_sff_p600/board_info.txt
index c7f9570..a93e375 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/board_info.txt
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/board_info.txt
@@ -1,3 +1,2 @@
-Category: desktop
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/cubietech/cubieboard/Kconfig b/src/mainboard/cubietech/cubieboard/Kconfig
index 6cb84cf..c6bec12 100644
--- a/src/mainboard/cubietech/cubieboard/Kconfig
+++ b/src/mainboard/cubietech/cubieboard/Kconfig
@@ -3,6 +3,7 @@ if BOARD_CUBIETECH_CUBIEBOARD
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_ARMV7
+	select BOARD_TYPE_SBC
 	select CPU_ALLWINNER_A10
 	select BOARD_ROMSIZE_KB_4096
 	select DRIVER_XPOWERS_AXP209
diff --git a/src/mainboard/cubietech/cubieboard/board_info.txt b/src/mainboard/cubietech/cubieboard/board_info.txt
index 14a3755..8b13789 100644
--- a/src/mainboard/cubietech/cubieboard/board_info.txt
+++ b/src/mainboard/cubietech/cubieboard/board_info.txt
@@ -1,2 +1 @@
-Category: sbc
 
diff --git a/src/mainboard/digitallogic/msm586seg/Kconfig b/src/mainboard/digitallogic/msm586seg/Kconfig
index d54037a..dfaf0dc 100644
--- a/src/mainboard/digitallogic/msm586seg/Kconfig
+++ b/src/mainboard/digitallogic/msm586seg/Kconfig
@@ -3,6 +3,7 @@ if BOARD_DIGITALLOGIC_MSM586SEG
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_SC520
 	select HAVE_PIRQ_TABLE
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/digitallogic/msm586seg/board_info.txt b/src/mainboard/digitallogic/msm586seg/board_info.txt
index 90fda6d..ffaaea7 100644
--- a/src/mainboard/digitallogic/msm586seg/board_info.txt
+++ b/src/mainboard/digitallogic/msm586seg/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.digitallogic.ch/english/products/datasheets/ms_pc104_detail.asp?id=MSM586SEG
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig
index 0b54906..832bb70 100644
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig
@@ -3,6 +3,7 @@ if BOARD_DIGITALLOGIC_MSM800SEV
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/digitallogic/msm800sev/board_info.txt b/src/mainboard/digitallogic/msm800sev/board_info.txt
index 21476ad..d527b5e 100644
--- a/src/mainboard/digitallogic/msm800sev/board_info.txt
+++ b/src/mainboard/digitallogic/msm800sev/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.digitallogic.ch/english/products/datasheets/ms_pc104_detail.asp?id=MSM800SEV
diff --git a/src/mainboard/eaglelion/5bcm/Kconfig b/src/mainboard/eaglelion/5bcm/Kconfig
index cc507f0..65ec863 100644
--- a/src/mainboard/eaglelion/5bcm/Kconfig
+++ b/src/mainboard/eaglelion/5bcm/Kconfig
@@ -21,6 +21,7 @@ if BOARD_EAGLELION_5BCM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/eaglelion/5bcm/board_info.txt b/src/mainboard/eaglelion/5bcm/board_info.txt
deleted file mode 100644
index 7680e6f..0000000
--- a/src/mainboard/eaglelion/5bcm/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: half
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig
index c88d976..fa40919 100644
--- a/src/mainboard/ecs/p6iwp-fe/Kconfig
+++ b/src/mainboard/ecs/p6iwp-fe/Kconfig
@@ -22,6 +22,7 @@ if BOARD_ECS_P6IWP_FE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/ecs/p6iwp-fe/board_info.txt b/src/mainboard/ecs/p6iwp-fe/board_info.txt
index 31ce6e4..7701557 100644
--- a/src/mainboard/ecs/p6iwp-fe/board_info.txt
+++ b/src/mainboard/ecs/p6iwp-fe/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.ecs.com.tw/ECSWebSite/Product/Product_Detail.aspx?CategoryID=1&DetailID=95&DetailName=Feature&MenuID=24&LanID=4
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index ff98eef..3547fcc 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -24,6 +24,7 @@ if BOARD_EMULATION_QEMU_ARMV7
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_ARMV7
+	select BOARD_TYPE_EMULATION
 	select CPU_ARMLTD_CORTEX_A9
 	select HAVE_UART_MEMORY_MAPPED
 	select HAVE_UART_SPECIAL
diff --git a/src/mainboard/emulation/qemu-armv7/board_info.txt b/src/mainboard/emulation/qemu-armv7/board_info.txt
index 1bb78e9..4abf629 100644
--- a/src/mainboard/emulation/qemu-armv7/board_info.txt
+++ b/src/mainboard/emulation/qemu-armv7/board_info.txt
@@ -1,3 +1,2 @@
 Board name: QEMU armv7 (vexpress-a9)
-Category: emulation
 Board URL: http://fabrice.bellard.free.fr/qemu/
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 0d4d07a..b804dbc 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_EMULATION_QEMU_X86_I440FX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EMULATION
 	select CPU_QEMU_X86
 	select SOUTHBRIDGE_INTEL_I82371EB
 	select CACHE_AS_RAM
diff --git a/src/mainboard/emulation/qemu-i440fx/board_info.txt b/src/mainboard/emulation/qemu-i440fx/board_info.txt
index 6938d86..aa8add6 100644
--- a/src/mainboard/emulation/qemu-i440fx/board_info.txt
+++ b/src/mainboard/emulation/qemu-i440fx/board_info.txt
@@ -1,2 +1 @@
-Category: emulation
 Board URL: http://fabrice.bellard.free.fr/qemu/
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index cd7024b..ef4b40f 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -3,6 +3,7 @@ if BOARD_EMULATION_QEMU_X86_Q35
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EMULATION
 	select CPU_QEMU_X86
 	select SOUTHBRIDGE_INTEL_I82801IX
 	select IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
diff --git a/src/mainboard/emulation/qemu-q35/board_info.txt b/src/mainboard/emulation/qemu-q35/board_info.txt
index 6938d86..aa8add6 100644
--- a/src/mainboard/emulation/qemu-q35/board_info.txt
+++ b/src/mainboard/emulation/qemu-q35/board_info.txt
@@ -1,2 +1 @@
-Category: emulation
 Board URL: http://fabrice.bellard.free.fr/qemu/
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index 3fdf6f7..c56e87a 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -21,6 +21,7 @@ if BOARD_GETAC_P470
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/getac/p470/board_info.txt b/src/mainboard/getac/p470/board_info.txt
index f4e4e58..fb844a5 100644
--- a/src/mainboard/getac/p470/board_info.txt
+++ b/src/mainboard/getac/p470/board_info.txt
@@ -1,2 +1 @@
-Category: laptop
 Board URL: http://en.getac.com/AP/MISC/M0100/F0110_DownLoad_File.aspx?bullid=AllBull&fileid=105261&DomainLang=100020&DomainRegion=100027
diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
index 62625fb..295c954 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -21,6 +21,7 @@ if BOARD_GIGABYTE_GA_6BXC
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/gigabyte/ga-6bxc/board_info.txt b/src/mainboard/gigabyte/ga-6bxc/board_info.txt
index ac2a58e..92f1e47 100644
--- a/src/mainboard/gigabyte/ga-6bxc/board_info.txt
+++ b/src/mainboard/gigabyte/ga-6bxc/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=1445#sp
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/gigabyte/ga-6bxe/Kconfig b/src/mainboard/gigabyte/ga-6bxe/Kconfig
index 6e3462e..8a2c021 100644
--- a/src/mainboard/gigabyte/ga-6bxe/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxe/Kconfig
@@ -22,6 +22,7 @@ if BOARD_GIGABYTE_GA_6BXE
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/gigabyte/ga-6bxe/board_info.txt b/src/mainboard/gigabyte/ga-6bxe/board_info.txt
index dc1457d..92bd117 100644
--- a/src/mainboard/gigabyte/ga-6bxe/board_info.txt
+++ b/src/mainboard/gigabyte/ga-6bxe/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=1430#sp
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index 9b0ef05..87fea7b 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GIGABYTE_GA_2761GXDK
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/board_info.txt b/src/mainboard/gigabyte/ga_2761gxdk/board_info.txt
index 87aac86..3366f89 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/board_info.txt
+++ b/src/mainboard/gigabyte/ga_2761gxdk/board_info.txt
@@ -1,3 +1,2 @@
 Board name: GA-2761GXDK (Churchill)
-Category: desktop
 Board URL: http://www.computerbase.de/news/hardware/mainboards/amd-systeme/2007/mai/gigabyte_dtx-mainboard/
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 1ffa552..c51a8c8 100644
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GIGABYTE_M57SLI
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/gigabyte/m57sli/board_info.txt b/src/mainboard/gigabyte/m57sli/board_info.txt
index 3e591f4..a3e3563 100644
--- a/src/mainboard/gigabyte/m57sli/board_info.txt
+++ b/src/mainboard/gigabyte/m57sli/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=2287#ov
 ROM socketed: n
 Flashrom support: y
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 0ea4eb7..0ad8fb2 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GIGABYTE_MA785GMT
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM3
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/gigabyte/ma785gmt/board_info.txt b/src/mainboard/gigabyte/ma785gmt/board_info.txt
index fea4649..f21bdeb 100644
--- a/src/mainboard/gigabyte/ma785gmt/board_info.txt
+++ b/src/mainboard/gigabyte/ma785gmt/board_info.txt
@@ -1,2 +1 @@
-Category: desktop
 Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=3156#ov
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index d663eca..cbb2b8a 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GIGABYTE_MA78GM
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2R2
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/gigabyte/ma78gm/board_info.txt b/src/mainboard/gigabyte/ma78gm/board_info.txt
index b4643c0..98bf6a1 100644
--- a/src/mainboard/gigabyte/ma78gm/board_info.txt
+++ b/src/mainboard/gigabyte/ma78gm/board_info.txt
@@ -1,2 +1 @@
-Category: desktop
 Board URL: http://www.gigabyte.com/products/product-page.aspx?pid=2995#ov
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 78c998a..0d72f32 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GOOGLE_BUTTERFLY
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/butterfly/board_info.txt b/src/mainboard/google/butterfly/board_info.txt
index 4dd467c..a4547ef 100644
--- a/src/mainboard/google/butterfly/board_info.txt
+++ b/src/mainboard/google/butterfly/board_info.txt
@@ -1,4 +1,3 @@
 Board name: Pavilion Chromebook 14
-Category: laptop
 Board URL: http://h10025.www1.hp.com/ewfrf/wc/product?product=5389124&cc=us&dlc=en&lc=en&jumpid=reg_r1002_usen_c-001_title_r0005
 ROM protocol: SPI
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index d1e809e..5d55b50 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GOOGLE_LINK
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/link/board_info.txt b/src/mainboard/google/link/board_info.txt
index 9fef051..fbeb6c3 100644
--- a/src/mainboard/google/link/board_info.txt
+++ b/src/mainboard/google/link/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Chromebook Pixel
-Category: laptop
 Board URL: http://www.google.com/intl/en/chrome/devices/chromebooks.html#pixel
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index d8a4e7a..db55a4b 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GOOGLE_PARROT
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/parrot/board_info.txt b/src/mainboard/google/parrot/board_info.txt
deleted file mode 100644
index 4ce92d3..0000000
--- a/src/mainboard/google/parrot/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: laptop
diff --git a/src/mainboard/google/snow/Kconfig b/src/mainboard/google/snow/Kconfig
index 279132d..d4a8f12 100644
--- a/src/mainboard/google/snow/Kconfig
+++ b/src/mainboard/google/snow/Kconfig
@@ -22,6 +22,7 @@ if BOARD_GOOGLE_SNOW
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_ARMV7
+	select BOARD_TYPE_LAPTOP
 	select CPU_SAMSUNG_EXYNOS5250
 	select HAVE_UART_MEMORY_MAPPED
 	select EC_GOOGLE_CHROMEEC
diff --git a/src/mainboard/google/snow/board_info.txt b/src/mainboard/google/snow/board_info.txt
deleted file mode 100644
index 4ce92d3..0000000
--- a/src/mainboard/google/snow/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: laptop
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index fb81754..65fb2ad 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -3,6 +3,7 @@ if BOARD_GOOGLE_STOUT
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_RPGA989
 	select NORTHBRIDGE_INTEL_IVYBRIDGE
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/stout/board_info.txt b/src/mainboard/google/stout/board_info.txt
deleted file mode 100644
index 4ce92d3..0000000
--- a/src/mainboard/google/stout/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: laptop
diff --git a/src/mainboard/hp/dl145_g1/Kconfig b/src/mainboard/hp/dl145_g1/Kconfig
index 7e63077..cda0986 100644
--- a/src/mainboard/hp/dl145_g1/Kconfig
+++ b/src/mainboard/hp/dl145_g1/Kconfig
@@ -3,6 +3,7 @@ if BOARD_HP_DL145_G1
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/hp/dl145_g1/board_info.txt b/src/mainboard/hp/dl145_g1/board_info.txt
index 2118837..b2b301a 100644
--- a/src/mainboard/hp/dl145_g1/board_info.txt
+++ b/src/mainboard/hp/dl145_g1/board_info.txt
@@ -1,4 +1,3 @@
-Category: server
 Board URL: http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?lang=en&cc=us&objectID=c00346784&prodTypeId=15351&prodSeriesId=3219755
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index be3f009..3c3f6e6 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -3,6 +3,7 @@ if BOARD_HP_DL145_G3
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/hp/dl145_g3/board_info.txt b/src/mainboard/hp/dl145_g3/board_info.txt
index 8c2a4af..0f0ac82 100644
--- a/src/mainboard/hp/dl145_g3/board_info.txt
+++ b/src/mainboard/hp/dl145_g3/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?objectID=c00816835&lang=en&cc=us&taskId=101&prodSeriesId=3219755&prodTypeId=15351
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index b72b8dd..4ebfaa8 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_HP_DL165_G6_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
         def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F_1207
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_BROADCOM_BCM21000
diff --git a/src/mainboard/hp/dl165_g6_fam10/board_info.txt b/src/mainboard/hp/dl165_g6_fam10/board_info.txt
index 9b58599..0652f67 100644
--- a/src/mainboard/hp/dl165_g6_fam10/board_info.txt
+++ b/src/mainboard/hp/dl165_g6_fam10/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://h20000.www2.hp.com/bizsupport/TechSupport/Document.jsp?lang=en&cc=us&objectID=c01765799
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index e78238c..269f430 100644
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -25,6 +25,7 @@ if BOARD_HP_E_VECTRA_P2706T
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/hp/e_vectra_p2706t/board_info.txt b/src/mainboard/hp/e_vectra_p2706t/board_info.txt
deleted file mode 100644
index 31cf750..0000000
--- a/src/mainboard/hp/e_vectra_p2706t/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: desktop
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 36353b3..79b268c 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IBASE_MB899
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/ibase/mb899/board_info.txt b/src/mainboard/ibase/mb899/board_info.txt
index 7b86bf2..44129da 100644
--- a/src/mainboard/ibase/mb899/board_info.txt
+++ b/src/mainboard/ibase/mb899/board_info.txt
@@ -1,4 +1,3 @@
-Category: mini
 Board URL: http://www.ibase.com.tw/mb899.htm
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index 0a8442b..81e2daf 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IBM_E325
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/ibm/e325/board_info.txt b/src/mainboard/ibm/e325/board_info.txt
index 5bb0bca..bfb0b90 100644
--- a/src/mainboard/ibm/e325/board_info.txt
+++ b/src/mainboard/ibm/e325/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www-307.ibm.com/pc/support/site.wss/document.do?sitestyle=ibm&lndocid=MIGR-53255
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index 2016ef9..f2cbbcb 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IBM_E326
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/ibm/e326/board_info.txt b/src/mainboard/ibm/e326/board_info.txt
index af5631e..f0136ce 100644
--- a/src/mainboard/ibm/e326/board_info.txt
+++ b/src/mainboard/ibm/e326/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www-307.ibm.com/pc/support/site.wss/document.do?sitestyle=ibm&lndocid=MIGR-58655
diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig
index 03dffff..f248389 100644
--- a/src/mainboard/iei/juki-511p/Kconfig
+++ b/src/mainboard/iei/juki-511p/Kconfig
@@ -21,6 +21,7 @@ if BOARD_IEI_JUKI_511P || BOARD_IEI_ROCKY_512
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/iei/juki-511p/board_info.txt b/src/mainboard/iei/juki-511p/board_info.txt
index 3445599..b949cee 100644
--- a/src/mainboard/iei/juki-511p/board_info.txt
+++ b/src/mainboard/iei/juki-511p/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.ieiworld.com/en/news_content.asp?id=erbium/projectOBJ00150613
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index 62c8671..4b8a981 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IEI_KINO_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_SOCKET_AM2R2
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/iei/kino-780am2-fam10/board_info.txt b/src/mainboard/iei/kino-780am2-fam10/board_info.txt
index 8265642..c68388e 100644
--- a/src/mainboard/iei/kino-780am2-fam10/board_info.txt
+++ b/src/mainboard/iei/kino-780am2-fam10/board_info.txt
@@ -1,4 +1,3 @@
 Board name: Kino-780AM2
-Category: half
 Board URL: http://web.archive.org/web/20111208234719/http://ieiworld.com/product_groups/industrial/content.aspx?gid=00001000010000000001&cid=09050652111816087425&id=09069696333360342284
 ROM protocol: SPI
diff --git a/src/mainboard/iei/nova4899r/Kconfig b/src/mainboard/iei/nova4899r/Kconfig
index 36db67b..38ba2db 100644
--- a/src/mainboard/iei/nova4899r/Kconfig
+++ b/src/mainboard/iei/nova4899r/Kconfig
@@ -21,6 +21,7 @@ if BOARD_IEI_NOVA_4899R
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/iei/nova4899r/board_info.txt b/src/mainboard/iei/nova4899r/board_info.txt
index 6ffdfbe..7dabf99 100644
--- a/src/mainboard/iei/nova4899r/board_info.txt
+++ b/src/mainboard/iei/nova4899r/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.icpamerica.com/products/single_board_computers/5_25_NOVA/NOVA-4899.html
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
index 69e106e..c67bcbb 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IEI_PCISA_LX_800_R10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/board_info.txt b/src/mainboard/iei/pcisa-lx-800-r10/board_info.txt
index b5a9773..f3bd86b 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/board_info.txt
+++ b/src/mainboard/iei/pcisa-lx-800-r10/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.ieiworld.com/en/product_IPC.asp?model=PCISA-LX
diff --git a/src/mainboard/iei/pm-lx-800-r11/Kconfig b/src/mainboard/iei/pm-lx-800-r11/Kconfig
index e443c6c..7073c82 100644
--- a/src/mainboard/iei/pm-lx-800-r11/Kconfig
+++ b/src/mainboard/iei/pm-lx-800-r11/Kconfig
@@ -24,6 +24,7 @@ if BOARD_IEI_PM_LX_800_R11
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/iei/pm-lx-800-r11/board_info.txt b/src/mainboard/iei/pm-lx-800-r11/board_info.txt
index f9a9fdb..ef2769e 100644
--- a/src/mainboard/iei/pm-lx-800-r11/board_info.txt
+++ b/src/mainboard/iei/pm-lx-800-r11/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.ieiworld.com/product_groups/industrial/content.aspx?gid=00001000010000000001&cid=09050665574743104681&id=08142307826854456110#.UCLx8cLlgao
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/iei/pm-lx2-800-r10/Kconfig b/src/mainboard/iei/pm-lx2-800-r10/Kconfig
index 1485c94..1ef97c5 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/Kconfig
+++ b/src/mainboard/iei/pm-lx2-800-r10/Kconfig
@@ -24,6 +24,7 @@ if BOARD_IEI_PM_LX2_800_R10
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/iei/pm-lx2-800-r10/board_info.txt b/src/mainboard/iei/pm-lx2-800-r10/board_info.txt
index 40edf4a..664e4f2 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/board_info.txt
+++ b/src/mainboard/iei/pm-lx2-800-r10/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.ieiworld.com/product_groups/industrial/content.aspx?gid=00001000010000000001&cid=09050665574743104681&id=09034367569861123956#.UI2CfiExUao
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/iei/rocky-512/board_info.txt b/src/mainboard/iei/rocky-512/board_info.txt
index 604bccf..e535521 100644
--- a/src/mainboard/iei/rocky-512/board_info.txt
+++ b/src/mainboard/iei/rocky-512/board_info.txt
@@ -1,3 +1,2 @@
-Category: half
 Board URL: http://www.ieiworld.com/en/product_IPC.asp?model=ROCKY-512
 Clone of: iei/juki-511p
diff --git a/src/mainboard/intel/d810e2cb/Kconfig b/src/mainboard/intel/d810e2cb/Kconfig
index 91edf33..bf6f8d4 100644
--- a/src/mainboard/intel/d810e2cb/Kconfig
+++ b/src/mainboard/intel/d810e2cb/Kconfig
@@ -21,6 +21,7 @@ if BOARD_INTEL_D810E2CB
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_FC_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801BX
diff --git a/src/mainboard/intel/d810e2cb/board_info.txt b/src/mainboard/intel/d810e2cb/board_info.txt
index 977c779..c5f0f18 100644
--- a/src/mainboard/intel/d810e2cb/board_info.txt
+++ b/src/mainboard/intel/d810e2cb/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://downloadcenter.intel.com/Detail_Desc.aspx?agr=Y&DwnldID=17789&lang=eng&wapkw=d810e2cb
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index 0a9de1a..ff97af0 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -21,6 +21,7 @@ if BOARD_INTEL_D945GCLF
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_441
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GC
diff --git a/src/mainboard/intel/d945gclf/board_info.txt b/src/mainboard/intel/d945gclf/board_info.txt
index be3b3e3..5597a3e 100644
--- a/src/mainboard/intel/d945gclf/board_info.txt
+++ b/src/mainboard/intel/d945gclf/board_info.txt
@@ -1,2 +1 @@
-Category: desktop
 Board URL: http://www.intel.com/support/motherboards/desktop/d945gclf/sb/CS-029163.htm?wapkw=d945gclf+overview
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index e74705b..79b37c0 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -3,6 +3,7 @@ if BOARD_INTEL_EAGLEHEIGHTS
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_INTEL_SOCKET_BGA956
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/eagleheights/board_info.txt b/src/mainboard/intel/eagleheights/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/intel/eagleheights/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index 2a62777..89d3db4 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -3,6 +3,7 @@ if BOARD_INTEL_JARRELL
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_PXHD
diff --git a/src/mainboard/intel/jarrell/board_info.txt b/src/mainboard/intel/jarrell/board_info.txt
index e62a179..4f97753 100644
--- a/src/mainboard/intel/jarrell/board_info.txt
+++ b/src/mainboard/intel/jarrell/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Jarrell (SE7520JR2)
-Category: server
 Board URL: http://www.intel.com/support/motherboards/server/se7520jr2/
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index af40cad..597e2ad 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -3,6 +3,7 @@ if BOARD_INTEL_MTARVON
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/mtarvon/board_info.txt b/src/mainboard/intel/mtarvon/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/intel/mtarvon/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index 5f7de08..7c19271 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -3,6 +3,7 @@ if BOARD_INTEL_TRUXTON
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_INTEL_EP80579
 	select NORTHBRIDGE_INTEL_I3100
 	select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/truxton/board_info.txt b/src/mainboard/intel/truxton/board_info.txt
index 7fb5aac..419f4ae 100644
--- a/src/mainboard/intel/truxton/board_info.txt
+++ b/src/mainboard/intel/truxton/board_info.txt
@@ -1,2 +1 @@
 Board name: EP80579 devkit (Truxton)
-Category: eval
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index 276b1f7..2195c3e 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -3,6 +3,7 @@ if BOARD_INTEL_XE7501DEVKIT
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
 	select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/intel/xe7501devkit/board_info.txt b/src/mainboard/intel/xe7501devkit/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/intel/xe7501devkit/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig b/src/mainboard/iwave/iWRainbowG6/Kconfig
index 75d4bb9..3d73561 100644
--- a/src/mainboard/iwave/iWRainbowG6/Kconfig
+++ b/src/mainboard/iwave/iWRainbowG6/Kconfig
@@ -4,6 +4,7 @@ if BOARD_IWAVE_RAINBOW_G6
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_INTEL_SOCKET_441
 	select NORTHBRIDGE_INTEL_SCH
 	select SOUTHBRIDGE_INTEL_SCH
diff --git a/src/mainboard/iwave/iWRainbowG6/board_info.txt b/src/mainboard/iwave/iWRainbowG6/board_info.txt
index ad25a93..84766f5 100644
--- a/src/mainboard/iwave/iWRainbowG6/board_info.txt
+++ b/src/mainboard/iwave/iWRainbowG6/board_info.txt
@@ -1,3 +1,2 @@
 Board name: iW-RainboW-G6
-Category: half
 Board URL: http://www.iwavesystems.com/iW-RainbowG6.htm
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index 6ccee76..8655f31 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IWILL_DK8_HTX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/iwill/dk8_htx/board_info.txt b/src/mainboard/iwill/dk8_htx/board_info.txt
index 4211c8d..d4d4c08 100644
--- a/src/mainboard/iwill/dk8_htx/board_info.txt
+++ b/src/mainboard/iwill/dk8_htx/board_info.txt
@@ -1,3 +1,2 @@
-Category: server
 Board URL: http://web.archive.org/web/20060507170150/http://www.iwill.net/product_2.asp?p_id=98
 Flashrom support: y
diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index d7fefd8..8dbbf9f 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IWILL_DK8S2
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/iwill/dk8s2/board_info.txt b/src/mainboard/iwill/dk8s2/board_info.txt
index d84d5c8..80dc3f8 100644
--- a/src/mainboard/iwill/dk8s2/board_info.txt
+++ b/src/mainboard/iwill/dk8s2/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://web.archive.org/web/20060509143427/http://www.iwill.net/product_2.asp?p_id=42&sp=Y
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index bdbeb69..737fab4 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -3,6 +3,7 @@ if BOARD_IWILL_DK8X
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/iwill/dk8x/board_info.txt b/src/mainboard/iwill/dk8x/board_info.txt
index 0a80c2b..bfe7c02 100644
--- a/src/mainboard/iwill/dk8x/board_info.txt
+++ b/src/mainboard/iwill/dk8x/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://web.archive.org/web/20060213163325/http://www.iwill.net/product_2.asp?p_id=28
diff --git a/src/mainboard/jetway/j7f2/Kconfig b/src/mainboard/jetway/j7f2/Kconfig
index 811b37e..cc545a4 100644
--- a/src/mainboard/jetway/j7f2/Kconfig
+++ b/src/mainboard/jetway/j7f2/Kconfig
@@ -3,6 +3,7 @@ if BOARD_JETWAY_J7F2 || BOARD_JETWAY_J7F4K1G2E || BOARD_JETWAY_J7F4K1G5D
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/jetway/j7f2/board_info.txt b/src/mainboard/jetway/j7f2/board_info.txt
index 39773db..b0c53fc 100644
--- a/src/mainboard/jetway/j7f2/board_info.txt
+++ b/src/mainboard/jetway/j7f2/board_info.txt
@@ -1,2 +1 @@
 Board URL: http://www.jetway.com.tw/jw/ipcboard_view.asp?productid=279&proname=J7F2
-Category: mini
diff --git a/src/mainboard/jetway/j7f4k1g2e/board_info.txt b/src/mainboard/jetway/j7f4k1g2e/board_info.txt
index 18199ea..5099dcc 100644
--- a/src/mainboard/jetway/j7f4k1g2e/board_info.txt
+++ b/src/mainboard/jetway/j7f4k1g2e/board_info.txt
@@ -1,3 +1,2 @@
 Board URL: http://www.jetway.com.tw/jw/ipcboard_view.asp?productid=279&proname=J7F4K1G2E
-Category: mini
 Clone of: jetway/j7f2
diff --git a/src/mainboard/jetway/j7f4k1g5d/board_info.txt b/src/mainboard/jetway/j7f4k1g5d/board_info.txt
index 3651386..6a50d3f 100644
--- a/src/mainboard/jetway/j7f4k1g5d/board_info.txt
+++ b/src/mainboard/jetway/j7f4k1g5d/board_info.txt
@@ -1,3 +1,2 @@
 Board URL: http://www.jetway.com.tw/jw/ipcboard_view.asp?productid=279&proname=J7F4K1G5D
-Category: mini
 Clone of: jetway/j7f2
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index 01c4a59..923c231 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -3,6 +3,7 @@ if BOARD_JETWAY_PA78VM5
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2R2
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/jetway/pa78vm5/board_info.txt b/src/mainboard/jetway/pa78vm5/board_info.txt
index 7b14dc4..795219a 100644
--- a/src/mainboard/jetway/pa78vm5/board_info.txt
+++ b/src/mainboard/jetway/pa78vm5/board_info.txt
@@ -1,2 +1 @@
-Category: desktop
 Board URL: http://www.jetway.com.tw/jw/motherboard_view.asp?productid=567&proname=PA78VM5
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index e8b7225..a5f4152 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -3,6 +3,7 @@ if BOARD_KONTRON_986LCD_M
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/kontron/986lcd-m/board_info.txt b/src/mainboard/kontron/986lcd-m/board_info.txt
index 769c6a2..c3be890 100644
--- a/src/mainboard/kontron/986lcd-m/board_info.txt
+++ b/src/mainboard/kontron/986lcd-m/board_info.txt
@@ -1,5 +1,4 @@
 Board name: 986LCD-M/mITX
-Category: mini
 Board URL: http://de.kontron.com/products/boards+and+mezzanines/embedded+motherboards/miniitx+motherboards/986lcdmmitx.html
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index b0b0195..7d90ddb 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -3,6 +3,7 @@ if BOARD_KONTRON_KT690
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/kontron/kt690/board_info.txt b/src/mainboard/kontron/kt690/board_info.txt
index fc42f53..1bbdd96 100644
--- a/src/mainboard/kontron/kt690/board_info.txt
+++ b/src/mainboard/kontron/kt690/board_info.txt
@@ -1,2 +1 @@
-Category: mini
 Board URL: http://emea.kontron.com/products/boards+and+mezzanines/embedded+motherboards/miniitx+motherboards/kt690mitx+bga.html?searchtermresultpage=kt690%2Fmitx
diff --git a/src/mainboard/lanner/em8510/Kconfig b/src/mainboard/lanner/em8510/Kconfig
index 1a306cf..80cc535 100644
--- a/src/mainboard/lanner/em8510/Kconfig
+++ b/src/mainboard/lanner/em8510/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LANNER_EM8510
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_MPGA479M
 	select NORTHBRIDGE_INTEL_I855
 	select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/lanner/em8510/board_info.txt b/src/mainboard/lanner/em8510/board_info.txt
deleted file mode 100644
index 31cf750..0000000
--- a/src/mainboard/lanner/em8510/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: desktop
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 303f55a..8afb700 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LENOVO_T60
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/lenovo/t60/board_info.txt b/src/mainboard/lenovo/t60/board_info.txt
index f7b8c63..aa4c906 100644
--- a/src/mainboard/lenovo/t60/board_info.txt
+++ b/src/mainboard/lenovo/t60/board_info.txt
@@ -1,5 +1,4 @@
 Board name: T60/T60p
-Category: laptop
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig
index 8e7ebae..57d42fa 100644
--- a/src/mainboard/lenovo/x201/Kconfig
+++ b/src/mainboard/lenovo/x201/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LENOVO_X201
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select NORTHBRIDGE_INTEL_NEHALEM
 	select SOUTHBRIDGE_INTEL_IBEXPEAK
 	select EC_LENOVO_PMH7
diff --git a/src/mainboard/lenovo/x201/board_info.txt b/src/mainboard/lenovo/x201/board_info.txt
index 84d726f..ab55c71 100644
--- a/src/mainboard/lenovo/x201/board_info.txt
+++ b/src/mainboard/lenovo/x201/board_info.txt
@@ -1,5 +1,4 @@
 Board name: X201
-Category: laptop
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index 7ed2665..b054280 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LENOVO_X60
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/lenovo/x60/board_info.txt b/src/mainboard/lenovo/x60/board_info.txt
index 5d4b926..3151133 100644
--- a/src/mainboard/lenovo/x60/board_info.txt
+++ b/src/mainboard/lenovo/x60/board_info.txt
@@ -1,5 +1,4 @@
 Board name: X60/X60s
-Category: laptop
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/linutop/linutop1/board_info.txt b/src/mainboard/linutop/linutop1/board_info.txt
index e9d3d1e..c009a88 100644
--- a/src/mainboard/linutop/linutop1/board_info.txt
+++ b/src/mainboard/linutop/linutop1/board_info.txt
@@ -1,4 +1,3 @@
-Category: settop
 Board URL: http://www.linutop.com
 Flashrom support: y
 Clone of: artecgroup/dbe61
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index a0dbaf9..e36d7c4 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -22,6 +22,7 @@ if BOARD_LIPPERT_FRONTRUNNER_AF
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/lippert/frontrunner-af/board_info.txt b/src/mainboard/lippert/frontrunner-af/board_info.txt
index d225e38..7abad1a 100644
--- a/src/mainboard/lippert/frontrunner-af/board_info.txt
+++ b/src/mainboard/lippert/frontrunner-af/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1283
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/lippert/frontrunner/Kconfig b/src/mainboard/lippert/frontrunner/Kconfig
index ba1d5f1..4872369 100644
--- a/src/mainboard/lippert/frontrunner/Kconfig
+++ b/src/mainboard/lippert/frontrunner/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LIPPERT_FRONTRUNNER
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5535
diff --git a/src/mainboard/lippert/frontrunner/board_info.txt b/src/mainboard/lippert/frontrunner/board_info.txt
index a2b2d9f..773a147 100644
--- a/src/mainboard/lippert/frontrunner/board_info.txt
+++ b/src/mainboard/lippert/frontrunner/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.lippertembedded.com/en/productoverview/products-in-detail/85-lipperts-cool-frontrunner.html
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/lippert/hurricane-lx/Kconfig b/src/mainboard/lippert/hurricane-lx/Kconfig
index 64e1631..87e6b5d 100644
--- a/src/mainboard/lippert/hurricane-lx/Kconfig
+++ b/src/mainboard/lippert/hurricane-lx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LIPPERT_HURRICANE_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/hurricane-lx/board_info.txt b/src/mainboard/lippert/hurricane-lx/board_info.txt
index b464c85..8a14191 100644
--- a/src/mainboard/lippert/hurricane-lx/board_info.txt
+++ b/src/mainboard/lippert/hurricane-lx/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1154
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/lippert/literunner-lx/Kconfig b/src/mainboard/lippert/literunner-lx/Kconfig
index c4684c9..4552690 100644
--- a/src/mainboard/lippert/literunner-lx/Kconfig
+++ b/src/mainboard/lippert/literunner-lx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LIPPERT_LITERUNNER_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/literunner-lx/board_info.txt b/src/mainboard/lippert/literunner-lx/board_info.txt
index 47b90b5..680f3e6 100644
--- a/src/mainboard/lippert/literunner-lx/board_info.txt
+++ b/src/mainboard/lippert/literunner-lx/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1128
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig
index f5ec9b9..9b5f3db 100644
--- a/src/mainboard/lippert/roadrunner-lx/Kconfig
+++ b/src/mainboard/lippert/roadrunner-lx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LIPPERT_ROADRUNNER_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/roadrunner-lx/board_info.txt b/src/mainboard/lippert/roadrunner-lx/board_info.txt
index fc48fcd..b676ea1 100644
--- a/src/mainboard/lippert/roadrunner-lx/board_info.txt
+++ b/src/mainboard/lippert/roadrunner-lx/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1147
 ROM package: PLCC
 ROM protocol: FWH
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig
index c4a2ce8..90b15cd 100644
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig
@@ -3,6 +3,7 @@ if BOARD_LIPPERT_SPACERUNNER_LX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/spacerunner-lx/board_info.txt b/src/mainboard/lippert/spacerunner-lx/board_info.txt
index 76be510..bbe51b9 100644
--- a/src/mainboard/lippert/spacerunner-lx/board_info.txt
+++ b/src/mainboard/lippert/spacerunner-lx/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1148
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 904c7c8..feef8e2 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -22,6 +22,7 @@ if BOARD_LIPPERT_TOUCAN_AF
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_AGESA_FAMILY14
 	select NORTHBRIDGE_AMD_AGESA_FAMILY14
 	select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/lippert/toucan-af/board_info.txt b/src/mainboard/lippert/toucan-af/board_info.txt
index 77acfae..2658890 100644
--- a/src/mainboard/lippert/toucan-af/board_info.txt
+++ b/src/mainboard/lippert/toucan-af/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.adlinktech.com/PD/web/PD_detail.php?pid=1132
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index e552982..6d6112b 100644
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -21,6 +21,7 @@ if BOARD_MITAC_6513WU
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/mitac/6513wu/board_info.txt b/src/mainboard/mitac/6513wu/board_info.txt
index 3364212..b160023 100644
--- a/src/mainboard/mitac/6513wu/board_info.txt
+++ b/src/mainboard/mitac/6513wu/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://web.archive.org/web/20050313054828/http://www.mitac.com/micweb/products/tyan/6513wu/6513wu.htm
 ROM package: PLCC
 Flashrom support: y
diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
index 7705522..6027d26 100644
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -21,6 +21,7 @@ if BOARD_MSI_MS_6119
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/msi/ms6119/board_info.txt b/src/mainboard/msi/ms6119/board_info.txt
index 2a029e4..808a2e8 100644
--- a/src/mainboard/msi/ms6119/board_info.txt
+++ b/src/mainboard/msi/ms6119/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://no.msi.com/product/mb/MS-6119.html
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
index 9b51a49..ac1cd1c 100644
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -21,6 +21,7 @@ if BOARD_MSI_MS_6147
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/msi/ms6147/board_info.txt b/src/mainboard/msi/ms6147/board_info.txt
index 62d41dd..6958f44 100644
--- a/src/mainboard/msi/ms6147/board_info.txt
+++ b/src/mainboard/msi/ms6147/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://no.msi.com/product/mb/MS-6147.html
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig
index 58654f6..9e92fdb 100644
--- a/src/mainboard/msi/ms6156/Kconfig
+++ b/src/mainboard/msi/ms6156/Kconfig
@@ -21,6 +21,7 @@ if BOARD_MSI_MS_6156
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/msi/ms6156/board_info.txt b/src/mainboard/msi/ms6156/board_info.txt
index beec822..f863e76 100644
--- a/src/mainboard/msi/ms6156/board_info.txt
+++ b/src/mainboard/msi/ms6156/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://no.msi.com/product/mb/MS-6156VA.html
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index 4baee5e..9673325 100644
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -21,6 +21,7 @@ if BOARD_MSI_MS_6178
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/msi/ms6178/board_info.txt b/src/mainboard/msi/ms6178/board_info.txt
index 0a15012..377b3c6 100644
--- a/src/mainboard/msi/ms6178/board_info.txt
+++ b/src/mainboard/msi/ms6178/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://no.msi.com/product/mb/MS-6178.html
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 76b6625..7dcfcee 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -3,6 +3,7 @@ if BOARD_MSI_MS7135
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_754
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/msi/ms7135/board_info.txt b/src/mainboard/msi/ms7135/board_info.txt
index 3d933cf..0f2fef5 100644
--- a/src/mainboard/msi/ms7135/board_info.txt
+++ b/src/mainboard/msi/ms7135/board_info.txt
@@ -1,5 +1,4 @@
 Board name: MS-7135 (K8N Neo3)
-Category: desktop
 Board URL: http://no.msi.com/product/mb/K8N-Neo3.html
 ROM package: PLCC
 ROM protocol: LPC
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index 27bd3e5..76d3b22 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -3,6 +3,7 @@ if BOARD_MSI_MS7260
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_AM2
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/msi/ms7260/board_info.txt b/src/mainboard/msi/ms7260/board_info.txt
index 431899a..441aaac 100644
--- a/src/mainboard/msi/ms7260/board_info.txt
+++ b/src/mainboard/msi/ms7260/board_info.txt
@@ -1,5 +1,4 @@
 Board name: MS-7260 (K9N Neo)
-Category: desktop
 Board URL: http://no.msi.com/product/mb/K9N-Neo--PCB-1-0-.html
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index 7823d56..cf19b73 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -3,6 +3,7 @@ if BOARD_MSI_MS9185
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/msi/ms9185/board_info.txt b/src/mainboard/msi/ms9185/board_info.txt
index 8ffecdb..bb8245e 100644
--- a/src/mainboard/msi/ms9185/board_info.txt
+++ b/src/mainboard/msi/ms9185/board_info.txt
@@ -1,3 +1,2 @@
 Board name: K9SD Master-S2R (MS-9185)
-Category: server
 Board URL: http://www.msiserver.de/de/Produkte/Server_Mainboards/K9SD_Master_S2R_MS_9185.aspx
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index 1359a89..b9f245b 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -3,6 +3,7 @@ if BOARD_MSI_MS9282
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/msi/ms9282/board_info.txt b/src/mainboard/msi/ms9282/board_info.txt
index 2f8e688..6f2d368 100644
--- a/src/mainboard/msi/ms9282/board_info.txt
+++ b/src/mainboard/msi/ms9282/board_info.txt
@@ -1,3 +1,2 @@
 Board name: K9SD Master (MS-9282)
-Category: server
 Board URL: http://cweb.msi.com.tw/program/products/server/svr/pro_svr_detail.php?UID=632
diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 82c2f9d..3a323b0 100644
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -21,6 +21,7 @@ if BOARD_NEC_POWERMATE_2000
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I82810
 	select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/nec/powermate2000/board_info.txt b/src/mainboard/nec/powermate2000/board_info.txt
index 50a4b2a..49bb125 100644
--- a/src/mainboard/nec/powermate2000/board_info.txt
+++ b/src/mainboard/nec/powermate2000/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 Board URL: http://support.necam.com/mobilesolutions/hardware/Desktops/pm2000/celeron/
 ROM socketed: n
 Flashrom support: y
diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig
index 94de54b..c1a8126 100644
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -3,6 +3,7 @@ if BOARD_NEWISYS_KHEPRI
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/newisys/khepri/board_info.txt b/src/mainboard/newisys/khepri/board_info.txt
index 869bbfd..96fb94b 100644
--- a/src/mainboard/newisys/khepri/board_info.txt
+++ b/src/mainboard/newisys/khepri/board_info.txt
@@ -1,3 +1,2 @@
 Board name: 2100 Server (SUN Fire v20z)
-Category: server
 Board URL: http://web.archive.org/web/20070922231423/http://www.newisys.com/core/2100e.html
diff --git a/src/mainboard/nokia/ip530/Kconfig b/src/mainboard/nokia/ip530/Kconfig
index 58d6d37..3ba9e46 100644
--- a/src/mainboard/nokia/ip530/Kconfig
+++ b/src/mainboard/nokia/ip530/Kconfig
@@ -21,6 +21,7 @@ if BOARD_NOKIA_IP530
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_PGA370
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/nokia/ip530/board_info.txt b/src/mainboard/nokia/ip530/board_info.txt
index f9285bf..09a815c 100644
--- a/src/mainboard/nokia/ip530/board_info.txt
+++ b/src/mainboard/nokia/ip530/board_info.txt
@@ -1,4 +1,3 @@
-Category: server
 ROM package: TSOP48
 ROM protocol: Parallel
 ROM socketed: n
diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig
index e04caaa..efbdda8 100644
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -3,6 +3,7 @@ if BOARD_NVIDIA_L1_2PVV
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/nvidia/l1_2pvv/board_info.txt b/src/mainboard/nvidia/l1_2pvv/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/nvidia/l1_2pvv/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig
index fab8710..e4072a9 100644
--- a/src/mainboard/pcengines/alix1c/Kconfig
+++ b/src/mainboard/pcengines/alix1c/Kconfig
@@ -3,6 +3,7 @@ if BOARD_PCENGINES_ALIX1C
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/pcengines/alix1c/board_info.txt b/src/mainboard/pcengines/alix1c/board_info.txt
index d1e1417..94ab1e6 100644
--- a/src/mainboard/pcengines/alix1c/board_info.txt
+++ b/src/mainboard/pcengines/alix1c/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://pcengines.ch/alix1c.htm
 Flashrom support: y
 Vendor cooperation score: 4
diff --git a/src/mainboard/pcengines/alix2d/Kconfig b/src/mainboard/pcengines/alix2d/Kconfig
index 2343d70..fe7591d 100644
--- a/src/mainboard/pcengines/alix2d/Kconfig
+++ b/src/mainboard/pcengines/alix2d/Kconfig
@@ -3,6 +3,7 @@ if BOARD_PCENGINES_ALIX2D || BOARD_PCENGINES_ALIX6
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/pcengines/alix2d/board_info.txt b/src/mainboard/pcengines/alix2d/board_info.txt
index d603aaa..941f1dc 100644
--- a/src/mainboard/pcengines/alix2d/board_info.txt
+++ b/src/mainboard/pcengines/alix2d/board_info.txt
@@ -1,4 +1,3 @@
 Board name: ALIX.2D
-Category: half
 Board URL: http://pcengines.ch/alix2d0.htm
 Flashrom support: y
diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig
index ecbd2cc..522ae51 100644
--- a/src/mainboard/rca/rm4100/Kconfig
+++ b/src/mainboard/rca/rm4100/Kconfig
@@ -3,6 +3,7 @@ if BOARD_RCA_RM4100
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_INTEL_SOCKET_MFCBGA479
 	select NORTHBRIDGE_INTEL_I82830
 	select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/rca/rm4100/board_info.txt b/src/mainboard/rca/rm4100/board_info.txt
index 0c06a7d..5546799 100644
--- a/src/mainboard/rca/rm4100/board_info.txt
+++ b/src/mainboard/rca/rm4100/board_info.txt
@@ -1,3 +1,2 @@
-Category: settop
 Board URL: http://www.settoplinux.org/index.php?title=RCA_RM4100
 Flashrom support: y
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 2113deb..948c077 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -3,6 +3,7 @@ if BOARD_RODA_RK886EX
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_MFCPGA478
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/roda/rk886ex/board_info.txt b/src/mainboard/roda/rk886ex/board_info.txt
index 50303fe..3ea4959 100644
--- a/src/mainboard/roda/rk886ex/board_info.txt
+++ b/src/mainboard/roda/rk886ex/board_info.txt
@@ -1,3 +1,2 @@
 Board name: RK886EX (Rocky III+)
-Category: laptop
 Board URL: http://www.roda-computer.com/en/products/notebooks/rocky-iii-rk886ex.html
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index 59ae455..d58f266 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -3,6 +3,7 @@ if BOARD_RODA_RK9
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select CPU_INTEL_SOCKET_BGA956
 	select NORTHBRIDGE_INTEL_GM45
 	select SOUTHBRIDGE_INTEL_I82801IX
diff --git a/src/mainboard/roda/rk9/board_info.txt b/src/mainboard/roda/rk9/board_info.txt
deleted file mode 100644
index 4ce92d3..0000000
--- a/src/mainboard/roda/rk9/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: laptop
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 032b4b5..6da4600 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SAMSUNG_LUMPY
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_LAPTOP
 	select BOARD_ROMSIZE_KB_8192
 	select MAINBOARD_HAS_CHROMEOS
 	select CPU_INTEL_SOCKET_RPGA989
diff --git a/src/mainboard/samsung/lumpy/board_info.txt b/src/mainboard/samsung/lumpy/board_info.txt
index e907351..66e4521 100644
--- a/src/mainboard/samsung/lumpy/board_info.txt
+++ b/src/mainboard/samsung/lumpy/board_info.txt
@@ -1,2 +1 @@
 Board name: Chromebook "Lumpy"
-Category: laptop
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
index 096aa7c..1f370a9 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -21,6 +21,7 @@ if BOARD_SOYO_SY_6BA_PLUS_III
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/board_info.txt b/src/mainboard/soyo/sy-6ba-plus-iii/board_info.txt
index 25ff698..b3e46f0 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/board_info.txt
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/board_info.txt
@@ -1,4 +1,3 @@
-Category: desktop
 ROM package: DIP32
 ROM protocol: Parallel
 ROM socketed: y
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 80e08c4..32f82ce 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUNW_ULTRA40
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/sunw/ultra40/board_info.txt b/src/mainboard/sunw/ultra40/board_info.txt
index 76b41dc..df6f434 100644
--- a/src/mainboard/sunw/ultra40/board_info.txt
+++ b/src/mainboard/sunw/ultra40/board_info.txt
@@ -1,2 +1 @@
-Category: desktop
 Board URL: http://docs.oracle.com/cd/E19127-01/ultra40.ws/820-0123-13/intro.html
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index bfcb724..364848f 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_H8DME
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8dme/board_info.txt b/src/mainboard/supermicro/h8dme/board_info.txt
index bd2a32b..26adb95 100644
--- a/src/mainboard/supermicro/h8dme/board_info.txt
+++ b/src/mainboard/supermicro/h8dme/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/Aplus/motherboard/Opteron2000/MCP55/H8DME-2.cfm
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index 546dfa5..5b5d21c 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_H8DMR
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8dmr/board_info.txt b/src/mainboard/supermicro/h8dmr/board_info.txt
index b4f8f0b..a3eb1b9 100644
--- a/src/mainboard/supermicro/h8dmr/board_info.txt
+++ b/src/mainboard/supermicro/h8dmr/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/Aplus/motherboard/Opteron2000/MCP55/H8DMR-i2.cfm
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 2f48b32..c258984 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_H8DMR_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F_1207
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8dmr_fam10/board_info.txt b/src/mainboard/supermicro/h8dmr_fam10/board_info.txt
deleted file mode 100644
index 3d902b6..0000000
--- a/src/mainboard/supermicro/h8dmr_fam10/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: server
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig
index 6371d9e..1250277 100644
--- a/src/mainboard/supermicro/h8qgi/Kconfig
+++ b/src/mainboard/supermicro/h8qgi/Kconfig
@@ -22,6 +22,7 @@ if BOARD_SUPERMICRO_H8QGI
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_AGESA_FAMILY15
 	select CPU_AMD_SOCKET_G34
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/supermicro/h8qgi/board_info.txt b/src/mainboard/supermicro/h8qgi/board_info.txt
index f50fae1..05e4613 100644
--- a/src/mainboard/supermicro/h8qgi/board_info.txt
+++ b/src/mainboard/supermicro/h8qgi/board_info.txt
@@ -1,5 +1,4 @@
 Board name: H8QGI+-F
-Category: server
 Board URL: http://www.supermicro.com/Aplus/motherboard/Opteron6100/SR56x0/H8QGi_-F.cfm
 ROM package: SOIC-8
 ROM protocol: SPI
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 27172ff..e6fa035 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_H8QME_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F_1207
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8qme_fam10/board_info.txt b/src/mainboard/supermicro/h8qme_fam10/board_info.txt
index cb3000f..3da84cd 100644
--- a/src/mainboard/supermicro/h8qme_fam10/board_info.txt
+++ b/src/mainboard/supermicro/h8qme_fam10/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/Aplus/motherboard/Opteron8000/MCP55/H8QME-2.cfm
diff --git a/src/mainboard/supermicro/h8scm/Kconfig b/src/mainboard/supermicro/h8scm/Kconfig
index 86395e4..52d2289 100644
--- a/src/mainboard/supermicro/h8scm/Kconfig
+++ b/src/mainboard/supermicro/h8scm/Kconfig
@@ -22,6 +22,7 @@ if BOARD_SUPERMICRO_H8SCM
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_AGESA_FAMILY15
 	select CPU_AMD_SOCKET_C32
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/supermicro/h8scm/board_info.txt b/src/mainboard/supermicro/h8scm/board_info.txt
index dca0971..d88256c 100644
--- a/src/mainboard/supermicro/h8scm/board_info.txt
+++ b/src/mainboard/supermicro/h8scm/board_info.txt
@@ -1,4 +1,3 @@
-Category: server
 Board URL: http://www.supermicro.com/aplus/motherboard/opteron4000/sr56x0/h8scm.cfm
 ROM package: SOIC-8
 ROM protocol: SPI
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 87cfc73..f9d7d18 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_H9SCM_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_C32_NON_AGESA
 	select DIMM_DDR3
 	select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8scm_fam10/board_info.txt b/src/mainboard/supermicro/h8scm_fam10/board_info.txt
deleted file mode 100644
index 3d902b6..0000000
--- a/src/mainboard/supermicro/h8scm_fam10/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: server
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index 90a800c..a756c98 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_X6DAI_G
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7525
 	select SOUTHBRIDGE_INTEL_ESB6300
diff --git a/src/mainboard/supermicro/x6dai_g/board_info.txt b/src/mainboard/supermicro/x6dai_g/board_info.txt
index 5d4f089..84cc4d8 100644
--- a/src/mainboard/supermicro/x6dai_g/board_info.txt
+++ b/src/mainboard/supermicro/x6dai_g/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/products/motherboard/Xeon800/E7525/X6DAi-G.cfm
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index 03bb0a8..aba89e2 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_X6DHE_G
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_ESB6300
diff --git a/src/mainboard/supermicro/x6dhe_g/board_info.txt b/src/mainboard/supermicro/x6dhe_g/board_info.txt
index 5d4f089..84cc4d8 100644
--- a/src/mainboard/supermicro/x6dhe_g/board_info.txt
+++ b/src/mainboard/supermicro/x6dhe_g/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/products/motherboard/Xeon800/E7525/X6DAi-G.cfm
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index 397087c..706eab1 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_X6DHE_G2
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhe_g2/board_info.txt b/src/mainboard/supermicro/x6dhe_g2/board_info.txt
index 093f85f..fd82ab1 100644
--- a/src/mainboard/supermicro/x6dhe_g2/board_info.txt
+++ b/src/mainboard/supermicro/x6dhe_g2/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/products/motherboard/Xeon800/E7520/X6DHE-G2.cfm
diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig
index 0b25fcd..ddd162f 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_X6DHR_IG
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhr_ig/board_info.txt b/src/mainboard/supermicro/x6dhr_ig/board_info.txt
index f8d9fe3..afa014c 100644
--- a/src/mainboard/supermicro/x6dhr_ig/board_info.txt
+++ b/src/mainboard/supermicro/x6dhr_ig/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/products/motherboard/Xeon800/E7520/X6DHR-iG.cfm
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
index 70df01a..caf9e4b 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_X6DHR_IG2
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7520
 	select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhr_ig2/board_info.txt b/src/mainboard/supermicro/x6dhr_ig2/board_info.txt
index 7b89c5a..f06a064 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/board_info.txt
+++ b/src/mainboard/supermicro/x6dhr_ig2/board_info.txt
@@ -1,2 +1 @@
-Category: server
 Board URL: http://www.supermicro.com/products/motherboard/Xeon800/E7520/X6DHR-iG2.cfm
diff --git a/src/mainboard/supermicro/x7db8/Kconfig b/src/mainboard/supermicro/x7db8/Kconfig
index 03f8ceb..ecdbbc6 100644
--- a/src/mainboard/supermicro/x7db8/Kconfig
+++ b/src/mainboard/supermicro/x7db8/Kconfig
@@ -3,6 +3,7 @@ if BOARD_SUPERMICRO_X7DB8
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_LGA771
 	select SOUTHBRIDGE_INTEL_I3100
 	select NORTHBRIDGE_INTEL_I5000
diff --git a/src/mainboard/supermicro/x7db8/board_info.txt b/src/mainboard/supermicro/x7db8/board_info.txt
index fee61ac..15c4686 100644
--- a/src/mainboard/supermicro/x7db8/board_info.txt
+++ b/src/mainboard/supermicro/x7db8/board_info.txt
@@ -1,4 +1,3 @@
-Category: server
 Board URL: http://www.supermicro.com/products/motherboard/xeon1333/5000p/x7db8_.cfm
 ROM package: PLCC32
 ROM protocol: FWH
diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index c0aca27..c0bb8ce 100644
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TECHNEXION_TIM5690
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/technexion/tim5690/board_info.txt b/src/mainboard/technexion/tim5690/board_info.txt
index c63907a..bef4d83 100644
--- a/src/mainboard/technexion/tim5690/board_info.txt
+++ b/src/mainboard/technexion/tim5690/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.technexion.com/index.php/embedded-mainboards/amd/tim-5690
diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index 890b7ac..419bf11 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TECHNEXION_TIM8690
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_SOCKET_S1G1
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/technexion/tim8690/board_info.txt b/src/mainboard/technexion/tim8690/board_info.txt
index dbda07e..dea6164 100644
--- a/src/mainboard/technexion/tim8690/board_info.txt
+++ b/src/mainboard/technexion/tim8690/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.technexion.com/index.php/tim-8690
diff --git a/src/mainboard/technologic/ts5300/Kconfig b/src/mainboard/technologic/ts5300/Kconfig
index 8def16d..f21eceb 100644
--- a/src/mainboard/technologic/ts5300/Kconfig
+++ b/src/mainboard/technologic/ts5300/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TECHNOLOGIC_TS5300
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_SC520
 	select ROMCC
 	select HAVE_OPTION_TABLE
diff --git a/src/mainboard/technologic/ts5300/board_info.txt b/src/mainboard/technologic/ts5300/board_info.txt
index ef8a731..43354bf 100644
--- a/src/mainboard/technologic/ts5300/board_info.txt
+++ b/src/mainboard/technologic/ts5300/board_info.txt
@@ -1,2 +1 @@
-Category: half
 Board URL: http://www.embeddedarm.com/epc/ts5300-spec-h.html
diff --git a/src/mainboard/televideo/tc7020/Kconfig b/src/mainboard/televideo/tc7020/Kconfig
index ab41e5b..578d5ed 100644
--- a/src/mainboard/televideo/tc7020/Kconfig
+++ b/src/mainboard/televideo/tc7020/Kconfig
@@ -21,6 +21,7 @@ if BOARD_TELEVIDEO_TC7020
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_GX1
 	select NORTHBRIDGE_AMD_GX1
 	select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/televideo/tc7020/board_info.txt b/src/mainboard/televideo/tc7020/board_info.txt
index 93e6c5c..b3ac923 100644
--- a/src/mainboard/televideo/tc7020/board_info.txt
+++ b/src/mainboard/televideo/tc7020/board_info.txt
@@ -1,2 +1 @@
-Category: settop
 Board URL: http://www.televideo.com/TeleVideo/TC7000_WinCE_Series.htm
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index b1988dd..5207e5f 100644
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -3,6 +3,7 @@ if BOARD_THOMSON_IP1000
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_INTEL_SOCKET_MFCBGA479
 	select NORTHBRIDGE_INTEL_I82830
 	select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/thomson/ip1000/board_info.txt b/src/mainboard/thomson/ip1000/board_info.txt
index 77f0895..22c9223 100644
--- a/src/mainboard/thomson/ip1000/board_info.txt
+++ b/src/mainboard/thomson/ip1000/board_info.txt
@@ -1,3 +1,2 @@
-Category: settop
 Board URL: http://www.settoplinux.org/index.php?title=Thomson_IP1000
 Flashrom support: y
diff --git a/src/mainboard/traverse/geos/Kconfig b/src/mainboard/traverse/geos/Kconfig
index 3139d7d..33707dd 100644
--- a/src/mainboard/traverse/geos/Kconfig
+++ b/src/mainboard/traverse/geos/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TRAVERSE_GEOS
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_HALF
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/traverse/geos/board_info.txt b/src/mainboard/traverse/geos/board_info.txt
index 394724a..103d7fc 100644
--- a/src/mainboard/traverse/geos/board_info.txt
+++ b/src/mainboard/traverse/geos/board_info.txt
@@ -1,4 +1,3 @@
-Category: half
 Board URL: http://www.traverse.com.au/geos11-adsl2-x86-router-appliance
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index b4e6c92..7ef9239 100644
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -21,6 +21,7 @@ if BOARD_TYAN_S1846
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_INTEL_SLOT_1
 	select NORTHBRIDGE_INTEL_I440BX
 	select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/tyan/s1846/board_info.txt b/src/mainboard/tyan/s1846/board_info.txt
index 92a0b08..3b31c7e 100644
--- a/src/mainboard/tyan/s1846/board_info.txt
+++ b/src/mainboard/tyan/s1846/board_info.txt
@@ -1,5 +1,4 @@
 Board name: Tsunami ATX (S1846)
-Category: desktop
 Board URL: http://www.tyan.com/archive/products/html/tsunamiatx.html
 ROM package: DIP32
 ROM protocol: Parallel
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index f908908..5eab148 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2735
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_INTEL_SOCKET_MPGA604
 	select NORTHBRIDGE_INTEL_E7501
 	select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/tyan/s2735/board_info.txt b/src/mainboard/tyan/s2735/board_info.txt
index 3eb1393..3dbe506 100644
--- a/src/mainboard/tyan/s2735/board_info.txt
+++ b/src/mainboard/tyan/s2735/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Tiger i7501R (S2735)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/tigeri7501r.html
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 88ab969..9c64480 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2850
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s2850/board_info.txt b/src/mainboard/tyan/s2850/board_info.txt
index e52a61d..6a93579 100644
--- a/src/mainboard/tyan/s2850/board_info.txt
+++ b/src/mainboard/tyan/s2850/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Tomcat K8S (S2850)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/tomcatk8s.html
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 8e77709..d903095 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2875
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8151
diff --git a/src/mainboard/tyan/s2875/board_info.txt b/src/mainboard/tyan/s2875/board_info.txt
index dbb5fd7..4f9a2d1 100644
--- a/src/mainboard/tyan/s2875/board_info.txt
+++ b/src/mainboard/tyan/s2875/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Tiger K8W (S2875)
-Category: desktop
 Board URL: http://www.tyan.com/archive/products/html/tigerk8w.html
diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig
index c6fed4b..6d85657 100644
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2880
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/tyan/s2880/board_info.txt b/src/mainboard/tyan/s2880/board_info.txt
index 06870a3..e9b819a 100644
--- a/src/mainboard/tyan/s2880/board_info.txt
+++ b/src/mainboard/tyan/s2880/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8S (S2880)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8s.html
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index fcc93f3..913b61e 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2881
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/tyan/s2881/board_info.txt b/src/mainboard/tyan/s2881/board_info.txt
index 8d3b454..b1cd3b5 100644
--- a/src/mainboard/tyan/s2881/board_info.txt
+++ b/src/mainboard/tyan/s2881/board_info.txt
@@ -1,4 +1,3 @@
 Board name: Thunder K8SR (S2881)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8sr.html
 Flashrom support: y
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index 0a0909a..139c6ea 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2882
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/tyan/s2882/board_info.txt b/src/mainboard/tyan/s2882/board_info.txt
index 33c6b04..101a394 100644
--- a/src/mainboard/tyan/s2882/board_info.txt
+++ b/src/mainboard/tyan/s2882/board_info.txt
@@ -1,4 +1,3 @@
 Board name: Thunder K8S Pro (S2882)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8spro.html
 Flashrom support: y
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index aab6732..8340a39 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2885
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s2885/board_info.txt b/src/mainboard/tyan/s2885/board_info.txt
index 9cfea17..ad846e7 100644
--- a/src/mainboard/tyan/s2885/board_info.txt
+++ b/src/mainboard/tyan/s2885/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8W (S2885)
-Category: desktop
 Board URL: http://www.tyan.com/archive/products/html/thunderk8w.html
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index ddd7ed0..46f8deb 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2891
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/tyan/s2891/board_info.txt b/src/mainboard/tyan/s2891/board_info.txt
index 0610d4b..3b6c37b 100644
--- a/src/mainboard/tyan/s2891/board_info.txt
+++ b/src/mainboard/tyan/s2891/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8SRE (S2891)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8sre.html
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index ddf2901..95f4275 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2892
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/tyan/s2892/board_info.txt b/src/mainboard/tyan/s2892/board_info.txt
index ba7b181..dd8af05 100644
--- a/src/mainboard/tyan/s2892/board_info.txt
+++ b/src/mainboard/tyan/s2892/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8SE (S2892)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8se.html
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 0201eb4..be38108 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2895
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/tyan/s2895/board_info.txt b/src/mainboard/tyan/s2895/board_info.txt
index bec47a4..3582655 100644
--- a/src/mainboard/tyan/s2895/board_info.txt
+++ b/src/mainboard/tyan/s2895/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8WE (S2895)
-Category: desktop
 Board URL: http://www.tyan.com/archive/products/html/thunderk8we.html
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 731cc5c..3c81401 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2912
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/tyan/s2912/board_info.txt b/src/mainboard/tyan/s2912/board_info.txt
index 16a0606..a18e4b8 100644
--- a/src/mainboard/tyan/s2912/board_info.txt
+++ b/src/mainboard/tyan/s2912/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder n3600R (S2912)
-Category: server
 Board URL: http://www.tyan.com/product_board_detail.aspx?pid=157
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index a7f9954..b9059f1 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S2912_FAM10
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_F_1207
 	select DIMM_DDR2
 	select DIMM_REGISTERED
diff --git a/src/mainboard/tyan/s2912_fam10/board_info.txt b/src/mainboard/tyan/s2912_fam10/board_info.txt
deleted file mode 100644
index 3d902b6..0000000
--- a/src/mainboard/tyan/s2912_fam10/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: server
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index 449aa39..da7f196 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S4880
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s4880/board_info.txt b/src/mainboard/tyan/s4880/board_info.txt
index 40d9b97..5839c6b 100644
--- a/src/mainboard/tyan/s4880/board_info.txt
+++ b/src/mainboard/tyan/s4880/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8QS (S4880)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8qs.html
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index ec1f7a9..e530fd9 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -3,6 +3,7 @@ if BOARD_TYAN_S4882
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s4882/board_info.txt b/src/mainboard/tyan/s4882/board_info.txt
index d953ac7..749a16f 100644
--- a/src/mainboard/tyan/s4882/board_info.txt
+++ b/src/mainboard/tyan/s4882/board_info.txt
@@ -1,3 +1,2 @@
 Board name: Thunder K8QS Pro (S4882)
-Category: server
 Board URL: http://www.tyan.com/archive/products/html/thunderk8qspro.html
diff --git a/src/mainboard/tyan/s8226/Kconfig b/src/mainboard/tyan/s8226/Kconfig
index 68ce152..05f0446 100644
--- a/src/mainboard/tyan/s8226/Kconfig
+++ b/src/mainboard/tyan/s8226/Kconfig
@@ -22,6 +22,7 @@ if BOARD_TYAN_S8226
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SERVER
 	select CPU_AMD_AGESA_FAMILY15
 	select CPU_AMD_SOCKET_C32
 	select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/tyan/s8226/board_info.txt b/src/mainboard/tyan/s8226/board_info.txt
deleted file mode 100644
index 3d902b6..0000000
--- a/src/mainboard/tyan/s8226/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: server
diff --git a/src/mainboard/via/epia-cn/Kconfig b/src/mainboard/via/epia-cn/Kconfig
index e7920e7..a8c21c5 100644
--- a/src/mainboard/via/epia-cn/Kconfig
+++ b/src/mainboard/via/epia-cn/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_EPIA_CN
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia-cn/board_info.txt b/src/mainboard/via/epia-cn/board_info.txt
index fbf0866..8cdd647 100644
--- a/src/mainboard/via/epia-cn/board_info.txt
+++ b/src/mainboard/via/epia-cn/board_info.txt
@@ -1,3 +1,2 @@
-Category: mini
 Board name: EPIA-CN10000EG / EPIA-CN13000G
 Board URL: http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=400
diff --git a/src/mainboard/via/epia-m/Kconfig b/src/mainboard/via/epia-m/Kconfig
index 3e8a93d..0dff9e2 100644
--- a/src/mainboard/via/epia-m/Kconfig
+++ b/src/mainboard/via/epia-m/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_EPIA_M || BOARD_VIA_EPIA_MII || BOARD_VIA_EPIA_ML
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C3
 	select NORTHBRIDGE_VIA_VT8623
 	select SOUTHBRIDGE_VIA_VT8235
diff --git a/src/mainboard/via/epia-m/board_info.txt b/src/mainboard/via/epia-m/board_info.txt
index 3d084e0..bb4463d 100644
--- a/src/mainboard/via/epia-m/board_info.txt
+++ b/src/mainboard/via/epia-m/board_info.txt
@@ -1,3 +1,2 @@
-Category: mini
 Board URL: http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=81
 Flashrom support: y
diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index fcadabc..61a5a3c 100644
--- a/src/mainboard/via/epia-m700/Kconfig
+++ b/src/mainboard/via/epia-m700/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_EPIA_M700
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_VX800
 	select SUPERIO_WINBOND_W83697HF
diff --git a/src/mainboard/via/epia-m700/board_info.txt b/src/mainboard/via/epia-m700/board_info.txt
index 9204d80..20f0cfe 100644
--- a/src/mainboard/via/epia-m700/board_info.txt
+++ b/src/mainboard/via/epia-m700/board_info.txt
@@ -1,4 +1,3 @@
-Category: mini
 Board URL: http://www.viaembedded.com/en/products/boards/670/1/EPIA-M700_%28EOL%29.html
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/via/epia-m850/Kconfig b/src/mainboard/via/epia-m850/Kconfig
index 01ef032..082de23 100644
--- a/src/mainboard/via/epia-m850/Kconfig
+++ b/src/mainboard/via/epia-m850/Kconfig
@@ -22,6 +22,7 @@ if BOARD_VIA_EPIA_M850
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_NANO
 	select NORTHBRIDGE_VIA_VX900
 	select SUPERIO_FINTEK_F81865F
diff --git a/src/mainboard/via/epia-m850/board_info.txt b/src/mainboard/via/epia-m850/board_info.txt
index 1e673ab..84a7bf6 100644
--- a/src/mainboard/via/epia-m850/board_info.txt
+++ b/src/mainboard/via/epia-m850/board_info.txt
@@ -1,4 +1,3 @@
-Category: mini
 Board URL: http://www.viaembedded.com/en/products/boards/1290/1/EPIA-M850.html
 ROM package: SOIC8
 ROM protocol: SPI
diff --git a/src/mainboard/via/epia-mii/board_info.txt b/src/mainboard/via/epia-mii/board_info.txt
index 78b956d..05f55b8 100644
--- a/src/mainboard/via/epia-mii/board_info.txt
+++ b/src/mainboard/via/epia-mii/board_info.txt
@@ -1,4 +1,3 @@
 Board URL: http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=202
 Flashrom support: y
-Category: mini
 Clone of: via/epia-m
diff --git a/src/mainboard/via/epia-ml/board_info.txt b/src/mainboard/via/epia-ml/board_info.txt
index cbea112..42a129f 100644
--- a/src/mainboard/via/epia-ml/board_info.txt
+++ b/src/mainboard/via/epia-ml/board_info.txt
@@ -1,4 +1,3 @@
 Board URL: http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=301
 Flashrom support: y
-Category: mini
 Clone of: via/epia-m
diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig
index 2b327b7..49e3a84 100644
--- a/src/mainboard/via/epia-n/Kconfig
+++ b/src/mainboard/via/epia-n/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_EPIA_N
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C3
 	select NORTHBRIDGE_VIA_CN400
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia-n/board_info.txt b/src/mainboard/via/epia-n/board_info.txt
index d7bb1d9..cec23c5 100644
--- a/src/mainboard/via/epia-n/board_info.txt
+++ b/src/mainboard/via/epia-n/board_info.txt
@@ -1,2 +1 @@
-Category: mini
 Board URL: http://www.idotpc.com/TheStore/pc/viewCategories.asp?idCategory=56
diff --git a/src/mainboard/via/epia/Kconfig b/src/mainboard/via/epia/Kconfig
index 60ce4f5..176def6 100644
--- a/src/mainboard/via/epia/Kconfig
+++ b/src/mainboard/via/epia/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_EPIA
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C3
 	select NORTHBRIDGE_VIA_VT8601
 	select SOUTHBRIDGE_VIA_VT8231
diff --git a/src/mainboard/via/epia/board_info.txt b/src/mainboard/via/epia/board_info.txt
index d39a82d..1f504a0 100644
--- a/src/mainboard/via/epia/board_info.txt
+++ b/src/mainboard/via/epia/board_info.txt
@@ -1,2 +1 @@
-Category: mini
 Board URL: http://www.via.com.tw/en/products/mainboards/motherboards.jsp?motherboard_id=21
diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index 70aa8d7..a89f6dd 100644
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_PC2500E
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_MINI
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CN700
 	select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/pc2500e/board_info.txt b/src/mainboard/via/pc2500e/board_info.txt
index 8be1813..5e84a21 100644
--- a/src/mainboard/via/pc2500e/board_info.txt
+++ b/src/mainboard/via/pc2500e/board_info.txt
@@ -1,4 +1,3 @@
-Category: mini
 Board URL: http://www.idot.com.tw/en/products/mb-pc2500e/
 ROM package: PLCC
 ROM socketed: y
diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
index 14eebe6..409bb0d 100644
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -3,6 +3,7 @@ if BOARD_VIA_VT8454C
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_EVAL
 	select CPU_VIA_C7
 	select NORTHBRIDGE_VIA_CX700
 	select SUPERIO_VIA_VT1211
diff --git a/src/mainboard/via/vt8454c/board_info.txt b/src/mainboard/via/vt8454c/board_info.txt
deleted file mode 100644
index b351b8e..0000000
--- a/src/mainboard/via/vt8454c/board_info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Category: eval
diff --git a/src/mainboard/winent/pl6064/Kconfig b/src/mainboard/winent/pl6064/Kconfig
index 7db7de5..b6b250f 100644
--- a/src/mainboard/winent/pl6064/Kconfig
+++ b/src/mainboard/winent/pl6064/Kconfig
@@ -3,6 +3,7 @@ if BOARD_WINENT_PL6064
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_DESKTOP
 	select CPU_AMD_GEODE_LX
 	select NORTHBRIDGE_AMD_LX
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/winent/pl6064/board_info.txt b/src/mainboard/winent/pl6064/board_info.txt
index f939cf4..8db2ec5 100644
--- a/src/mainboard/winent/pl6064/board_info.txt
+++ b/src/mainboard/winent/pl6064/board_info.txt
@@ -1,3 +1,2 @@
 Board name: PL60640
-Category: desktop
 Board URL: http://www.win-ent.com/network-computing/network-systems/desktop-platforms/440-pl-60640.html
diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig
index d8d2628..8ec251d 100644
--- a/src/mainboard/wyse/s50/Kconfig
+++ b/src/mainboard/wyse/s50/Kconfig
@@ -21,6 +21,7 @@ if BOARD_WYSE_S50
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
 	select ARCH_X86
+	select BOARD_TYPE_SETTOP
 	select CPU_AMD_GEODE_GX2
 	select NORTHBRIDGE_AMD_GX2
 	select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/wyse/s50/board_info.txt b/src/mainboard/wyse/s50/board_info.txt
index 061101b..c536739 100644
--- a/src/mainboard/wyse/s50/board_info.txt
+++ b/src/mainboard/wyse/s50/board_info.txt
@@ -1,5 +1,4 @@
 Board name: S50
-Category: settop
 Board URL: http://au.wyse.com/products/hardware/thinclients/S50/index.asp
 ROM package: PLCC
 ROM protocol: LPC

