MAINTAINERS: Organize contents

Group entries by categories, and sort the groups alphabetically. Also,
separate different mainboard vendors with two extra spaces for clarity.

Change-Id: I43df8c24a40433357760827777497cbac4b6a919
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42129
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

1 files changed, 324 insertions, 252 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index e15e31c977..edd274b9b5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -133,77 +133,101 @@ Maintainers List (try to look for most precise areas first)
 
 		-----------------------------------
 
-RISC-V ARCHITECTURE
-M:	Ronald Minnich <rminnich@gmail.com>
-R:	Philipp Hug <philipp@hug.cx>
+################################################################################
+# Mainboards
+################################################################################
+
+APPLE MAINBOARDS
+M:	Evgeny Zinoviev <me@ch1p.io>
 S:	Maintained
-F:	src/arch/riscv/
-F:	src/soc/sifive/
-F:	src/soc/ucb/
-F:	src/mainboard/emulation/*-riscv/
-F:	src/mainboard/sifive/
-F:	util/riscv/
+F:	src/mainboard/apple/
 
-PPC64 ARCHITECTURE
-M:	Ronald Minnich <rminnich@gmail.com>
-M:	Timothy Pearson <tpearson@raptorengineeringinc.com>
+
+
+ASROCK B85M PRO4 MAINBOARD
+M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
-F:	src/arch/ppc64/
-F:	src/cpu/qemu-power8/
-F:	src/mainboard/emulation/qemu-power8/
+F:	src/mainboard/asrock/b85m_pro4/
 
-LENOVO EC
-M:	Alexander Couzens <lynxis@fe80.eu>
+ASROCK G41C-GS MAINBOARD & VARIANTS
+M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
-F:	src/ec/lenovo/
+F:	src/mainboard/asrock/g41c-gs/
 
-LENOVO MAINBOARDS
-M:	Alexander Couzens <lynxis@fe80.eu>
-M:	Patrick Rudolph <siro@das-labor.org>
+ASROCK H81M-HDS MAINBOARD
+M:	Tristan Corrick <tristan@corrick.kiwi>
 S:	Maintained
-F:	src/mainboard/lenovo/
+F:	src/mainboard/asrock/h81m-hds/
 
-LENOVO G505S MAINBOARD
+
+
+ASUS AM1I-A MAINBOARD
 M:	Mike Banon <mikebdp2@gmail.com>
 S:	Maintained
-F:	src/mainboard/lenovo/g505s/
+F:	src/mainboard/asus/am1i-a/
 
-APPLE MAINBOARDS
-M:	Evgeny Zinoviev <me@ch1p.io>
+ASUS MAXIMUS IV GENE-Z MAINBOARD
+M:	Tristan Corrick <tristan@corrick.kiwi>
 S:	Maintained
-F:	src/mainboard/apple/
+F:	src/mainboard/asus/maximus_iv_gene-z/
 
-GETAC P470 MAINBOARD
-M:	Patrick Georgi <patrick@georgi.software>
+ASUS P5QC PRO MAINBOARD & VARIANTS
+M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
-F:	src/mainboard/getac/p470
+F:	src/mainboard/asus/p5qc/
 
-INTEL HASWELL NORTHBRIDGE
+ASUS P5QPL-AM MAINBOARD & VARIANTS
 M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
-F:	src/northbridge/intel/haswell/
+F:	src/mainboard/asus/p5qpl-am/
 
-INTEL PINEVIEW CHIPSET
-M:	Damien Zammit <damien@zamaudio.com>
+ASUS P8H61-M LX MAINBOARD
+M:	Tristan Corrick <tristan@corrick.kiwi>
+S:	Maintained
+F:	src/mainboard/asus/p8h61-m_lx/
+
+ASUS P8H61-M LX3 R2.0 MAINBOARD
 M:	Angel Pons <th3fanbus@gmail.com>
-S:	Odd Fixes
-F:	src/northbridge/intel/pineview/
+S:	Maintained
+F:	src/mainboard/asus/p8h61-m_lx3_r2_0/
 
-INTEL SANDYBRIDGE NORTHBRIDGE
+ASUS P8H61-M PRO MAINBOARD
 M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
-F:	src/northbridge/intel/sandybridge/
+F:	src/mainboard/asus/p8h61-m_pro/
 
-INTEL D510MO MAINBOARD
-M:	Damien Zammit <damien@zamaudio.com>
-S:	Odd Fixes
-F:	src/mainboard/intel/d510mo
+ASUS P8Z77-M PRO MAINBOARD
+M:	Vlado Cibic <vladocb@protonmail.com>
+S:	Maintained
+F:	src/mainboard/asus/p8z77-m_pro/
 
-INTEL X4X CHIPSET
-M:	Damien Zammit <damien@zamaudio.com>
+ASUS P8Z77-V LX2 MAINBOARD
 M:	Angel Pons <th3fanbus@gmail.com>
-S:	Odd Fixes
-F:	src/northbridge/intel/x4x/
+S:	Maintained
+F:	src/mainboard/asus/p8z77-v_lx2/
+
+
+
+FACEBOOK FBG1701 MAINBOARD
+M:	Frans Hendriks <fhendriks@eltan.com>
+M:	Wim Vervoorn <wvervoorn@eltan.com>
+S:	Maintained
+F:	src/mainboard/facebook/fbg1701/
+
+FACEBOOK MONOLITH MAINBOARD
+M:	Frans Hendriks <fhendriks@eltan.com>
+M:	Wim Vervoorn <wvervoorn@eltan.com>
+S:	Maintained
+F:	src/mainboard/facebook/monolith/
+
+
+
+GETAC P470 MAINBOARD
+M:	Patrick Georgi <patrick@georgi.software>
+S:	Maintained
+F:	src/mainboard/getac/p470
+
+
 
 GIGABYTE GA-G41M-ES2L MAINBOARD
 M:	Damien Zammit <damien@zamaudio.com>
@@ -215,6 +239,8 @@ M:	Angel Pons <th3fanbus@gmail.com>
 S:	Maintained
 F:	src/mainboard/gigabyte/ga-h61m-series
 
+
+
 GOOGLE PANTHER MAINBOARD
 M:	Stefan Reinauer <stefan.reinauer@coreboot.org>
 S:	Supported
@@ -234,126 +260,60 @@ F:	src/mainboard/google/parrot/
 F:	src/mainboard/google/slippy/
 F:	src/mainboard/google/stout/
 
-OPENCELLULAR MAINBOARDS
-M:	Christian Walter <christian.walter@9elements.com>
-M:	Patrick Rudolph <patrick.rudolph@9elements.com>
-S:	Supported
-F:	src/mainboard/opencellular/elgon/
-
-PURISM MAINBOARDS
-M:	Matt DeVillier <matt.devillier@puri.sm>
-S:	Supported
-F:	src/mainboard/purism
 
-SAMSUNG CHROMEOS MAINBOARDS
-M:	Matt DeVillier <MrChromebox@gmail.com>
-S:	Maintained
-F:	src/mainboard/samsung/lumpy/
-F:	src/mainboard/samsung/stumpy/
 
-INTEL FSP DENVERTON-NS SOC & HARCUVAR CRB
-M:	Vanessa Eusebio <vanessa.f.eusebio@intel.com>
-M:	David Guckian <david.guckian@intel.com>
+INTEL D510MO MAINBOARD
+M:	Damien Zammit <damien@zamaudio.com>
 S:	Odd Fixes
-F:	src/mainboard/intel/harcuvar/
-F:	src/soc/intel/denverton_ns/
-F:	src/vendorcode/intel/fsp/fsp2_0/denverton_ns/
-
-INTEL FSP 1.1
-M:	Lee Leahy <leroy.p.leahy@intel.com>
-M:	Huang Jin <huang.jin@intel.com>
-M:	York Yang <york.yang@intel.com>
-S:	Supported
-F:	src/drivers/intel/fsp1_1/
-
-INTEL FSP 2.0
-M:	Andrey Petrov <andrey.petrov@gmail.com>
-S:	Maintained
-F:	src/drivers/intel/fsp2_0/
+F:	src/mainboard/intel/d510mo
 
 INTEL STRAGO MAINBOARD
 M:	Hannah Williams <hannah.williams@intel.com>
 S:	Supported
 F:	/src/mainboard/intel/strago/
 
-INTEL BRASWELL SOC
-M:	Piotr Król <piotr.krol@3mdeb.com>
-M:	Michał Żygowski <michal.zygowski@3mdeb.com>
-M:	Frans Hendriks <fhendriks@eltan.com>
-S:	Maintained
-F:	/src/soc/intel/braswell
-F:	/src/vendorcode/intel/fsp/fsp1_1/braswell
 
-INTEL APOLLOLAKE_SOC
-M:	Andrey Petrov <andrey.petrov@gmail.com>
-S:	Maintained
-F:	src/soc/intel/apollolake/
 
-ASROCK G41C-GS MAINBOARD & VARIANTS
-M:	Angel Pons <th3fanbus@gmail.com>
+LENOVO MAINBOARDS
+M:	Alexander Couzens <lynxis@fe80.eu>
+M:	Patrick Rudolph <siro@das-labor.org>
 S:	Maintained
-F:	src/mainboard/asrock/g41c-gs/
+F:	src/mainboard/lenovo/
 
-ASROCK H81M-HDS MAINBOARD
-M:	Tristan Corrick <tristan@corrick.kiwi>
+LENOVO G505S MAINBOARD
+M:	Mike Banon <mikebdp2@gmail.com>
 S:	Maintained
-F:	src/mainboard/asrock/h81m-hds/
+F:	src/mainboard/lenovo/g505s/
 
-ASROCK B85M PRO4 MAINBOARD
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asrock/b85m_pro4/
 
-ASUS AM1I-A MAINBOARD
-M:	Mike Banon <mikebdp2@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/am1i-a/
 
-ASUS MAXIMUS IV GENE-Z MAINBOARD
-M:	Tristan Corrick <tristan@corrick.kiwi>
+LIBRETREND LT1000 MAINBOARD
+M:	Piotr Król <piotr.krol@3mdeb.com>
+M:	Michał Żygowski <michal.zygowski@3mdeb.com>
 S:	Maintained
-F:	src/mainboard/asus/maximus_iv_gene-z/
+F:	src/mainboard/libretrend/lt1000
 
-ASUS P5QC PRO MAINBOARD & VARIANTS
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p5qc/
 
-ASUS P5QPL-AM MAINBOARD & VARIANTS
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p5qpl-am/
 
-ASUS P8H61-M LX MAINBOARD
-M:	Tristan Corrick <tristan@corrick.kiwi>
+OCP TIOGAPASS MAINBOARD
+M:	Jonathan Zhang <jonzhang@fb.com>
+M:	Reddy Chagam <anjaneya.chagam@intel.com>
+M:	Johnny Lin <Johnny_Lin@wiwynn.com>
+M:	Morgan Jang <Morgan_Jang@wiwynn.com>
+M:	Ryback Hung <<Ryback.Hung@quantatw.com>
+M:	Bryant Ou <Bryant.Ou@quantatw.com>
 S:	Maintained
-F:	src/mainboard/asus/p8h61-m_lx/
+F:	src/mainboard/ocp/tiogapass
 
-ASUS P8H61-M LX3 R2.0 MAINBOARD
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p8h61-m_lx3_r2_0/
 
-ASUS P8H61-M PRO MAINBOARD
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p8h61-m_pro/
 
-ASUS P8Z77-M PRO MAINBOARD
-M:	Vlado Cibic <vladocb@protonmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p8z77-m_pro/
+OPENCELLULAR MAINBOARDS
+M:	Christian Walter <christian.walter@9elements.com>
+M:	Patrick Rudolph <patrick.rudolph@9elements.com>
+S:	Supported
+F:	src/mainboard/opencellular/elgon/
 
-ASUS P8Z77-V LX2 MAINBOARD
-M:	Angel Pons <th3fanbus@gmail.com>
-S:	Maintained
-F:	src/mainboard/asus/p8z77-v_lx2/
 
-LIBRETREND LT1000 MAINBOARD
-M:	Piotr Król <piotr.krol@3mdeb.com>
-M:	Michał Żygowski <michal.zygowski@3mdeb.com>
-S:	Maintained
-F:	src/mainboard/libretrend/lt1000
 
 PC ENGINES ALL MAINBOARDS
 M:	Piotr Król <piotr.krol@3mdeb.com>
@@ -361,17 +321,46 @@ M:	Michał Żygowski <michal.zygowski@3mdeb.com>
 S:	Supported
 F:	src/mainboard/pcengines/
 
+
+
+PORTWELL PQ-M107 MAINBOARD
+M:	Frans Hendriks <fhendriks@eltan.com>
+M:	Wim Vervoorn <wvervoorn@eltan.com>
+S:	Maintained
+F:	src/mainboard/portwell/m107/
+
+
+
 PROTECTLI ALL MAINBOARDS
 M:	Piotr Król <piotr.krol@3mdeb.com>
 M:	Michał Żygowski <michal.zygowski@3mdeb.com>
 S:	Maintained
 F:	src/mainboard/protectli/
 
+
+
+PURISM MAINBOARDS
+M:	Matt DeVillier <matt.devillier@puri.sm>
+S:	Supported
+F:	src/mainboard/purism
+
+
+
+SAMSUNG CHROMEOS MAINBOARDS
+M:	Matt DeVillier <MrChromebox@gmail.com>
+S:	Maintained
+F:	src/mainboard/samsung/lumpy/
+F:	src/mainboard/samsung/stumpy/
+
+
+
 SIEMENS MC_xxxx MAINBOARDS
 M:	Werner Zeh <werner.zeh@siemens.com>
 S:	Maintained
 F:	src/mainboard/siemens/mc_apl1/
 
+
+
 SUPERMICRO X10SLM+-F MAINBOARD
 M:	Tristan Corrick <tristan@corrick.kiwi>
 S:	Maintained
@@ -382,57 +371,9 @@ M:	Michael Niewöhner <foss@mniewoehner.de>
 S:	Maintained
 F:	src/mainboard/supermicro/x11-lga1151-series
 
-FACEBOOK FBG1701 MAINBOARD
-M:	Frans Hendriks <fhendriks@eltan.com>
-M:	Wim Vervoorn <wvervoorn@eltan.com>
-S:	Maintained
-F:	src/mainboard/facebook/fbg1701/
-
-FACEBOOK MONOLITH MAINBOARD
-M:	Frans Hendriks <fhendriks@eltan.com>
-M:	Wim Vervoorn <wvervoorn@eltan.com>
-S:	Maintained
-F:	src/mainboard/facebook/monolith/
-
-OCP TIOGAPASS MAINBOARD
-M:	Jonathan Zhang <jonzhang@fb.com>
-M:	Reddy Chagam <anjaneya.chagam@intel.com>
-M:	Johnny Lin <Johnny_Lin@wiwynn.com>
-M:	Morgan Jang <Morgan_Jang@wiwynn.com>
-M:	Ryback Hung <<Ryback.Hung@quantatw.com>
-M:	Bryant Ou <Bryant.Ou@quantatw.com>
-S:	Maintained
-F:	src/mainboard/ocp/tiogapass
-
-PORTWELL PQ-M107 MAINBOARD
-M:	Frans Hendriks <fhendriks@eltan.com>
-M:	Wim Vervoorn <wvervoorn@eltan.com>
-S:	Maintained
-F:	src/mainboard/portwell/m107/
-
-ASPEED AST2050 DRIVER & COMMON CODE
-M:	Timothy Pearson <tpearson@raptorengineeringinc.com>
-S:	Supported
-F:	src/drivers/aspeed/common/
-F:	src/drivers/aspeed/ast2050/
-
-ABUILD
-M:	Patrick Georgi <patrick@georgi-clan.de>
-M:	Martin Roth <gaumless@gmail.com>
-S:	Supported
-F:	util/abuild/
-
-ACPI
-F:	src/acpi/
-F:	src/arch/x86/acpi/
-F:	util/acpi/
-
-LZ4 COMPRESSION
-M:	Julius Werner <jwerner@chromium.org>
-S:	Supported
-F:	src/commonlib/lz4*
-F:	payloads/libpayload/liblz4/
-F:	util/cbfstool/lz4/
+################################################################################
+# Architectures
+################################################################################
 
 ARM ARCHITECTURE
 M:	Julius Werner <jwerner@chromium.org>
@@ -445,14 +386,24 @@ F:	src/soc/rockchip/
 F:	util/nvidia/
 F:	util/rockchip/
 
-ORPHANED ARM SOCS
-S:	Orphaned
-F:	src/cpu/armltd/
-F:	src/cpu/ti/
-F:	src/soc/qualcomm/
-F:	src/soc/samsung/
-F:	util/exynos/
-F:	util/ipqheader/
+PPC64 ARCHITECTURE
+M:	Ronald Minnich <rminnich@gmail.com>
+M:	Timothy Pearson <tpearson@raptorengineeringinc.com>
+S:	Maintained
+F:	src/arch/ppc64/
+F:	src/cpu/qemu-power8/
+F:	src/mainboard/emulation/qemu-power8/
+
+RISC-V ARCHITECTURE
+M:	Ronald Minnich <rminnich@gmail.com>
+R:	Philipp Hug <philipp@hug.cx>
+S:	Maintained
+F:	src/arch/riscv/
+F:	src/soc/sifive/
+F:	src/soc/ucb/
+F:	src/mainboard/emulation/*-riscv/
+F:	src/mainboard/sifive/
+F:	util/riscv/
 
 X86 ARCHITECTURE
 F:	src/arch/x86/
@@ -461,6 +412,52 @@ F:	src/drivers/pc80/
 F:	src/include/pc80/
 F:	src/include/cpu/x86/
 
+################################################################################
+# Embedded Controllers
+################################################################################
+
+LENOVO EC
+M:	Alexander Couzens <lynxis@fe80.eu>
+S:	Maintained
+F:	src/ec/lenovo/
+
+################################################################################
+# Northbridges
+################################################################################
+
+INTEL HASWELL NORTHBRIDGE
+M:	Angel Pons <th3fanbus@gmail.com>
+S:	Maintained
+F:	src/northbridge/intel/haswell/
+
+INTEL PINEVIEW CHIPSET
+M:	Damien Zammit <damien@zamaudio.com>
+M:	Angel Pons <th3fanbus@gmail.com>
+S:	Odd Fixes
+F:	src/northbridge/intel/pineview/
+
+INTEL SANDYBRIDGE NORTHBRIDGE
+M:	Angel Pons <th3fanbus@gmail.com>
+S:	Maintained
+F:	src/northbridge/intel/sandybridge/
+
+INTEL X4X CHIPSET
+M:	Damien Zammit <damien@zamaudio.com>
+M:	Angel Pons <th3fanbus@gmail.com>
+S:	Odd Fixes
+F:	src/northbridge/intel/x4x/
+
+################################################################################
+# Platforms
+################################################################################
+
+AMD SUPPORT
+F:	src/vendorcode/amd/
+F:	src/cpu/amd/
+F:	src/northbridge/amd/
+F:	src/southbridge/amd/
+F:	src/include/cpu/amd/
+
 INTEL SUPPORT
 M:	Patrick Rudolph <siro@das-labor.org>
 S:	Maintained
@@ -472,12 +469,113 @@ F:	src/soc/intel/
 F:	src/drivers/intel/
 F:	src/include/cpu/intel/
 
-AMD SUPPORT
-F:	src/vendorcode/amd/
-F:	src/cpu/amd/
-F:	src/northbridge/amd/
-F:	src/southbridge/amd/
-F:	src/include/cpu/amd/
+INTEL FSP DENVERTON-NS SOC & HARCUVAR CRB
+M:	Vanessa Eusebio <vanessa.f.eusebio@intel.com>
+M:	David Guckian <david.guckian@intel.com>
+S:	Odd Fixes
+F:	src/mainboard/intel/harcuvar/
+F:	src/soc/intel/denverton_ns/
+F:	src/vendorcode/intel/fsp/fsp2_0/denverton_ns/
+
+INTEL FSP 1.1
+M:	Lee Leahy <leroy.p.leahy@intel.com>
+M:	Huang Jin <huang.jin@intel.com>
+M:	York Yang <york.yang@intel.com>
+S:	Supported
+F:	src/drivers/intel/fsp1_1/
+
+INTEL FSP 2.0
+M:	Andrey Petrov <andrey.petrov@gmail.com>
+S:	Maintained
+F:	src/drivers/intel/fsp2_0/
+
+################################################################################
+# Systems on a Chip
+################################################################################
+
+INTEL APOLLOLAKE_SOC
+M:	Andrey Petrov <andrey.petrov@gmail.com>
+S:	Maintained
+F:	src/soc/intel/apollolake/
+
+INTEL BRASWELL SOC
+M:	Piotr Król <piotr.krol@3mdeb.com>
+M:	Michał Żygowski <michal.zygowski@3mdeb.com>
+M:	Frans Hendriks <fhendriks@eltan.com>
+S:	Maintained
+F:	/src/soc/intel/braswell
+F:	/src/vendorcode/intel/fsp/fsp1_1/braswell
+
+ORPHANED ARM SOCS
+S:	Orphaned
+F:	src/cpu/armltd/
+F:	src/cpu/ti/
+F:	src/soc/qualcomm/
+F:	src/soc/samsung/
+F:	util/exynos/
+F:	util/ipqheader/
+
+################################################################################
+# Payloads
+################################################################################
+
+NVRAM
+F:	util/nvramtool/
+F:	payloads/nvramcui/
+
+LIBPAYLOAD
+F:	payloads/libpayload/
+
+COREINFO PAYLOAD
+F:	payloads/coreinfo/
+
+EXTERNAL PAYLOADS INTEGRATION
+M:	Stefan Reinauer <stefan.reinauer@coreboot.org>
+M:	Martin Roth <gaumless@gmail.com>
+F:	payloads/external
+
+LINUXBOOT PAYLOAD INTEGRATION
+M:	Christian Walter <christian.walter@9elements.com>
+M:	Marcello Sylvester Bauer <info@marcellobauer.com>
+S:	Supported
+F:	payloads/external/LinuxBoot
+
+################################################################################
+# Utilities
+################################################################################
+
+ABUILD
+M:	Patrick Georgi <patrick@georgi-clan.de>
+M:	Martin Roth <gaumless@gmail.com>
+S:	Supported
+F:	util/abuild/
+
+BOARD STATUS
+F:	util/board_status/
+
+BUILD SYSTEM
+M:	Patrick Georgi <patrick@georgi-clan.de>
+M:	Martin Roth <gaumless@gmail.com>
+S:	Supported
+F:	Makefile
+F:	*.inc
+F:	src/include/kconfig.h
+F:	util/kconfig/
+F:	util/sconfig/
+F:	util/xcompile/
+F:	util/genbuild_h/
+
+TOOLCHAIN
+F:	util/crossgcc/
+
+DOCKER
+M:	Martin Roth <gaumless@gmail.com>
+S:	Supported
+F:	util/docker/
+
+GIT
+F:	.git*
+F:	/util/gitconfig
 
 LINT SCRIPTS
 M:	Patrick Georgi <patrick@georgi-clan.de>
@@ -485,6 +583,10 @@ M:	Martin Roth <gaumless@gmail.com>
 S:	Supported
 F:	util/lint/
 
+IFDTOOL
+M:	Stefan Reinauer <stefan.reinauer@coreboot.org>
+F:	util/ifdtool/
+
 INTELTOOL
 M:	Stefan Reinauer <stefan.reinauer@coreboot.org>
 F:	util/inteltool/
@@ -499,24 +601,27 @@ W:	https://github.com/corna/me_cleaner
 S:	Maintained
 F:	util/me_cleaner/
 
-IFDTOOL
-M:	Stefan Reinauer <stefan.reinauer@coreboot.org>
-F:	util/ifdtool/
+################################################################################
+# Miscellaneous
+################################################################################
 
-BUILD SYSTEM
-M:	Patrick Georgi <patrick@georgi-clan.de>
-M:	Martin Roth <gaumless@gmail.com>
+ASPEED AST2050 DRIVER & COMMON CODE
+M:	Timothy Pearson <tpearson@raptorengineeringinc.com>
 S:	Supported
-F:	Makefile
-F:	*.inc
-F:	src/include/kconfig.h
-F:	util/kconfig/
-F:	util/sconfig/
-F:	util/xcompile/
-F:	util/genbuild_h/
+F:	src/drivers/aspeed/common/
+F:	src/drivers/aspeed/ast2050/
 
-BOARD STATUS
-F:	util/board_status/
+ACPI
+F:	src/acpi/
+F:	src/arch/x86/acpi/
+F:	util/acpi/
+
+LZ4 COMPRESSION
+M:	Julius Werner <jwerner@chromium.org>
+S:	Supported
+F:	src/commonlib/lz4*
+F:	payloads/libpayload/liblz4/
+F:	util/cbfstool/lz4/
 
 BINARY OBJECTS
 F:	3rdparty/blobs/
@@ -550,27 +655,6 @@ F:	src/console/
 F:	src/include/console/
 F:	src/drivers/uart/
 
-NVRAM
-F:	util/nvramtool/
-F:	payloads/nvramcui/
-
-LIBPAYLOAD
-F:	payloads/libpayload/
-
-COREINFO PAYLOAD
-F:	payloads/coreinfo/
-
-EXTERNAL PAYLOADS INTEGRATION
-M:	Stefan Reinauer <stefan.reinauer@coreboot.org>
-M:	Martin Roth <gaumless@gmail.com>
-F:	payloads/external
-
-LINUXBOOT PAYLOAD INTEGRATION
-M:	Christian Walter <christian.walter@9elements.com>
-M:	Marcello Sylvester Bauer <info@marcellobauer.com>
-S:	Supported
-F:	payloads/external/LinuxBoot
-
 VERIFIED BOOT 2
 M:	Aaron Durbin <adurbin@chromium.org>
 F:	src/security/vboot/
@@ -581,18 +665,6 @@ S:	Supported
 F:	src/drivers/*/tpm/
 F:	src/security/tpm
 
-DOCKER
-M:	Martin Roth <gaumless@gmail.com>
-S:	Supported
-F:	util/docker/
-
-TOOLCHAIN
-F:	util/crossgcc/
-
-GIT
-F:	.git*
-F:	/util/gitconfig
-
 SUPERIOS & SUPERIOTOOL
 M:	Felix Held <felix-coreboot@felixheld.de>
 S:	Maintained