[coreboot-gerrit] New patch to review for coreboot: tree: drop last sentence of GPL copyright header

Patrick Georgi (pgeorgi@google.com) gerrit at coreboot.org
Tue Oct 13 22:17:00 CEST 2015


Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11888

-gerrit

commit d7253a7ab99c11c53584f895ce46f0bf7d2001c4
Author: Patrick Georgi <pgeorgi at chromium.org>
Date:   Tue Oct 13 22:12:53 2015 +0200

    tree: drop last sentence of GPL copyright header
    
    It encourages users from writing to the FSF without giving an address.
    Linux prefers to drop that sentence, too, and checkpatch.pl looks out
    for that.
    
    This is the result of util/scripts/no-fsf-addresses.sh with no further
    editing.
    
    Change-Id: Ie96faea295fe001911d77dbc51e9a6789558fbd6
    Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
 Documentation/mainboard_io_trap_handler_sample.c                  | 3 +--
 Makefile.inc                                                      | 3 +--
 payloads/bayou/Makefile                                           | 3 +--
 payloads/bayou/bayou.h                                            | 3 +--
 payloads/bayou/bayou.xml.example                                  | 3 +--
 payloads/bayou/config.c                                           | 3 +--
 payloads/bayou/main.c                                             | 3 +--
 payloads/bayou/menu.c                                             | 3 +--
 payloads/bayou/payload.c                                          | 3 +--
 payloads/bayou/self.c                                             | 3 +--
 payloads/bayou/self.h                                             | 3 +--
 payloads/bayou/util/pbuilder/Makefile                             | 3 +--
 payloads/bayou/util/pbuilder/config.c                             | 3 +--
 payloads/bayou/util/pbuilder/create.c                             | 3 +--
 payloads/bayou/util/pbuilder/liblar/Makefile                      | 3 +--
 payloads/bayou/util/pbuilder/liblar/elf.h                         | 3 +--
 payloads/bayou/util/pbuilder/liblar/lar.h                         | 3 +--
 payloads/bayou/util/pbuilder/liblar/lib.c                         | 3 +--
 payloads/bayou/util/pbuilder/liblar/liblar.h                      | 3 +--
 payloads/bayou/util/pbuilder/liblar/self.h                        | 3 +--
 payloads/bayou/util/pbuilder/lzma/Makefile                        | 3 +--
 payloads/bayou/util/pbuilder/lzma/minilzma.cc                     | 3 +--
 payloads/bayou/util/pbuilder/main.c                               | 3 +--
 payloads/bayou/util/pbuilder/pbuilder.h                           | 3 +--
 payloads/bayou/util/pbuilder/show.c                               | 3 +--
 payloads/coreinfo/Kconfig                                         | 3 +--
 payloads/coreinfo/Makefile                                        | 3 +--
 payloads/coreinfo/bootlog_module.c                                | 3 +--
 payloads/coreinfo/cbfs_module.c                                   | 3 +--
 payloads/coreinfo/coreboot_module.c                               | 3 +--
 payloads/coreinfo/coreinfo.c                                      | 3 +--
 payloads/coreinfo/coreinfo.h                                      | 3 +--
 payloads/coreinfo/cpuid.S                                         | 3 +--
 payloads/coreinfo/cpuinfo_module.c                                | 3 +--
 payloads/coreinfo/lar_module.c                                    | 3 +--
 payloads/coreinfo/multiboot_module.c                              | 3 +--
 payloads/coreinfo/nvram_module.c                                  | 3 +--
 payloads/coreinfo/pci_module.c                                    | 3 +--
 payloads/coreinfo/ramdump_module.c                                | 3 +--
 payloads/external/Makefile.inc                                    | 3 +--
 payloads/libpayload/arch/arm/gdb.c                                | 3 +--
 payloads/libpayload/arch/arm64/gdb.c                              | 3 +--
 payloads/libpayload/arch/mips/Kconfig                             | 3 +--
 payloads/libpayload/arch/mips/Makefile.inc                        | 3 +--
 payloads/libpayload/arch/mips/cache.c                             | 3 +--
 payloads/libpayload/arch/mips/coreboot.c                          | 3 +--
 payloads/libpayload/arch/mips/exception.c                         | 3 +--
 payloads/libpayload/arch/mips/exception_asm.S                     | 3 +--
 payloads/libpayload/arch/mips/gdb.c                               | 3 +--
 payloads/libpayload/arch/mips/head.S                              | 3 +--
 payloads/libpayload/arch/mips/libpayload.ldscript                 | 3 +--
 payloads/libpayload/arch/mips/main.c                              | 3 +--
 payloads/libpayload/arch/mips/string.c                            | 3 +--
 payloads/libpayload/arch/mips/sysinfo.c                           | 3 +--
 payloads/libpayload/arch/mips/timer.c                             | 3 +--
 payloads/libpayload/arch/mips/util.S                              | 3 +--
 payloads/libpayload/arch/x86/gdb.c                                | 3 +--
 payloads/libpayload/arch/x86/string.c                             | 3 +--
 payloads/libpayload/drivers/serial/bg4cd.c                        | 3 +--
 payloads/libpayload/drivers/timer/bg4cd.c                         | 3 +--
 payloads/libpayload/drivers/timer/cygnus.c                        | 3 +--
 payloads/libpayload/drivers/timer/img_pistachio.c                 | 3 +--
 payloads/libpayload/drivers/timer/mtk_timer.c                     | 3 +--
 payloads/libpayload/drivers/timer/rktimer.c                       | 3 +--
 payloads/libpayload/drivers/udc/dwc2.c                            | 3 +--
 payloads/libpayload/drivers/udc/dwc2_priv.h                       | 3 +--
 payloads/libpayload/drivers/usb/dwc2.c                            | 3 +--
 payloads/libpayload/drivers/usb/dwc2.h                            | 3 +--
 payloads/libpayload/drivers/usb/dwc2_private.h                    | 3 +--
 payloads/libpayload/drivers/usb/dwc2_rh.c                         | 3 +--
 payloads/libpayload/gdb/Makefile.inc                              | 3 +--
 payloads/libpayload/gdb/commands.c                                | 3 +--
 payloads/libpayload/gdb/stub.c                                    | 3 +--
 payloads/libpayload/gdb/transport.c                               | 3 +--
 payloads/libpayload/include/arm/arch/asm.h                        | 3 +--
 payloads/libpayload/include/cbfs.h                                | 3 +--
 payloads/libpayload/include/cbfs_core.h                           | 3 +--
 payloads/libpayload/include/cbfs_ram.h                            | 3 +--
 payloads/libpayload/include/gdb.h                                 | 3 +--
 payloads/libpayload/include/mips/arch/byteorder.h                 | 3 +--
 payloads/libpayload/include/mips/arch/cache.h                     | 3 +--
 payloads/libpayload/include/mips/arch/exception.h                 | 3 +--
 payloads/libpayload/include/mips/arch/io.h                        | 3 +--
 payloads/libpayload/include/mips/arch/stdint.h                    | 3 +--
 payloads/libpayload/include/mips/arch/types.h                     | 3 +--
 payloads/libpayload/include/mips/arch/virtual.h                   | 3 +--
 payloads/libpayload/include/udc/dwc2_udc.h                        | 3 +--
 payloads/libpayload/include/usb/dwc2_registers.h                  | 3 +--
 payloads/nvramcui/nvramcui.c                                      | 3 +--
 src/Kconfig                                                       | 3 +--
 src/acpi/sata.c                                                   | 3 +--
 src/arch/arm/Makefile.inc                                         | 3 +--
 src/arch/arm/armv4/Makefile.inc                                   | 3 +--
 src/arch/arm/armv4/bootblock.S                                    | 3 +--
 src/arch/arm/armv4/bootblock_simple.c                             | 3 +--
 src/arch/arm/armv7/Makefile.inc                                   | 3 +--
 src/arch/arm/armv7/bootblock.S                                    | 3 +--
 src/arch/arm/armv7/bootblock_simple.c                             | 3 +--
 src/arch/arm/armv7/thread.c                                       | 3 +--
 src/arch/arm/boot.c                                               | 3 +--
 src/arch/arm/div0.c                                               | 3 +--
 src/arch/arm/include/arch/asm.h                                   | 3 +--
 src/arch/arm/include/arch/clock.h                                 | 3 +--
 src/arch/arm/include/arch/early_variables.h                       | 3 +--
 src/arch/arm/include/arch/header.ld                               | 3 +--
 src/arch/arm/include/arch/memlayout.h                             | 3 +--
 src/arch/arm/include/arch/pci_ops.h                               | 3 +--
 src/arch/arm/include/arch/stages.h                                | 3 +--
 src/arch/arm/include/armv4/arch/cpu.h                             | 3 +--
 src/arch/arm/include/armv7.h                                      | 3 +--
 src/arch/arm/include/armv7/arch/cpu.h                             | 3 +--
 src/arch/arm/include/bootblock_common.h                           | 3 +--
 src/arch/arm/include/clocks.h                                     | 3 +--
 src/arch/arm/libgcc/Makefile.inc                                  | 3 +--
 src/arch/arm/libgcc/libgcc.h                                      | 3 +--
 src/arch/arm/libgcc/udivmoddi4.c                                  | 3 +--
 src/arch/arm/libgcc/umoddi3.c                                     | 3 +--
 src/arch/arm/stages.c                                             | 3 +--
 src/arch/arm/tables.c                                             | 3 +--
 src/arch/arm64/Makefile.inc                                       | 3 +--
 src/arch/arm64/arm_tf.c                                           | 3 +--
 src/arch/arm64/armv8/Makefile.inc                                 | 3 +--
 src/arch/arm64/armv8/bootblock.S                                  | 3 +--
 src/arch/arm64/armv8/bootblock_simple.c                           | 3 +--
 src/arch/arm64/armv8/cpu.S                                        | 3 +--
 src/arch/arm64/armv8/lib/Makefile.inc                             | 3 +--
 src/arch/arm64/armv8/lib/cache.c                                  | 3 +--
 src/arch/arm64/armv8/lib/clock.c                                  | 3 +--
 src/arch/arm64/armv8/lib/pstate.c                                 | 3 +--
 src/arch/arm64/armv8/lib/sysctrl.c                                | 3 +--
 src/arch/arm64/armv8/lib/tlb.c                                    | 3 +--
 src/arch/arm64/armv8/secmon/Makefile.inc                          | 3 +--
 src/arch/arm64/armv8/secmon/psci.c                                | 3 +--
 src/arch/arm64/armv8/secmon/secmon.h                              | 3 +--
 src/arch/arm64/armv8/secmon/secmon_init.c                         | 3 +--
 src/arch/arm64/armv8/secmon/smc.c                                 | 3 +--
 src/arch/arm64/armv8/secmon/trampoline.S                          | 3 +--
 src/arch/arm64/armv8/secmon_loader.c                              | 3 +--
 src/arch/arm64/boot.c                                             | 3 +--
 src/arch/arm64/c_entry.c                                          | 3 +--
 src/arch/arm64/cpu-internal.h                                     | 3 +--
 src/arch/arm64/cpu-stubs.c                                        | 3 +--
 src/arch/arm64/cpu.c                                              | 3 +--
 src/arch/arm64/cpu/Kconfig                                        | 3 +--
 src/arch/arm64/cpu/Makefile.inc                                   | 3 +--
 src/arch/arm64/cpu/cortex_a57.S                                   | 3 +--
 src/arch/arm64/cpu_ramstage.c                                     | 3 +--
 src/arch/arm64/div0.c                                             | 3 +--
 src/arch/arm64/include/arch/asm.h                                 | 3 +--
 src/arch/arm64/include/arch/clock.h                               | 3 +--
 src/arch/arm64/include/arch/early_variables.h                     | 3 +--
 src/arch/arm64/include/arch/header.ld                             | 3 +--
 src/arch/arm64/include/arch/memlayout.h                           | 3 +--
 src/arch/arm64/include/arch/mpidr.h                               | 3 +--
 src/arch/arm64/include/arch/pci_ops.h                             | 3 +--
 src/arch/arm64/include/arch/psci.h                                | 3 +--
 src/arch/arm64/include/arch/smc.h                                 | 3 +--
 src/arch/arm64/include/arch/spintable.h                           | 3 +--
 src/arch/arm64/include/arch/stages.h                              | 3 +--
 src/arch/arm64/include/arch/startup.h                             | 3 +--
 src/arch/arm64/include/arch/transition.h                          | 3 +--
 src/arch/arm64/include/arm_tf.h                                   | 3 +--
 src/arch/arm64/include/armv8/arch/cpu.h                           | 3 +--
 src/arch/arm64/include/armv8/arch/lib_helpers.h                   | 3 +--
 src/arch/arm64/include/armv8/arch/mmu.h                           | 3 +--
 src/arch/arm64/include/armv8/arch/rules.h                         | 3 +--
 src/arch/arm64/include/armv8/arch/secmon.h                        | 3 +--
 src/arch/arm64/include/clocks.h                                   | 3 +--
 src/arch/arm64/include/cpu/cortex_a57.h                           | 3 +--
 src/arch/arm64/spintable.c                                        | 3 +--
 src/arch/arm64/spintable_asm.S                                    | 3 +--
 src/arch/arm64/stage_entry.S                                      | 3 +--
 src/arch/arm64/stages.c                                           | 3 +--
 src/arch/arm64/startup.c                                          | 3 +--
 src/arch/arm64/tables.c                                           | 3 +--
 src/arch/arm64/transition.c                                       | 3 +--
 src/arch/arm64/transition_asm.S                                   | 3 +--
 src/arch/mips/Kconfig                                             | 3 +--
 src/arch/mips/Makefile.inc                                        | 3 +--
 src/arch/mips/ashldi3.c                                           | 3 +--
 src/arch/mips/boot.c                                              | 3 +--
 src/arch/mips/bootblock.S                                         | 3 +--
 src/arch/mips/bootblock_simple.c                                  | 3 +--
 src/arch/mips/cache.c                                             | 3 +--
 src/arch/mips/include/arch/byteorder.h                            | 3 +--
 src/arch/mips/include/arch/cache.h                                | 3 +--
 src/arch/mips/include/arch/cpu.h                                  | 3 +--
 src/arch/mips/include/arch/early_variables.h                      | 3 +--
 src/arch/mips/include/arch/exception.h                            | 3 +--
 src/arch/mips/include/arch/header.ld                              | 3 +--
 src/arch/mips/include/arch/hlt.h                                  | 3 +--
 src/arch/mips/include/arch/io.h                                   | 3 +--
 src/arch/mips/include/arch/memlayout.h                            | 3 +--
 src/arch/mips/include/arch/mmu.h                                  | 3 +--
 src/arch/mips/include/arch/pci_ops.h                              | 3 +--
 src/arch/mips/include/arch/stages.h                               | 3 +--
 src/arch/mips/include/arch/types.h                                | 3 +--
 src/arch/mips/include/bootblock_common.h                          | 3 +--
 src/arch/mips/include/stdint.h                                    | 3 +--
 src/arch/mips/mmu.c                                               | 3 +--
 src/arch/mips/stages.c                                            | 3 +--
 src/arch/mips/tables.c                                            | 3 +--
 src/arch/riscv/Makefile.inc                                       | 3 +--
 src/arch/riscv/boot.c                                             | 3 +--
 src/arch/riscv/bootblock.S                                        | 3 +--
 src/arch/riscv/bootblock_simple.c                                 | 3 +--
 src/arch/riscv/include/arch/cpu.h                                 | 3 +--
 src/arch/riscv/include/arch/early_variables.h                     | 3 +--
 src/arch/riscv/include/arch/header.ld                             | 3 +--
 src/arch/riscv/include/arch/memlayout.h                           | 3 +--
 src/arch/riscv/include/arch/stages.h                              | 3 +--
 src/arch/riscv/include/spike_util.h                               | 3 +--
 src/arch/riscv/prologue.inc                                       | 3 +--
 src/arch/riscv/rom_media.c                                        | 3 +--
 src/arch/riscv/stages.c                                           | 3 +--
 src/arch/riscv/tables.c                                           | 3 +--
 src/arch/riscv/trap_handler.c                                     | 3 +--
 src/arch/riscv/trap_util.S                                        | 3 +--
 src/arch/riscv/virtual_memory.c                                   | 3 +--
 src/arch/x86/Makefile.inc                                         | 3 +--
 src/arch/x86/acpi/debug.asl                                       | 3 +--
 src/arch/x86/acpi/globutil.asl                                    | 3 +--
 src/arch/x86/acpi/statdef.asl                                     | 3 +--
 src/arch/x86/acpigen.c                                            | 3 +--
 src/arch/x86/assembly_entry.S                                     | 3 +--
 src/arch/x86/bootblock.S                                          | 3 +--
 src/arch/x86/bootblock.ld                                         | 3 +--
 src/arch/x86/car.ld                                               | 3 +--
 src/arch/x86/cbfs_and_run.c                                       | 3 +--
 src/arch/x86/cbmem.c                                              | 3 +--
 src/arch/x86/ebda.c                                               | 3 +--
 src/arch/x86/failover.ld                                          | 3 +--
 src/arch/x86/gdt.c                                                | 3 +--
 src/arch/x86/include/arch/acpi.h                                  | 3 +--
 src/arch/x86/include/arch/acpigen.h                               | 3 +--
 src/arch/x86/include/arch/cbfs.h                                  | 3 +--
 src/arch/x86/include/arch/early_variables.h                       | 3 +--
 src/arch/x86/include/arch/ebda.h                                  | 3 +--
 src/arch/x86/include/arch/header.ld                               | 3 +--
 src/arch/x86/include/arch/interrupt.h                             | 3 +--
 src/arch/x86/include/arch/ioapic.h                                | 3 +--
 src/arch/x86/include/arch/memlayout.h                             | 3 +--
 src/arch/x86/include/arch/pci_io_cfg.h                            | 3 +--
 src/arch/x86/include/arch/pci_mmio_cfg.h                          | 3 +--
 src/arch/x86/include/arch/registers.h                             | 3 +--
 src/arch/x86/include/arch/smp/mpspec.h                            | 3 +--
 src/arch/x86/include/arch/stages.h                                | 3 +--
 src/arch/x86/ioapic.c                                             | 3 +--
 src/arch/x86/memlayout.ld                                         | 3 +--
 src/arch/x86/memset.c                                             | 3 +--
 src/arch/x86/mmap_boot.c                                          | 3 +--
 src/arch/x86/mpspec.c                                             | 3 +--
 src/arch/x86/prologue.inc                                         | 3 +--
 src/arch/x86/romcc_console.c                                      | 3 +--
 src/arch/x86/smbios.c                                             | 3 +--
 src/arch/x86/stages.c                                             | 3 +--
 src/arch/x86/tables.c                                             | 3 +--
 src/arch/x86/thread.c                                             | 3 +--
 src/arch/x86/thread_switch.S                                      | 3 +--
 src/arch/x86/timestamp.c                                          | 3 +--
 src/arch/x86/wakeup.S                                             | 3 +--
 src/commonlib/fsp1_1_relocate.c                                   | 3 +--
 src/commonlib/include/commonlib/cbfs_serialized.h                 | 3 +--
 src/commonlib/include/commonlib/cbmem_id.h                        | 3 +--
 src/commonlib/include/commonlib/endian.h                          | 3 +--
 src/commonlib/include/commonlib/fsp1_1.h                          | 3 +--
 src/commonlib/include/commonlib/loglevel.h                        | 3 +--
 src/commonlib/include/commonlib/mem_pool.h                        | 3 +--
 src/commonlib/include/commonlib/region.h                          | 3 +--
 src/commonlib/include/commonlib/rmodule-defs.h                    | 3 +--
 src/commonlib/include/commonlib/timestamp_serialized.h            | 3 +--
 src/commonlib/mem_pool.c                                          | 3 +--
 src/commonlib/region.c                                            | 3 +--
 src/console/console.c                                             | 3 +--
 src/console/die.c                                                 | 3 +--
 src/console/early_print.c                                         | 3 +--
 src/console/init.c                                                | 3 +--
 src/console/post.c                                                | 3 +--
 src/console/vsprintf.c                                            | 3 +--
 src/cpu/amd/agesa/Kconfig                                         | 3 +--
 src/cpu/amd/agesa/Makefile.inc                                    | 3 +--
 src/cpu/amd/agesa/amd_late_init.c                                 | 3 +--
 src/cpu/amd/agesa/cache_as_ram.inc                                | 3 +--
 src/cpu/amd/agesa/family10/Kconfig                                | 3 +--
 src/cpu/amd/agesa/family10/Makefile.inc                           | 3 +--
 src/cpu/amd/agesa/family10/chip_name.c                            | 3 +--
 src/cpu/amd/agesa/family10/model_10_init.c                        | 3 +--
 src/cpu/amd/agesa/family12/Kconfig                                | 3 +--
 src/cpu/amd/agesa/family12/chip_name.c                            | 3 +--
 src/cpu/amd/agesa/family12/fixme.c                                | 3 +--
 src/cpu/amd/agesa/family12/model_12_init.c                        | 3 +--
 src/cpu/amd/agesa/family14/Kconfig                                | 3 +--
 src/cpu/amd/agesa/family14/Makefile.inc                           | 3 +--
 src/cpu/amd/agesa/family14/acpi/cpu.asl                           | 3 +--
 src/cpu/amd/agesa/family14/chip_name.c                            | 3 +--
 src/cpu/amd/agesa/family14/fixme.c                                | 3 +--
 src/cpu/amd/agesa/family14/model_14_init.c                        | 3 +--
 src/cpu/amd/agesa/family15/Kconfig                                | 3 +--
 src/cpu/amd/agesa/family15/Makefile.inc                           | 3 +--
 src/cpu/amd/agesa/family15/chip_name.c                            | 3 +--
 src/cpu/amd/agesa/family15/fixme.c                                | 3 +--
 src/cpu/amd/agesa/family15/model_15_init.c                        | 3 +--
 src/cpu/amd/agesa/family15rl/Kconfig                              | 3 +--
 src/cpu/amd/agesa/family15rl/Makefile.inc                         | 3 +--
 src/cpu/amd/agesa/family15rl/acpi/cpu.asl                         | 3 +--
 src/cpu/amd/agesa/family15rl/fixme.c                              | 3 +--
 src/cpu/amd/agesa/family15rl/model_15_init.c                      | 3 +--
 src/cpu/amd/agesa/family15tn/Kconfig                              | 3 +--
 src/cpu/amd/agesa/family15tn/Makefile.inc                         | 3 +--
 src/cpu/amd/agesa/family15tn/acpi/cpu.asl                         | 3 +--
 src/cpu/amd/agesa/family15tn/chip_name.c                          | 3 +--
 src/cpu/amd/agesa/family15tn/fixme.c                              | 3 +--
 src/cpu/amd/agesa/family15tn/model_15_init.c                      | 3 +--
 src/cpu/amd/agesa/family16kb/Kconfig                              | 3 +--
 src/cpu/amd/agesa/family16kb/Makefile.inc                         | 3 +--
 src/cpu/amd/agesa/family16kb/acpi/cpu.asl                         | 3 +--
 src/cpu/amd/agesa/family16kb/chip_name.c                          | 3 +--
 src/cpu/amd/agesa/family16kb/fixme.c                              | 3 +--
 src/cpu/amd/agesa/family16kb/model_16_init.c                      | 3 +--
 src/cpu/amd/agesa/s3_mtrr.c                                       | 3 +--
 src/cpu/amd/agesa/s3_resume.c                                     | 3 +--
 src/cpu/amd/agesa/s3_resume.h                                     | 3 +--
 src/cpu/amd/car/cache_as_ram.inc                                  | 3 +--
 src/cpu/amd/car/disable_cache_as_ram.c                            | 3 +--
 src/cpu/amd/geode_gx2/Kconfig                                     | 3 +--
 src/cpu/amd/geode_gx2/cache_as_ram.inc                            | 3 +--
 src/cpu/amd/geode_lx/cache_as_ram.inc                             | 3 +--
 src/cpu/amd/geode_lx/cpubug.c                                     | 3 +--
 src/cpu/amd/geode_lx/cpureginit.c                                 | 3 +--
 src/cpu/amd/geode_lx/geode_lx_init.c                              | 3 +--
 src/cpu/amd/geode_lx/msrinit.c                                    | 3 +--
 src/cpu/amd/geode_lx/syspreinit.c                                 | 3 +--
 src/cpu/amd/microcode/microcode.c                                 | 3 +--
 src/cpu/amd/model_10xxx/defaults.h                                | 3 +--
 src/cpu/amd/model_10xxx/fidvid.c                                  | 3 +--
 src/cpu/amd/model_10xxx/init_cpus.c                               | 3 +--
 src/cpu/amd/model_10xxx/model_10xxx_init.c                        | 3 +--
 src/cpu/amd/model_10xxx/monotonic_timer.c                         | 3 +--
 src/cpu/amd/model_10xxx/powernow_acpi.c                           | 3 +--
 src/cpu/amd/model_10xxx/processor_name.c                          | 3 +--
 src/cpu/amd/model_10xxx/ram_calc.c                                | 3 +--
 src/cpu/amd/model_10xxx/ram_calc.h                                | 3 +--
 src/cpu/amd/model_10xxx/update_microcode.c                        | 3 +--
 src/cpu/amd/model_fxx/model_fxx_update_microcode.c                | 3 +--
 src/cpu/amd/model_fxx/powernow_acpi.c                             | 3 +--
 src/cpu/amd/model_fxx/processor_name.c                            | 3 +--
 src/cpu/amd/pi/00630F01/Kconfig                                   | 3 +--
 src/cpu/amd/pi/00630F01/Makefile.inc                              | 3 +--
 src/cpu/amd/pi/00630F01/acpi/cpu.asl                              | 3 +--
 src/cpu/amd/pi/00630F01/chip_name.c                               | 3 +--
 src/cpu/amd/pi/00630F01/fixme.c                                   | 3 +--
 src/cpu/amd/pi/00630F01/model_15_init.c                           | 3 +--
 src/cpu/amd/pi/00660F01/Kconfig                                   | 3 +--
 src/cpu/amd/pi/00660F01/Makefile.inc                              | 3 +--
 src/cpu/amd/pi/00660F01/acpi/cpu.asl                              | 3 +--
 src/cpu/amd/pi/00660F01/chip_name.c                               | 3 +--
 src/cpu/amd/pi/00660F01/fixme.c                                   | 3 +--
 src/cpu/amd/pi/00660F01/model_15_init.c                           | 3 +--
 src/cpu/amd/pi/00730F01/Kconfig                                   | 3 +--
 src/cpu/amd/pi/00730F01/Makefile.inc                              | 3 +--
 src/cpu/amd/pi/00730F01/acpi/cpu.asl                              | 3 +--
 src/cpu/amd/pi/00730F01/chip_name.c                               | 3 +--
 src/cpu/amd/pi/00730F01/fixme.c                                   | 3 +--
 src/cpu/amd/pi/00730F01/model_16_init.c                           | 3 +--
 src/cpu/amd/pi/Kconfig                                            | 3 +--
 src/cpu/amd/pi/Makefile.inc                                       | 3 +--
 src/cpu/amd/pi/amd_late_init.c                                    | 3 +--
 src/cpu/amd/pi/cache_as_ram.inc                                   | 3 +--
 src/cpu/amd/pi/s3_resume.c                                        | 3 +--
 src/cpu/amd/pi/s3_resume.h                                        | 3 +--
 src/cpu/amd/pi/spi.c                                              | 3 +--
 src/cpu/amd/quadcore/amd_sibling.c                                | 3 +--
 src/cpu/amd/quadcore/quadcore.c                                   | 3 +--
 src/cpu/amd/quadcore/quadcore_id.c                                | 3 +--
 src/cpu/amd/smm/smm_init.c                                        | 3 +--
 src/cpu/dmp/Kconfig                                               | 3 +--
 src/cpu/dmp/Makefile.inc                                          | 3 +--
 src/cpu/dmp/dmp_post_code.h                                       | 3 +--
 src/cpu/dmp/vortex86ex/Kconfig                                    | 3 +--
 src/cpu/dmp/vortex86ex/Makefile.inc                               | 3 +--
 src/cpu/dmp/vortex86ex/biosdata.inc                               | 3 +--
 src/cpu/dmp/vortex86ex/biosdata.ld                                | 3 +--
 src/cpu/dmp/vortex86ex/biosdata_ex.inc                            | 3 +--
 src/cpu/dmp/vortex86ex/biosdata_ex.ld                             | 3 +--
 src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc                       | 3 +--
 src/cpu/intel/car/cache_as_ram.inc                                | 3 +--
 src/cpu/intel/car/cache_as_ram_ht.inc                             | 3 +--
 src/cpu/intel/ep80579/ep80579.c                                   | 3 +--
 src/cpu/intel/ep80579/ep80579_init.c                              | 3 +--
 src/cpu/intel/haswell/acpi.c                                      | 3 +--
 src/cpu/intel/haswell/acpi/cpu.asl                                | 3 +--
 src/cpu/intel/haswell/bootblock.c                                 | 3 +--
 src/cpu/intel/haswell/cache_as_ram.inc                            | 3 +--
 src/cpu/intel/haswell/chip.h                                      | 3 +--
 src/cpu/intel/haswell/finalize.c                                  | 3 +--
 src/cpu/intel/haswell/haswell.h                                   | 3 +--
 src/cpu/intel/haswell/haswell_init.c                              | 3 +--
 src/cpu/intel/haswell/monotonic_timer.c                           | 3 +--
 src/cpu/intel/haswell/romstage.c                                  | 3 +--
 src/cpu/intel/haswell/smmrelocate.c                               | 3 +--
 src/cpu/intel/haswell/stage_cache.c                               | 3 +--
 src/cpu/intel/haswell/tsc_freq.c                                  | 3 +--
 src/cpu/intel/microcode/microcode.c                               | 3 +--
 src/cpu/intel/model_1067x/chip.h                                  | 3 +--
 src/cpu/intel/model_1067x/model_1067x_init.c                      | 3 +--
 src/cpu/intel/model_106cx/model_106cx_init.c                      | 3 +--
 src/cpu/intel/model_2065x/acpi.c                                  | 3 +--
 src/cpu/intel/model_2065x/bootblock.c                             | 3 +--
 src/cpu/intel/model_2065x/cache_as_ram.inc                        | 3 +--
 src/cpu/intel/model_2065x/chip.h                                  | 3 +--
 src/cpu/intel/model_2065x/finalize.c                              | 3 +--
 src/cpu/intel/model_2065x/model_2065x.h                           | 3 +--
 src/cpu/intel/model_2065x/model_2065x_init.c                      | 3 +--
 src/cpu/intel/model_2065x/tsc_freq.c                              | 3 +--
 src/cpu/intel/model_206ax/acpi.c                                  | 3 +--
 src/cpu/intel/model_206ax/acpi/cpu.asl                            | 3 +--
 src/cpu/intel/model_206ax/bootblock.c                             | 3 +--
 src/cpu/intel/model_206ax/cache_as_ram.inc                        | 3 +--
 src/cpu/intel/model_206ax/chip.h                                  | 3 +--
 src/cpu/intel/model_206ax/finalize.c                              | 3 +--
 src/cpu/intel/model_206ax/model_206ax.h                           | 3 +--
 src/cpu/intel/model_206ax/model_206ax_init.c                      | 3 +--
 src/cpu/intel/model_65x/Makefile.inc                              | 3 +--
 src/cpu/intel/model_65x/model_65x_init.c                          | 3 +--
 src/cpu/intel/model_67x/Makefile.inc                              | 3 +--
 src/cpu/intel/model_67x/model_67x_init.c                          | 3 +--
 src/cpu/intel/model_68x/Kconfig                                   | 3 +--
 src/cpu/intel/model_68x/Makefile.inc                              | 3 +--
 src/cpu/intel/model_68x/model_68x_init.c                          | 3 +--
 src/cpu/intel/model_6bx/model_6bx_init.c                          | 3 +--
 src/cpu/intel/model_6ex/cache_as_ram.inc                          | 3 +--
 src/cpu/intel/model_6ex/model_6ex_init.c                          | 3 +--
 src/cpu/intel/model_6fx/model_6fx_init.c                          | 3 +--
 src/cpu/intel/slot_1/Kconfig                                      | 3 +--
 src/cpu/intel/slot_1/Makefile.inc                                 | 3 +--
 src/cpu/intel/slot_1/l2_cache.c                                   | 3 +--
 src/cpu/intel/slot_1/slot_1.c                                     | 3 +--
 src/cpu/intel/slot_2/Kconfig                                      | 3 +--
 src/cpu/intel/slot_2/Makefile.inc                                 | 3 +--
 src/cpu/intel/smm/gen1/smmrelocate.c                              | 3 +--
 src/cpu/intel/socket_FC_PGA370/Kconfig                            | 3 +--
 src/cpu/intel/socket_FC_PGA370/Makefile.inc                       | 3 +--
 src/cpu/intel/socket_PGA370/Kconfig                               | 3 +--
 src/cpu/intel/socket_PGA370/Makefile.inc                          | 3 +--
 src/cpu/intel/speedstep/acpi.c                                    | 3 +--
 src/cpu/intel/speedstep/speedstep.c                               | 3 +--
 src/cpu/intel/turbo/turbo.c                                       | 3 +--
 src/cpu/mips/Kconfig                                              | 3 +--
 src/cpu/qemu-x86/Kconfig                                          | 3 +--
 src/cpu/qemu-x86/Makefile.inc                                     | 3 +--
 src/cpu/qemu-x86/qemu.c                                           | 3 +--
 src/cpu/ti/am335x/bootblock.c                                     | 3 +--
 src/cpu/ti/am335x/bootblock_media.c                               | 3 +--
 src/cpu/ti/am335x/cbmem.c                                         | 3 +--
 src/cpu/ti/am335x/dmtimer.c                                       | 3 +--
 src/cpu/ti/am335x/dmtimer.h                                       | 3 +--
 src/cpu/ti/am335x/header.c                                        | 3 +--
 src/cpu/ti/am335x/header.h                                        | 3 +--
 src/cpu/ti/am335x/header.ld                                       | 3 +--
 src/cpu/ti/am335x/memlayout.ld                                    | 3 +--
 src/cpu/ti/am335x/monotonic_timer.c                               | 3 +--
 src/cpu/ti/am335x/nand.c                                          | 3 +--
 src/cpu/ti/am335x/pinmux.c                                        | 3 +--
 src/cpu/ti/am335x/pinmux.h                                        | 3 +--
 src/cpu/ti/am335x/uart.c                                          | 3 +--
 src/cpu/ti/am335x/uart.h                                          | 3 +--
 src/cpu/via/c3/c3_init.c                                          | 3 +--
 src/cpu/via/c7/c7_init.c                                          | 3 +--
 src/cpu/via/car/cache_as_ram.inc                                  | 3 +--
 src/cpu/x86/car.c                                                 | 3 +--
 src/cpu/x86/fpu_enable.inc                                        | 3 +--
 src/cpu/x86/lapic/apic_timer.c                                    | 3 +--
 src/cpu/x86/lapic/lapic_cpu_init.c                                | 3 +--
 src/cpu/x86/mirror_payload.c                                      | 3 +--
 src/cpu/x86/mp_init.c                                             | 3 +--
 src/cpu/x86/mtrr/mtrr.c                                           | 3 +--
 src/cpu/x86/name/Makefile.inc                                     | 3 +--
 src/cpu/x86/name/name.c                                           | 3 +--
 src/cpu/x86/sipi_vector.S                                         | 3 +--
 src/cpu/x86/smm/Makefile.inc                                      | 3 +--
 src/cpu/x86/smm/backup_default_smm.c                              | 3 +--
 src/cpu/x86/smm/smihandler.c                                      | 3 +--
 src/cpu/x86/smm/smm_module_handler.c                              | 3 +--
 src/cpu/x86/smm/smm_module_loader.c                               | 3 +--
 src/cpu/x86/smm/smm_stub.S                                        | 3 +--
 src/cpu/x86/smm/smmhandler.S                                      | 3 +--
 src/cpu/x86/smm/smmrelocate.S                                     | 3 +--
 src/cpu/x86/sse_enable.inc                                        | 3 +--
 src/device/Kconfig                                                | 3 +--
 src/device/azalia_device.c                                        | 3 +--
 src/device/cardbus_device.c                                       | 3 +--
 src/device/cpu_device.c                                           | 3 +--
 src/device/device_romstage.c                                      | 3 +--
 src/device/device_util.c                                          | 3 +--
 src/device/dram/spd_cache.c                                       | 3 +--
 src/device/hypertransport.c                                       | 3 +--
 src/device/oprom/Makefile.inc                                     | 3 +--
 src/device/oprom/realmode/Makefile.inc                            | 3 +--
 src/device/oprom/realmode/x86.c                                   | 3 +--
 src/device/oprom/realmode/x86.h                                   | 3 +--
 src/device/oprom/realmode/x86_asm.S                               | 3 +--
 src/device/oprom/realmode/x86_interrupts.c                        | 3 +--
 src/device/pci_class.c                                            | 3 +--
 src/device/pci_early.c                                            | 3 +--
 src/device/pci_ops.c                                              | 3 +--
 src/device/pci_rom.c                                              | 3 +--
 src/device/pciexp_device.c                                        | 3 +--
 src/device/pcix_device.c                                          | 3 +--
 src/device/pnp_device.c                                           | 3 +--
 src/device/root_device.c                                          | 3 +--
 src/device/smbus_ops.c                                            | 3 +--
 src/device/software_i2c.c                                         | 3 +--
 src/drivers/ams/as3722rtc.c                                       | 3 +--
 src/drivers/dec/21143/21143.c                                     | 3 +--
 src/drivers/elog/Kconfig                                          | 3 +--
 src/drivers/elog/boot_count.c                                     | 3 +--
 src/drivers/elog/elog.c                                           | 3 +--
 src/drivers/elog/elog_internal.h                                  | 3 +--
 src/drivers/elog/gsmi.c                                           | 3 +--
 src/drivers/emulation/qemu/cirrus.c                               | 3 +--
 src/drivers/emulation/qemu/qemu_debugcon.c                        | 3 +--
 src/drivers/generic/ioapic/chip.h                                 | 3 +--
 src/drivers/gic/gic.c                                             | 3 +--
 src/drivers/gic/gic.h                                             | 3 +--
 src/drivers/i2c/adt7463/adt7463.c                                 | 3 +--
 src/drivers/i2c/at24rf08c/at24rf08c.c                             | 3 +--
 src/drivers/i2c/at24rf08c/lenovo_serials.c                        | 3 +--
 src/drivers/i2c/rtd2132/chip.h                                    | 3 +--
 src/drivers/i2c/rtd2132/rtd2132.c                                 | 3 +--
 src/drivers/i2c/tpm/tis.c                                         | 3 +--
 src/drivers/i2c/tpm/tpm.c                                         | 3 +--
 src/drivers/i2c/tpm/tpm.h                                         | 3 +--
 src/drivers/i2c/w83793/w83793.c                                   | 3 +--
 src/drivers/i2c/w83793/w83793.h                                   | 3 +--
 src/drivers/i2c/w83795/w83795.c                                   | 3 +--
 src/drivers/i2c/w83795/w83795.h                                   | 3 +--
 src/drivers/ics/954309/chip.h                                     | 3 +--
 src/drivers/ics/954309/ics954309.c                                | 3 +--
 src/drivers/intel/Kconfig                                         | 3 +--
 src/drivers/intel/fsp1_0/Kconfig                                  | 3 +--
 src/drivers/intel/fsp1_0/Makefile.inc                             | 3 +--
 src/drivers/intel/fsp1_0/cache_as_ram.inc                         | 3 +--
 src/drivers/intel/fsp1_0/fastboot_cache.c                         | 3 +--
 src/drivers/intel/fsp1_0/fsp_util.c                               | 3 +--
 src/drivers/intel/fsp1_0/fsp_util.h                               | 3 +--
 src/drivers/intel/fsp1_0/fsp_values.h                             | 3 +--
 src/drivers/intel/fsp1_0/hob.c                                    | 3 +--
 src/drivers/intel/fsp1_1/Kconfig                                  | 3 +--
 src/drivers/intel/fsp1_1/Makefile.inc                             | 3 +--
 src/drivers/intel/fsp1_1/after_raminit.S                          | 3 +--
 src/drivers/intel/fsp1_1/cache_as_ram.inc                         | 3 +--
 src/drivers/intel/fsp1_1/car.c                                    | 3 +--
 src/drivers/intel/fsp1_1/fsp_gop.c                                | 3 +--
 src/drivers/intel/fsp1_1/fsp_relocate.c                           | 3 +--
 src/drivers/intel/fsp1_1/fsp_util.c                               | 3 +--
 src/drivers/intel/fsp1_1/hob.c                                    | 3 +--
 src/drivers/intel/fsp1_1/include/fsp/api.h                        | 3 +--
 src/drivers/intel/fsp1_1/include/fsp/car.h                        | 3 +--
 src/drivers/intel/fsp1_1/include/fsp/gop.h                        | 3 +--
 src/drivers/intel/fsp1_1/include/fsp/soc_binding.h                | 3 +--
 src/drivers/intel/fsp1_1/include/fsp/uefi_binding.h               | 3 +--
 src/drivers/intel/fsp1_1/include/fsp/util.h                       | 3 +--
 src/drivers/intel/gma/Kconfig                                     | 3 +--
 src/drivers/intel/gma/Makefile.inc                                | 3 +--
 src/drivers/intel/gma/acpi/common.asl                             | 3 +--
 src/drivers/intel/gma/acpi/non-pch.asl                            | 3 +--
 src/drivers/intel/gma/acpi/pch.asl                                | 3 +--
 src/drivers/intel/gma/edid.c                                      | 3 +--
 src/drivers/intel/gma/i915.h                                      | 3 +--
 src/drivers/intel/gma/int15.c                                     | 3 +--
 src/drivers/intel/gma/vbt.c                                       | 3 +--
 src/drivers/intel/i210/i210.c                                     | 3 +--
 src/drivers/intel/i210/i210.h                                     | 3 +--
 src/drivers/intel/wifi/wifi.c                                     | 3 +--
 src/drivers/ipmi/ipmi_kcs.c                                       | 3 +--
 src/drivers/ipmi/ipmi_kcs.h                                       | 3 +--
 src/drivers/lenovo/wacom.c                                        | 3 +--
 src/drivers/maxim/Kconfig                                         | 3 +--
 src/drivers/maxim/Makefile.inc                                    | 3 +--
 src/drivers/maxim/max77686/Kconfig                                | 3 +--
 src/drivers/maxim/max77686/Makefile.inc                           | 3 +--
 src/drivers/maxim/max77686/max77686.c                             | 3 +--
 src/drivers/maxim/max77686/max77686.h                             | 3 +--
 src/drivers/maxim/max77802/max77802.h                             | 3 +--
 src/drivers/parade/Kconfig                                        | 3 +--
 src/drivers/parade/Makefile.inc                                   | 3 +--
 src/drivers/parade/ps8625/Kconfig                                 | 3 +--
 src/drivers/parade/ps8625/Makefile.inc                            | 3 +--
 src/drivers/parade/ps8625/ps8625.c                                | 3 +--
 src/drivers/parade/ps8625/ps8625.h                                | 3 +--
 src/drivers/pc80/i8254.c                                          | 3 +--
 src/drivers/pc80/i8259.c                                          | 3 +--
 src/drivers/pc80/keyboard.c                                       | 3 +--
 src/drivers/pc80/mc146818rtc.c                                    | 3 +--
 src/drivers/pc80/ps2_controller.asl                               | 3 +--
 src/drivers/pc80/spkmodem.c                                       | 3 +--
 src/drivers/pc80/tpm/acpi/tpm.asl                                 | 3 +--
 src/drivers/pc80/tpm/chip.h                                       | 3 +--
 src/drivers/pc80/tpm/romstage.c                                   | 3 +--
 src/drivers/pc80/tpm/tpm.c                                        | 3 +--
 src/drivers/pc80/vga/vga.c                                        | 2 +-
 src/drivers/pc80/vga/vga_font_8x16.c                              | 2 +-
 src/drivers/pc80/vga/vga_io.c                                     | 2 +-
 src/drivers/pc80/vga/vga_palette.c                                | 2 +-
 src/drivers/ricoh/rce822/chip.h                                   | 3 +--
 src/drivers/ricoh/rce822/rce822.c                                 | 3 +--
 src/drivers/spi/Kconfig                                           | 3 +--
 src/drivers/spi/gigadevice.c                                      | 3 +--
 src/drivers/spi/macronix.c                                        | 3 +--
 src/drivers/spi/spansion.c                                        | 3 +--
 src/drivers/spi/spiconsole.c                                      | 3 +--
 src/drivers/spi/stmicro.c                                         | 3 +--
 src/drivers/ti/Kconfig                                            | 3 +--
 src/drivers/ti/Makefile.inc                                       | 3 +--
 src/drivers/ti/tps65090/Kconfig                                   | 3 +--
 src/drivers/ti/tps65090/Makefile.inc                              | 3 +--
 src/drivers/ti/tps65913/Kconfig                                   | 3 +--
 src/drivers/ti/tps65913/Makefile.inc                              | 3 +--
 src/drivers/ti/tps65913/tps65913rtc.c                             | 3 +--
 src/drivers/uart/oxpcie.c                                         | 3 +--
 src/drivers/uart/oxpcie_early.c                                   | 3 +--
 src/drivers/uart/uart8250io.c                                     | 3 +--
 src/drivers/uart/uart8250mem.c                                    | 3 +--
 src/drivers/uart/uart8250reg.h                                    | 3 +--
 src/drivers/uart/util.c                                           | 3 +--
 src/drivers/usb/console.c                                         | 3 +--
 src/drivers/usb/ehci.h                                            | 3 +--
 src/drivers/usb/ehci_debug.c                                      | 3 +--
 src/drivers/usb/ehci_debug.h                                      | 3 +--
 src/drivers/usb/gadget.c                                          | 3 +--
 src/drivers/usb/pci_ehci.c                                        | 3 +--
 src/drivers/usb/usb_ch9.h                                         | 3 +--
 src/drivers/xgi/common/XGI_main.c                                 | 3 +--
 src/drivers/xgi/common/XGI_main.h                                 | 3 +--
 src/drivers/xgi/common/XGIfb.h                                    | 3 +--
 src/drivers/xgi/common/initdef.h                                  | 3 +--
 src/drivers/xgi/common/vb_def.h                                   | 3 +--
 src/drivers/xgi/common/vb_init.c                                  | 3 +--
 src/drivers/xgi/common/vb_init.h                                  | 3 +--
 src/drivers/xgi/common/vb_setmode.c                               | 3 +--
 src/drivers/xgi/common/vb_setmode.h                               | 3 +--
 src/drivers/xgi/common/vb_struct.h                                | 3 +--
 src/drivers/xgi/common/vb_table.h                                 | 3 +--
 src/drivers/xgi/common/vb_util.c                                  | 3 +--
 src/drivers/xgi/common/vb_util.h                                  | 3 +--
 src/drivers/xgi/common/vgatypes.h                                 | 3 +--
 src/drivers/xgi/common/vstruct.h                                  | 3 +--
 src/drivers/xgi/common/xgi_coreboot.c                             | 3 +--
 src/drivers/xgi/common/xgi_coreboot.h                             | 3 +--
 src/drivers/xgi/z9s/z9s.c                                         | 3 +--
 src/ec/acpi/ec.asl                                                | 3 +--
 src/ec/acpi/ec.c                                                  | 3 +--
 src/ec/acpi/ec.h                                                  | 3 +--
 src/ec/compal/ene932/acpi/ac.asl                                  | 3 +--
 src/ec/compal/ene932/acpi/battery.asl                             | 3 +--
 src/ec/compal/ene932/acpi/ec.asl                                  | 3 +--
 src/ec/compal/ene932/acpi/superio.asl                             | 3 +--
 src/ec/compal/ene932/chip.h                                       | 3 +--
 src/ec/compal/ene932/ec.c                                         | 3 +--
 src/ec/compal/ene932/ec.h                                         | 3 +--
 src/ec/google/chromeec/acpi/ac.asl                                | 3 +--
 src/ec/google/chromeec/acpi/als.asl                               | 3 +--
 src/ec/google/chromeec/acpi/battery.asl                           | 3 +--
 src/ec/google/chromeec/acpi/ec.asl                                | 3 +--
 src/ec/google/chromeec/acpi/emem.asl                              | 3 +--
 src/ec/google/chromeec/acpi/keyboard_backlight.asl                | 3 +--
 src/ec/google/chromeec/acpi/pd.asl                                | 3 +--
 src/ec/google/chromeec/acpi/superio.asl                           | 3 +--
 src/ec/google/chromeec/chip.h                                     | 3 +--
 src/ec/google/chromeec/crosec_proto.c                             | 3 +--
 src/ec/google/chromeec/ec.c                                       | 3 +--
 src/ec/google/chromeec/ec.h                                       | 3 +--
 src/ec/google/chromeec/ec_i2c.c                                   | 3 +--
 src/ec/google/chromeec/ec_lpc.c                                   | 3 +--
 src/ec/google/chromeec/ec_mec.c                                   | 3 +--
 src/ec/google/chromeec/ec_message.h                               | 3 +--
 src/ec/google/chromeec/ec_spi.c                                   | 3 +--
 src/ec/kontron/it8516e/acpi/ec.asl                                | 3 +--
 src/ec/kontron/it8516e/acpi/pm_channels.asl                       | 3 +--
 src/ec/kontron/it8516e/chip.h                                     | 3 +--
 src/ec/kontron/it8516e/ec.c                                       | 3 +--
 src/ec/kontron/it8516e/ec.h                                       | 3 +--
 src/ec/lenovo/h8/acpi/ac.asl                                      | 3 +--
 src/ec/lenovo/h8/acpi/battery.asl                                 | 3 +--
 src/ec/lenovo/h8/acpi/beep.asl                                    | 3 +--
 src/ec/lenovo/h8/acpi/ec.asl                                      | 3 +--
 src/ec/lenovo/h8/acpi/lid.asl                                     | 3 +--
 src/ec/lenovo/h8/acpi/sleepbutton.asl                             | 3 +--
 src/ec/lenovo/h8/acpi/systemstatus.asl                            | 3 +--
 src/ec/lenovo/h8/chip.h                                           | 3 +--
 src/ec/lenovo/h8/h8.c                                             | 3 +--
 src/ec/lenovo/h8/h8.h                                             | 3 +--
 src/ec/lenovo/pmh7/chip.h                                         | 3 +--
 src/ec/lenovo/pmh7/pmh7.c                                         | 3 +--
 src/ec/lenovo/pmh7/pmh7.h                                         | 3 +--
 src/ec/quanta/ene_kb3940q/acpi/ac.asl                             | 3 +--
 src/ec/quanta/ene_kb3940q/acpi/battery.asl                        | 3 +--
 src/ec/quanta/ene_kb3940q/acpi/ec.asl                             | 3 +--
 src/ec/quanta/ene_kb3940q/acpi/superio.asl                        | 3 +--
 src/ec/quanta/ene_kb3940q/chip.h                                  | 3 +--
 src/ec/quanta/ene_kb3940q/ec.c                                    | 3 +--
 src/ec/quanta/ene_kb3940q/ec.h                                    | 3 +--
 src/ec/quanta/it8518/acpi/ac.asl                                  | 3 +--
 src/ec/quanta/it8518/acpi/battery.asl                             | 3 +--
 src/ec/quanta/it8518/acpi/ec.asl                                  | 3 +--
 src/ec/quanta/it8518/acpi/superio.asl                             | 3 +--
 src/ec/quanta/it8518/chip.h                                       | 3 +--
 src/ec/quanta/it8518/ec.c                                         | 3 +--
 src/ec/quanta/it8518/ec.h                                         | 3 +--
 src/ec/smsc/mec1308/acpi/ac.asl                                   | 3 +--
 src/ec/smsc/mec1308/acpi/battery.asl                              | 3 +--
 src/ec/smsc/mec1308/acpi/ec.asl                                   | 3 +--
 src/ec/smsc/mec1308/chip.h                                        | 3 +--
 src/ec/smsc/mec1308/ec.c                                          | 3 +--
 src/ec/smsc/mec1308/ec.h                                          | 3 +--
 src/include/assert.h                                              | 3 +--
 src/include/assets.h                                              | 3 +--
 src/include/base3.h                                               | 3 +--
 src/include/bcd.h                                                 | 3 +--
 src/include/boardid.h                                             | 3 +--
 src/include/boot_device.h                                         | 3 +--
 src/include/bootmem.h                                             | 3 +--
 src/include/bootmode.h                                            | 3 +--
 src/include/bootstate.h                                           | 3 +--
 src/include/cbfs.h                                                | 3 +--
 src/include/cbmem.h                                               | 3 +--
 src/include/console/cbmem_console.h                               | 3 +--
 src/include/console/console.h                                     | 3 +--
 src/include/console/early_print.h                                 | 3 +--
 src/include/console/ne2k.h                                        | 3 +--
 src/include/console/post_codes.h                                  | 3 +--
 src/include/console/spi.h                                         | 3 +--
 src/include/console/streams.h                                     | 3 +--
 src/include/console/uart.h                                        | 3 +--
 src/include/console/usb.h                                         | 3 +--
 src/include/console/vtxprintf.h                                   | 3 +--
 src/include/cpu/amd/amdfam10_sysconf.h                            | 3 +--
 src/include/cpu/amd/amdfam12.h                                    | 3 +--
 src/include/cpu/amd/amdfam14.h                                    | 3 +--
 src/include/cpu/amd/amdfam15.h                                    | 3 +--
 src/include/cpu/amd/amdfam16.h                                    | 3 +--
 src/include/cpu/amd/common/cbtypes.h                              | 3 +--
 src/include/cpu/amd/lxdef.h                                       | 3 +--
 src/include/cpu/amd/model_10xxx_msr.h                             | 3 +--
 src/include/cpu/amd/model_10xxx_rev.h                             | 3 +--
 src/include/cpu/amd/multicore.h                                   | 3 +--
 src/include/cpu/amd/powernow.h                                    | 3 +--
 src/include/cpu/intel/l2_cache.h                                  | 3 +--
 src/include/cpu/intel/microcode.h                                 | 3 +--
 src/include/cpu/intel/speedstep.h                                 | 3 +--
 src/include/cpu/intel/turbo.h                                     | 3 +--
 src/include/cpu/x86/cache.h                                       | 3 +--
 src/include/cpu/x86/cr.h                                          | 3 +--
 src/include/cpu/x86/gdt.h                                         | 3 +--
 src/include/cpu/x86/mp.h                                          | 3 +--
 src/include/cpu/x86/name.h                                        | 3 +--
 src/include/cpu/x86/smm.h                                         | 3 +--
 src/include/device/azalia.h                                       | 3 +--
 src/include/device/azalia_device.h                                | 3 +--
 src/include/device/i2c.h                                          | 3 +--
 src/include/device/pci_ehci.h                                     | 3 +--
 src/include/edid.h                                                | 3 +--
 src/include/elog.h                                                | 3 +--
 src/include/endian.h                                              | 3 +--
 src/include/fmap.h                                                | 3 +--
 src/include/gic.h                                                 | 3 +--
 src/include/gpio.h                                                | 3 +--
 src/include/halt.h                                                | 3 +--
 src/include/imd.h                                                 | 3 +--
 src/include/lib.h                                                 | 3 +--
 src/include/memlayout.h                                           | 3 +--
 src/include/memrange.h                                            | 3 +--
 src/include/pc80/i8254.h                                          | 3 +--
 src/include/pc80/i8259.h                                          | 3 +--
 src/include/pc80/vga.h                                            | 3 +--
 src/include/pc80/vga_io.h                                         | 3 +--
 src/include/program_loading.h                                     | 3 +--
 src/include/reg_script.h                                          | 3 +--
 src/include/rmodule.h                                             | 3 +--
 src/include/romstage_handoff.h                                    | 3 +--
 src/include/rtc.h                                                 | 3 +--
 src/include/rules.h                                               | 3 +--
 src/include/sdram_mode.h                                          | 3 +--
 src/include/smbios.h                                              | 3 +--
 src/include/spd.h                                                 | 3 +--
 src/include/spd_cache.h                                           | 3 +--
 src/include/spd_ddr2.h                                            | 3 +--
 src/include/spi-generic.h                                         | 3 +--
 src/include/spi_flash.h                                           | 3 +--
 src/include/stage_cache.h                                         | 3 +--
 src/include/superio/conf_mode.h                                   | 3 +--
 src/include/symbols.h                                             | 3 +--
 src/include/thread.h                                              | 3 +--
 src/include/timer.h                                               | 3 +--
 src/include/timestamp.h                                           | 3 +--
 src/include/tpm.h                                                 | 3 +--
 src/include/trace.h                                               | 3 +--
 src/include/types.h                                               | 3 +--
 src/lib/Makefile.inc                                              | 3 +--
 src/lib/assets.c                                                  | 3 +--
 src/lib/boot_device.c                                             | 3 +--
 src/lib/bootmem.c                                                 | 3 +--
 src/lib/bootmode.c                                                | 3 +--
 src/lib/cbfs.c                                                    | 3 +--
 src/lib/cbfs_boot_props.c                                         | 3 +--
 src/lib/cbfs_spi.c                                                | 3 +--
 src/lib/cbmem_common.c                                            | 3 +--
 src/lib/cbmem_console.c                                           | 3 +--
 src/lib/cbmem_stage_cache.c                                       | 3 +--
 src/lib/coreboot_table.c                                          | 3 +--
 src/lib/debug.c                                                   | 3 +--
 src/lib/ext_stage_cache.c                                         | 3 +--
 src/lib/fmap.c                                                    | 3 +--
 src/lib/gcc.c                                                     | 3 +--
 src/lib/gcov-glue.c                                               | 3 +--
 src/lib/gpio.c                                                    | 3 +--
 src/lib/halt.c                                                    | 3 +--
 src/lib/hardwaremain.c                                            | 3 +--
 src/lib/hexdump.c                                                 | 3 +--
 src/lib/imd.c                                                     | 3 +--
 src/lib/imd_cbmem.c                                               | 3 +--
 src/lib/jpeg.c                                                    | 3 +--
 src/lib/jpeg.h                                                    | 3 +--
 src/lib/libgcc.c                                                  | 3 +--
 src/lib/memrange.c                                                | 3 +--
 src/lib/mocked_tlcl.c                                             | 3 +--
 src/lib/primitive_memtest.c                                       | 3 +--
 src/lib/prog_loaders.c                                            | 3 +--
 src/lib/prog_ops.c                                                | 3 +--
 src/lib/program.ld                                                | 3 +--
 src/lib/reg_script.c                                              | 3 +--
 src/lib/rmodule.c                                                 | 3 +--
 src/lib/selfboot.c                                                | 3 +--
 src/lib/thread.c                                                  | 3 +--
 src/lib/timer.c                                                   | 3 +--
 src/lib/timer_queue.c                                             | 3 +--
 src/lib/timestamp.c                                               | 3 +--
 src/lib/trace.c                                                   | 3 +--
 src/mainboard/a-trend/Kconfig                                     | 3 +--
 src/mainboard/a-trend/atc-6220/Kconfig                            | 3 +--
 src/mainboard/a-trend/atc-6220/irq_tables.c                       | 3 +--
 src/mainboard/a-trend/atc-6220/romstage.c                         | 3 +--
 src/mainboard/a-trend/atc-6240/Kconfig                            | 3 +--
 src/mainboard/a-trend/atc-6240/irq_tables.c                       | 3 +--
 src/mainboard/a-trend/atc-6240/romstage.c                         | 3 +--
 src/mainboard/aaeon/pfm-540i_revb/irq_tables.c                    | 3 +--
 src/mainboard/aaeon/pfm-540i_revb/mainboard.c                     | 3 +--
 src/mainboard/aaeon/pfm-540i_revb/romstage.c                      | 3 +--
 src/mainboard/abit/Kconfig                                        | 3 +--
 src/mainboard/abit/be6-ii_v2_0/Kconfig                            | 3 +--
 src/mainboard/abit/be6-ii_v2_0/irq_tables.c                       | 3 +--
 src/mainboard/abit/be6-ii_v2_0/romstage.c                         | 3 +--
 src/mainboard/advansus/Kconfig                                    | 3 +--
 src/mainboard/advansus/a785e-i/acpi/cpstate.asl                   | 3 +--
 src/mainboard/advansus/a785e-i/acpi/routing.asl                   | 3 +--
 src/mainboard/advansus/a785e-i/acpi/sata.asl                      | 3 +--
 src/mainboard/advansus/a785e-i/acpi/usb.asl                       | 3 +--
 src/mainboard/advansus/a785e-i/acpi_tables.c                      | 3 +--
 src/mainboard/advansus/a785e-i/dsdt.asl                           | 3 +--
 src/mainboard/advansus/a785e-i/get_bus_conf.c                     | 3 +--
 src/mainboard/advansus/a785e-i/irq_tables.c                       | 3 +--
 src/mainboard/advansus/a785e-i/mainboard.c                        | 3 +--
 src/mainboard/advansus/a785e-i/mb_sysconf.h                       | 3 +--
 src/mainboard/advansus/a785e-i/mptable.c                          | 3 +--
 src/mainboard/advansus/a785e-i/platform_cfg.h                     | 3 +--
 src/mainboard/advansus/a785e-i/resourcemap.c                      | 3 +--
 src/mainboard/advansus/a785e-i/romstage.c                         | 3 +--
 src/mainboard/amd/bettong/BiosCallOuts.c                          | 3 +--
 src/mainboard/amd/bettong/BiosCallOuts.h                          | 3 +--
 src/mainboard/amd/bettong/Kconfig                                 | 3 +--
 src/mainboard/amd/bettong/Makefile.inc                            | 3 +--
 src/mainboard/amd/bettong/PlatformGnbPcie.c                       | 3 +--
 src/mainboard/amd/bettong/acpi/AmdImc.asl                         | 3 +--
 src/mainboard/amd/bettong/acpi/gpe.asl                            | 3 +--
 src/mainboard/amd/bettong/acpi/mainboard.asl                      | 3 +--
 src/mainboard/amd/bettong/acpi/routing.asl                        | 3 +--
 src/mainboard/amd/bettong/acpi/sleep.asl                          | 3 +--
 src/mainboard/amd/bettong/acpi/usb_oc.asl                         | 3 +--
 src/mainboard/amd/bettong/acpi_tables.c                           | 3 +--
 src/mainboard/amd/bettong/cmos.layout                             | 3 +--
 src/mainboard/amd/bettong/devicetree.cb                           | 3 +--
 src/mainboard/amd/bettong/dsdt.asl                                | 3 +--
 src/mainboard/amd/bettong/fchec.c                                 | 3 +--
 src/mainboard/amd/bettong/fchec.h                                 | 3 +--
 src/mainboard/amd/bettong/irq_tables.c                            | 3 +--
 src/mainboard/amd/bettong/mainboard.c                             | 3 +--
 src/mainboard/amd/bettong/mptable.c                               | 3 +--
 src/mainboard/amd/bettong/romstage.c                              | 3 +--
 src/mainboard/amd/bimini_fam10/acpi/cpstate.asl                   | 3 +--
 src/mainboard/amd/bimini_fam10/acpi/ide.asl                       | 3 +--
 src/mainboard/amd/bimini_fam10/acpi/routing.asl                   | 3 +--
 src/mainboard/amd/bimini_fam10/acpi/sata.asl                      | 3 +--
 src/mainboard/amd/bimini_fam10/acpi/usb.asl                       | 3 +--
 src/mainboard/amd/bimini_fam10/acpi_tables.c                      | 3 +--
 src/mainboard/amd/bimini_fam10/dsdt.asl                           | 3 +--
 src/mainboard/amd/bimini_fam10/get_bus_conf.c                     | 3 +--
 src/mainboard/amd/bimini_fam10/irq_tables.c                       | 3 +--
 src/mainboard/amd/bimini_fam10/mainboard.c                        | 3 +--
 src/mainboard/amd/bimini_fam10/mb_sysconf.h                       | 3 +--
 src/mainboard/amd/bimini_fam10/mptable.c                          | 3 +--
 src/mainboard/amd/bimini_fam10/resourcemap.c                      | 3 +--
 src/mainboard/amd/bimini_fam10/romstage.c                         | 3 +--
 src/mainboard/amd/db800/irq_tables.c                              | 3 +--
 src/mainboard/amd/db800/mainboard.c                               | 3 +--
 src/mainboard/amd/db800/romstage.c                                | 3 +--
 src/mainboard/amd/dbm690t/acpi/ide.asl                            | 3 +--
 src/mainboard/amd/dbm690t/acpi/routing.asl                        | 3 +--
 src/mainboard/amd/dbm690t/acpi/sata.asl                           | 3 +--
 src/mainboard/amd/dbm690t/acpi/usb.asl                            | 3 +--
 src/mainboard/amd/dbm690t/acpi_tables.c                           | 3 +--
 src/mainboard/amd/dbm690t/cmos.layout                             | 3 +--
 src/mainboard/amd/dbm690t/dsdt.asl                                | 3 +--
 src/mainboard/amd/dbm690t/fadt.c                                  | 3 +--
 src/mainboard/amd/dbm690t/get_bus_conf.c                          | 3 +--
 src/mainboard/amd/dbm690t/irq_tables.c                            | 3 +--
 src/mainboard/amd/dbm690t/mainboard.c                             | 3 +--
 src/mainboard/amd/dbm690t/mptable.c                               | 3 +--
 src/mainboard/amd/dbm690t/resourcemap.c                           | 3 +--
 src/mainboard/amd/dbm690t/romstage.c                              | 3 +--
 src/mainboard/amd/dinar/BiosCallOuts.c                            | 3 +--
 src/mainboard/amd/dinar/Kconfig                                   | 3 +--
 src/mainboard/amd/dinar/Makefile.inc                              | 3 +--
 src/mainboard/amd/dinar/OptionsIds.h                              | 3 +--
 src/mainboard/amd/dinar/acpi/ide.asl                              | 3 +--
 src/mainboard/amd/dinar/acpi/routing.asl                          | 3 +--
 src/mainboard/amd/dinar/acpi/sata.asl                             | 3 +--
 src/mainboard/amd/dinar/acpi_tables.c                             | 3 +--
 src/mainboard/amd/dinar/buildOpts.c                               | 3 +--
 src/mainboard/amd/dinar/cmos.layout                               | 3 +--
 src/mainboard/amd/dinar/devicetree.cb                             | 3 +--
 src/mainboard/amd/dinar/dsdt.asl                                  | 3 +--
 src/mainboard/amd/dinar/fadt.c                                    | 3 +--
 src/mainboard/amd/dinar/gpio.c                                    | 3 +--
 src/mainboard/amd/dinar/gpio.h                                    | 3 +--
 src/mainboard/amd/dinar/irq_tables.c                              | 3 +--
 src/mainboard/amd/dinar/mainboard.c                               | 3 +--
 src/mainboard/amd/dinar/mptable.c                                 | 3 +--
 src/mainboard/amd/dinar/platform_cfg.h                            | 3 +--
 src/mainboard/amd/dinar/rd890_cfg.c                               | 3 +--
 src/mainboard/amd/dinar/rd890_cfg.h                               | 3 +--
 src/mainboard/amd/dinar/romstage.c                                | 3 +--
 src/mainboard/amd/dinar/sb700_cfg.c                               | 3 +--
 src/mainboard/amd/dinar/sb700_cfg.h                               | 3 +--
 src/mainboard/amd/inagua/BiosCallOuts.c                           | 3 +--
 src/mainboard/amd/inagua/Kconfig                                  | 3 +--
 src/mainboard/amd/inagua/Makefile.inc                             | 3 +--
 src/mainboard/amd/inagua/OptionsIds.h                             | 3 +--
 src/mainboard/amd/inagua/PlatformGnbPcie.c                        | 3 +--
 src/mainboard/amd/inagua/PlatformGnbPcieComplex.h                 | 3 +--
 src/mainboard/amd/inagua/acpi/gpe.asl                             | 3 +--
 src/mainboard/amd/inagua/acpi/ide.asl                             | 3 +--
 src/mainboard/amd/inagua/acpi/mainboard.asl                       | 3 +--
 src/mainboard/amd/inagua/acpi/routing.asl                         | 3 +--
 src/mainboard/amd/inagua/acpi/sata.asl                            | 3 +--
 src/mainboard/amd/inagua/acpi/sleep.asl                           | 3 +--
 src/mainboard/amd/inagua/acpi/superio.asl                         | 3 +--
 src/mainboard/amd/inagua/acpi/usb_oc.asl                          | 3 +--
 src/mainboard/amd/inagua/acpi_tables.c                            | 3 +--
 src/mainboard/amd/inagua/broadcom.c                               | 3 +--
 src/mainboard/amd/inagua/buildOpts.c                              | 3 +--
 src/mainboard/amd/inagua/cmos.layout                              | 3 +--
 src/mainboard/amd/inagua/devicetree.cb                            | 3 +--
 src/mainboard/amd/inagua/dsdt.asl                                 | 3 +--
 src/mainboard/amd/inagua/irq_tables.c                             | 3 +--
 src/mainboard/amd/inagua/mainboard.c                              | 3 +--
 src/mainboard/amd/inagua/mptable.c                                | 3 +--
 src/mainboard/amd/inagua/platform_cfg.h                           | 3 +--
 src/mainboard/amd/inagua/romstage.c                               | 3 +--
 src/mainboard/amd/lamar/BiosCallOuts.c                            | 3 +--
 src/mainboard/amd/lamar/Kconfig                                   | 3 +--
 src/mainboard/amd/lamar/Makefile.inc                              | 3 +--
 src/mainboard/amd/lamar/PlatformGnbPcie.c                         | 3 +--
 src/mainboard/amd/lamar/acpi/AmdImc.asl                           | 3 +--
 src/mainboard/amd/lamar/acpi/gpe.asl                              | 3 +--
 src/mainboard/amd/lamar/acpi/mainboard.asl                        | 3 +--
 src/mainboard/amd/lamar/acpi/routing.asl                          | 3 +--
 src/mainboard/amd/lamar/acpi/si.asl                               | 3 +--
 src/mainboard/amd/lamar/acpi/sleep.asl                            | 3 +--
 src/mainboard/amd/lamar/acpi/usb_oc.asl                           | 3 +--
 src/mainboard/amd/lamar/acpi_tables.c                             | 3 +--
 src/mainboard/amd/lamar/cmos.layout                               | 3 +--
 src/mainboard/amd/lamar/devicetree.cb                             | 3 +--
 src/mainboard/amd/lamar/dsdt.asl                                  | 3 +--
 src/mainboard/amd/lamar/irq_tables.c                              | 3 +--
 src/mainboard/amd/lamar/mainboard.c                               | 3 +--
 src/mainboard/amd/lamar/mptable.c                                 | 3 +--
 src/mainboard/amd/lamar/romstage.c                                | 3 +--
 src/mainboard/amd/mahogany/acpi/ide.asl                           | 3 +--
 src/mainboard/amd/mahogany/acpi/routing.asl                       | 3 +--
 src/mainboard/amd/mahogany/acpi/sata.asl                          | 3 +--
 src/mainboard/amd/mahogany/acpi/usb.asl                           | 3 +--
 src/mainboard/amd/mahogany/acpi_tables.c                          | 3 +--
 src/mainboard/amd/mahogany/cmos.layout                            | 3 +--
 src/mainboard/amd/mahogany/dsdt.asl                               | 3 +--
 src/mainboard/amd/mahogany/get_bus_conf.c                         | 3 +--
 src/mainboard/amd/mahogany/irq_tables.c                           | 3 +--
 src/mainboard/amd/mahogany/mainboard.c                            | 3 +--
 src/mainboard/amd/mahogany/mptable.c                              | 3 +--
 src/mainboard/amd/mahogany/resourcemap.c                          | 3 +--
 src/mainboard/amd/mahogany/romstage.c                             | 3 +--
 src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl                 | 3 +--
 src/mainboard/amd/mahogany_fam10/acpi/ide.asl                     | 3 +--
 src/mainboard/amd/mahogany_fam10/acpi/routing.asl                 | 3 +--
 src/mainboard/amd/mahogany_fam10/acpi/sata.asl                    | 3 +--
 src/mainboard/amd/mahogany_fam10/acpi/usb.asl                     | 3 +--
 src/mainboard/amd/mahogany_fam10/acpi_tables.c                    | 3 +--
 src/mainboard/amd/mahogany_fam10/dsdt.asl                         | 3 +--
 src/mainboard/amd/mahogany_fam10/get_bus_conf.c                   | 3 +--
 src/mainboard/amd/mahogany_fam10/irq_tables.c                     | 3 +--
 src/mainboard/amd/mahogany_fam10/mainboard.c                      | 3 +--
 src/mainboard/amd/mahogany_fam10/mb_sysconf.h                     | 3 +--
 src/mainboard/amd/mahogany_fam10/mptable.c                        | 3 +--
 src/mainboard/amd/mahogany_fam10/resourcemap.c                    | 3 +--
 src/mainboard/amd/mahogany_fam10/romstage.c                       | 3 +--
 src/mainboard/amd/norwich/irq_tables.c                            | 3 +--
 src/mainboard/amd/norwich/mainboard.c                             | 3 +--
 src/mainboard/amd/norwich/romstage.c                              | 3 +--
 src/mainboard/amd/olivehill/BiosCallOuts.c                        | 3 +--
 src/mainboard/amd/olivehill/Kconfig                               | 3 +--
 src/mainboard/amd/olivehill/Makefile.inc                          | 3 +--
 src/mainboard/amd/olivehill/OptionsIds.h                          | 3 +--
 src/mainboard/amd/olivehill/PlatformGnbPcie.c                     | 3 +--
 src/mainboard/amd/olivehill/acpi/AmdImc.asl                       | 3 +--
 src/mainboard/amd/olivehill/acpi/gpe.asl                          | 3 +--
 src/mainboard/amd/olivehill/acpi/ide.asl                          | 3 +--
 src/mainboard/amd/olivehill/acpi/mainboard.asl                    | 3 +--
 src/mainboard/amd/olivehill/acpi/routing.asl                      | 3 +--
 src/mainboard/amd/olivehill/acpi/sata.asl                         | 3 +--
 src/mainboard/amd/olivehill/acpi/si.asl                           | 3 +--
 src/mainboard/amd/olivehill/acpi/sleep.asl                        | 3 +--
 src/mainboard/amd/olivehill/acpi/superio.asl                      | 3 +--
 src/mainboard/amd/olivehill/acpi/thermal.asl                      | 3 +--
 src/mainboard/amd/olivehill/acpi/usb_oc.asl                       | 3 +--
 src/mainboard/amd/olivehill/acpi_tables.c                         | 3 +--
 src/mainboard/amd/olivehill/buildOpts.c                           | 3 +--
 src/mainboard/amd/olivehill/cmos.layout                           | 3 +--
 src/mainboard/amd/olivehill/devicetree.cb                         | 3 +--
 src/mainboard/amd/olivehill/dsdt.asl                              | 3 +--
 src/mainboard/amd/olivehill/irq_tables.c                          | 3 +--
 src/mainboard/amd/olivehill/mainboard.c                           | 3 +--
 src/mainboard/amd/olivehill/mptable.c                             | 3 +--
 src/mainboard/amd/olivehill/romstage.c                            | 3 +--
 src/mainboard/amd/olivehillplus/BiosCallOuts.c                    | 3 +--
 src/mainboard/amd/olivehillplus/Kconfig                           | 3 +--
 src/mainboard/amd/olivehillplus/Makefile.inc                      | 3 +--
 src/mainboard/amd/olivehillplus/PlatformGnbPcie.c                 | 3 +--
 src/mainboard/amd/olivehillplus/acpi/AmdImc.asl                   | 3 +--
 src/mainboard/amd/olivehillplus/acpi/gpe.asl                      | 3 +--
 src/mainboard/amd/olivehillplus/acpi/mainboard.asl                | 3 +--
 src/mainboard/amd/olivehillplus/acpi/routing.asl                  | 3 +--
 src/mainboard/amd/olivehillplus/acpi/si.asl                       | 3 +--
 src/mainboard/amd/olivehillplus/acpi/sleep.asl                    | 3 +--
 src/mainboard/amd/olivehillplus/acpi/usb_oc.asl                   | 3 +--
 src/mainboard/amd/olivehillplus/acpi_tables.c                     | 3 +--
 src/mainboard/amd/olivehillplus/cmos.layout                       | 3 +--
 src/mainboard/amd/olivehillplus/devicetree.cb                     | 3 +--
 src/mainboard/amd/olivehillplus/dsdt.asl                          | 3 +--
 src/mainboard/amd/olivehillplus/irq_tables.c                      | 3 +--
 src/mainboard/amd/olivehillplus/mainboard.c                       | 3 +--
 src/mainboard/amd/olivehillplus/mptable.c                         | 3 +--
 src/mainboard/amd/olivehillplus/romstage.c                        | 3 +--
 src/mainboard/amd/parmer/BiosCallOuts.c                           | 3 +--
 src/mainboard/amd/parmer/Kconfig                                  | 3 +--
 src/mainboard/amd/parmer/Makefile.inc                             | 3 +--
 src/mainboard/amd/parmer/OptionsIds.h                             | 3 +--
 src/mainboard/amd/parmer/PlatformGnbPcie.c                        | 3 +--
 src/mainboard/amd/parmer/acpi/gpe.asl                             | 3 +--
 src/mainboard/amd/parmer/acpi/mainboard.asl                       | 3 +--
 src/mainboard/amd/parmer/acpi/routing.asl                         | 3 +--
 src/mainboard/amd/parmer/acpi/sata.asl                            | 3 +--
 src/mainboard/amd/parmer/acpi/si.asl                              | 3 +--
 src/mainboard/amd/parmer/acpi/sleep.asl                           | 3 +--
 src/mainboard/amd/parmer/acpi/superio.asl                         | 3 +--
 src/mainboard/amd/parmer/acpi/thermal.asl                         | 3 +--
 src/mainboard/amd/parmer/acpi/usb_oc.asl                          | 3 +--
 src/mainboard/amd/parmer/acpi_tables.c                            | 3 +--
 src/mainboard/amd/parmer/buildOpts.c                              | 3 +--
 src/mainboard/amd/parmer/cmos.layout                              | 3 +--
 src/mainboard/amd/parmer/devicetree.cb                            | 3 +--
 src/mainboard/amd/parmer/dsdt.asl                                 | 3 +--
 src/mainboard/amd/parmer/irq_tables.c                             | 3 +--
 src/mainboard/amd/parmer/mainboard.c                              | 3 +--
 src/mainboard/amd/parmer/mptable.c                                | 3 +--
 src/mainboard/amd/parmer/romstage.c                               | 3 +--
 src/mainboard/amd/persimmon/BiosCallOuts.c                        | 3 +--
 src/mainboard/amd/persimmon/Kconfig                               | 3 +--
 src/mainboard/amd/persimmon/Makefile.inc                          | 3 +--
 src/mainboard/amd/persimmon/OptionsIds.h                          | 3 +--
 src/mainboard/amd/persimmon/PlatformGnbPcie.c                     | 3 +--
 src/mainboard/amd/persimmon/PlatformGnbPcieComplex.h              | 3 +--
 src/mainboard/amd/persimmon/acpi/gpe.asl                          | 3 +--
 src/mainboard/amd/persimmon/acpi/ide.asl                          | 3 +--
 src/mainboard/amd/persimmon/acpi/mainboard.asl                    | 3 +--
 src/mainboard/amd/persimmon/acpi/routing.asl                      | 3 +--
 src/mainboard/amd/persimmon/acpi/sata.asl                         | 3 +--
 src/mainboard/amd/persimmon/acpi/sleep.asl                        | 3 +--
 src/mainboard/amd/persimmon/acpi/superio.asl                      | 3 +--
 src/mainboard/amd/persimmon/acpi/usb_oc.asl                       | 3 +--
 src/mainboard/amd/persimmon/acpi_tables.c                         | 3 +--
 src/mainboard/amd/persimmon/buildOpts.c                           | 3 +--
 src/mainboard/amd/persimmon/cmos.layout                           | 3 +--
 src/mainboard/amd/persimmon/devicetree.cb                         | 3 +--
 src/mainboard/amd/persimmon/dsdt.asl                              | 3 +--
 src/mainboard/amd/persimmon/irq_tables.c                          | 3 +--
 src/mainboard/amd/persimmon/mainboard.c                           | 3 +--
 src/mainboard/amd/persimmon/mptable.c                             | 3 +--
 src/mainboard/amd/persimmon/platform_cfg.h                        | 3 +--
 src/mainboard/amd/persimmon/romstage.c                            | 3 +--
 src/mainboard/amd/pistachio/acpi/ide.asl                          | 3 +--
 src/mainboard/amd/pistachio/acpi/routing.asl                      | 3 +--
 src/mainboard/amd/pistachio/acpi/sata.asl                         | 3 +--
 src/mainboard/amd/pistachio/acpi/usb.asl                          | 3 +--
 src/mainboard/amd/pistachio/acpi_tables.c                         | 3 +--
 src/mainboard/amd/pistachio/cmos.layout                           | 3 +--
 src/mainboard/amd/pistachio/dsdt.asl                              | 3 +--
 src/mainboard/amd/pistachio/fadt.c                                | 3 +--
 src/mainboard/amd/pistachio/get_bus_conf.c                        | 3 +--
 src/mainboard/amd/pistachio/irq_tables.c                          | 3 +--
 src/mainboard/amd/pistachio/mainboard.c                           | 3 +--
 src/mainboard/amd/pistachio/mptable.c                             | 3 +--
 src/mainboard/amd/pistachio/resourcemap.c                         | 3 +--
 src/mainboard/amd/pistachio/romstage.c                            | 3 +--
 src/mainboard/amd/rumba/Kconfig                                   | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl    | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl    | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl      | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl      | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl  | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl        | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c           | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout             | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl                | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/fadt.c                  | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c          | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c            | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/mb_sysconf.h            | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/mptable.c               | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c           | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/romstage.c              | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl               | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl               | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl               | 3 +--
 src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl               | 3 +--
 src/mainboard/amd/south_station/BiosCallOuts.c                    | 3 +--
 src/mainboard/amd/south_station/Kconfig                           | 3 +--
 src/mainboard/amd/south_station/Makefile.inc                      | 3 +--
 src/mainboard/amd/south_station/OptionsIds.h                      | 3 +--
 src/mainboard/amd/south_station/PlatformGnbPcie.c                 | 3 +--
 src/mainboard/amd/south_station/PlatformGnbPcieComplex.h          | 3 +--
 src/mainboard/amd/south_station/acpi/gpe.asl                      | 3 +--
 src/mainboard/amd/south_station/acpi/ide.asl                      | 3 +--
 src/mainboard/amd/south_station/acpi/mainboard.asl                | 3 +--
 src/mainboard/amd/south_station/acpi/routing.asl                  | 3 +--
 src/mainboard/amd/south_station/acpi/sata.asl                     | 3 +--
 src/mainboard/amd/south_station/acpi/sleep.asl                    | 3 +--
 src/mainboard/amd/south_station/acpi/superio.asl                  | 3 +--
 src/mainboard/amd/south_station/acpi/usb_oc.asl                   | 3 +--
 src/mainboard/amd/south_station/acpi_tables.c                     | 3 +--
 src/mainboard/amd/south_station/buildOpts.c                       | 3 +--
 src/mainboard/amd/south_station/cmos.layout                       | 3 +--
 src/mainboard/amd/south_station/devicetree.cb                     | 3 +--
 src/mainboard/amd/south_station/dsdt.asl                          | 3 +--
 src/mainboard/amd/south_station/irq_tables.c                      | 3 +--
 src/mainboard/amd/south_station/mainboard.c                       | 3 +--
 src/mainboard/amd/south_station/mptable.c                         | 3 +--
 src/mainboard/amd/south_station/platform_cfg.h                    | 3 +--
 src/mainboard/amd/south_station/romstage.c                        | 3 +--
 src/mainboard/amd/thatcher/BiosCallOuts.c                         | 3 +--
 src/mainboard/amd/thatcher/Kconfig                                | 3 +--
 src/mainboard/amd/thatcher/Makefile.inc                           | 3 +--
 src/mainboard/amd/thatcher/OptionsIds.h                           | 3 +--
 src/mainboard/amd/thatcher/PlatformGnbPcie.c                      | 3 +--
 src/mainboard/amd/thatcher/acpi/cpstate.asl                       | 3 +--
 src/mainboard/amd/thatcher/acpi/gpe.asl                           | 3 +--
 src/mainboard/amd/thatcher/acpi/mainboard.asl                     | 3 +--
 src/mainboard/amd/thatcher/acpi/routing.asl                       | 3 +--
 src/mainboard/amd/thatcher/acpi/sata.asl                          | 3 +--
 src/mainboard/amd/thatcher/acpi/si.asl                            | 3 +--
 src/mainboard/amd/thatcher/acpi/sleep.asl                         | 3 +--
 src/mainboard/amd/thatcher/acpi/superio.asl                       | 3 +--
 src/mainboard/amd/thatcher/acpi/thermal.asl                       | 3 +--
 src/mainboard/amd/thatcher/acpi/usb_oc.asl                        | 3 +--
 src/mainboard/amd/thatcher/acpi_tables.c                          | 3 +--
 src/mainboard/amd/thatcher/buildOpts.c                            | 3 +--
 src/mainboard/amd/thatcher/cmos.layout                            | 3 +--
 src/mainboard/amd/thatcher/devicetree.cb                          | 3 +--
 src/mainboard/amd/thatcher/dsdt.asl                               | 3 +--
 src/mainboard/amd/thatcher/irq_tables.c                           | 3 +--
 src/mainboard/amd/thatcher/mainboard.c                            | 3 +--
 src/mainboard/amd/thatcher/mptable.c                              | 3 +--
 src/mainboard/amd/thatcher/romstage.c                             | 3 +--
 src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl                  | 3 +--
 src/mainboard/amd/tilapia_fam10/acpi/ide.asl                      | 3 +--
 src/mainboard/amd/tilapia_fam10/acpi/routing.asl                  | 3 +--
 src/mainboard/amd/tilapia_fam10/acpi/sata.asl                     | 3 +--
 src/mainboard/amd/tilapia_fam10/acpi/usb.asl                      | 3 +--
 src/mainboard/amd/tilapia_fam10/acpi_tables.c                     | 3 +--
 src/mainboard/amd/tilapia_fam10/dsdt.asl                          | 3 +--
 src/mainboard/amd/tilapia_fam10/get_bus_conf.c                    | 3 +--
 src/mainboard/amd/tilapia_fam10/irq_tables.c                      | 3 +--
 src/mainboard/amd/tilapia_fam10/mainboard.c                       | 3 +--
 src/mainboard/amd/tilapia_fam10/mb_sysconf.h                      | 3 +--
 src/mainboard/amd/tilapia_fam10/mptable.c                         | 3 +--
 src/mainboard/amd/tilapia_fam10/resourcemap.c                     | 3 +--
 src/mainboard/amd/tilapia_fam10/romstage.c                        | 3 +--
 src/mainboard/amd/torpedo/BiosCallOuts.c                          | 3 +--
 src/mainboard/amd/torpedo/Kconfig                                 | 3 +--
 src/mainboard/amd/torpedo/Makefile.inc                            | 3 +--
 src/mainboard/amd/torpedo/Oem.h                                   | 3 +--
 src/mainboard/amd/torpedo/OptionsIds.h                            | 3 +--
 src/mainboard/amd/torpedo/PlatformGnbPcie.c                       | 3 +--
 src/mainboard/amd/torpedo/PlatformGnbPcieComplex.h                | 3 +--
 src/mainboard/amd/torpedo/acpi/ide.asl                            | 3 +--
 src/mainboard/amd/torpedo/acpi/routing.asl                        | 3 +--
 src/mainboard/amd/torpedo/acpi/sata.asl                           | 3 +--
 src/mainboard/amd/torpedo/acpi/usb.asl                            | 3 +--
 src/mainboard/amd/torpedo/acpi_tables.c                           | 3 +--
 src/mainboard/amd/torpedo/buildOpts.c                             | 3 +--
 src/mainboard/amd/torpedo/cmos.layout                             | 3 +--
 src/mainboard/amd/torpedo/devicetree.cb                           | 3 +--
 src/mainboard/amd/torpedo/dsdt.asl                                | 3 +--
 src/mainboard/amd/torpedo/fadt.c                                  | 3 +--
 src/mainboard/amd/torpedo/gpio.c                                  | 3 +--
 src/mainboard/amd/torpedo/gpio.h                                  | 3 +--
 src/mainboard/amd/torpedo/irq_tables.c                            | 3 +--
 src/mainboard/amd/torpedo/mainboard.c                             | 3 +--
 src/mainboard/amd/torpedo/mptable.c                               | 3 +--
 src/mainboard/amd/torpedo/platform_cfg.h                          | 3 +--
 src/mainboard/amd/torpedo/pmio.h                                  | 3 +--
 src/mainboard/amd/torpedo/romstage.c                              | 3 +--
 src/mainboard/amd/union_station/BiosCallOuts.c                    | 3 +--
 src/mainboard/amd/union_station/Kconfig                           | 3 +--
 src/mainboard/amd/union_station/Makefile.inc                      | 3 +--
 src/mainboard/amd/union_station/OptionsIds.h                      | 3 +--
 src/mainboard/amd/union_station/PlatformGnbPcie.c                 | 3 +--
 src/mainboard/amd/union_station/PlatformGnbPcieComplex.h          | 3 +--
 src/mainboard/amd/union_station/acpi/gpe.asl                      | 3 +--
 src/mainboard/amd/union_station/acpi/ide.asl                      | 3 +--
 src/mainboard/amd/union_station/acpi/mainboard.asl                | 3 +--
 src/mainboard/amd/union_station/acpi/routing.asl                  | 3 +--
 src/mainboard/amd/union_station/acpi/sata.asl                     | 3 +--
 src/mainboard/amd/union_station/acpi/sleep.asl                    | 3 +--
 src/mainboard/amd/union_station/acpi/superio.asl                  | 3 +--
 src/mainboard/amd/union_station/acpi/usb_oc.asl                   | 3 +--
 src/mainboard/amd/union_station/acpi_tables.c                     | 3 +--
 src/mainboard/amd/union_station/buildOpts.c                       | 3 +--
 src/mainboard/amd/union_station/cmos.layout                       | 3 +--
 src/mainboard/amd/union_station/devicetree.cb                     | 3 +--
 src/mainboard/amd/union_station/dsdt.asl                          | 3 +--
 src/mainboard/amd/union_station/irq_tables.c                      | 3 +--
 src/mainboard/amd/union_station/mainboard.c                       | 3 +--
 src/mainboard/amd/union_station/mptable.c                         | 3 +--
 src/mainboard/amd/union_station/platform_cfg.h                    | 3 +--
 src/mainboard/amd/union_station/romstage.c                        | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl                  | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl                  | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/i82801db.asl                   | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/p64h2.asl                      | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/power.asl                      | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/scsi.asl                       | 3 +--
 src/mainboard/aopen/dxplplusu/acpi/superio.asl                    | 3 +--
 src/mainboard/aopen/dxplplusu/acpi_tables.c                       | 3 +--
 src/mainboard/aopen/dxplplusu/bus.h                               | 3 +--
 src/mainboard/aopen/dxplplusu/devicetree.cb                       | 3 +--
 src/mainboard/aopen/dxplplusu/dsdt.asl                            | 3 +--
 src/mainboard/aopen/dxplplusu/fadt.c                              | 3 +--
 src/mainboard/aopen/dxplplusu/irq_tables.c                        | 3 +--
 src/mainboard/aopen/dxplplusu/romstage.c                          | 3 +--
 src/mainboard/apple/macbook21/acpi/i945_pci_irqs.asl              | 3 +--
 src/mainboard/apple/macbook21/acpi/ich7_pci_irqs.asl              | 3 +--
 src/mainboard/apple/macbook21/acpi/platform.asl                   | 3 +--
 src/mainboard/apple/macbook21/acpi_tables.c                       | 3 +--
 src/mainboard/apple/macbook21/cmos.layout                         | 3 +--
 src/mainboard/apple/macbook21/devicetree.cb                       | 3 +--
 src/mainboard/apple/macbook21/dsdt.asl                            | 3 +--
 src/mainboard/apple/macbook21/hda_verb.c                          | 3 +--
 src/mainboard/apple/macbook21/mainboard.c                         | 3 +--
 src/mainboard/apple/macbook21/mptable.c                           | 3 +--
 src/mainboard/apple/macbook21/romstage.c                          | 3 +--
 src/mainboard/apple/macbook21/smihandler.c                        | 3 +--
 src/mainboard/artecgroup/dbe61/irq_tables.c                       | 3 +--
 src/mainboard/artecgroup/dbe61/mainboard.c                        | 3 +--
 src/mainboard/artecgroup/dbe61/romstage.c                         | 3 +--
 src/mainboard/artecgroup/dbe61/spd_table.h                        | 3 +--
 src/mainboard/asrock/939a785gmh/acpi/routing.asl                  | 3 +--
 src/mainboard/asrock/939a785gmh/acpi_tables.c                     | 3 +--
 src/mainboard/asrock/939a785gmh/cmos.layout                       | 3 +--
 src/mainboard/asrock/939a785gmh/dsdt.asl                          | 3 +--
 src/mainboard/asrock/939a785gmh/get_bus_conf.c                    | 3 +--
 src/mainboard/asrock/939a785gmh/irq_tables.c                      | 3 +--
 src/mainboard/asrock/939a785gmh/mainboard.c                       | 3 +--
 src/mainboard/asrock/939a785gmh/mptable.c                         | 3 +--
 src/mainboard/asrock/939a785gmh/resourcemap.c                     | 3 +--
 src/mainboard/asrock/939a785gmh/romstage.c                        | 3 +--
 src/mainboard/asrock/Kconfig                                      | 3 +--
 src/mainboard/asrock/e350m1/BiosCallOuts.c                        | 3 +--
 src/mainboard/asrock/e350m1/Kconfig                               | 3 +--
 src/mainboard/asrock/e350m1/Makefile.inc                          | 3 +--
 src/mainboard/asrock/e350m1/OptionsIds.h                          | 3 +--
 src/mainboard/asrock/e350m1/PlatformGnbPcie.c                     | 3 +--
 src/mainboard/asrock/e350m1/PlatformGnbPcieComplex.h              | 3 +--
 src/mainboard/asrock/e350m1/acpi/gpe.asl                          | 3 +--
 src/mainboard/asrock/e350m1/acpi/mainboard.asl                    | 3 +--
 src/mainboard/asrock/e350m1/acpi/routing.asl                      | 3 +--
 src/mainboard/asrock/e350m1/acpi/sata.asl                         | 3 +--
 src/mainboard/asrock/e350m1/acpi/sleep.asl                        | 3 +--
 src/mainboard/asrock/e350m1/acpi/superio.asl                      | 3 +--
 src/mainboard/asrock/e350m1/acpi/usb_oc.asl                       | 3 +--
 src/mainboard/asrock/e350m1/acpi_tables.c                         | 3 +--
 src/mainboard/asrock/e350m1/buildOpts.c                           | 3 +--
 src/mainboard/asrock/e350m1/cmos.layout                           | 3 +--
 src/mainboard/asrock/e350m1/devicetree.cb                         | 3 +--
 src/mainboard/asrock/e350m1/dsdt.asl                              | 3 +--
 src/mainboard/asrock/e350m1/irq_tables.c                          | 3 +--
 src/mainboard/asrock/e350m1/mainboard.c                           | 3 +--
 src/mainboard/asrock/e350m1/mptable.c                             | 3 +--
 src/mainboard/asrock/e350m1/platform_cfg.h                        | 3 +--
 src/mainboard/asrock/e350m1/romstage.c                            | 3 +--
 src/mainboard/asrock/imb-a180/BiosCallOuts.c                      | 3 +--
 src/mainboard/asrock/imb-a180/Kconfig                             | 3 +--
 src/mainboard/asrock/imb-a180/Makefile.inc                        | 3 +--
 src/mainboard/asrock/imb-a180/OptionsIds.h                        | 3 +--
 src/mainboard/asrock/imb-a180/PlatformGnbPcie.c                   | 3 +--
 src/mainboard/asrock/imb-a180/acpi/AmdImc.asl                     | 3 +--
 src/mainboard/asrock/imb-a180/acpi/gpe.asl                        | 3 +--
 src/mainboard/asrock/imb-a180/acpi/ide.asl                        | 3 +--
 src/mainboard/asrock/imb-a180/acpi/mainboard.asl                  | 3 +--
 src/mainboard/asrock/imb-a180/acpi/routing.asl                    | 3 +--
 src/mainboard/asrock/imb-a180/acpi/sata.asl                       | 3 +--
 src/mainboard/asrock/imb-a180/acpi/si.asl                         | 3 +--
 src/mainboard/asrock/imb-a180/acpi/sleep.asl                      | 3 +--
 src/mainboard/asrock/imb-a180/acpi/superio.asl                    | 3 +--
 src/mainboard/asrock/imb-a180/acpi/thermal.asl                    | 3 +--
 src/mainboard/asrock/imb-a180/acpi/usb_oc.asl                     | 3 +--
 src/mainboard/asrock/imb-a180/acpi_tables.c                       | 3 +--
 src/mainboard/asrock/imb-a180/buildOpts.c                         | 3 +--
 src/mainboard/asrock/imb-a180/cmos.layout                         | 3 +--
 src/mainboard/asrock/imb-a180/devicetree.cb                       | 3 +--
 src/mainboard/asrock/imb-a180/dsdt.asl                            | 3 +--
 src/mainboard/asrock/imb-a180/irq_tables.c                        | 3 +--
 src/mainboard/asrock/imb-a180/mainboard.c                         | 3 +--
 src/mainboard/asrock/imb-a180/mptable.c                           | 3 +--
 src/mainboard/asrock/imb-a180/romstage.c                          | 3 +--
 src/mainboard/asus/Kconfig                                        | 3 +--
 src/mainboard/asus/a8n_e/dsdt.asl                                 | 3 +--
 src/mainboard/asus/a8n_e/get_bus_conf.c                           | 3 +--
 src/mainboard/asus/a8n_e/irq_tables.c                             | 3 +--
 src/mainboard/asus/a8n_e/mptable.c                                | 3 +--
 src/mainboard/asus/a8n_e/romstage.c                               | 3 +--
 src/mainboard/asus/a8v-e_deluxe/acpi_tables.c                     | 3 +--
 src/mainboard/asus/a8v-e_deluxe/dsdt.asl                          | 3 +--
 src/mainboard/asus/a8v-e_deluxe/mptable.c                         | 3 +--
 src/mainboard/asus/a8v-e_deluxe/romstage.c                        | 3 +--
 src/mainboard/asus/a8v-e_se/acpi_tables.c                         | 3 +--
 src/mainboard/asus/a8v-e_se/dsdt.asl                              | 3 +--
 src/mainboard/asus/a8v-e_se/mptable.c                             | 3 +--
 src/mainboard/asus/a8v-e_se/romstage.c                            | 3 +--
 src/mainboard/asus/dsbf/cmos.layout                               | 3 +--
 src/mainboard/asus/dsbf/devicetree.cb                             | 3 +--
 src/mainboard/asus/dsbf/irq_tables.c                              | 3 +--
 src/mainboard/asus/dsbf/mainboard.c                               | 3 +--
 src/mainboard/asus/dsbf/romstage.c                                | 3 +--
 src/mainboard/asus/f2a85-m/BiosCallOuts.c                         | 3 +--
 src/mainboard/asus/f2a85-m/Kconfig                                | 3 +--
 src/mainboard/asus/f2a85-m/Makefile.inc                           | 3 +--
 src/mainboard/asus/f2a85-m/OptionsIds.h                           | 3 +--
 src/mainboard/asus/f2a85-m/PlatformGnbPcie.c                      | 3 +--
 src/mainboard/asus/f2a85-m/acpi/cpstate.asl                       | 3 +--
 src/mainboard/asus/f2a85-m/acpi/gpe.asl                           | 3 +--
 src/mainboard/asus/f2a85-m/acpi/mainboard.asl                     | 3 +--
 src/mainboard/asus/f2a85-m/acpi/routing.asl                       | 3 +--
 src/mainboard/asus/f2a85-m/acpi/sata.asl                          | 3 +--
 src/mainboard/asus/f2a85-m/acpi/si.asl                            | 3 +--
 src/mainboard/asus/f2a85-m/acpi/sleep.asl                         | 3 +--
 src/mainboard/asus/f2a85-m/acpi/superio.asl                       | 3 +--
 src/mainboard/asus/f2a85-m/acpi/thermal.asl                       | 3 +--
 src/mainboard/asus/f2a85-m/acpi/usb_oc.asl                        | 3 +--
 src/mainboard/asus/f2a85-m/acpi_tables.c                          | 3 +--
 src/mainboard/asus/f2a85-m/buildOpts.c                            | 3 +--
 src/mainboard/asus/f2a85-m/cmos.layout                            | 3 +--
 src/mainboard/asus/f2a85-m/devicetree.cb                          | 3 +--
 src/mainboard/asus/f2a85-m/dsdt.asl                               | 3 +--
 src/mainboard/asus/f2a85-m/irq_tables.c                           | 3 +--
 src/mainboard/asus/f2a85-m/mainboard.c                            | 3 +--
 src/mainboard/asus/f2a85-m/mptable.c                              | 3 +--
 src/mainboard/asus/f2a85-m/romstage.c                             | 3 +--
 src/mainboard/asus/f2a85-m_le/BiosCallOuts.c                      | 3 +--
 src/mainboard/asus/f2a85-m_le/Kconfig                             | 3 +--
 src/mainboard/asus/f2a85-m_le/Makefile.inc                        | 3 +--
 src/mainboard/asus/f2a85-m_le/buildOpts.c                         | 3 +--
 src/mainboard/asus/f2a85-m_le/cmos.layout                         | 3 +--
 src/mainboard/asus/f2a85-m_le/devicetree.cb                       | 3 +--
 src/mainboard/asus/k8v-x/acpi_tables.c                            | 3 +--
 src/mainboard/asus/k8v-x/dsdt.asl                                 | 3 +--
 src/mainboard/asus/k8v-x/mainboard.c                              | 3 +--
 src/mainboard/asus/k8v-x/mptable.c                                | 3 +--
 src/mainboard/asus/k8v-x/romstage.c                               | 3 +--
 src/mainboard/asus/kfsn4-dre/acpi/pm_ctrl.asl                     | 3 +--
 src/mainboard/asus/kfsn4-dre/bootblock.c                          | 3 +--
 src/mainboard/asus/kfsn4-dre/cmos.layout                          | 3 +--
 src/mainboard/asus/kfsn4-dre/dsdt.asl                             | 3 +--
 src/mainboard/asus/kfsn4-dre/get_bus_conf.c                       | 3 +--
 src/mainboard/asus/kfsn4-dre/irq_tables.c                         | 3 +--
 src/mainboard/asus/kfsn4-dre/mptable.c                            | 3 +--
 src/mainboard/asus/kfsn4-dre/resourcemap.c                        | 3 +--
 src/mainboard/asus/kfsn4-dre/romstage.c                           | 3 +--
 src/mainboard/asus/m2n-e/Kconfig                                  | 3 +--
 src/mainboard/asus/m2n-e/Makefile.inc                             | 3 +--
 src/mainboard/asus/m2n-e/cmos.layout                              | 3 +--
 src/mainboard/asus/m2n-e/devicetree.cb                            | 3 +--
 src/mainboard/asus/m2n-e/fanctl.c                                 | 3 +--
 src/mainboard/asus/m2n-e/get_bus_conf.c                           | 3 +--
 src/mainboard/asus/m2n-e/hda_verb.c                               | 3 +--
 src/mainboard/asus/m2n-e/mainboard.c                              | 3 +--
 src/mainboard/asus/m2n-e/mptable.c                                | 3 +--
 src/mainboard/asus/m2n-e/resourcemap.c                            | 3 +--
 src/mainboard/asus/m2n-e/romstage.c                               | 3 +--
 src/mainboard/asus/m2v-mx_se/Kconfig                              | 3 +--
 src/mainboard/asus/m2v-mx_se/acpi_tables.c                        | 3 +--
 src/mainboard/asus/m2v-mx_se/dsdt.asl                             | 3 +--
 src/mainboard/asus/m2v-mx_se/romstage.c                           | 3 +--
 src/mainboard/asus/m2v/acpi_tables.c                              | 3 +--
 src/mainboard/asus/m2v/dsdt.asl                                   | 3 +--
 src/mainboard/asus/m2v/irq_tables.c                               | 3 +--
 src/mainboard/asus/m2v/mainboard.c                                | 3 +--
 src/mainboard/asus/m2v/mptable.c                                  | 3 +--
 src/mainboard/asus/m2v/romstage.c                                 | 3 +--
 src/mainboard/asus/m4a78-em/acpi/cpstate.asl                      | 3 +--
 src/mainboard/asus/m4a78-em/acpi/ide.asl                          | 3 +--
 src/mainboard/asus/m4a78-em/acpi/routing.asl                      | 3 +--
 src/mainboard/asus/m4a78-em/acpi/sata.asl                         | 3 +--
 src/mainboard/asus/m4a78-em/acpi/usb.asl                          | 3 +--
 src/mainboard/asus/m4a78-em/acpi_tables.c                         | 3 +--
 src/mainboard/asus/m4a78-em/dsdt.asl                              | 3 +--
 src/mainboard/asus/m4a78-em/get_bus_conf.c                        | 3 +--
 src/mainboard/asus/m4a78-em/irq_tables.c                          | 3 +--
 src/mainboard/asus/m4a78-em/mainboard.c                           | 3 +--
 src/mainboard/asus/m4a78-em/mb_sysconf.h                          | 3 +--
 src/mainboard/asus/m4a78-em/mptable.c                             | 3 +--
 src/mainboard/asus/m4a78-em/resourcemap.c                         | 3 +--
 src/mainboard/asus/m4a78-em/romstage.c                            | 3 +--
 src/mainboard/asus/m4a785-m/acpi/cpstate.asl                      | 3 +--
 src/mainboard/asus/m4a785-m/acpi/ide.asl                          | 3 +--
 src/mainboard/asus/m4a785-m/acpi/routing.asl                      | 3 +--
 src/mainboard/asus/m4a785-m/acpi/sata.asl                         | 3 +--
 src/mainboard/asus/m4a785-m/acpi/usb.asl                          | 3 +--
 src/mainboard/asus/m4a785-m/acpi_tables.c                         | 3 +--
 src/mainboard/asus/m4a785-m/dsdt.asl                              | 3 +--
 src/mainboard/asus/m4a785-m/get_bus_conf.c                        | 3 +--
 src/mainboard/asus/m4a785-m/irq_tables.c                          | 3 +--
 src/mainboard/asus/m4a785-m/mainboard.c                           | 3 +--
 src/mainboard/asus/m4a785-m/mb_sysconf.h                          | 3 +--
 src/mainboard/asus/m4a785-m/mptable.c                             | 3 +--
 src/mainboard/asus/m4a785-m/resourcemap.c                         | 3 +--
 src/mainboard/asus/m4a785-m/romstage.c                            | 3 +--
 src/mainboard/asus/m4a785t-m/acpi/cpstate.asl                     | 3 +--
 src/mainboard/asus/m4a785t-m/acpi/ide.asl                         | 3 +--
 src/mainboard/asus/m4a785t-m/acpi/routing.asl                     | 3 +--
 src/mainboard/asus/m4a785t-m/acpi/sata.asl                        | 3 +--
 src/mainboard/asus/m4a785t-m/acpi/usb.asl                         | 3 +--
 src/mainboard/asus/m4a785t-m/acpi_tables.c                        | 3 +--
 src/mainboard/asus/m4a785t-m/dsdt.asl                             | 3 +--
 src/mainboard/asus/m4a785t-m/get_bus_conf.c                       | 3 +--
 src/mainboard/asus/m4a785t-m/irq_tables.c                         | 3 +--
 src/mainboard/asus/m4a785t-m/mainboard.c                          | 3 +--
 src/mainboard/asus/m4a785t-m/mptable.c                            | 3 +--
 src/mainboard/asus/m4a785t-m/romstage.c                           | 3 +--
 src/mainboard/asus/m5a88-v/acpi/cpstate.asl                       | 3 +--
 src/mainboard/asus/m5a88-v/acpi/ide.asl                           | 3 +--
 src/mainboard/asus/m5a88-v/acpi/routing.asl                       | 3 +--
 src/mainboard/asus/m5a88-v/acpi/sata.asl                          | 3 +--
 src/mainboard/asus/m5a88-v/acpi/usb.asl                           | 3 +--
 src/mainboard/asus/m5a88-v/acpi_tables.c                          | 3 +--
 src/mainboard/asus/m5a88-v/dsdt.asl                               | 3 +--
 src/mainboard/asus/m5a88-v/get_bus_conf.c                         | 3 +--
 src/mainboard/asus/m5a88-v/irq_tables.c                           | 3 +--
 src/mainboard/asus/m5a88-v/mainboard.c                            | 3 +--
 src/mainboard/asus/m5a88-v/mb_sysconf.h                           | 3 +--
 src/mainboard/asus/m5a88-v/mptable.c                              | 3 +--
 src/mainboard/asus/m5a88-v/platform_cfg.h                         | 3 +--
 src/mainboard/asus/m5a88-v/resourcemap.c                          | 3 +--
 src/mainboard/asus/m5a88-v/romstage.c                             | 3 +--
 src/mainboard/asus/mew-am/Kconfig                                 | 3 +--
 src/mainboard/asus/mew-am/irq_tables.c                            | 3 +--
 src/mainboard/asus/mew-am/romstage.c                              | 3 +--
 src/mainboard/asus/mew-vm/Kconfig                                 | 3 +--
 src/mainboard/asus/mew-vm/romstage.c                              | 3 +--
 src/mainboard/asus/p2b-d/Kconfig                                  | 3 +--
 src/mainboard/asus/p2b-d/irq_tables.c                             | 3 +--
 src/mainboard/asus/p2b-d/mptable.c                                | 3 +--
 src/mainboard/asus/p2b-d/romstage.c                               | 3 +--
 src/mainboard/asus/p2b-ds/Kconfig                                 | 3 +--
 src/mainboard/asus/p2b-ds/irq_tables.c                            | 3 +--
 src/mainboard/asus/p2b-ds/mptable.c                               | 3 +--
 src/mainboard/asus/p2b-ds/romstage.c                              | 3 +--
 src/mainboard/asus/p2b-f/Kconfig                                  | 3 +--
 src/mainboard/asus/p2b-f/irq_tables.c                             | 3 +--
 src/mainboard/asus/p2b-f/romstage.c                               | 3 +--
 src/mainboard/asus/p2b-ls/Kconfig                                 | 3 +--
 src/mainboard/asus/p2b-ls/irq_tables.c                            | 3 +--
 src/mainboard/asus/p2b-ls/romstage.c                              | 3 +--
 src/mainboard/asus/p2b/Kconfig                                    | 3 +--
 src/mainboard/asus/p2b/acpi_tables.c                              | 3 +--
 src/mainboard/asus/p2b/dsdt.asl                                   | 3 +--
 src/mainboard/asus/p2b/irq_tables.c                               | 3 +--
 src/mainboard/asus/p2b/romstage.c                                 | 3 +--
 src/mainboard/asus/p3b-f/Kconfig                                  | 3 +--
 src/mainboard/asus/p3b-f/irq_tables.c                             | 3 +--
 src/mainboard/asus/p3b-f/romstage.c                               | 3 +--
 src/mainboard/avalue/Kconfig                                      | 3 +--
 src/mainboard/avalue/eax-785e/acpi/cpstate.asl                    | 3 +--
 src/mainboard/avalue/eax-785e/acpi/routing.asl                    | 3 +--
 src/mainboard/avalue/eax-785e/acpi/sata.asl                       | 3 +--
 src/mainboard/avalue/eax-785e/acpi/usb.asl                        | 3 +--
 src/mainboard/avalue/eax-785e/acpi_tables.c                       | 3 +--
 src/mainboard/avalue/eax-785e/dsdt.asl                            | 3 +--
 src/mainboard/avalue/eax-785e/get_bus_conf.c                      | 3 +--
 src/mainboard/avalue/eax-785e/irq_tables.c                        | 3 +--
 src/mainboard/avalue/eax-785e/mainboard.c                         | 3 +--
 src/mainboard/avalue/eax-785e/mb_sysconf.h                        | 3 +--
 src/mainboard/avalue/eax-785e/mptable.c                           | 3 +--
 src/mainboard/avalue/eax-785e/platform_cfg.h                      | 3 +--
 src/mainboard/avalue/eax-785e/resourcemap.c                       | 3 +--
 src/mainboard/avalue/eax-785e/romstage.c                          | 3 +--
 src/mainboard/azza/Kconfig                                        | 3 +--
 src/mainboard/azza/pt-6ibd/Kconfig                                | 3 +--
 src/mainboard/azza/pt-6ibd/irq_tables.c                           | 3 +--
 src/mainboard/azza/pt-6ibd/romstage.c                             | 3 +--
 src/mainboard/bachmann/ot200/cmos.layout                          | 3 +--
 src/mainboard/bachmann/ot200/irq_tables.c                         | 3 +--
 src/mainboard/bachmann/ot200/mainboard.c                          | 3 +--
 src/mainboard/bachmann/ot200/romstage.c                           | 3 +--
 src/mainboard/bap/Kconfig                                         | 3 +--
 src/mainboard/bap/ode_e20XX/BAP_Q7.spd.hex                        | 3 +--
 src/mainboard/bap/ode_e20XX/BiosCallOuts.c                        | 3 +--
 src/mainboard/bap/ode_e20XX/Kconfig                               | 3 +--
 src/mainboard/bap/ode_e20XX/Makefile.inc                          | 3 +--
 src/mainboard/bap/ode_e20XX/OptionsIds.h                          | 3 +--
 src/mainboard/bap/ode_e20XX/PlatformGnbPcie.c                     | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl                       | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/gpe.asl                          | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/ide.asl                          | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/mainboard.asl                    | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/routing.asl                      | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/sata.asl                         | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/si.asl                           | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/sleep.asl                        | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/superio.asl                      | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/thermal.asl                      | 3 +--
 src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl                       | 3 +--
 src/mainboard/bap/ode_e20XX/acpi_tables.c                         | 3 +--
 src/mainboard/bap/ode_e20XX/buildOpts.c                           | 3 +--
 src/mainboard/bap/ode_e20XX/cmos.layout                           | 3 +--
 src/mainboard/bap/ode_e20XX/devicetree.cb                         | 3 +--
 src/mainboard/bap/ode_e20XX/dsdt.asl                              | 3 +--
 src/mainboard/bap/ode_e20XX/irq_tables.c                          | 3 +--
 src/mainboard/bap/ode_e20XX/mainboard.c                           | 3 +--
 src/mainboard/bap/ode_e20XX/mptable.c                             | 3 +--
 src/mainboard/bap/ode_e20XX/romstage.c                            | 3 +--
 src/mainboard/bcom/Kconfig                                        | 3 +--
 src/mainboard/bcom/winnetp680/irq_tables.c                        | 3 +--
 src/mainboard/bcom/winnetp680/romstage.c                          | 3 +--
 src/mainboard/bifferos/Kconfig                                    | 3 +--
 src/mainboard/bifferos/bifferboard/romstage.c                     | 3 +--
 src/mainboard/biostar/Kconfig                                     | 3 +--
 src/mainboard/biostar/am1ml/BiosCallOuts.c                        | 3 +--
 src/mainboard/biostar/am1ml/Kconfig                               | 3 +--
 src/mainboard/biostar/am1ml/Makefile.inc                          | 3 +--
 src/mainboard/biostar/am1ml/OptionsIds.h                          | 3 +--
 src/mainboard/biostar/am1ml/PlatformGnbPcie.c                     | 3 +--
 src/mainboard/biostar/am1ml/acpi/AmdImc.asl                       | 3 +--
 src/mainboard/biostar/am1ml/acpi/flag0.asl                        | 3 +--
 src/mainboard/biostar/am1ml/acpi/gpe.asl                          | 3 +--
 src/mainboard/biostar/am1ml/acpi/ide.asl                          | 3 +--
 src/mainboard/biostar/am1ml/acpi/mainboard.asl                    | 3 +--
 src/mainboard/biostar/am1ml/acpi/routing.asl                      | 3 +--
 src/mainboard/biostar/am1ml/acpi/sata.asl                         | 3 +--
 src/mainboard/biostar/am1ml/acpi/si.asl                           | 3 +--
 src/mainboard/biostar/am1ml/acpi/sio.asl                          | 3 +--
 src/mainboard/biostar/am1ml/acpi/sleep.asl                        | 3 +--
 src/mainboard/biostar/am1ml/acpi/superio.asl                      | 3 +--
 src/mainboard/biostar/am1ml/acpi/thermal.asl                      | 3 +--
 src/mainboard/biostar/am1ml/acpi/usb_oc.asl                       | 3 +--
 src/mainboard/biostar/am1ml/acpi_tables.c                         | 3 +--
 src/mainboard/biostar/am1ml/buildOpts.c                           | 3 +--
 src/mainboard/biostar/am1ml/cmos.layout                           | 3 +--
 src/mainboard/biostar/am1ml/devicetree.cb                         | 3 +--
 src/mainboard/biostar/am1ml/dsdt.asl                              | 3 +--
 src/mainboard/biostar/am1ml/irq_tables.c                          | 3 +--
 src/mainboard/biostar/am1ml/mainboard.c                           | 3 +--
 src/mainboard/biostar/am1ml/mptable.c                             | 3 +--
 src/mainboard/biostar/am1ml/romstage.c                            | 3 +--
 src/mainboard/biostar/m6tba/Kconfig                               | 3 +--
 src/mainboard/biostar/m6tba/irq_tables.c                          | 3 +--
 src/mainboard/biostar/m6tba/romstage.c                            | 3 +--
 src/mainboard/compaq/Kconfig                                      | 3 +--
 src/mainboard/compaq/deskpro_en_sff_p600/Kconfig                  | 3 +--
 src/mainboard/compaq/deskpro_en_sff_p600/irq_tables.c             | 3 +--
 src/mainboard/compaq/deskpro_en_sff_p600/romstage.c               | 3 +--
 src/mainboard/cubietech/cubieboard/memlayout.ld                   | 3 +--
 src/mainboard/digitallogic/msm800sev/irq_tables.c                 | 3 +--
 src/mainboard/digitallogic/msm800sev/mainboard.c                  | 3 +--
 src/mainboard/dmp/Kconfig                                         | 3 +--
 src/mainboard/dmp/vortex86ex/Kconfig                              | 3 +--
 src/mainboard/dmp/vortex86ex/devicetree.cb                        | 3 +--
 src/mainboard/dmp/vortex86ex/hda_verb.c                           | 3 +--
 src/mainboard/dmp/vortex86ex/irq_tables.c                         | 3 +--
 src/mainboard/dmp/vortex86ex/mainboard.c                          | 3 +--
 src/mainboard/dmp/vortex86ex/romstage.c                           | 3 +--
 src/mainboard/ecs/Kconfig                                         | 3 +--
 src/mainboard/ecs/p6iwp-fe/Kconfig                                | 3 +--
 src/mainboard/ecs/p6iwp-fe/devicetree.cb                          | 3 +--
 src/mainboard/ecs/p6iwp-fe/irq_tables.c                           | 3 +--
 src/mainboard/ecs/p6iwp-fe/romstage.c                             | 3 +--
 src/mainboard/emulation/qemu-armv7/cbmem.c                        | 3 +--
 src/mainboard/emulation/qemu-armv7/memlayout.ld                   | 3 +--
 src/mainboard/emulation/qemu-i440fx/acpi_tables.c                 | 3 +--
 src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc              | 3 +--
 src/mainboard/emulation/qemu-i440fx/dsdt.asl                      | 3 +--
 src/mainboard/emulation/qemu-i440fx/fw_cfg.c                      | 3 +--
 src/mainboard/emulation/qemu-i440fx/fw_cfg.h                      | 3 +--
 src/mainboard/emulation/qemu-i440fx/mainboard.c                   | 3 +--
 src/mainboard/emulation/qemu-i440fx/memory.c                      | 3 +--
 src/mainboard/emulation/qemu-i440fx/romstage.c                    | 3 +--
 src/mainboard/emulation/qemu-q35/acpi_tables.c                    | 3 +--
 src/mainboard/emulation/qemu-q35/dsdt.asl                         | 3 +--
 src/mainboard/emulation/qemu-q35/mainboard.c                      | 3 +--
 src/mainboard/emulation/qemu-q35/romstage.c                       | 3 +--
 src/mainboard/emulation/qemu-riscv/bootblock.c                    | 3 +--
 src/mainboard/emulation/qemu-riscv/memlayout.ld                   | 3 +--
 src/mainboard/emulation/qemu-riscv/uart.c                         | 3 +--
 src/mainboard/emulation/spike-riscv/bootblock.c                   | 3 +--
 src/mainboard/emulation/spike-riscv/memlayout.ld                  | 3 +--
 src/mainboard/emulation/spike-riscv/uart.c                        | 3 +--
 src/mainboard/getac/Kconfig                                       | 3 +--
 src/mainboard/getac/p470/Kconfig                                  | 3 +--
 src/mainboard/getac/p470/Makefile.inc                             | 3 +--
 src/mainboard/getac/p470/acpi/battery.asl                         | 3 +--
 src/mainboard/getac/p470/acpi/ec.asl                              | 3 +--
 src/mainboard/getac/p470/acpi/gpe.asl                             | 3 +--
 src/mainboard/getac/p470/acpi/i945_pci_irqs.asl                   | 3 +--
 src/mainboard/getac/p470/acpi/ich7_pci_irqs.asl                   | 3 +--
 src/mainboard/getac/p470/acpi/mainboard.asl                       | 3 +--
 src/mainboard/getac/p470/acpi/platform.asl                        | 3 +--
 src/mainboard/getac/p470/acpi/superio.asl                         | 3 +--
 src/mainboard/getac/p470/acpi/thermal.asl                         | 3 +--
 src/mainboard/getac/p470/acpi_tables.c                            | 3 +--
 src/mainboard/getac/p470/cmos.layout                              | 3 +--
 src/mainboard/getac/p470/devicetree.cb                            | 3 +--
 src/mainboard/getac/p470/dsdt.asl                                 | 3 +--
 src/mainboard/getac/p470/ec_oem.c                                 | 3 +--
 src/mainboard/getac/p470/ec_oem.h                                 | 3 +--
 src/mainboard/getac/p470/hda_verb.c                               | 3 +--
 src/mainboard/getac/p470/irq_tables.c                             | 3 +--
 src/mainboard/getac/p470/mainboard.c                              | 3 +--
 src/mainboard/getac/p470/mptable.c                                | 3 +--
 src/mainboard/getac/p470/romstage.c                               | 3 +--
 src/mainboard/getac/p470/smihandler.c                             | 3 +--
 src/mainboard/gigabyte/Kconfig                                    | 3 +--
 src/mainboard/gigabyte/ga-6bxc/Kconfig                            | 3 +--
 src/mainboard/gigabyte/ga-6bxc/irq_tables.c                       | 3 +--
 src/mainboard/gigabyte/ga-6bxc/romstage.c                         | 3 +--
 src/mainboard/gigabyte/ga-6bxe/Kconfig                            | 3 +--
 src/mainboard/gigabyte/ga-6bxe/irq_tables.c                       | 3 +--
 src/mainboard/gigabyte/ga-6bxe/romstage.c                         | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc                   | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl             | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl              | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl               | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl               | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c                  | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout                    | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c                    | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/romstage.c                     | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3h/thermal.h                      | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc                   | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl              | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl               | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c                  | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout                    | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c                    | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/romstage.c                     | 3 +--
 src/mainboard/gigabyte/ga-b75m-d3v/thermal.h                      | 3 +--
 src/mainboard/gigabyte/ga_2761gxdk/cmos.layout                    | 3 +--
 src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c                 | 3 +--
 src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c                   | 3 +--
 src/mainboard/gigabyte/ga_2761gxdk/mptable.c                      | 3 +--
 src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c                  | 3 +--
 src/mainboard/gigabyte/ga_2761gxdk/romstage.c                     | 3 +--
 src/mainboard/gigabyte/m57sli/Makefile.inc                        | 3 +--
 src/mainboard/gigabyte/m57sli/acpi_tables.c                       | 3 +--
 src/mainboard/gigabyte/m57sli/cmos.layout                         | 3 +--
 src/mainboard/gigabyte/m57sli/dsdt.asl                            | 3 +--
 src/mainboard/gigabyte/m57sli/get_bus_conf.c                      | 3 +--
 src/mainboard/gigabyte/m57sli/irq_tables.c                        | 3 +--
 src/mainboard/gigabyte/m57sli/mainboard.c                         | 3 +--
 src/mainboard/gigabyte/m57sli/mptable.c                           | 3 +--
 src/mainboard/gigabyte/m57sli/resourcemap.c                       | 3 +--
 src/mainboard/gigabyte/m57sli/romstage.c                          | 3 +--
 src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl                   | 3 +--
 src/mainboard/gigabyte/ma785gm/acpi/ide.asl                       | 3 +--
 src/mainboard/gigabyte/ma785gm/acpi/routing.asl                   | 3 +--
 src/mainboard/gigabyte/ma785gm/acpi/sata.asl                      | 3 +--
 src/mainboard/gigabyte/ma785gm/acpi/usb.asl                       | 3 +--
 src/mainboard/gigabyte/ma785gm/acpi_tables.c                      | 3 +--
 src/mainboard/gigabyte/ma785gm/dsdt.asl                           | 3 +--
 src/mainboard/gigabyte/ma785gm/get_bus_conf.c                     | 3 +--
 src/mainboard/gigabyte/ma785gm/irq_tables.c                       | 3 +--
 src/mainboard/gigabyte/ma785gm/mainboard.c                        | 3 +--
 src/mainboard/gigabyte/ma785gm/mb_sysconf.h                       | 3 +--
 src/mainboard/gigabyte/ma785gm/mptable.c                          | 3 +--
 src/mainboard/gigabyte/ma785gm/resourcemap.c                      | 3 +--
 src/mainboard/gigabyte/ma785gm/romstage.c                         | 3 +--
 src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl                  | 3 +--
 src/mainboard/gigabyte/ma785gmt/acpi/ide.asl                      | 3 +--
 src/mainboard/gigabyte/ma785gmt/acpi/routing.asl                  | 3 +--
 src/mainboard/gigabyte/ma785gmt/acpi/sata.asl                     | 3 +--
 src/mainboard/gigabyte/ma785gmt/acpi/usb.asl                      | 3 +--
 src/mainboard/gigabyte/ma785gmt/acpi_tables.c                     | 3 +--
 src/mainboard/gigabyte/ma785gmt/dsdt.asl                          | 3 +--
 src/mainboard/gigabyte/ma785gmt/get_bus_conf.c                    | 3 +--
 src/mainboard/gigabyte/ma785gmt/irq_tables.c                      | 3 +--
 src/mainboard/gigabyte/ma785gmt/mainboard.c                       | 3 +--
 src/mainboard/gigabyte/ma785gmt/mptable.c                         | 3 +--
 src/mainboard/gigabyte/ma785gmt/resourcemap.c                     | 3 +--
 src/mainboard/gigabyte/ma785gmt/romstage.c                        | 3 +--
 src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl                    | 3 +--
 src/mainboard/gigabyte/ma78gm/acpi/ide.asl                        | 3 +--
 src/mainboard/gigabyte/ma78gm/acpi/routing.asl                    | 3 +--
 src/mainboard/gigabyte/ma78gm/acpi/sata.asl                       | 3 +--
 src/mainboard/gigabyte/ma78gm/acpi/usb.asl                        | 3 +--
 src/mainboard/gigabyte/ma78gm/acpi_tables.c                       | 3 +--
 src/mainboard/gigabyte/ma78gm/dsdt.asl                            | 3 +--
 src/mainboard/gigabyte/ma78gm/get_bus_conf.c                      | 3 +--
 src/mainboard/gigabyte/ma78gm/irq_tables.c                        | 3 +--
 src/mainboard/gigabyte/ma78gm/mainboard.c                         | 3 +--
 src/mainboard/gigabyte/ma78gm/mptable.c                           | 3 +--
 src/mainboard/gigabyte/ma78gm/resourcemap.c                       | 3 +--
 src/mainboard/gigabyte/ma78gm/romstage.c                          | 3 +--
 src/mainboard/gizmosphere/Kconfig                                 | 3 +--
 src/mainboard/gizmosphere/gizmo/BiosCallOuts.c                    | 3 +--
 src/mainboard/gizmosphere/gizmo/Kconfig                           | 3 +--
 src/mainboard/gizmosphere/gizmo/Makefile.inc                      | 3 +--
 src/mainboard/gizmosphere/gizmo/OptionsIds.h                      | 3 +--
 src/mainboard/gizmosphere/gizmo/PlatformGnbPcie.c                 | 3 +--
 src/mainboard/gizmosphere/gizmo/PlatformGnbPcieComplex.h          | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/gpe.asl                      | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/ide.asl                      | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl                | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/routing.asl                  | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/sata.asl                     | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/sleep.asl                    | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/superio.asl                  | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl                   | 3 +--
 src/mainboard/gizmosphere/gizmo/acpi_tables.c                     | 3 +--
 src/mainboard/gizmosphere/gizmo/buildOpts.c                       | 3 +--
 src/mainboard/gizmosphere/gizmo/cmos.layout                       | 3 +--
 src/mainboard/gizmosphere/gizmo/devicetree.cb                     | 3 +--
 src/mainboard/gizmosphere/gizmo/dsdt.asl                          | 3 +--
 src/mainboard/gizmosphere/gizmo/irq_tables.c                      | 3 +--
 src/mainboard/gizmosphere/gizmo/mainboard.c                       | 3 +--
 src/mainboard/gizmosphere/gizmo/mptable.c                         | 3 +--
 src/mainboard/gizmosphere/gizmo/platform_cfg.h                    | 3 +--
 src/mainboard/gizmosphere/gizmo/romstage.c                        | 3 +--
 src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c                   | 3 +--
 src/mainboard/gizmosphere/gizmo2/Kconfig                          | 3 +--
 src/mainboard/gizmosphere/gizmo2/Makefile.inc                     | 3 +--
 src/mainboard/gizmosphere/gizmo2/Micron_MT41J128M16JT.spd.hex     | 3 +--
 src/mainboard/gizmosphere/gizmo2/OptionsIds.h                     | 3 +--
 src/mainboard/gizmosphere/gizmo2/PlatformGnbPcie.c                | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl                  | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/gpe.asl                     | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/ide.asl                     | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl               | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/routing.asl                 | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/sata.asl                    | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/si.asl                      | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/sleep.asl                   | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/superio.asl                 | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/thermal.asl                 | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl                  | 3 +--
 src/mainboard/gizmosphere/gizmo2/acpi_tables.c                    | 3 +--
 src/mainboard/gizmosphere/gizmo2/buildOpts.c                      | 3 +--
 src/mainboard/gizmosphere/gizmo2/cmos.layout                      | 3 +--
 src/mainboard/gizmosphere/gizmo2/devicetree.cb                    | 3 +--
 src/mainboard/gizmosphere/gizmo2/dsdt.asl                         | 3 +--
 src/mainboard/gizmosphere/gizmo2/irq_tables.c                     | 3 +--
 src/mainboard/gizmosphere/gizmo2/mainboard.c                      | 3 +--
 src/mainboard/gizmosphere/gizmo2/mptable.c                        | 3 +--
 src/mainboard/gizmosphere/gizmo2/romstage.c                       | 3 +--
 src/mainboard/google/Kconfig                                      | 3 +--
 src/mainboard/google/auron/Makefile.inc                           | 3 +--
 src/mainboard/google/auron/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/auron/acpi/ec.asl                            | 3 +--
 src/mainboard/google/auron/acpi/haswell_pci_irqs.asl              | 3 +--
 src/mainboard/google/auron/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/auron/acpi/platform.asl                      | 3 +--
 src/mainboard/google/auron/acpi/superio.asl                       | 3 +--
 src/mainboard/google/auron/acpi/thermal.asl                       | 3 +--
 src/mainboard/google/auron/acpi/video.asl                         | 3 +--
 src/mainboard/google/auron/acpi_tables.c                          | 3 +--
 src/mainboard/google/auron/chromeos.c                             | 3 +--
 src/mainboard/google/auron/cmos.layout                            | 3 +--
 src/mainboard/google/auron/dsdt.asl                               | 3 +--
 src/mainboard/google/auron/ec.c                                   | 3 +--
 src/mainboard/google/auron/ec.h                                   | 3 +--
 src/mainboard/google/auron/fadt.c                                 | 3 +--
 src/mainboard/google/auron/gpio.h                                 | 3 +--
 src/mainboard/google/auron/hda_verb.c                             | 3 +--
 src/mainboard/google/auron/mainboard.c                            | 3 +--
 src/mainboard/google/auron/onboard.h                              | 3 +--
 src/mainboard/google/auron/pei_data.c                             | 3 +--
 src/mainboard/google/auron/romstage.c                             | 3 +--
 src/mainboard/google/auron/smihandler.c                           | 3 +--
 src/mainboard/google/auron/spd/Makefile.inc                       | 3 +--
 src/mainboard/google/auron/spd/spd.c                              | 3 +--
 src/mainboard/google/auron/spd/spd.h                              | 3 +--
 src/mainboard/google/auron/thermal.h                              | 3 +--
 src/mainboard/google/bolt/Makefile.inc                            | 3 +--
 src/mainboard/google/bolt/acpi/chromeos.asl                       | 3 +--
 src/mainboard/google/bolt/acpi/ec.asl                             | 3 +--
 src/mainboard/google/bolt/acpi/haswell_pci_irqs.asl               | 3 +--
 src/mainboard/google/bolt/acpi/mainboard.asl                      | 3 +--
 src/mainboard/google/bolt/acpi/platform.asl                       | 3 +--
 src/mainboard/google/bolt/acpi/superio.asl                        | 3 +--
 src/mainboard/google/bolt/acpi/thermal.asl                        | 3 +--
 src/mainboard/google/bolt/acpi_tables.c                           | 3 +--
 src/mainboard/google/bolt/chromeos.c                              | 3 +--
 src/mainboard/google/bolt/cmos.layout                             | 3 +--
 src/mainboard/google/bolt/dsdt.asl                                | 3 +--
 src/mainboard/google/bolt/ec.c                                    | 3 +--
 src/mainboard/google/bolt/ec.h                                    | 3 +--
 src/mainboard/google/bolt/fadt.c                                  | 3 +--
 src/mainboard/google/bolt/gpio.h                                  | 3 +--
 src/mainboard/google/bolt/hda_verb.c                              | 3 +--
 src/mainboard/google/bolt/mainboard.c                             | 3 +--
 src/mainboard/google/bolt/onboard.h                               | 3 +--
 src/mainboard/google/bolt/romstage.c                              | 3 +--
 src/mainboard/google/bolt/smihandler.c                            | 3 +--
 src/mainboard/google/bolt/thermal.h                               | 3 +--
 src/mainboard/google/butterfly/Makefile.inc                       | 3 +--
 src/mainboard/google/butterfly/acpi/chromeos.asl                  | 3 +--
 src/mainboard/google/butterfly/acpi/ec.asl                        | 3 +--
 src/mainboard/google/butterfly/acpi/mainboard.asl                 | 3 +--
 src/mainboard/google/butterfly/acpi/platform.asl                  | 3 +--
 src/mainboard/google/butterfly/acpi/superio.asl                   | 3 +--
 src/mainboard/google/butterfly/acpi/thermal.asl                   | 3 +--
 src/mainboard/google/butterfly/acpi_tables.c                      | 3 +--
 src/mainboard/google/butterfly/chromeos.c                         | 3 +--
 src/mainboard/google/butterfly/cmos.layout                        | 3 +--
 src/mainboard/google/butterfly/dsdt.asl                           | 3 +--
 src/mainboard/google/butterfly/ec.c                               | 3 +--
 src/mainboard/google/butterfly/ec.h                               | 3 +--
 src/mainboard/google/butterfly/gpio.c                             | 3 +--
 src/mainboard/google/butterfly/hda_verb.c                         | 3 +--
 src/mainboard/google/butterfly/mainboard.c                        | 3 +--
 src/mainboard/google/butterfly/mainboard_smi.c                    | 3 +--
 src/mainboard/google/butterfly/onboard.h                          | 3 +--
 src/mainboard/google/butterfly/romstage.c                         | 3 +--
 src/mainboard/google/butterfly/thermal.h                          | 3 +--
 src/mainboard/google/cosmos/Kconfig                               | 3 +--
 src/mainboard/google/cosmos/Makefile.inc                          | 3 +--
 src/mainboard/google/cosmos/boardid.c                             | 3 +--
 src/mainboard/google/cosmos/bootblock.c                           | 3 +--
 src/mainboard/google/cosmos/chromeos.c                            | 3 +--
 src/mainboard/google/cosmos/devicetree.cb                         | 3 +--
 src/mainboard/google/cosmos/mainboard.c                           | 3 +--
 src/mainboard/google/cosmos/reset.c                               | 3 +--
 src/mainboard/google/cosmos/romstage.c                            | 3 +--
 src/mainboard/google/cyan/Makefile.inc                            | 3 +--
 src/mainboard/google/cyan/acpi/chromeos.asl                       | 3 +--
 src/mainboard/google/cyan/acpi/dptf.asl                           | 3 +--
 src/mainboard/google/cyan/acpi/ec.asl                             | 3 +--
 src/mainboard/google/cyan/acpi/mainboard.asl                      | 3 +--
 src/mainboard/google/cyan/acpi/superio.asl                        | 3 +--
 src/mainboard/google/cyan/acpi_tables.c                           | 3 +--
 src/mainboard/google/cyan/boardid.c                               | 3 +--
 src/mainboard/google/cyan/chromeos.c                              | 3 +--
 src/mainboard/google/cyan/cmos.layout                             | 3 +--
 src/mainboard/google/cyan/com_init.c                              | 3 +--
 src/mainboard/google/cyan/dsdt.asl                                | 3 +--
 src/mainboard/google/cyan/ec.c                                    | 3 +--
 src/mainboard/google/cyan/ec.h                                    | 3 +--
 src/mainboard/google/cyan/fadt.c                                  | 3 +--
 src/mainboard/google/cyan/gpio.c                                  | 3 +--
 src/mainboard/google/cyan/gpio.h                                  | 3 +--
 src/mainboard/google/cyan/gpio_pre_evt.c                          | 3 +--
 src/mainboard/google/cyan/irqroute.c                              | 3 +--
 src/mainboard/google/cyan/irqroute.h                              | 3 +--
 src/mainboard/google/cyan/mainboard.c                             | 3 +--
 src/mainboard/google/cyan/onboard.h                               | 3 +--
 src/mainboard/google/cyan/ramstage.c                              | 3 +--
 src/mainboard/google/cyan/romstage.c                              | 3 +--
 src/mainboard/google/cyan/smihandler.c                            | 3 +--
 src/mainboard/google/cyan/spd/Makefile.inc                        | 3 +--
 src/mainboard/google/cyan/spd/spd.c                               | 3 +--
 src/mainboard/google/cyan/w25q64.c                                | 3 +--
 src/mainboard/google/daisy/Kconfig                                | 3 +--
 src/mainboard/google/daisy/Makefile.inc                           | 3 +--
 src/mainboard/google/daisy/chromeos.c                             | 3 +--
 src/mainboard/google/daisy/devicetree.cb                          | 3 +--
 src/mainboard/google/daisy/exynos5250.h                           | 3 +--
 src/mainboard/google/daisy/mainboard.c                            | 3 +--
 src/mainboard/google/daisy/memory.c                               | 3 +--
 src/mainboard/google/daisy/romstage.c                             | 3 +--
 src/mainboard/google/daisy/wakeup.c                               | 3 +--
 src/mainboard/google/falco/Makefile.inc                           | 3 +--
 src/mainboard/google/falco/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/falco/acpi/ec.asl                            | 3 +--
 src/mainboard/google/falco/acpi/haswell_pci_irqs.asl              | 3 +--
 src/mainboard/google/falco/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/falco/acpi/platform.asl                      | 3 +--
 src/mainboard/google/falco/acpi/superio.asl                       | 3 +--
 src/mainboard/google/falco/acpi/thermal.asl                       | 3 +--
 src/mainboard/google/falco/acpi_tables.c                          | 3 +--
 src/mainboard/google/falco/chromeos.c                             | 3 +--
 src/mainboard/google/falco/cmos.layout                            | 3 +--
 src/mainboard/google/falco/dsdt.asl                               | 3 +--
 src/mainboard/google/falco/ec.c                                   | 3 +--
 src/mainboard/google/falco/ec.h                                   | 3 +--
 src/mainboard/google/falco/fadt.c                                 | 3 +--
 src/mainboard/google/falco/gma.c                                  | 3 +--
 src/mainboard/google/falco/gpio.h                                 | 3 +--
 src/mainboard/google/falco/hda_verb.c                             | 3 +--
 src/mainboard/google/falco/i915io.c                               | 3 +--
 src/mainboard/google/falco/mainboard.c                            | 3 +--
 src/mainboard/google/falco/mainboard.h                            | 3 +--
 src/mainboard/google/falco/onboard.h                              | 3 +--
 src/mainboard/google/falco/romstage.c                             | 3 +--
 src/mainboard/google/falco/smihandler.c                           | 3 +--
 src/mainboard/google/falco/thermal.h                              | 3 +--
 src/mainboard/google/foster/Kconfig                               | 3 +--
 src/mainboard/google/foster/Makefile.inc                          | 3 +--
 src/mainboard/google/foster/bct/Makefile.inc                      | 3 +--
 src/mainboard/google/foster/bct/cfg2inc.sh                        | 3 +--
 src/mainboard/google/foster/boardid.c                             | 3 +--
 src/mainboard/google/foster/bootblock.c                           | 3 +--
 src/mainboard/google/foster/chromeos.c                            | 3 +--
 src/mainboard/google/foster/devicetree.cb                         | 3 +--
 src/mainboard/google/foster/mainboard.c                           | 3 +--
 src/mainboard/google/foster/pmic.c                                | 3 +--
 src/mainboard/google/foster/pmic.h                                | 3 +--
 src/mainboard/google/foster/reset.c                               | 3 +--
 src/mainboard/google/foster/romstage.c                            | 3 +--
 src/mainboard/google/glados/Makefile.inc                          | 3 +--
 src/mainboard/google/glados/acpi/chromeos.asl                     | 3 +--
 src/mainboard/google/glados/acpi/dptf.asl                         | 3 +--
 src/mainboard/google/glados/acpi/ec.asl                           | 3 +--
 src/mainboard/google/glados/acpi/mainboard.asl                    | 3 +--
 src/mainboard/google/glados/acpi/superio.asl                      | 3 +--
 src/mainboard/google/glados/acpi_tables.c                         | 3 +--
 src/mainboard/google/glados/boardid.c                             | 3 +--
 src/mainboard/google/glados/chromeos.c                            | 3 +--
 src/mainboard/google/glados/cmos.layout                           | 3 +--
 src/mainboard/google/glados/dsdt.asl                              | 3 +--
 src/mainboard/google/glados/ec.c                                  | 3 +--
 src/mainboard/google/glados/ec.h                                  | 3 +--
 src/mainboard/google/glados/fadt.c                                | 3 +--
 src/mainboard/google/glados/gpio.h                                | 3 +--
 src/mainboard/google/glados/mainboard.c                           | 3 +--
 src/mainboard/google/glados/pei_data.c                            | 3 +--
 src/mainboard/google/glados/ramstage.c                            | 3 +--
 src/mainboard/google/glados/romstage.c                            | 3 +--
 src/mainboard/google/glados/smihandler.c                          | 3 +--
 src/mainboard/google/glados/spd/Makefile.inc                      | 3 +--
 src/mainboard/google/glados/spd/spd.c                             | 3 +--
 src/mainboard/google/glados/spd/spd.h                             | 3 +--
 src/mainboard/google/jecht/Makefile.inc                           | 3 +--
 src/mainboard/google/jecht/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/jecht/acpi/haswell_pci_irqs.asl              | 3 +--
 src/mainboard/google/jecht/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/jecht/acpi/platform.asl                      | 3 +--
 src/mainboard/google/jecht/acpi/superio.asl                       | 3 +--
 src/mainboard/google/jecht/acpi/thermal.asl                       | 3 +--
 src/mainboard/google/jecht/acpi_tables.c                          | 3 +--
 src/mainboard/google/jecht/chromeos.c                             | 3 +--
 src/mainboard/google/jecht/cmos.layout                            | 3 +--
 src/mainboard/google/jecht/dsdt.asl                               | 3 +--
 src/mainboard/google/jecht/fadt.c                                 | 3 +--
 src/mainboard/google/jecht/gpio.h                                 | 3 +--
 src/mainboard/google/jecht/hda_verb.c                             | 3 +--
 src/mainboard/google/jecht/lan.c                                  | 3 +--
 src/mainboard/google/jecht/mainboard.c                            | 3 +--
 src/mainboard/google/jecht/onboard.h                              | 3 +--
 src/mainboard/google/jecht/pei_data.c                             | 3 +--
 src/mainboard/google/jecht/romstage.c                             | 3 +--
 src/mainboard/google/jecht/smihandler.c                           | 3 +--
 src/mainboard/google/jecht/spd/Makefile.inc                       | 3 +--
 src/mainboard/google/jecht/spd/spd.c                              | 3 +--
 src/mainboard/google/jecht/spd/spd.h                              | 3 +--
 src/mainboard/google/jecht/thermal.h                              | 3 +--
 src/mainboard/google/link/Makefile.inc                            | 3 +--
 src/mainboard/google/link/acpi/chromeos.asl                       | 3 +--
 src/mainboard/google/link/acpi/ec.asl                             | 3 +--
 src/mainboard/google/link/acpi/ivybridge_pci_irqs.asl             | 3 +--
 src/mainboard/google/link/acpi/mainboard.asl                      | 3 +--
 src/mainboard/google/link/acpi/platform.asl                       | 3 +--
 src/mainboard/google/link/acpi/superio.asl                        | 3 +--
 src/mainboard/google/link/acpi/thermal.asl                        | 3 +--
 src/mainboard/google/link/acpi_tables.c                           | 3 +--
 src/mainboard/google/link/chromeos.c                              | 3 +--
 src/mainboard/google/link/cmos.layout                             | 3 +--
 src/mainboard/google/link/dsdt.asl                                | 3 +--
 src/mainboard/google/link/ec.c                                    | 3 +--
 src/mainboard/google/link/ec.h                                    | 3 +--
 src/mainboard/google/link/gpio.h                                  | 3 +--
 src/mainboard/google/link/hda_verb.c                              | 3 +--
 src/mainboard/google/link/i915.c                                  | 3 +--
 src/mainboard/google/link/i915io.c                                | 3 +--
 src/mainboard/google/link/i915io.h                                | 3 +--
 src/mainboard/google/link/mainboard.c                             | 3 +--
 src/mainboard/google/link/mainboard_smi.c                         | 3 +--
 src/mainboard/google/link/onboard.h                               | 3 +--
 src/mainboard/google/link/romstage.c                              | 3 +--
 src/mainboard/google/link/thermal.h                               | 3 +--
 src/mainboard/google/nyan/Kconfig                                 | 3 +--
 src/mainboard/google/nyan/Makefile.inc                            | 3 +--
 src/mainboard/google/nyan/bct/Makefile.inc                        | 3 +--
 src/mainboard/google/nyan/bct/cfg2inc.sh                          | 3 +--
 src/mainboard/google/nyan/boardid.c                               | 3 +--
 src/mainboard/google/nyan/bootblock.c                             | 3 +--
 src/mainboard/google/nyan/chromeos.c                              | 3 +--
 src/mainboard/google/nyan/devicetree.cb                           | 3 +--
 src/mainboard/google/nyan/early_configs.c                         | 3 +--
 src/mainboard/google/nyan/mainboard.c                             | 3 +--
 src/mainboard/google/nyan/pmic.c                                  | 3 +--
 src/mainboard/google/nyan/pmic.h                                  | 3 +--
 src/mainboard/google/nyan/reset.c                                 | 3 +--
 src/mainboard/google/nyan/romstage.c                              | 3 +--
 src/mainboard/google/nyan/sdram_configs.c                         | 3 +--
 src/mainboard/google/nyan/sdram_configs.h                         | 3 +--
 src/mainboard/google/nyan_big/Kconfig                             | 3 +--
 src/mainboard/google/nyan_big/Makefile.inc                        | 3 +--
 src/mainboard/google/nyan_big/bct/Makefile.inc                    | 3 +--
 src/mainboard/google/nyan_big/boardid.c                           | 3 +--
 src/mainboard/google/nyan_big/bootblock.c                         | 3 +--
 src/mainboard/google/nyan_big/chromeos.c                          | 3 +--
 src/mainboard/google/nyan_big/devicetree.cb                       | 3 +--
 src/mainboard/google/nyan_big/early_configs.c                     | 3 +--
 src/mainboard/google/nyan_big/mainboard.c                         | 3 +--
 src/mainboard/google/nyan_big/pmic.c                              | 3 +--
 src/mainboard/google/nyan_big/pmic.h                              | 3 +--
 src/mainboard/google/nyan_big/reset.c                             | 3 +--
 src/mainboard/google/nyan_big/romstage.c                          | 3 +--
 src/mainboard/google/nyan_big/sdram_configs.c                     | 3 +--
 src/mainboard/google/nyan_big/sdram_configs.h                     | 3 +--
 src/mainboard/google/nyan_blaze/Kconfig                           | 3 +--
 src/mainboard/google/nyan_blaze/Makefile.inc                      | 3 +--
 src/mainboard/google/nyan_blaze/bct/Makefile.inc                  | 3 +--
 src/mainboard/google/nyan_blaze/boardid.c                         | 3 +--
 src/mainboard/google/nyan_blaze/bootblock.c                       | 3 +--
 src/mainboard/google/nyan_blaze/chromeos.c                        | 3 +--
 src/mainboard/google/nyan_blaze/devicetree.cb                     | 3 +--
 src/mainboard/google/nyan_blaze/early_configs.c                   | 3 +--
 src/mainboard/google/nyan_blaze/mainboard.c                       | 3 +--
 src/mainboard/google/nyan_blaze/pmic.c                            | 3 +--
 src/mainboard/google/nyan_blaze/pmic.h                            | 3 +--
 src/mainboard/google/nyan_blaze/reset.c                           | 3 +--
 src/mainboard/google/nyan_blaze/romstage.c                        | 3 +--
 src/mainboard/google/nyan_blaze/sdram_configs.c                   | 3 +--
 src/mainboard/google/nyan_blaze/sdram_configs.h                   | 3 +--
 src/mainboard/google/panther/Makefile.inc                         | 3 +--
 src/mainboard/google/panther/acpi/chromeos.asl                    | 3 +--
 src/mainboard/google/panther/acpi/haswell_pci_irqs.asl            | 3 +--
 src/mainboard/google/panther/acpi/mainboard.asl                   | 3 +--
 src/mainboard/google/panther/acpi/platform.asl                    | 3 +--
 src/mainboard/google/panther/acpi/superio.asl                     | 3 +--
 src/mainboard/google/panther/acpi/thermal.asl                     | 3 +--
 src/mainboard/google/panther/acpi_tables.c                        | 3 +--
 src/mainboard/google/panther/chromeos.c                           | 3 +--
 src/mainboard/google/panther/cmos.layout                          | 3 +--
 src/mainboard/google/panther/dsdt.asl                             | 3 +--
 src/mainboard/google/panther/fadt.c                               | 3 +--
 src/mainboard/google/panther/gpio.h                               | 3 +--
 src/mainboard/google/panther/hda_verb.c                           | 3 +--
 src/mainboard/google/panther/lan.c                                | 3 +--
 src/mainboard/google/panther/mainboard.c                          | 3 +--
 src/mainboard/google/panther/romstage.c                           | 3 +--
 src/mainboard/google/panther/smihandler.c                         | 3 +--
 src/mainboard/google/panther/thermal.h                            | 3 +--
 src/mainboard/google/parrot/Makefile.inc                          | 3 +--
 src/mainboard/google/parrot/acpi/chromeos.asl                     | 3 +--
 src/mainboard/google/parrot/acpi/ec.asl                           | 3 +--
 src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl           | 3 +--
 src/mainboard/google/parrot/acpi/mainboard.asl                    | 3 +--
 src/mainboard/google/parrot/acpi/platform.asl                     | 3 +--
 src/mainboard/google/parrot/acpi/superio.asl                      | 3 +--
 src/mainboard/google/parrot/acpi/thermal.asl                      | 3 +--
 src/mainboard/google/parrot/acpi_tables.c                         | 3 +--
 src/mainboard/google/parrot/chromeos.c                            | 3 +--
 src/mainboard/google/parrot/cmos.layout                           | 3 +--
 src/mainboard/google/parrot/dsdt.asl                              | 3 +--
 src/mainboard/google/parrot/ec.c                                  | 3 +--
 src/mainboard/google/parrot/ec.h                                  | 3 +--
 src/mainboard/google/parrot/gpio.h                                | 3 +--
 src/mainboard/google/parrot/hda_verb.c                            | 3 +--
 src/mainboard/google/parrot/mainboard.c                           | 3 +--
 src/mainboard/google/parrot/onboard.h                             | 3 +--
 src/mainboard/google/parrot/romstage.c                            | 3 +--
 src/mainboard/google/parrot/smihandler.c                          | 3 +--
 src/mainboard/google/parrot/thermal.h                             | 3 +--
 src/mainboard/google/peach_pit/Kconfig                            | 3 +--
 src/mainboard/google/peach_pit/Makefile.inc                       | 3 +--
 src/mainboard/google/peach_pit/chromeos.c                         | 3 +--
 src/mainboard/google/peach_pit/devicetree.cb                      | 3 +--
 src/mainboard/google/peach_pit/mainboard.c                        | 3 +--
 src/mainboard/google/peach_pit/memory.c                           | 3 +--
 src/mainboard/google/peach_pit/romstage.c                         | 3 +--
 src/mainboard/google/peach_pit/wakeup.c                           | 3 +--
 src/mainboard/google/peppy/Makefile.inc                           | 3 +--
 src/mainboard/google/peppy/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/peppy/acpi/ec.asl                            | 3 +--
 src/mainboard/google/peppy/acpi/haswell_pci_irqs.asl              | 3 +--
 src/mainboard/google/peppy/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/peppy/acpi/platform.asl                      | 3 +--
 src/mainboard/google/peppy/acpi/superio.asl                       | 3 +--
 src/mainboard/google/peppy/acpi/thermal.asl                       | 3 +--
 src/mainboard/google/peppy/acpi_tables.c                          | 3 +--
 src/mainboard/google/peppy/chromeos.c                             | 3 +--
 src/mainboard/google/peppy/cmos.layout                            | 3 +--
 src/mainboard/google/peppy/dsdt.asl                               | 3 +--
 src/mainboard/google/peppy/ec.c                                   | 3 +--
 src/mainboard/google/peppy/ec.h                                   | 3 +--
 src/mainboard/google/peppy/fadt.c                                 | 3 +--
 src/mainboard/google/peppy/gma.c                                  | 3 +--
 src/mainboard/google/peppy/gpio.h                                 | 3 +--
 src/mainboard/google/peppy/hda_verb.c                             | 3 +--
 src/mainboard/google/peppy/i915io.c                               | 3 +--
 src/mainboard/google/peppy/mainboard.c                            | 3 +--
 src/mainboard/google/peppy/mainboard.h                            | 3 +--
 src/mainboard/google/peppy/onboard.h                              | 3 +--
 src/mainboard/google/peppy/romstage.c                             | 3 +--
 src/mainboard/google/peppy/smihandler.c                           | 3 +--
 src/mainboard/google/peppy/thermal.h                              | 3 +--
 src/mainboard/google/purin/Kconfig                                | 3 +--
 src/mainboard/google/purin/Makefile.inc                           | 3 +--
 src/mainboard/google/purin/boardid.c                              | 3 +--
 src/mainboard/google/purin/bootblock.c                            | 3 +--
 src/mainboard/google/purin/chromeos.c                             | 3 +--
 src/mainboard/google/purin/devicetree.cb                          | 3 +--
 src/mainboard/google/purin/mainboard.c                            | 3 +--
 src/mainboard/google/purin/reset.c                                | 3 +--
 src/mainboard/google/rambi/Makefile.inc                           | 3 +--
 src/mainboard/google/rambi/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/rambi/acpi/ec.asl                            | 3 +--
 src/mainboard/google/rambi/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/rambi/acpi/superio.asl                       | 3 +--
 src/mainboard/google/rambi/acpi_tables.c                          | 3 +--
 src/mainboard/google/rambi/chromeos.c                             | 3 +--
 src/mainboard/google/rambi/cmos.layout                            | 3 +--
 src/mainboard/google/rambi/dsdt.asl                               | 3 +--
 src/mainboard/google/rambi/ec.c                                   | 3 +--
 src/mainboard/google/rambi/ec.h                                   | 3 +--
 src/mainboard/google/rambi/fadt.c                                 | 3 +--
 src/mainboard/google/rambi/gpio.c                                 | 3 +--
 src/mainboard/google/rambi/irqroute.c                             | 3 +--
 src/mainboard/google/rambi/irqroute.h                             | 3 +--
 src/mainboard/google/rambi/mainboard.c                            | 3 +--
 src/mainboard/google/rambi/mainboard_smi.c                        | 3 +--
 src/mainboard/google/rambi/onboard.h                              | 3 +--
 src/mainboard/google/rambi/romstage.c                             | 3 +--
 src/mainboard/google/rambi/spd/Makefile.inc                       | 3 +--
 src/mainboard/google/rambi/w25q64.c                               | 3 +--
 src/mainboard/google/rush/Kconfig                                 | 3 +--
 src/mainboard/google/rush/Makefile.inc                            | 3 +--
 src/mainboard/google/rush/bct/Makefile.inc                        | 3 +--
 src/mainboard/google/rush/bct/cfg2inc.sh                          | 3 +--
 src/mainboard/google/rush/boardid.c                               | 3 +--
 src/mainboard/google/rush/bootblock.c                             | 3 +--
 src/mainboard/google/rush/chromeos.c                              | 3 +--
 src/mainboard/google/rush/devicetree.cb                           | 3 +--
 src/mainboard/google/rush/mainboard.c                             | 3 +--
 src/mainboard/google/rush/pmic.c                                  | 3 +--
 src/mainboard/google/rush/pmic.h                                  | 3 +--
 src/mainboard/google/rush/reset.c                                 | 3 +--
 src/mainboard/google/rush/romstage.c                              | 3 +--
 src/mainboard/google/rush/sdram_configs.c                         | 3 +--
 src/mainboard/google/rush/verstage.c                              | 3 +--
 src/mainboard/google/rush_ryu/Kconfig                             | 3 +--
 src/mainboard/google/rush_ryu/Makefile.inc                        | 3 +--
 src/mainboard/google/rush_ryu/bct/Makefile.inc                    | 3 +--
 src/mainboard/google/rush_ryu/bct/cfg2inc.sh                      | 3 +--
 src/mainboard/google/rush_ryu/boardid.c                           | 3 +--
 src/mainboard/google/rush_ryu/bootblock.c                         | 3 +--
 src/mainboard/google/rush_ryu/chromeos.c                          | 3 +--
 src/mainboard/google/rush_ryu/devicetree.cb                       | 3 +--
 src/mainboard/google/rush_ryu/gpio.h                              | 3 +--
 src/mainboard/google/rush_ryu/mainboard.c                         | 3 +--
 src/mainboard/google/rush_ryu/pmic.c                              | 3 +--
 src/mainboard/google/rush_ryu/pmic.h                              | 3 +--
 src/mainboard/google/rush_ryu/reset.c                             | 3 +--
 src/mainboard/google/rush_ryu/romstage.c                          | 3 +--
 src/mainboard/google/rush_ryu/sdram_configs.c                     | 3 +--
 src/mainboard/google/rush_ryu/verstage.c                          | 3 +--
 src/mainboard/google/samus/Makefile.inc                           | 3 +--
 src/mainboard/google/samus/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/samus/acpi/ec.asl                            | 3 +--
 src/mainboard/google/samus/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/samus/acpi/superio.asl                       | 3 +--
 src/mainboard/google/samus/acpi/thermal.asl                       | 3 +--
 src/mainboard/google/samus/acpi_tables.c                          | 3 +--
 src/mainboard/google/samus/board_version.c                        | 3 +--
 src/mainboard/google/samus/board_version.h                        | 3 +--
 src/mainboard/google/samus/chromeos.c                             | 3 +--
 src/mainboard/google/samus/cmos.layout                            | 3 +--
 src/mainboard/google/samus/dsdt.asl                               | 3 +--
 src/mainboard/google/samus/ec.c                                   | 3 +--
 src/mainboard/google/samus/ec.h                                   | 3 +--
 src/mainboard/google/samus/fadt.c                                 | 3 +--
 src/mainboard/google/samus/gpio.h                                 | 3 +--
 src/mainboard/google/samus/mainboard.c                            | 3 +--
 src/mainboard/google/samus/pei_data.c                             | 3 +--
 src/mainboard/google/samus/romstage.c                             | 3 +--
 src/mainboard/google/samus/smihandler.c                           | 3 +--
 src/mainboard/google/samus/spd/Makefile.inc                       | 3 +--
 src/mainboard/google/samus/spd/spd.c                              | 3 +--
 src/mainboard/google/samus/spd/spd.h                              | 3 +--
 src/mainboard/google/samus/thermal.h                              | 3 +--
 src/mainboard/google/slippy/Makefile.inc                          | 3 +--
 src/mainboard/google/slippy/acpi/chromeos.asl                     | 3 +--
 src/mainboard/google/slippy/acpi/ec.asl                           | 3 +--
 src/mainboard/google/slippy/acpi/haswell_pci_irqs.asl             | 3 +--
 src/mainboard/google/slippy/acpi/mainboard.asl                    | 3 +--
 src/mainboard/google/slippy/acpi/platform.asl                     | 3 +--
 src/mainboard/google/slippy/acpi/superio.asl                      | 3 +--
 src/mainboard/google/slippy/acpi/thermal.asl                      | 3 +--
 src/mainboard/google/slippy/acpi_tables.c                         | 3 +--
 src/mainboard/google/slippy/chromeos.c                            | 3 +--
 src/mainboard/google/slippy/cmos.layout                           | 3 +--
 src/mainboard/google/slippy/dsdt.asl                              | 3 +--
 src/mainboard/google/slippy/ec.c                                  | 3 +--
 src/mainboard/google/slippy/ec.h                                  | 3 +--
 src/mainboard/google/slippy/fadt.c                                | 3 +--
 src/mainboard/google/slippy/gpio.h                                | 3 +--
 src/mainboard/google/slippy/hda_verb.c                            | 3 +--
 src/mainboard/google/slippy/mainboard.c                           | 3 +--
 src/mainboard/google/slippy/mainboard.h                           | 3 +--
 src/mainboard/google/slippy/onboard.h                             | 3 +--
 src/mainboard/google/slippy/romstage.c                            | 3 +--
 src/mainboard/google/slippy/smihandler.c                          | 3 +--
 src/mainboard/google/slippy/thermal.h                             | 3 +--
 src/mainboard/google/smaug/Kconfig                                | 3 +--
 src/mainboard/google/smaug/Makefile.inc                           | 3 +--
 src/mainboard/google/smaug/bct/Makefile.inc                       | 3 +--
 src/mainboard/google/smaug/bct/cfg2inc.sh                         | 3 +--
 src/mainboard/google/smaug/boardid.c                              | 3 +--
 src/mainboard/google/smaug/bootblock.c                            | 3 +--
 src/mainboard/google/smaug/chromeos.c                             | 3 +--
 src/mainboard/google/smaug/devicetree.cb                          | 3 +--
 src/mainboard/google/smaug/gpio.h                                 | 3 +--
 src/mainboard/google/smaug/mainboard.c                            | 3 +--
 src/mainboard/google/smaug/pmic.c                                 | 3 +--
 src/mainboard/google/smaug/pmic.h                                 | 3 +--
 src/mainboard/google/smaug/reset.c                                | 3 +--
 src/mainboard/google/smaug/romstage.c                             | 3 +--
 src/mainboard/google/storm/Kconfig                                | 3 +--
 src/mainboard/google/storm/Makefile.inc                           | 3 +--
 src/mainboard/google/storm/boardid.c                              | 3 +--
 src/mainboard/google/storm/chromeos.c                             | 3 +--
 src/mainboard/google/storm/devicetree.cb                          | 3 +--
 src/mainboard/google/storm/mainboard.c                            | 3 +--
 src/mainboard/google/storm/reset.c                                | 3 +--
 src/mainboard/google/storm/romstage.c                             | 3 +--
 src/mainboard/google/stout/Makefile.inc                           | 3 +--
 src/mainboard/google/stout/acpi/chromeos.asl                      | 3 +--
 src/mainboard/google/stout/acpi/ec.asl                            | 3 +--
 src/mainboard/google/stout/acpi/mainboard.asl                     | 3 +--
 src/mainboard/google/stout/acpi/platform.asl                      | 3 +--
 src/mainboard/google/stout/acpi/superio.asl                       | 3 +--
 src/mainboard/google/stout/acpi/thermal.asl                       | 3 +--
 src/mainboard/google/stout/acpi_tables.c                          | 3 +--
 src/mainboard/google/stout/chromeos.c                             | 3 +--
 src/mainboard/google/stout/cmos.layout                            | 3 +--
 src/mainboard/google/stout/dsdt.asl                               | 3 +--
 src/mainboard/google/stout/ec.c                                   | 3 +--
 src/mainboard/google/stout/ec.h                                   | 3 +--
 src/mainboard/google/stout/gpio.h                                 | 3 +--
 src/mainboard/google/stout/hda_verb.c                             | 3 +--
 src/mainboard/google/stout/mainboard.c                            | 3 +--
 src/mainboard/google/stout/mainboard_smi.c                        | 3 +--
 src/mainboard/google/stout/onboard.h                              | 3 +--
 src/mainboard/google/stout/romstage.c                             | 3 +--
 src/mainboard/google/stout/thermal.h                              | 3 +--
 src/mainboard/google/urara/Kconfig                                | 3 +--
 src/mainboard/google/urara/Makefile.inc                           | 3 +--
 src/mainboard/google/urara/boardid.c                              | 3 +--
 src/mainboard/google/urara/bootblock.c                            | 3 +--
 src/mainboard/google/urara/chromeos.c                             | 3 +--
 src/mainboard/google/urara/devicetree.cb                          | 3 +--
 src/mainboard/google/urara/mainboard.c                            | 3 +--
 src/mainboard/google/veyron/Kconfig                               | 3 +--
 src/mainboard/google/veyron/Makefile.inc                          | 3 +--
 src/mainboard/google/veyron/board.h                               | 3 +--
 src/mainboard/google/veyron/boardid.c                             | 3 +--
 src/mainboard/google/veyron/bootblock.c                           | 3 +--
 src/mainboard/google/veyron/chromeos.c                            | 3 +--
 src/mainboard/google/veyron/devicetree.cb                         | 3 +--
 src/mainboard/google/veyron/mainboard.c                           | 3 +--
 src/mainboard/google/veyron/reset.c                               | 3 +--
 src/mainboard/google/veyron/romstage.c                            | 3 +--
 src/mainboard/google/veyron/sdram_configs.c                       | 3 +--
 src/mainboard/google/veyron_brain/Kconfig                         | 3 +--
 src/mainboard/google/veyron_brain/Makefile.inc                    | 3 +--
 src/mainboard/google/veyron_brain/board.h                         | 3 +--
 src/mainboard/google/veyron_brain/boardid.c                       | 3 +--
 src/mainboard/google/veyron_brain/bootblock.c                     | 3 +--
 src/mainboard/google/veyron_brain/chromeos.c                      | 3 +--
 src/mainboard/google/veyron_brain/devicetree.cb                   | 3 +--
 src/mainboard/google/veyron_brain/mainboard.c                     | 3 +--
 src/mainboard/google/veyron_brain/reset.c                         | 3 +--
 src/mainboard/google/veyron_brain/romstage.c                      | 3 +--
 src/mainboard/google/veyron_brain/sdram_configs.c                 | 3 +--
 src/mainboard/google/veyron_danger/Kconfig                        | 3 +--
 src/mainboard/google/veyron_danger/Makefile.inc                   | 3 +--
 src/mainboard/google/veyron_danger/board.h                        | 3 +--
 src/mainboard/google/veyron_danger/boardid.c                      | 3 +--
 src/mainboard/google/veyron_danger/bootblock.c                    | 3 +--
 src/mainboard/google/veyron_danger/chromeos.c                     | 3 +--
 src/mainboard/google/veyron_danger/devicetree.cb                  | 3 +--
 src/mainboard/google/veyron_danger/mainboard.c                    | 3 +--
 src/mainboard/google/veyron_danger/reset.c                        | 3 +--
 src/mainboard/google/veyron_danger/romstage.c                     | 3 +--
 src/mainboard/google/veyron_danger/sdmmc.c                        | 3 +--
 src/mainboard/google/veyron_danger/sdram_configs.c                | 3 +--
 src/mainboard/google/veyron_mickey/Kconfig                        | 3 +--
 src/mainboard/google/veyron_mickey/Makefile.inc                   | 3 +--
 src/mainboard/google/veyron_mickey/board.h                        | 3 +--
 src/mainboard/google/veyron_mickey/boardid.c                      | 3 +--
 src/mainboard/google/veyron_mickey/bootblock.c                    | 3 +--
 src/mainboard/google/veyron_mickey/chromeos.c                     | 3 +--
 src/mainboard/google/veyron_mickey/devicetree.cb                  | 3 +--
 src/mainboard/google/veyron_mickey/mainboard.c                    | 3 +--
 src/mainboard/google/veyron_mickey/reset.c                        | 3 +--
 src/mainboard/google/veyron_mickey/romstage.c                     | 3 +--
 src/mainboard/google/veyron_mickey/sdram_configs.c                | 3 +--
 src/mainboard/google/veyron_rialto/Kconfig                        | 3 +--
 src/mainboard/google/veyron_rialto/Makefile.inc                   | 3 +--
 src/mainboard/google/veyron_rialto/board.h                        | 3 +--
 src/mainboard/google/veyron_rialto/boardid.c                      | 3 +--
 src/mainboard/google/veyron_rialto/bootblock.c                    | 3 +--
 src/mainboard/google/veyron_rialto/chromeos.c                     | 3 +--
 src/mainboard/google/veyron_rialto/devicetree.cb                  | 3 +--
 src/mainboard/google/veyron_rialto/mainboard.c                    | 3 +--
 src/mainboard/google/veyron_rialto/reset.c                        | 3 +--
 src/mainboard/google/veyron_rialto/romstage.c                     | 3 +--
 src/mainboard/google/veyron_rialto/sdram_configs.c                | 3 +--
 src/mainboard/google/veyron_romy/Kconfig                          | 3 +--
 src/mainboard/google/veyron_romy/Makefile.inc                     | 3 +--
 src/mainboard/google/veyron_romy/board.h                          | 3 +--
 src/mainboard/google/veyron_romy/boardid.c                        | 3 +--
 src/mainboard/google/veyron_romy/bootblock.c                      | 3 +--
 src/mainboard/google/veyron_romy/chromeos.c                       | 3 +--
 src/mainboard/google/veyron_romy/devicetree.cb                    | 3 +--
 src/mainboard/google/veyron_romy/mainboard.c                      | 3 +--
 src/mainboard/google/veyron_romy/reset.c                          | 3 +--
 src/mainboard/google/veyron_romy/romstage.c                       | 3 +--
 src/mainboard/google/veyron_romy/sdram_configs.c                  | 3 +--
 src/mainboard/hp/abm/BiosCallOuts.c                               | 3 +--
 src/mainboard/hp/abm/Kconfig                                      | 3 +--
 src/mainboard/hp/abm/Makefile.inc                                 | 3 +--
 src/mainboard/hp/abm/OptionsIds.h                                 | 3 +--
 src/mainboard/hp/abm/PlatformGnbPcie.c                            | 3 +--
 src/mainboard/hp/abm/acpi/AmdImc.asl                              | 3 +--
 src/mainboard/hp/abm/acpi/gpe.asl                                 | 3 +--
 src/mainboard/hp/abm/acpi/ide.asl                                 | 3 +--
 src/mainboard/hp/abm/acpi/mainboard.asl                           | 3 +--
 src/mainboard/hp/abm/acpi/routing.asl                             | 3 +--
 src/mainboard/hp/abm/acpi/sata.asl                                | 3 +--
 src/mainboard/hp/abm/acpi/si.asl                                  | 3 +--
 src/mainboard/hp/abm/acpi/sleep.asl                               | 3 +--
 src/mainboard/hp/abm/acpi/superio.asl                             | 3 +--
 src/mainboard/hp/abm/acpi/thermal.asl                             | 3 +--
 src/mainboard/hp/abm/acpi/usb_oc.asl                              | 3 +--
 src/mainboard/hp/abm/acpi_tables.c                                | 3 +--
 src/mainboard/hp/abm/buildOpts.c                                  | 3 +--
 src/mainboard/hp/abm/cmos.layout                                  | 3 +--
 src/mainboard/hp/abm/devicetree.cb                                | 3 +--
 src/mainboard/hp/abm/dsdt.asl                                     | 3 +--
 src/mainboard/hp/abm/irq_tables.c                                 | 3 +--
 src/mainboard/hp/abm/mainboard.c                                  | 3 +--
 src/mainboard/hp/abm/mptable.c                                    | 3 +--
 src/mainboard/hp/abm/romstage.c                                   | 3 +--
 src/mainboard/hp/dl145_g1/dsdt.asl                                | 3 +--
 src/mainboard/hp/dl145_g3/get_bus_conf.c                          | 3 +--
 src/mainboard/hp/dl145_g3/mb_sysconf.h                            | 3 +--
 src/mainboard/hp/dl145_g3/mptable.c                               | 3 +--
 src/mainboard/hp/dl145_g3/romstage.c                              | 3 +--
 src/mainboard/hp/dl165_g6_fam10/cmos.layout                       | 3 +--
 src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c                    | 3 +--
 src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h                      | 3 +--
 src/mainboard/hp/dl165_g6_fam10/mptable.c                         | 3 +--
 src/mainboard/hp/dl165_g6_fam10/romstage.c                        | 3 +--
 src/mainboard/hp/e_vectra_p2706t/Kconfig                          | 3 +--
 src/mainboard/hp/e_vectra_p2706t/irq_tables.c                     | 3 +--
 src/mainboard/hp/e_vectra_p2706t/romstage.c                       | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c                | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/Kconfig                       | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc                  | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h                  | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/PlatformGnbPcie.c             | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl                  | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl            | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/routing.asl              | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/sata.asl                 | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/si.asl                   | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl                | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/superio.asl              | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/thermal.asl              | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi/usb_oc.asl               | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c                 | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c                   | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb                 | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl                      | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c                  | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/mainboard.c                   | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/mptable.c                     | 3 +--
 src/mainboard/hp/pavilion_m6_1035dx/romstage.c                    | 3 +--
 src/mainboard/ibase/mb899/acpi/ec.asl                             | 3 +--
 src/mainboard/ibase/mb899/acpi/i945_pci_irqs.asl                  | 3 +--
 src/mainboard/ibase/mb899/acpi/ich7_pci_irqs.asl                  | 3 +--
 src/mainboard/ibase/mb899/acpi/platform.asl                       | 3 +--
 src/mainboard/ibase/mb899/acpi/superio.asl                        | 3 +--
 src/mainboard/ibase/mb899/acpi/thermal.asl                        | 3 +--
 src/mainboard/ibase/mb899/acpi_tables.c                           | 3 +--
 src/mainboard/ibase/mb899/cmos.layout                             | 3 +--
 src/mainboard/ibase/mb899/dsdt.asl                                | 3 +--
 src/mainboard/ibase/mb899/irq_tables.c                            | 3 +--
 src/mainboard/ibase/mb899/mainboard.c                             | 3 +--
 src/mainboard/ibase/mb899/mptable.c                               | 3 +--
 src/mainboard/ibase/mb899/romstage.c                              | 3 +--
 src/mainboard/ibase/mb899/superio_hwm.c                           | 3 +--
 src/mainboard/ibase/mb899/superio_hwm.h                           | 3 +--
 src/mainboard/iei/Kconfig                                         | 3 +--
 src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl              | 3 +--
 src/mainboard/iei/kino-780am2-fam10/acpi/ide.asl                  | 3 +--
 src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl              | 3 +--
 src/mainboard/iei/kino-780am2-fam10/acpi/sata.asl                 | 3 +--
 src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl                  | 3 +--
 src/mainboard/iei/kino-780am2-fam10/acpi_tables.c                 | 3 +--
 src/mainboard/iei/kino-780am2-fam10/dsdt.asl                      | 3 +--
 src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c                | 3 +--
 src/mainboard/iei/kino-780am2-fam10/irq_tables.c                  | 3 +--
 src/mainboard/iei/kino-780am2-fam10/mainboard.c                   | 3 +--
 src/mainboard/iei/kino-780am2-fam10/mb_sysconf.h                  | 3 +--
 src/mainboard/iei/kino-780am2-fam10/mptable.c                     | 3 +--
 src/mainboard/iei/kino-780am2-fam10/resourcemap.c                 | 3 +--
 src/mainboard/iei/kino-780am2-fam10/romstage.c                    | 3 +--
 src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c                   | 3 +--
 src/mainboard/iei/pcisa-lx-800-r10/romstage.c                     | 3 +--
 src/mainboard/iei/pm-lx-800-r11/Kconfig                           | 3 +--
 src/mainboard/iei/pm-lx-800-r11/devicetree.cb                     | 3 +--
 src/mainboard/iei/pm-lx-800-r11/irq_tables.c                      | 3 +--
 src/mainboard/iei/pm-lx-800-r11/romstage.c                        | 3 +--
 src/mainboard/iei/pm-lx2-800-r10/Kconfig                          | 3 +--
 src/mainboard/iei/pm-lx2-800-r10/devicetree.cb                    | 3 +--
 src/mainboard/iei/pm-lx2-800-r10/irq_tables.c                     | 3 +--
 src/mainboard/iei/pm-lx2-800-r10/mainboard.c                      | 3 +--
 src/mainboard/iei/pm-lx2-800-r10/romstage.c                       | 3 +--
 src/mainboard/intel/bakersport_fsp/Kconfig                        | 3 +--
 src/mainboard/intel/baskingridge/Makefile.inc                     | 3 +--
 src/mainboard/intel/baskingridge/acpi/chromeos.asl                | 3 +--
 src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl        | 3 +--
 src/mainboard/intel/baskingridge/acpi/mainboard.asl               | 3 +--
 src/mainboard/intel/baskingridge/acpi/platform.asl                | 3 +--
 src/mainboard/intel/baskingridge/acpi/superio.asl                 | 3 +--
 src/mainboard/intel/baskingridge/acpi/thermal.asl                 | 3 +--
 src/mainboard/intel/baskingridge/acpi_tables.c                    | 3 +--
 src/mainboard/intel/baskingridge/chromeos.c                       | 3 +--
 src/mainboard/intel/baskingridge/cmos.layout                      | 3 +--
 src/mainboard/intel/baskingridge/dsdt.asl                         | 3 +--
 src/mainboard/intel/baskingridge/fadt.c                           | 3 +--
 src/mainboard/intel/baskingridge/gpio.h                           | 3 +--
 src/mainboard/intel/baskingridge/hda_verb.c                       | 3 +--
 src/mainboard/intel/baskingridge/mainboard.c                      | 3 +--
 src/mainboard/intel/baskingridge/mainboard_smi.c                  | 3 +--
 src/mainboard/intel/baskingridge/romstage.c                       | 3 +--
 src/mainboard/intel/baskingridge/thermal.h                        | 3 +--
 src/mainboard/intel/bayleybay_fsp/Kconfig                         | 3 +--
 src/mainboard/intel/bayleybay_fsp/Makefile.inc                    | 3 +--
 src/mainboard/intel/bayleybay_fsp/acpi/mainboard.asl              | 3 +--
 src/mainboard/intel/bayleybay_fsp/acpi_tables.c                   | 3 +--
 src/mainboard/intel/bayleybay_fsp/cmos.layout                     | 3 +--
 src/mainboard/intel/bayleybay_fsp/devicetree.cb                   | 3 +--
 src/mainboard/intel/bayleybay_fsp/dsdt.asl                        | 3 +--
 src/mainboard/intel/bayleybay_fsp/fadt.c                          | 3 +--
 src/mainboard/intel/bayleybay_fsp/gpio.c                          | 3 +--
 src/mainboard/intel/bayleybay_fsp/irqroute.c                      | 3 +--
 src/mainboard/intel/bayleybay_fsp/irqroute.h                      | 3 +--
 src/mainboard/intel/bayleybay_fsp/mainboard.c                     | 3 +--
 src/mainboard/intel/bayleybay_fsp/romstage.c                      | 3 +--
 src/mainboard/intel/bayleybay_fsp/thermal.h                       | 3 +--
 src/mainboard/intel/d810e2cb/Kconfig                              | 3 +--
 src/mainboard/intel/d810e2cb/devicetree.cb                        | 3 +--
 src/mainboard/intel/d810e2cb/gpio.c                               | 3 +--
 src/mainboard/intel/d810e2cb/irq_tables.c                         | 3 +--
 src/mainboard/intel/d810e2cb/romstage.c                           | 3 +--
 src/mainboard/intel/d945gclf/Kconfig                              | 3 +--
 src/mainboard/intel/d945gclf/acpi/ec.asl                          | 3 +--
 src/mainboard/intel/d945gclf/acpi/i945_pci_irqs.asl               | 3 +--
 src/mainboard/intel/d945gclf/acpi/ich7_pci_irqs.asl               | 3 +--
 src/mainboard/intel/d945gclf/acpi/mainboard.asl                   | 3 +--
 src/mainboard/intel/d945gclf/acpi/platform.asl                    | 3 +--
 src/mainboard/intel/d945gclf/acpi/superio.asl                     | 3 +--
 src/mainboard/intel/d945gclf/acpi/thermal.asl                     | 3 +--
 src/mainboard/intel/d945gclf/acpi_tables.c                        | 3 +--
 src/mainboard/intel/d945gclf/cmos.layout                          | 3 +--
 src/mainboard/intel/d945gclf/devicetree.cb                        | 3 +--
 src/mainboard/intel/d945gclf/dsdt.asl                             | 3 +--
 src/mainboard/intel/d945gclf/irq_tables.c                         | 3 +--
 src/mainboard/intel/d945gclf/mptable.c                            | 3 +--
 src/mainboard/intel/d945gclf/romstage.c                           | 3 +--
 src/mainboard/intel/eagleheights/acpi_tables.c                    | 3 +--
 src/mainboard/intel/eagleheights/cmos.layout                      | 3 +--
 src/mainboard/intel/eagleheights/debug.c                          | 3 +--
 src/mainboard/intel/eagleheights/dsdt.asl                         | 3 +--
 src/mainboard/intel/eagleheights/fadt.c                           | 3 +--
 src/mainboard/intel/eagleheights/irq_tables.c                     | 3 +--
 src/mainboard/intel/eagleheights/mptable.c                        | 3 +--
 src/mainboard/intel/eagleheights/romstage.c                       | 3 +--
 src/mainboard/intel/emeraldlake2/Makefile.inc                     | 3 +--
 src/mainboard/intel/emeraldlake2/acpi/chromeos.asl                | 3 +--
 src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl      | 3 +--
 src/mainboard/intel/emeraldlake2/acpi/mainboard.asl               | 3 +--
 src/mainboard/intel/emeraldlake2/acpi/platform.asl                | 3 +--
 src/mainboard/intel/emeraldlake2/acpi/superio.asl                 | 3 +--
 src/mainboard/intel/emeraldlake2/acpi/thermal.asl                 | 3 +--
 src/mainboard/intel/emeraldlake2/acpi_tables.c                    | 3 +--
 src/mainboard/intel/emeraldlake2/chromeos.c                       | 3 +--
 src/mainboard/intel/emeraldlake2/cmos.layout                      | 3 +--
 src/mainboard/intel/emeraldlake2/dsdt.asl                         | 3 +--
 src/mainboard/intel/emeraldlake2/ec.c                             | 3 +--
 src/mainboard/intel/emeraldlake2/ec.h                             | 3 +--
 src/mainboard/intel/emeraldlake2/gpio.h                           | 3 +--
 src/mainboard/intel/emeraldlake2/hda_verb.c                       | 3 +--
 src/mainboard/intel/emeraldlake2/mainboard.c                      | 3 +--
 src/mainboard/intel/emeraldlake2/romstage.c                       | 3 +--
 src/mainboard/intel/emeraldlake2/smihandler.c                     | 3 +--
 src/mainboard/intel/emeraldlake2/thermal.h                        | 3 +--
 src/mainboard/intel/kunimitsu/Makefile.inc                        | 3 +--
 src/mainboard/intel/kunimitsu/acpi/chromeos.asl                   | 3 +--
 src/mainboard/intel/kunimitsu/acpi/dptf.asl                       | 3 +--
 src/mainboard/intel/kunimitsu/acpi/ec.asl                         | 3 +--
 src/mainboard/intel/kunimitsu/acpi/mainboard.asl                  | 3 +--
 src/mainboard/intel/kunimitsu/acpi/superio.asl                    | 3 +--
 src/mainboard/intel/kunimitsu/acpi_tables.c                       | 3 +--
 src/mainboard/intel/kunimitsu/boardid.c                           | 3 +--
 src/mainboard/intel/kunimitsu/boardid.h                           | 3 +--
 src/mainboard/intel/kunimitsu/chromeos.c                          | 3 +--
 src/mainboard/intel/kunimitsu/cmos.layout                         | 3 +--
 src/mainboard/intel/kunimitsu/dsdt.asl                            | 3 +--
 src/mainboard/intel/kunimitsu/ec.c                                | 3 +--
 src/mainboard/intel/kunimitsu/ec.h                                | 3 +--
 src/mainboard/intel/kunimitsu/fadt.c                              | 3 +--
 src/mainboard/intel/kunimitsu/gpio.h                              | 3 +--
 src/mainboard/intel/kunimitsu/mainboard.c                         | 3 +--
 src/mainboard/intel/kunimitsu/pei_data.c                          | 3 +--
 src/mainboard/intel/kunimitsu/ramstage.c                          | 3 +--
 src/mainboard/intel/kunimitsu/romstage.c                          | 3 +--
 src/mainboard/intel/kunimitsu/smihandler.c                        | 3 +--
 src/mainboard/intel/kunimitsu/spd/Makefile.inc                    | 3 +--
 src/mainboard/intel/kunimitsu/spd/spd.c                           | 3 +--
 src/mainboard/intel/kunimitsu/spd/spd.h                           | 3 +--
 src/mainboard/intel/minnowmax/Kconfig                             | 3 +--
 src/mainboard/intel/minnowmax/Makefile.inc                        | 3 +--
 src/mainboard/intel/minnowmax/acpi/mainboard.asl                  | 3 +--
 src/mainboard/intel/minnowmax/acpi_tables.c                       | 3 +--
 src/mainboard/intel/minnowmax/cmos.layout                         | 3 +--
 src/mainboard/intel/minnowmax/devicetree.cb                       | 3 +--
 src/mainboard/intel/minnowmax/dsdt.asl                            | 3 +--
 src/mainboard/intel/minnowmax/fadt.c                              | 3 +--
 src/mainboard/intel/minnowmax/gpio.c                              | 3 +--
 src/mainboard/intel/minnowmax/irqroute.c                          | 3 +--
 src/mainboard/intel/minnowmax/irqroute.h                          | 3 +--
 src/mainboard/intel/minnowmax/mainboard.c                         | 3 +--
 src/mainboard/intel/minnowmax/romstage.c                          | 3 +--
 src/mainboard/intel/mtarvon/irq_tables.c                          | 3 +--
 src/mainboard/intel/mtarvon/mptable.c                             | 3 +--
 src/mainboard/intel/mtarvon/romstage.c                            | 3 +--
 src/mainboard/intel/sklrvp/Makefile.inc                           | 3 +--
 src/mainboard/intel/sklrvp/acpi/chromeos.asl                      | 3 +--
 src/mainboard/intel/sklrvp/acpi/ec.asl                            | 3 +--
 src/mainboard/intel/sklrvp/acpi/mainboard.asl                     | 3 +--
 src/mainboard/intel/sklrvp/acpi/superio.asl                       | 3 +--
 src/mainboard/intel/sklrvp/acpi_tables.c                          | 3 +--
 src/mainboard/intel/sklrvp/chromeos.c                             | 3 +--
 src/mainboard/intel/sklrvp/cmos.layout                            | 3 +--
 src/mainboard/intel/sklrvp/dsdt.asl                               | 3 +--
 src/mainboard/intel/sklrvp/fadt.c                                 | 3 +--
 src/mainboard/intel/sklrvp/gpio_rvp3.h                            | 3 +--
 src/mainboard/intel/sklrvp/mainboard.c                            | 3 +--
 src/mainboard/intel/sklrvp/pei_data.c                             | 3 +--
 src/mainboard/intel/sklrvp/ramstage.c                             | 3 +--
 src/mainboard/intel/sklrvp/romstage.c                             | 3 +--
 src/mainboard/intel/sklrvp/spd/Makefile.inc                       | 3 +--
 src/mainboard/intel/sklrvp/spd/spd.c                              | 3 +--
 src/mainboard/intel/sklrvp/spd/spd.h                              | 3 +--
 src/mainboard/intel/strago/Makefile.inc                           | 3 +--
 src/mainboard/intel/strago/acpi/chromeos.asl                      | 3 +--
 src/mainboard/intel/strago/acpi/dptf.asl                          | 3 +--
 src/mainboard/intel/strago/acpi/ec.asl                            | 3 +--
 src/mainboard/intel/strago/acpi/mainboard.asl                     | 3 +--
 src/mainboard/intel/strago/acpi/superio.asl                       | 3 +--
 src/mainboard/intel/strago/acpi_tables.c                          | 3 +--
 src/mainboard/intel/strago/boardid.c                              | 3 +--
 src/mainboard/intel/strago/chromeos.c                             | 3 +--
 src/mainboard/intel/strago/cmos.layout                            | 3 +--
 src/mainboard/intel/strago/com_init.c                             | 3 +--
 src/mainboard/intel/strago/dsdt.asl                               | 3 +--
 src/mainboard/intel/strago/ec.c                                   | 3 +--
 src/mainboard/intel/strago/ec.h                                   | 3 +--
 src/mainboard/intel/strago/fadt.c                                 | 3 +--
 src/mainboard/intel/strago/gpio.c                                 | 3 +--
 src/mainboard/intel/strago/gpio.h                                 | 3 +--
 src/mainboard/intel/strago/gpio_bcrd2.c                           | 3 +--
 src/mainboard/intel/strago/gpio_dvt.c                             | 3 +--
 src/mainboard/intel/strago/irqroute.c                             | 3 +--
 src/mainboard/intel/strago/irqroute.h                             | 3 +--
 src/mainboard/intel/strago/mainboard.c                            | 3 +--
 src/mainboard/intel/strago/onboard.h                              | 3 +--
 src/mainboard/intel/strago/ramstage.c                             | 3 +--
 src/mainboard/intel/strago/romstage.c                             | 3 +--
 src/mainboard/intel/strago/smihandler.c                           | 3 +--
 src/mainboard/intel/strago/spd/Makefile.inc                       | 3 +--
 src/mainboard/intel/strago/spd/spd.c                              | 3 +--
 src/mainboard/intel/strago/w25q64.c                               | 3 +--
 src/mainboard/intel/truxton/irq_tables.c                          | 3 +--
 src/mainboard/intel/truxton/mptable.c                             | 3 +--
 src/mainboard/intel/truxton/romstage.c                            | 3 +--
 src/mainboard/intel/wtm2/Makefile.inc                             | 3 +--
 src/mainboard/intel/wtm2/acpi/chromeos.asl                        | 3 +--
 src/mainboard/intel/wtm2/acpi/mainboard.asl                       | 3 +--
 src/mainboard/intel/wtm2/acpi/platform.asl                        | 3 +--
 src/mainboard/intel/wtm2/acpi/superio.asl                         | 3 +--
 src/mainboard/intel/wtm2/acpi/thermal.asl                         | 3 +--
 src/mainboard/intel/wtm2/acpi_tables.c                            | 3 +--
 src/mainboard/intel/wtm2/chromeos.c                               | 3 +--
 src/mainboard/intel/wtm2/cmos.layout                              | 3 +--
 src/mainboard/intel/wtm2/dsdt.asl                                 | 3 +--
 src/mainboard/intel/wtm2/fadt.c                                   | 3 +--
 src/mainboard/intel/wtm2/gpio.h                                   | 3 +--
 src/mainboard/intel/wtm2/graphics.c                               | 3 +--
 src/mainboard/intel/wtm2/hda_verb.c                               | 3 +--
 src/mainboard/intel/wtm2/i915.c                                   | 3 +--
 src/mainboard/intel/wtm2/mainboard.c                              | 3 +--
 src/mainboard/intel/wtm2/pei_data.c                               | 3 +--
 src/mainboard/intel/wtm2/romstage.c                               | 3 +--
 src/mainboard/intel/wtm2/thermal.h                                | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/cpu.asl                      | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/ec.asl                       | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/northbridge_pci_irqs.asl     | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/platform.asl                 | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/sleepstates.asl              | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/southbridge_pci_irqs.asl     | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/superio.asl                  | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl                  | 3 +--
 src/mainboard/iwave/iWRainbowG6/acpi_tables.c                     | 3 +--
 src/mainboard/iwave/iWRainbowG6/cmos.layout                       | 3 +--
 src/mainboard/iwave/iWRainbowG6/dsdt.asl                          | 3 +--
 src/mainboard/iwave/iWRainbowG6/fadt.c                            | 3 +--
 src/mainboard/iwave/iWRainbowG6/hda_verb.c                        | 3 +--
 src/mainboard/iwave/iWRainbowG6/irq_tables.c                      | 3 +--
 src/mainboard/iwave/iWRainbowG6/mainboard.c                       | 3 +--
 src/mainboard/iwave/iWRainbowG6/mptable.c                         | 3 +--
 src/mainboard/iwave/iWRainbowG6/romstage.c                        | 3 +--
 src/mainboard/jetway/j7f2/irq_tables.c                            | 3 +--
 src/mainboard/jetway/j7f2/romstage.c                              | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c                  | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/Kconfig                         | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/Makefile.inc                    | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h                    | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c               | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcieComplex.h        | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl                    | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl              | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl                | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/sata.asl                   | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/sleep.asl                  | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/superio.asl                | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl                 | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c                   | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/buildOpts.c                     | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/cmos.layout                     | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/devicetree.cb                   | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/dsdt.asl                        | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/irq_tables.c                    | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/mainboard.c                     | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/mptable.c                       | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/platform_cfg.h                  | 3 +--
 src/mainboard/jetway/nf81-t56n-lf/romstage.c                      | 3 +--
 src/mainboard/jetway/pa78vm5/acpi/cpstate.asl                     | 3 +--
 src/mainboard/jetway/pa78vm5/acpi/ide.asl                         | 3 +--
 src/mainboard/jetway/pa78vm5/acpi/routing.asl                     | 3 +--
 src/mainboard/jetway/pa78vm5/acpi/sata.asl                        | 3 +--
 src/mainboard/jetway/pa78vm5/acpi/usb.asl                         | 3 +--
 src/mainboard/jetway/pa78vm5/acpi_tables.c                        | 3 +--
 src/mainboard/jetway/pa78vm5/dsdt.asl                             | 3 +--
 src/mainboard/jetway/pa78vm5/get_bus_conf.c                       | 3 +--
 src/mainboard/jetway/pa78vm5/irq_tables.c                         | 3 +--
 src/mainboard/jetway/pa78vm5/mainboard.c                          | 3 +--
 src/mainboard/jetway/pa78vm5/mptable.c                            | 3 +--
 src/mainboard/jetway/pa78vm5/resourcemap.c                        | 3 +--
 src/mainboard/jetway/pa78vm5/romstage.c                           | 3 +--
 src/mainboard/kontron/986lcd-m/acpi/ec.asl                        | 3 +--
 src/mainboard/kontron/986lcd-m/acpi/i945_pci_irqs.asl             | 3 +--
 src/mainboard/kontron/986lcd-m/acpi/ich7_pci_irqs.asl             | 3 +--
 src/mainboard/kontron/986lcd-m/acpi/platform.asl                  | 3 +--
 src/mainboard/kontron/986lcd-m/acpi/superio.asl                   | 3 +--
 src/mainboard/kontron/986lcd-m/acpi/thermal.asl                   | 3 +--
 src/mainboard/kontron/986lcd-m/acpi_tables.c                      | 3 +--
 src/mainboard/kontron/986lcd-m/cmos.layout                        | 3 +--
 src/mainboard/kontron/986lcd-m/dsdt.asl                           | 3 +--
 src/mainboard/kontron/986lcd-m/irq_tables.c                       | 3 +--
 src/mainboard/kontron/986lcd-m/mainboard.c                        | 3 +--
 src/mainboard/kontron/986lcd-m/mptable.c                          | 3 +--
 src/mainboard/kontron/986lcd-m/romstage.c                         | 3 +--
 src/mainboard/kontron/kt690/acpi/ide.asl                          | 3 +--
 src/mainboard/kontron/kt690/acpi/routing.asl                      | 3 +--
 src/mainboard/kontron/kt690/acpi/sata.asl                         | 3 +--
 src/mainboard/kontron/kt690/acpi/usb.asl                          | 3 +--
 src/mainboard/kontron/kt690/acpi_tables.c                         | 3 +--
 src/mainboard/kontron/kt690/cmos.layout                           | 3 +--
 src/mainboard/kontron/kt690/dsdt.asl                              | 3 +--
 src/mainboard/kontron/kt690/fadt.c                                | 3 +--
 src/mainboard/kontron/kt690/get_bus_conf.c                        | 3 +--
 src/mainboard/kontron/kt690/irq_tables.c                          | 3 +--
 src/mainboard/kontron/kt690/mainboard.c                           | 3 +--
 src/mainboard/kontron/kt690/mptable.c                             | 3 +--
 src/mainboard/kontron/kt690/resourcemap.c                         | 3 +--
 src/mainboard/kontron/kt690/romstage.c                            | 3 +--
 src/mainboard/kontron/ktqm77/acpi/mainboard.asl                   | 3 +--
 src/mainboard/kontron/ktqm77/acpi/platform.asl                    | 3 +--
 src/mainboard/kontron/ktqm77/acpi/thermal.asl                     | 3 +--
 src/mainboard/kontron/ktqm77/acpi_tables.c                        | 3 +--
 src/mainboard/kontron/ktqm77/cmos.layout                          | 3 +--
 src/mainboard/kontron/ktqm77/dsdt.asl                             | 3 +--
 src/mainboard/kontron/ktqm77/gpio.h                               | 3 +--
 src/mainboard/kontron/ktqm77/hda_verb.c                           | 3 +--
 src/mainboard/kontron/ktqm77/mainboard.c                          | 3 +--
 src/mainboard/kontron/ktqm77/romstage.c                           | 3 +--
 src/mainboard/kontron/ktqm77/thermal.h                            | 3 +--
 src/mainboard/lanner/em8510/irq_tables.c                          | 3 +--
 src/mainboard/lanner/em8510/romstage.c                            | 3 +--
 src/mainboard/lenovo/g505s/BiosCallOuts.c                         | 3 +--
 src/mainboard/lenovo/g505s/Kconfig                                | 3 +--
 src/mainboard/lenovo/g505s/Makefile.inc                           | 3 +--
 src/mainboard/lenovo/g505s/OptionsIds.h                           | 3 +--
 src/mainboard/lenovo/g505s/PlatformGnbPcie.c                      | 3 +--
 src/mainboard/lenovo/g505s/acpi/gpe.asl                           | 3 +--
 src/mainboard/lenovo/g505s/acpi/mainboard.asl                     | 3 +--
 src/mainboard/lenovo/g505s/acpi/routing.asl                       | 3 +--
 src/mainboard/lenovo/g505s/acpi/sata.asl                          | 3 +--
 src/mainboard/lenovo/g505s/acpi/si.asl                            | 3 +--
 src/mainboard/lenovo/g505s/acpi/sleep.asl                         | 3 +--
 src/mainboard/lenovo/g505s/acpi/thermal.asl                       | 3 +--
 src/mainboard/lenovo/g505s/acpi/usb_oc.asl                        | 3 +--
 src/mainboard/lenovo/g505s/acpi_tables.c                          | 3 +--
 src/mainboard/lenovo/g505s/buildOpts.c                            | 3 +--
 src/mainboard/lenovo/g505s/cmos.layout                            | 3 +--
 src/mainboard/lenovo/g505s/devicetree.cb                          | 3 +--
 src/mainboard/lenovo/g505s/dsdt.asl                               | 3 +--
 src/mainboard/lenovo/g505s/irq_tables.c                           | 3 +--
 src/mainboard/lenovo/g505s/mainboard.c                            | 3 +--
 src/mainboard/lenovo/g505s/mptable.c                              | 3 +--
 src/mainboard/lenovo/g505s/romstage.c                             | 3 +--
 src/mainboard/lenovo/t400/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/t400/acpi/dock.asl                           | 3 +--
 src/mainboard/lenovo/t400/acpi/gm45_pci_irqs.asl                  | 3 +--
 src/mainboard/lenovo/t400/acpi/gpe.asl                            | 3 +--
 src/mainboard/lenovo/t400/acpi/graphics.asl                       | 3 +--
 src/mainboard/lenovo/t400/acpi/ich9_pci_irqs.asl                  | 3 +--
 src/mainboard/lenovo/t400/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/t400/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/t400/cmos.layout                             | 3 +--
 src/mainboard/lenovo/t400/cstates.c                               | 3 +--
 src/mainboard/lenovo/t400/dock.c                                  | 3 +--
 src/mainboard/lenovo/t400/dock.h                                  | 3 +--
 src/mainboard/lenovo/t400/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/t400/fadt.c                                  | 3 +--
 src/mainboard/lenovo/t400/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/t400/mainboard.c                             | 3 +--
 src/mainboard/lenovo/t400/romstage.c                              | 3 +--
 src/mainboard/lenovo/t400/smihandler.c                            | 3 +--
 src/mainboard/lenovo/t420s/Makefile.inc                           | 3 +--
 src/mainboard/lenovo/t420s/acpi/ec.asl                            | 3 +--
 src/mainboard/lenovo/t420s/acpi/platform.asl                      | 3 +--
 src/mainboard/lenovo/t420s/acpi_tables.c                          | 3 +--
 src/mainboard/lenovo/t420s/cmos.layout                            | 3 +--
 src/mainboard/lenovo/t420s/dsdt.asl                               | 3 +--
 src/mainboard/lenovo/t420s/hda_verb.c                             | 3 +--
 src/mainboard/lenovo/t420s/mainboard.c                            | 3 +--
 src/mainboard/lenovo/t420s/romstage.c                             | 3 +--
 src/mainboard/lenovo/t420s/smihandler.c                           | 3 +--
 src/mainboard/lenovo/t420s/thermal.h                              | 3 +--
 src/mainboard/lenovo/t430s/Makefile.inc                           | 3 +--
 src/mainboard/lenovo/t430s/acpi/ec.asl                            | 3 +--
 src/mainboard/lenovo/t430s/acpi/platform.asl                      | 3 +--
 src/mainboard/lenovo/t430s/acpi_tables.c                          | 3 +--
 src/mainboard/lenovo/t430s/cmos.layout                            | 3 +--
 src/mainboard/lenovo/t430s/dsdt.asl                               | 3 +--
 src/mainboard/lenovo/t430s/hda_verb.c                             | 3 +--
 src/mainboard/lenovo/t430s/mainboard.c                            | 3 +--
 src/mainboard/lenovo/t430s/romstage.c                             | 3 +--
 src/mainboard/lenovo/t430s/smihandler.c                           | 3 +--
 src/mainboard/lenovo/t430s/thermal.h                              | 3 +--
 src/mainboard/lenovo/t520/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/t520/acpi/ec.asl                             | 3 +--
 src/mainboard/lenovo/t520/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/t520/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/t520/cmos.layout                             | 3 +--
 src/mainboard/lenovo/t520/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/t520/gpio.c                                  | 3 +--
 src/mainboard/lenovo/t520/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/t520/mainboard.c                             | 3 +--
 src/mainboard/lenovo/t520/romstage.c                              | 3 +--
 src/mainboard/lenovo/t520/smihandler.c                            | 3 +--
 src/mainboard/lenovo/t520/thermal.h                               | 3 +--
 src/mainboard/lenovo/t530/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/t530/acpi/ec.asl                             | 3 +--
 src/mainboard/lenovo/t530/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/t530/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/t530/cmos.layout                             | 3 +--
 src/mainboard/lenovo/t530/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/t530/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/t530/mainboard.c                             | 3 +--
 src/mainboard/lenovo/t530/romstage.c                              | 3 +--
 src/mainboard/lenovo/t530/smihandler.c                            | 3 +--
 src/mainboard/lenovo/t530/thermal.h                               | 3 +--
 src/mainboard/lenovo/t60/Makefile.inc                             | 3 +--
 src/mainboard/lenovo/t60/acpi/dock.asl                            | 3 +--
 src/mainboard/lenovo/t60/acpi/ec.asl                              | 3 +--
 src/mainboard/lenovo/t60/acpi/gpe.asl                             | 3 +--
 src/mainboard/lenovo/t60/acpi/i945_pci_irqs.asl                   | 3 +--
 src/mainboard/lenovo/t60/acpi/ich7_pci_irqs.asl                   | 3 +--
 src/mainboard/lenovo/t60/acpi/platform.asl                        | 3 +--
 src/mainboard/lenovo/t60/acpi/video.asl                           | 3 +--
 src/mainboard/lenovo/t60/acpi_tables.c                            | 3 +--
 src/mainboard/lenovo/t60/cmos.layout                              | 3 +--
 src/mainboard/lenovo/t60/devicetree.cb                            | 3 +--
 src/mainboard/lenovo/t60/dock.c                                   | 3 +--
 src/mainboard/lenovo/t60/dock.h                                   | 3 +--
 src/mainboard/lenovo/t60/dsdt.asl                                 | 3 +--
 src/mainboard/lenovo/t60/mainboard.c                              | 3 +--
 src/mainboard/lenovo/t60/mptable.c                                | 3 +--
 src/mainboard/lenovo/t60/romstage.c                               | 3 +--
 src/mainboard/lenovo/t60/smi.h                                    | 3 +--
 src/mainboard/lenovo/t60/smihandler.c                             | 3 +--
 src/mainboard/lenovo/x200/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/x200/acpi/dock.asl                           | 3 +--
 src/mainboard/lenovo/x200/acpi/gm45_pci_irqs.asl                  | 3 +--
 src/mainboard/lenovo/x200/acpi/gpe.asl                            | 3 +--
 src/mainboard/lenovo/x200/acpi/ich9_pci_irqs.asl                  | 3 +--
 src/mainboard/lenovo/x200/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/x200/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/x200/cmos.layout                             | 3 +--
 src/mainboard/lenovo/x200/cstates.c                               | 3 +--
 src/mainboard/lenovo/x200/dock.c                                  | 3 +--
 src/mainboard/lenovo/x200/dock.h                                  | 3 +--
 src/mainboard/lenovo/x200/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/x200/fadt.c                                  | 3 +--
 src/mainboard/lenovo/x200/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/x200/mainboard.c                             | 3 +--
 src/mainboard/lenovo/x200/romstage.c                              | 3 +--
 src/mainboard/lenovo/x200/smihandler.c                            | 3 +--
 src/mainboard/lenovo/x201/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/x201/acpi/dock.asl                           | 3 +--
 src/mainboard/lenovo/x201/acpi/ec.asl                             | 3 +--
 src/mainboard/lenovo/x201/acpi/gpe.asl                            | 3 +--
 src/mainboard/lenovo/x201/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/x201/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/x201/cmos.layout                             | 3 +--
 src/mainboard/lenovo/x201/devicetree.cb                           | 3 +--
 src/mainboard/lenovo/x201/dock.c                                  | 3 +--
 src/mainboard/lenovo/x201/dock.h                                  | 3 +--
 src/mainboard/lenovo/x201/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/x201/gpio.h                                  | 3 +--
 src/mainboard/lenovo/x201/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/x201/mainboard.c                             | 3 +--
 src/mainboard/lenovo/x201/romstage.c                              | 3 +--
 src/mainboard/lenovo/x201/smi.h                                   | 3 +--
 src/mainboard/lenovo/x201/smihandler.c                            | 3 +--
 src/mainboard/lenovo/x220/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/x220/acpi/ec.asl                             | 3 +--
 src/mainboard/lenovo/x220/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/x220/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/x220/cmos.layout                             | 3 +--
 src/mainboard/lenovo/x220/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/x220/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/x220/mainboard.c                             | 3 +--
 src/mainboard/lenovo/x220/romstage.c                              | 3 +--
 src/mainboard/lenovo/x220/smihandler.c                            | 3 +--
 src/mainboard/lenovo/x220/thermal.h                               | 3 +--
 src/mainboard/lenovo/x230/Makefile.inc                            | 3 +--
 src/mainboard/lenovo/x230/acpi/ec.asl                             | 3 +--
 src/mainboard/lenovo/x230/acpi/platform.asl                       | 3 +--
 src/mainboard/lenovo/x230/acpi_tables.c                           | 3 +--
 src/mainboard/lenovo/x230/cmos.layout                             | 3 +--
 src/mainboard/lenovo/x230/dsdt.asl                                | 3 +--
 src/mainboard/lenovo/x230/gpio.c                                  | 3 +--
 src/mainboard/lenovo/x230/hda_verb.c                              | 3 +--
 src/mainboard/lenovo/x230/mainboard.c                             | 3 +--
 src/mainboard/lenovo/x230/romstage.c                              | 3 +--
 src/mainboard/lenovo/x230/smihandler.c                            | 3 +--
 src/mainboard/lenovo/x230/thermal.h                               | 3 +--
 src/mainboard/lenovo/x60/Makefile.inc                             | 3 +--
 src/mainboard/lenovo/x60/acpi/dock.asl                            | 3 +--
 src/mainboard/lenovo/x60/acpi/ec.asl                              | 3 +--
 src/mainboard/lenovo/x60/acpi/gpe.asl                             | 3 +--
 src/mainboard/lenovo/x60/acpi/i945_pci_irqs.asl                   | 3 +--
 src/mainboard/lenovo/x60/acpi/ich7_pci_irqs.asl                   | 3 +--
 src/mainboard/lenovo/x60/acpi/platform.asl                        | 3 +--
 src/mainboard/lenovo/x60/acpi_tables.c                            | 3 +--
 src/mainboard/lenovo/x60/cmos.layout                              | 3 +--
 src/mainboard/lenovo/x60/devicetree.cb                            | 3 +--
 src/mainboard/lenovo/x60/dock.c                                   | 3 +--
 src/mainboard/lenovo/x60/dock.h                                   | 3 +--
 src/mainboard/lenovo/x60/dsdt.asl                                 | 3 +--
 src/mainboard/lenovo/x60/irq_tables.c                             | 3 +--
 src/mainboard/lenovo/x60/mainboard.c                              | 3 +--
 src/mainboard/lenovo/x60/mptable.c                                | 3 +--
 src/mainboard/lenovo/x60/romstage.c                               | 3 +--
 src/mainboard/lenovo/x60/smi.h                                    | 3 +--
 src/mainboard/lenovo/x60/smihandler.c                             | 3 +--
 src/mainboard/lippert/frontrunner-af/BiosCallOuts.c               | 3 +--
 src/mainboard/lippert/frontrunner-af/Kconfig                      | 3 +--
 src/mainboard/lippert/frontrunner-af/Makefile.inc                 | 3 +--
 src/mainboard/lippert/frontrunner-af/OptionsIds.h                 | 3 +--
 src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c            | 3 +--
 src/mainboard/lippert/frontrunner-af/PlatformGnbPcieComplex.h     | 3 +--
 src/mainboard/lippert/frontrunner-af/acpi/routing.asl             | 3 +--
 src/mainboard/lippert/frontrunner-af/acpi/sata.asl                | 3 +--
 src/mainboard/lippert/frontrunner-af/acpi/superio.asl             | 3 +--
 src/mainboard/lippert/frontrunner-af/acpi/usb.asl                 | 3 +--
 src/mainboard/lippert/frontrunner-af/acpi_tables.c                | 3 +--
 src/mainboard/lippert/frontrunner-af/buildOpts.c                  | 3 +--
 src/mainboard/lippert/frontrunner-af/cmos.layout                  | 3 +--
 src/mainboard/lippert/frontrunner-af/devicetree.cb                | 3 +--
 src/mainboard/lippert/frontrunner-af/dsdt.asl                     | 3 +--
 src/mainboard/lippert/frontrunner-af/irq_tables.c                 | 3 +--
 src/mainboard/lippert/frontrunner-af/mainboard.c                  | 3 +--
 src/mainboard/lippert/frontrunner-af/mptable.c                    | 3 +--
 src/mainboard/lippert/frontrunner-af/platform_cfg.h               | 3 +--
 src/mainboard/lippert/frontrunner-af/romstage.c                   | 3 +--
 src/mainboard/lippert/hurricane-lx/irq_tables.c                   | 3 +--
 src/mainboard/lippert/hurricane-lx/mainboard.c                    | 3 +--
 src/mainboard/lippert/hurricane-lx/romstage.c                     | 3 +--
 src/mainboard/lippert/literunner-lx/irq_tables.c                  | 3 +--
 src/mainboard/lippert/literunner-lx/mainboard.c                   | 3 +--
 src/mainboard/lippert/literunner-lx/romstage.c                    | 3 +--
 src/mainboard/lippert/roadrunner-lx/irq_tables.c                  | 3 +--
 src/mainboard/lippert/roadrunner-lx/mainboard.c                   | 3 +--
 src/mainboard/lippert/roadrunner-lx/romstage.c                    | 3 +--
 src/mainboard/lippert/spacerunner-lx/irq_tables.c                 | 3 +--
 src/mainboard/lippert/spacerunner-lx/mainboard.c                  | 3 +--
 src/mainboard/lippert/spacerunner-lx/romstage.c                   | 3 +--
 src/mainboard/lippert/toucan-af/BiosCallOuts.c                    | 3 +--
 src/mainboard/lippert/toucan-af/Kconfig                           | 3 +--
 src/mainboard/lippert/toucan-af/Makefile.inc                      | 3 +--
 src/mainboard/lippert/toucan-af/OptionsIds.h                      | 3 +--
 src/mainboard/lippert/toucan-af/PlatformGnbPcie.c                 | 3 +--
 src/mainboard/lippert/toucan-af/PlatformGnbPcieComplex.h          | 3 +--
 src/mainboard/lippert/toucan-af/acpi/routing.asl                  | 3 +--
 src/mainboard/lippert/toucan-af/acpi/sata.asl                     | 3 +--
 src/mainboard/lippert/toucan-af/acpi/superio.asl                  | 3 +--
 src/mainboard/lippert/toucan-af/acpi/usb.asl                      | 3 +--
 src/mainboard/lippert/toucan-af/acpi_tables.c                     | 3 +--
 src/mainboard/lippert/toucan-af/buildOpts.c                       | 3 +--
 src/mainboard/lippert/toucan-af/cmos.layout                       | 3 +--
 src/mainboard/lippert/toucan-af/devicetree.cb                     | 3 +--
 src/mainboard/lippert/toucan-af/dsdt.asl                          | 3 +--
 src/mainboard/lippert/toucan-af/irq_tables.c                      | 3 +--
 src/mainboard/lippert/toucan-af/mainboard.c                       | 3 +--
 src/mainboard/lippert/toucan-af/mptable.c                         | 3 +--
 src/mainboard/lippert/toucan-af/platform_cfg.h                    | 3 +--
 src/mainboard/lippert/toucan-af/romstage.c                        | 3 +--
 src/mainboard/mitac/6513wu/Kconfig                                | 3 +--
 src/mainboard/mitac/6513wu/devicetree.cb                          | 3 +--
 src/mainboard/mitac/6513wu/irq_tables.c                           | 3 +--
 src/mainboard/mitac/6513wu/romstage.c                             | 3 +--
 src/mainboard/mitac/Kconfig                                       | 3 +--
 src/mainboard/msi/Kconfig                                         | 3 +--
 src/mainboard/msi/ms6119/Kconfig                                  | 3 +--
 src/mainboard/msi/ms6119/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms6119/romstage.c                               | 3 +--
 src/mainboard/msi/ms6147/Kconfig                                  | 3 +--
 src/mainboard/msi/ms6147/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms6147/romstage.c                               | 3 +--
 src/mainboard/msi/ms6156/Kconfig                                  | 3 +--
 src/mainboard/msi/ms6156/devicetree.cb                            | 3 +--
 src/mainboard/msi/ms6156/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms6156/romstage.c                               | 3 +--
 src/mainboard/msi/ms6178/Kconfig                                  | 3 +--
 src/mainboard/msi/ms6178/devicetree.cb                            | 3 +--
 src/mainboard/msi/ms6178/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms6178/romstage.c                               | 3 +--
 src/mainboard/msi/ms7135/dsdt.asl                                 | 3 +--
 src/mainboard/msi/ms7135/get_bus_conf.c                           | 3 +--
 src/mainboard/msi/ms7135/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms7135/mptable.c                                | 3 +--
 src/mainboard/msi/ms7135/romstage.c                               | 3 +--
 src/mainboard/msi/ms7260/cmos.layout                              | 3 +--
 src/mainboard/msi/ms7260/get_bus_conf.c                           | 3 +--
 src/mainboard/msi/ms7260/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms7260/mainboard.c                              | 3 +--
 src/mainboard/msi/ms7260/mptable.c                                | 3 +--
 src/mainboard/msi/ms7260/resourcemap.c                            | 3 +--
 src/mainboard/msi/ms7260/romstage.c                               | 3 +--
 src/mainboard/msi/ms9185/get_bus_conf.c                           | 3 +--
 src/mainboard/msi/ms9185/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms9185/mb_sysconf.h                             | 3 +--
 src/mainboard/msi/ms9185/mptable.c                                | 3 +--
 src/mainboard/msi/ms9185/resourcemap.c                            | 3 +--
 src/mainboard/msi/ms9185/romstage.c                               | 3 +--
 src/mainboard/msi/ms9282/get_bus_conf.c                           | 3 +--
 src/mainboard/msi/ms9282/irq_tables.c                             | 3 +--
 src/mainboard/msi/ms9282/mainboard.c                              | 3 +--
 src/mainboard/msi/ms9282/mb_sysconf.h                             | 3 +--
 src/mainboard/msi/ms9282/mptable.c                                | 3 +--
 src/mainboard/msi/ms9282/resourcemap.c                            | 3 +--
 src/mainboard/msi/ms9282/romstage.c                               | 3 +--
 src/mainboard/msi/ms9652_fam10/acpi_tables.c                      | 3 +--
 src/mainboard/msi/ms9652_fam10/cmos.layout                        | 3 +--
 src/mainboard/msi/ms9652_fam10/devicetree.cb                      | 3 +--
 src/mainboard/msi/ms9652_fam10/dsdt.asl                           | 3 +--
 src/mainboard/msi/ms9652_fam10/get_bus_conf.c                     | 3 +--
 src/mainboard/msi/ms9652_fam10/irq_tables.c                       | 3 +--
 src/mainboard/msi/ms9652_fam10/mainboard.c                        | 3 +--
 src/mainboard/msi/ms9652_fam10/mb_sysconf.h                       | 3 +--
 src/mainboard/msi/ms9652_fam10/mptable.c                          | 3 +--
 src/mainboard/msi/ms9652_fam10/resourcemap.c                      | 3 +--
 src/mainboard/msi/ms9652_fam10/romstage.c                         | 3 +--
 src/mainboard/nec/Kconfig                                         | 3 +--
 src/mainboard/nec/powermate2000/Kconfig                           | 3 +--
 src/mainboard/nec/powermate2000/irq_tables.c                      | 3 +--
 src/mainboard/nec/powermate2000/romstage.c                        | 3 +--
 src/mainboard/nokia/Kconfig                                       | 3 +--
 src/mainboard/nokia/ip530/Kconfig                                 | 3 +--
 src/mainboard/nokia/ip530/devicetree.cb                           | 3 +--
 src/mainboard/nokia/ip530/irq_tables.c                            | 3 +--
 src/mainboard/nokia/ip530/romstage.c                              | 3 +--
 src/mainboard/nvidia/l1_2pvv/cmos.layout                          | 3 +--
 src/mainboard/nvidia/l1_2pvv/get_bus_conf.c                       | 3 +--
 src/mainboard/nvidia/l1_2pvv/hda_verb.c                           | 3 +--
 src/mainboard/nvidia/l1_2pvv/irq_tables.c                         | 3 +--
 src/mainboard/nvidia/l1_2pvv/mainboard.c                          | 3 +--
 src/mainboard/nvidia/l1_2pvv/mb_sysconf.h                         | 3 +--
 src/mainboard/nvidia/l1_2pvv/mptable.c                            | 3 +--
 src/mainboard/nvidia/l1_2pvv/resourcemap.c                        | 3 +--
 src/mainboard/nvidia/l1_2pvv/romstage.c                           | 3 +--
 src/mainboard/packardbell/ms2290/Makefile.inc                     | 3 +--
 src/mainboard/packardbell/ms2290/acpi/ac.asl                      | 3 +--
 src/mainboard/packardbell/ms2290/acpi/ec.asl                      | 3 +--
 src/mainboard/packardbell/ms2290/acpi/gpe.asl                     | 3 +--
 src/mainboard/packardbell/ms2290/acpi/platform.asl                | 3 +--
 src/mainboard/packardbell/ms2290/acpi_tables.c                    | 3 +--
 src/mainboard/packardbell/ms2290/cmos.layout                      | 3 +--
 src/mainboard/packardbell/ms2290/devicetree.cb                    | 3 +--
 src/mainboard/packardbell/ms2290/dsdt.asl                         | 3 +--
 src/mainboard/packardbell/ms2290/hda_verb.c                       | 3 +--
 src/mainboard/packardbell/ms2290/mainboard.c                      | 3 +--
 src/mainboard/packardbell/ms2290/romstage.c                       | 3 +--
 src/mainboard/packardbell/ms2290/smihandler.c                     | 3 +--
 src/mainboard/pcengines/alix1c/irq_tables.c                       | 3 +--
 src/mainboard/pcengines/alix1c/mainboard.c                        | 3 +--
 src/mainboard/pcengines/alix1c/romstage.c                         | 3 +--
 src/mainboard/pcengines/alix2d/irq_tables.c                       | 3 +--
 src/mainboard/pcengines/alix2d/mainboard.c                        | 3 +--
 src/mainboard/pcengines/alix2d/romstage.c                         | 3 +--
 src/mainboard/pcengines/apu1/BiosCallOuts.c                       | 3 +--
 src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex            | 3 +--
 src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex            | 3 +--
 src/mainboard/pcengines/apu1/Kconfig                              | 3 +--
 src/mainboard/pcengines/apu1/Makefile.inc                         | 3 +--
 src/mainboard/pcengines/apu1/OptionsIds.h                         | 3 +--
 src/mainboard/pcengines/apu1/PlatformGnbPcie.c                    | 3 +--
 src/mainboard/pcengines/apu1/PlatformGnbPcieComplex.h             | 3 +--
 src/mainboard/pcengines/apu1/acpi/buttons.asl                     | 3 +--
 src/mainboard/pcengines/apu1/acpi/gpe.asl                         | 3 +--
 src/mainboard/pcengines/apu1/acpi/gpio.asl                        | 3 +--
 src/mainboard/pcengines/apu1/acpi/leds.asl                        | 3 +--
 src/mainboard/pcengines/apu1/acpi/mainboard.asl                   | 3 +--
 src/mainboard/pcengines/apu1/acpi/routing.asl                     | 3 +--
 src/mainboard/pcengines/apu1/acpi/sata.asl                        | 3 +--
 src/mainboard/pcengines/apu1/acpi/sleep.asl                       | 3 +--
 src/mainboard/pcengines/apu1/acpi/superio.asl                     | 3 +--
 src/mainboard/pcengines/apu1/acpi/usb_oc.asl                      | 3 +--
 src/mainboard/pcengines/apu1/acpi_tables.c                        | 3 +--
 src/mainboard/pcengines/apu1/buildOpts.c                          | 3 +--
 src/mainboard/pcengines/apu1/devicetree.cb                        | 3 +--
 src/mainboard/pcengines/apu1/dsdt.asl                             | 3 +--
 src/mainboard/pcengines/apu1/gpio_ftns.c                          | 3 +--
 src/mainboard/pcengines/apu1/gpio_ftns.h                          | 3 +--
 src/mainboard/pcengines/apu1/irq_tables.c                         | 3 +--
 src/mainboard/pcengines/apu1/mainboard.c                          | 3 +--
 src/mainboard/pcengines/apu1/mptable.c                            | 3 +--
 src/mainboard/pcengines/apu1/platform_cfg.h                       | 3 +--
 src/mainboard/pcengines/apu1/romstage.c                           | 3 +--
 src/mainboard/rca/rm4100/gpio.c                                   | 3 +--
 src/mainboard/rca/rm4100/irq_tables.c                             | 3 +--
 src/mainboard/rca/rm4100/mainboard.c                              | 3 +--
 src/mainboard/rca/rm4100/romstage.c                               | 3 +--
 src/mainboard/rca/rm4100/smihandler.c                             | 3 +--
 src/mainboard/rca/rm4100/spd_table.h                              | 3 +--
 src/mainboard/roda/rk886ex/Makefile.inc                           | 3 +--
 src/mainboard/roda/rk886ex/acpi/battery.asl                       | 3 +--
 src/mainboard/roda/rk886ex/acpi/ec.asl                            | 3 +--
 src/mainboard/roda/rk886ex/acpi/gpe.asl                           | 3 +--
 src/mainboard/roda/rk886ex/acpi/i945_pci_irqs.asl                 | 3 +--
 src/mainboard/roda/rk886ex/acpi/ich7_pci_irqs.asl                 | 3 +--
 src/mainboard/roda/rk886ex/acpi/mainboard.asl                     | 3 +--
 src/mainboard/roda/rk886ex/acpi/platform.asl                      | 3 +--
 src/mainboard/roda/rk886ex/acpi/superio.asl                       | 3 +--
 src/mainboard/roda/rk886ex/acpi/thermal.asl                       | 3 +--
 src/mainboard/roda/rk886ex/acpi_tables.c                          | 3 +--
 src/mainboard/roda/rk886ex/cmos.layout                            | 3 +--
 src/mainboard/roda/rk886ex/devicetree.cb                          | 3 +--
 src/mainboard/roda/rk886ex/dsdt.asl                               | 3 +--
 src/mainboard/roda/rk886ex/irq_tables.c                           | 3 +--
 src/mainboard/roda/rk886ex/m3885.c                                | 3 +--
 src/mainboard/roda/rk886ex/m3885.h                                | 3 +--
 src/mainboard/roda/rk886ex/mainboard.c                            | 3 +--
 src/mainboard/roda/rk886ex/mptable.c                              | 3 +--
 src/mainboard/roda/rk886ex/romstage.c                             | 3 +--
 src/mainboard/roda/rk9/Makefile.inc                               | 3 +--
 src/mainboard/roda/rk9/acpi/battery.asl                           | 3 +--
 src/mainboard/roda/rk9/acpi/ec.asl                                | 3 +--
 src/mainboard/roda/rk9/acpi/gm45_pci_irqs.asl                     | 3 +--
 src/mainboard/roda/rk9/acpi/gpe.asl                               | 3 +--
 src/mainboard/roda/rk9/acpi/ich9_pci_irqs.asl                     | 3 +--
 src/mainboard/roda/rk9/acpi/mainboard.asl                         | 3 +--
 src/mainboard/roda/rk9/acpi/platform.asl                          | 3 +--
 src/mainboard/roda/rk9/acpi/superio.asl                           | 3 +--
 src/mainboard/roda/rk9/acpi/thermal.asl                           | 3 +--
 src/mainboard/roda/rk9/acpi_tables.c                              | 3 +--
 src/mainboard/roda/rk9/cmos.layout                                | 3 +--
 src/mainboard/roda/rk9/cstates.c                                  | 3 +--
 src/mainboard/roda/rk9/dsdt.asl                                   | 3 +--
 src/mainboard/roda/rk9/fadt.c                                     | 3 +--
 src/mainboard/roda/rk9/hda_verb.c                                 | 3 +--
 src/mainboard/roda/rk9/mainboard.c                                | 3 +--
 src/mainboard/roda/rk9/romstage.c                                 | 3 +--
 src/mainboard/roda/rk9/smihandler.c                               | 3 +--
 src/mainboard/roda/rk9/ti_pci7xx1.c                               | 3 +--
 src/mainboard/samsung/lumpy/Makefile.inc                          | 3 +--
 src/mainboard/samsung/lumpy/acpi/chromeos.asl                     | 3 +--
 src/mainboard/samsung/lumpy/acpi/ec.asl                           | 3 +--
 src/mainboard/samsung/lumpy/acpi/mainboard.asl                    | 3 +--
 src/mainboard/samsung/lumpy/acpi/platform.asl                     | 3 +--
 src/mainboard/samsung/lumpy/acpi/superio.asl                      | 3 +--
 src/mainboard/samsung/lumpy/acpi/thermal.asl                      | 3 +--
 src/mainboard/samsung/lumpy/acpi_tables.c                         | 3 +--
 src/mainboard/samsung/lumpy/chromeos.c                            | 3 +--
 src/mainboard/samsung/lumpy/cmos.layout                           | 3 +--
 src/mainboard/samsung/lumpy/dsdt.asl                              | 3 +--
 src/mainboard/samsung/lumpy/ec.c                                  | 3 +--
 src/mainboard/samsung/lumpy/ec.h                                  | 3 +--
 src/mainboard/samsung/lumpy/gpio.h                                | 3 +--
 src/mainboard/samsung/lumpy/hda_verb.c                            | 3 +--
 src/mainboard/samsung/lumpy/mainboard.c                           | 3 +--
 src/mainboard/samsung/lumpy/onboard.h                             | 3 +--
 src/mainboard/samsung/lumpy/romstage.c                            | 3 +--
 src/mainboard/samsung/lumpy/smihandler.c                          | 3 +--
 src/mainboard/samsung/lumpy/thermal.h                             | 3 +--
 src/mainboard/samsung/stumpy/Makefile.inc                         | 3 +--
 src/mainboard/samsung/stumpy/acpi/chromeos.asl                    | 3 +--
 src/mainboard/samsung/stumpy/acpi/mainboard.asl                   | 3 +--
 src/mainboard/samsung/stumpy/acpi/platform.asl                    | 3 +--
 src/mainboard/samsung/stumpy/acpi/superio.asl                     | 3 +--
 src/mainboard/samsung/stumpy/acpi/thermal.asl                     | 3 +--
 src/mainboard/samsung/stumpy/acpi_tables.c                        | 3 +--
 src/mainboard/samsung/stumpy/chromeos.c                           | 3 +--
 src/mainboard/samsung/stumpy/cmos.layout                          | 3 +--
 src/mainboard/samsung/stumpy/dsdt.asl                             | 3 +--
 src/mainboard/samsung/stumpy/gpio.h                               | 3 +--
 src/mainboard/samsung/stumpy/hda_verb.c                           | 3 +--
 src/mainboard/samsung/stumpy/mainboard.c                          | 3 +--
 src/mainboard/samsung/stumpy/romstage.c                           | 3 +--
 src/mainboard/samsung/stumpy/smihandler.c                         | 3 +--
 src/mainboard/samsung/stumpy/thermal.h                            | 3 +--
 src/mainboard/siemens/mc_tcu3/Kconfig                             | 3 +--
 src/mainboard/siemens/mc_tcu3/Makefile.inc                        | 3 +--
 src/mainboard/siemens/mc_tcu3/acpi/mainboard.asl                  | 3 +--
 src/mainboard/siemens/mc_tcu3/acpi_tables.c                       | 3 +--
 src/mainboard/siemens/mc_tcu3/cmos.layout                         | 3 +--
 src/mainboard/siemens/mc_tcu3/devicetree.cb                       | 3 +--
 src/mainboard/siemens/mc_tcu3/dsdt.asl                            | 3 +--
 src/mainboard/siemens/mc_tcu3/fadt.c                              | 3 +--
 src/mainboard/siemens/mc_tcu3/gpio.c                              | 3 +--
 src/mainboard/siemens/mc_tcu3/irqroute.c                          | 3 +--
 src/mainboard/siemens/mc_tcu3/irqroute.h                          | 3 +--
 src/mainboard/siemens/mc_tcu3/lcd_panel.c                         | 3 +--
 src/mainboard/siemens/mc_tcu3/lcd_panel.h                         | 3 +--
 src/mainboard/siemens/mc_tcu3/mainboard.c                         | 3 +--
 src/mainboard/siemens/mc_tcu3/modhwinfo.c                         | 3 +--
 src/mainboard/siemens/mc_tcu3/modhwinfo.h                         | 3 +--
 src/mainboard/siemens/mc_tcu3/ptn3460.c                           | 3 +--
 src/mainboard/siemens/mc_tcu3/ptn3460.h                           | 3 +--
 src/mainboard/siemens/mc_tcu3/romstage.c                          | 3 +--
 src/mainboard/siemens/mc_tcu3/thermal.h                           | 3 +--
 src/mainboard/siemens/sitemp_g1p1/Makefile.inc                    | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/debug.asl                  | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/event.asl                  | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/globutil.asl               | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/ide.asl                    | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl               | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/routing.asl                | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/sata.asl                   | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/statdef.asl                | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl                | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi/usb.asl                    | 3 +--
 src/mainboard/siemens/sitemp_g1p1/acpi_tables.c                   | 3 +--
 src/mainboard/siemens/sitemp_g1p1/cmos.layout                     | 3 +--
 src/mainboard/siemens/sitemp_g1p1/dsdt.asl                        | 3 +--
 src/mainboard/siemens/sitemp_g1p1/fadt.c                          | 3 +--
 src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c                  | 3 +--
 src/mainboard/siemens/sitemp_g1p1/int15_func.c                    | 3 +--
 src/mainboard/siemens/sitemp_g1p1/int15_func.h                    | 3 +--
 src/mainboard/siemens/sitemp_g1p1/irq_tables.c                    | 3 +--
 src/mainboard/siemens/sitemp_g1p1/mainboard.c                     | 3 +--
 src/mainboard/siemens/sitemp_g1p1/mptable.c                       | 3 +--
 src/mainboard/siemens/sitemp_g1p1/resourcemap.c                   | 3 +--
 src/mainboard/siemens/sitemp_g1p1/romstage.c                      | 3 +--
 src/mainboard/soyo/Kconfig                                        | 3 +--
 src/mainboard/soyo/sy-6ba-plus-iii/Kconfig                        | 3 +--
 src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb                  | 3 +--
 src/mainboard/soyo/sy-6ba-plus-iii/irq_tables.c                   | 3 +--
 src/mainboard/soyo/sy-6ba-plus-iii/romstage.c                     | 3 +--
 src/mainboard/supermicro/h8dme/cmos.layout                        | 3 +--
 src/mainboard/supermicro/h8dme/get_bus_conf.c                     | 3 +--
 src/mainboard/supermicro/h8dme/irq_tables.c                       | 3 +--
 src/mainboard/supermicro/h8dme/mptable.c                          | 3 +--
 src/mainboard/supermicro/h8dme/resourcemap.c                      | 3 +--
 src/mainboard/supermicro/h8dme/romstage.c                         | 3 +--
 src/mainboard/supermicro/h8dmr/cmos.layout                        | 3 +--
 src/mainboard/supermicro/h8dmr/get_bus_conf.c                     | 3 +--
 src/mainboard/supermicro/h8dmr/irq_tables.c                       | 3 +--
 src/mainboard/supermicro/h8dmr/mptable.c                          | 3 +--
 src/mainboard/supermicro/h8dmr/resourcemap.c                      | 3 +--
 src/mainboard/supermicro/h8dmr/romstage.c                         | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/cmos.layout                  | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c               | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/irq_tables.c                 | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h                 | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/mptable.c                    | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/resourcemap.c                | 3 +--
 src/mainboard/supermicro/h8dmr_fam10/romstage.c                   | 3 +--
 src/mainboard/supermicro/h8qgi/BiosCallOuts.c                     | 3 +--
 src/mainboard/supermicro/h8qgi/Kconfig                            | 3 +--
 src/mainboard/supermicro/h8qgi/Makefile.inc                       | 3 +--
 src/mainboard/supermicro/h8qgi/OptionsIds.h                       | 3 +--
 src/mainboard/supermicro/h8qgi/acpi/routing.asl                   | 3 +--
 src/mainboard/supermicro/h8qgi/acpi/sata.asl                      | 3 +--
 src/mainboard/supermicro/h8qgi/acpi/usb.asl                       | 3 +--
 src/mainboard/supermicro/h8qgi/acpi_tables.c                      | 3 +--
 src/mainboard/supermicro/h8qgi/buildOpts.c                        | 3 +--
 src/mainboard/supermicro/h8qgi/cmos.layout                        | 3 +--
 src/mainboard/supermicro/h8qgi/devicetree.cb                      | 3 +--
 src/mainboard/supermicro/h8qgi/dsdt.asl                           | 3 +--
 src/mainboard/supermicro/h8qgi/fadt.c                             | 3 +--
 src/mainboard/supermicro/h8qgi/irq_tables.c                       | 3 +--
 src/mainboard/supermicro/h8qgi/mainboard.c                        | 3 +--
 src/mainboard/supermicro/h8qgi/mptable.c                          | 3 +--
 src/mainboard/supermicro/h8qgi/platform_cfg.h                     | 3 +--
 src/mainboard/supermicro/h8qgi/rd890_cfg.c                        | 3 +--
 src/mainboard/supermicro/h8qgi/rd890_cfg.h                        | 3 +--
 src/mainboard/supermicro/h8qgi/romstage.c                         | 3 +--
 src/mainboard/supermicro/h8qgi/sb700_cfg.c                        | 3 +--
 src/mainboard/supermicro/h8qgi/sb700_cfg.h                        | 3 +--
 src/mainboard/supermicro/h8qme_fam10/cmos.layout                  | 3 +--
 src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c               | 3 +--
 src/mainboard/supermicro/h8qme_fam10/irq_tables.c                 | 3 +--
 src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h                 | 3 +--
 src/mainboard/supermicro/h8qme_fam10/mptable.c                    | 3 +--
 src/mainboard/supermicro/h8qme_fam10/resourcemap.c                | 3 +--
 src/mainboard/supermicro/h8qme_fam10/romstage.c                   | 3 +--
 src/mainboard/supermicro/h8scm/BiosCallOuts.c                     | 3 +--
 src/mainboard/supermicro/h8scm/Kconfig                            | 3 +--
 src/mainboard/supermicro/h8scm/Makefile.inc                       | 3 +--
 src/mainboard/supermicro/h8scm/OptionsIds.h                       | 3 +--
 src/mainboard/supermicro/h8scm/acpi/cpstate.asl                   | 3 +--
 src/mainboard/supermicro/h8scm/acpi/ide.asl                       | 3 +--
 src/mainboard/supermicro/h8scm/acpi/routing.asl                   | 3 +--
 src/mainboard/supermicro/h8scm/acpi/sata.asl                      | 3 +--
 src/mainboard/supermicro/h8scm/acpi/usb.asl                       | 3 +--
 src/mainboard/supermicro/h8scm/acpi_tables.c                      | 3 +--
 src/mainboard/supermicro/h8scm/buildOpts.c                        | 3 +--
 src/mainboard/supermicro/h8scm/chip.h                             | 3 +--
 src/mainboard/supermicro/h8scm/cmos.layout                        | 3 +--
 src/mainboard/supermicro/h8scm/devicetree.cb                      | 3 +--
 src/mainboard/supermicro/h8scm/dsdt.asl                           | 3 +--
 src/mainboard/supermicro/h8scm/fadt.c                             | 3 +--
 src/mainboard/supermicro/h8scm/irq_tables.c                       | 3 +--
 src/mainboard/supermicro/h8scm/mainboard.c                        | 3 +--
 src/mainboard/supermicro/h8scm/mptable.c                          | 3 +--
 src/mainboard/supermicro/h8scm/platform_cfg.h                     | 3 +--
 src/mainboard/supermicro/h8scm/rd890_cfg.c                        | 3 +--
 src/mainboard/supermicro/h8scm/rd890_cfg.h                        | 3 +--
 src/mainboard/supermicro/h8scm/romstage.c                         | 3 +--
 src/mainboard/supermicro/h8scm/sb700_cfg.c                        | 3 +--
 src/mainboard/supermicro/h8scm/sb700_cfg.h                        | 3 +--
 src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl             | 3 +--
 src/mainboard/supermicro/h8scm_fam10/acpi/ide.asl                 | 3 +--
 src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl             | 3 +--
 src/mainboard/supermicro/h8scm_fam10/acpi/sata.asl                | 3 +--
 src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl                 | 3 +--
 src/mainboard/supermicro/h8scm_fam10/acpi_tables.c                | 3 +--
 src/mainboard/supermicro/h8scm_fam10/dsdt.asl                     | 3 +--
 src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c               | 3 +--
 src/mainboard/supermicro/h8scm_fam10/irq_tables.c                 | 3 +--
 src/mainboard/supermicro/h8scm_fam10/mainboard.c                  | 3 +--
 src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h                 | 3 +--
 src/mainboard/supermicro/h8scm_fam10/mptable.c                    | 3 +--
 src/mainboard/supermicro/h8scm_fam10/resourcemap.c                | 3 +--
 src/mainboard/supermicro/h8scm_fam10/romstage.c                   | 3 +--
 src/mainboard/supermicro/x7db8/cmos.layout                        | 3 +--
 src/mainboard/supermicro/x7db8/devicetree.cb                      | 3 +--
 src/mainboard/supermicro/x7db8/irq_tables.c                       | 3 +--
 src/mainboard/supermicro/x7db8/mainboard.c                        | 3 +--
 src/mainboard/supermicro/x7db8/romstage.c                         | 3 +--
 src/mainboard/technexion/tim5690/Makefile.inc                     | 3 +--
 src/mainboard/technexion/tim5690/acpi/ide.asl                     | 3 +--
 src/mainboard/technexion/tim5690/acpi/routing.asl                 | 3 +--
 src/mainboard/technexion/tim5690/acpi/sata.asl                    | 3 +--
 src/mainboard/technexion/tim5690/acpi/usb.asl                     | 3 +--
 src/mainboard/technexion/tim5690/acpi_tables.c                    | 3 +--
 src/mainboard/technexion/tim5690/cmos.layout                      | 3 +--
 src/mainboard/technexion/tim5690/dsdt.asl                         | 3 +--
 src/mainboard/technexion/tim5690/fadt.c                           | 3 +--
 src/mainboard/technexion/tim5690/get_bus_conf.c                   | 3 +--
 src/mainboard/technexion/tim5690/irq_tables.c                     | 3 +--
 src/mainboard/technexion/tim5690/mainboard.c                      | 3 +--
 src/mainboard/technexion/tim5690/mptable.c                        | 3 +--
 src/mainboard/technexion/tim5690/resourcemap.c                    | 3 +--
 src/mainboard/technexion/tim5690/romstage.c                       | 3 +--
 src/mainboard/technexion/tim5690/speaker.c                        | 3 +--
 src/mainboard/technexion/tim5690/speaker.h                        | 3 +--
 src/mainboard/technexion/tim5690/tn_post_code.c                   | 3 +--
 src/mainboard/technexion/tim5690/tn_post_code.h                   | 3 +--
 src/mainboard/technexion/tim5690/vgabios.c                        | 3 +--
 src/mainboard/technexion/tim5690/vgabios.h                        | 3 +--
 src/mainboard/technexion/tim8690/acpi/ide.asl                     | 3 +--
 src/mainboard/technexion/tim8690/acpi/routing.asl                 | 3 +--
 src/mainboard/technexion/tim8690/acpi/sata.asl                    | 3 +--
 src/mainboard/technexion/tim8690/acpi/usb.asl                     | 3 +--
 src/mainboard/technexion/tim8690/acpi_tables.c                    | 3 +--
 src/mainboard/technexion/tim8690/cmos.layout                      | 3 +--
 src/mainboard/technexion/tim8690/dsdt.asl                         | 3 +--
 src/mainboard/technexion/tim8690/fadt.c                           | 3 +--
 src/mainboard/technexion/tim8690/get_bus_conf.c                   | 3 +--
 src/mainboard/technexion/tim8690/irq_tables.c                     | 3 +--
 src/mainboard/technexion/tim8690/mainboard.c                      | 3 +--
 src/mainboard/technexion/tim8690/mptable.c                        | 3 +--
 src/mainboard/technexion/tim8690/resourcemap.c                    | 3 +--
 src/mainboard/technexion/tim8690/romstage.c                       | 3 +--
 src/mainboard/thomson/ip1000/gpio.c                               | 3 +--
 src/mainboard/thomson/ip1000/irq_tables.c                         | 3 +--
 src/mainboard/thomson/ip1000/mainboard.c                          | 3 +--
 src/mainboard/thomson/ip1000/romstage.c                           | 3 +--
 src/mainboard/thomson/ip1000/smihandler.c                         | 3 +--
 src/mainboard/thomson/ip1000/spd_table.h                          | 3 +--
 src/mainboard/ti/Kconfig                                          | 3 +--
 src/mainboard/ti/beaglebone/Kconfig                               | 3 +--
 src/mainboard/ti/beaglebone/Makefile.inc                          | 3 +--
 src/mainboard/ti/beaglebone/bootblock.c                           | 3 +--
 src/mainboard/ti/beaglebone/devicetree.cb                         | 3 +--
 src/mainboard/ti/beaglebone/romstage.c                            | 3 +--
 src/mainboard/traverse/geos/irq_tables.c                          | 3 +--
 src/mainboard/traverse/geos/mainboard.c                           | 3 +--
 src/mainboard/traverse/geos/romstage.c                            | 3 +--
 src/mainboard/tyan/Kconfig                                        | 3 +--
 src/mainboard/tyan/s1846/Kconfig                                  | 3 +--
 src/mainboard/tyan/s1846/romstage.c                               | 3 +--
 src/mainboard/tyan/s2891/dsdt.asl                                 | 3 +--
 src/mainboard/tyan/s2892/dsdt.asl                                 | 3 +--
 src/mainboard/tyan/s2895/dsdt.asl                                 | 3 +--
 src/mainboard/tyan/s2912/cmos.layout                              | 3 +--
 src/mainboard/tyan/s2912/get_bus_conf.c                           | 3 +--
 src/mainboard/tyan/s2912/irq_tables.c                             | 3 +--
 src/mainboard/tyan/s2912/mb_sysconf.h                             | 3 +--
 src/mainboard/tyan/s2912/mptable.c                                | 3 +--
 src/mainboard/tyan/s2912/resourcemap.c                            | 3 +--
 src/mainboard/tyan/s2912/romstage.c                               | 3 +--
 src/mainboard/tyan/s2912_fam10/cmos.layout                        | 3 +--
 src/mainboard/tyan/s2912_fam10/get_bus_conf.c                     | 3 +--
 src/mainboard/tyan/s2912_fam10/irq_tables.c                       | 3 +--
 src/mainboard/tyan/s2912_fam10/mb_sysconf.h                       | 3 +--
 src/mainboard/tyan/s2912_fam10/mptable.c                          | 3 +--
 src/mainboard/tyan/s2912_fam10/resourcemap.c                      | 3 +--
 src/mainboard/tyan/s2912_fam10/romstage.c                         | 3 +--
 src/mainboard/tyan/s8226/BiosCallOuts.c                           | 3 +--
 src/mainboard/tyan/s8226/Kconfig                                  | 3 +--
 src/mainboard/tyan/s8226/Makefile.inc                             | 3 +--
 src/mainboard/tyan/s8226/OptionsIds.h                             | 3 +--
 src/mainboard/tyan/s8226/acpi/routing.asl                         | 3 +--
 src/mainboard/tyan/s8226/acpi/sata.asl                            | 3 +--
 src/mainboard/tyan/s8226/acpi/usb.asl                             | 3 +--
 src/mainboard/tyan/s8226/acpi_tables.c                            | 3 +--
 src/mainboard/tyan/s8226/buildOpts.c                              | 3 +--
 src/mainboard/tyan/s8226/cmos.layout                              | 3 +--
 src/mainboard/tyan/s8226/devicetree.cb                            | 3 +--
 src/mainboard/tyan/s8226/dsdt.asl                                 | 3 +--
 src/mainboard/tyan/s8226/fadt.c                                   | 3 +--
 src/mainboard/tyan/s8226/irq_tables.c                             | 3 +--
 src/mainboard/tyan/s8226/mainboard.c                              | 3 +--
 src/mainboard/tyan/s8226/mptable.c                                | 3 +--
 src/mainboard/tyan/s8226/platform_cfg.h                           | 3 +--
 src/mainboard/tyan/s8226/rd890_cfg.c                              | 3 +--
 src/mainboard/tyan/s8226/rd890_cfg.h                              | 3 +--
 src/mainboard/tyan/s8226/romstage.c                               | 3 +--
 src/mainboard/tyan/s8226/sb700_cfg.c                              | 3 +--
 src/mainboard/tyan/s8226/sb700_cfg.h                              | 3 +--
 src/mainboard/via/epia-cn/irq_tables.c                            | 3 +--
 src/mainboard/via/epia-cn/romstage.c                              | 3 +--
 src/mainboard/via/epia-m700/acpi_tables.c                         | 3 +--
 src/mainboard/via/epia-m700/driving_clk_phase_data.c              | 3 +--
 src/mainboard/via/epia-m700/fadt.c                                | 3 +--
 src/mainboard/via/epia-m700/get_dsdt                              | 3 +--
 src/mainboard/via/epia-m700/irq_tables.c                          | 3 +--
 src/mainboard/via/epia-m700/romstage.c                            | 3 +--
 src/mainboard/via/epia-m700/wakeup.c                              | 3 +--
 src/mainboard/via/epia-m700/wakeup.h                              | 3 +--
 src/mainboard/via/pc2500e/cmos.layout                             | 3 +--
 src/mainboard/via/pc2500e/irq_tables.c                            | 3 +--
 src/mainboard/via/pc2500e/mptable.c                               | 3 +--
 src/mainboard/via/pc2500e/romstage.c                              | 3 +--
 src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl                 | 3 +--
 src/mainboard/via/vt8454c/acpi/irq.asl                            | 3 +--
 src/mainboard/via/vt8454c/acpi_tables.c                           | 3 +--
 src/mainboard/via/vt8454c/cmos.layout                             | 3 +--
 src/mainboard/via/vt8454c/dsdt.asl                                | 3 +--
 src/mainboard/via/vt8454c/fadt.c                                  | 3 +--
 src/mainboard/via/vt8454c/irq_tables.c                            | 3 +--
 src/mainboard/via/vt8454c/mptable.c                               | 3 +--
 src/mainboard/via/vt8454c/romstage.c                              | 3 +--
 src/mainboard/winent/Kconfig                                      | 3 +--
 src/mainboard/winent/mb6047/dsdt.asl                              | 3 +--
 src/mainboard/winent/pl6064/irq_tables.c                          | 3 +--
 src/mainboard/winent/pl6064/mainboard.c                           | 3 +--
 src/mainboard/winent/pl6064/romstage.c                            | 3 +--
 src/mainboard/wyse/Kconfig                                        | 3 +--
 src/mainboard/wyse/s50/Kconfig                                    | 3 +--
 src/mainboard/wyse/s50/cmos.layout                                | 3 +--
 src/mainboard/wyse/s50/devicetree.cb                              | 3 +--
 src/mainboard/wyse/s50/irq_tables.c                               | 3 +--
 src/mainboard/wyse/s50/mainboard.c                                | 3 +--
 src/mainboard/wyse/s50/romstage.c                                 | 3 +--
 src/northbridge/amd/agesa/BiosCallOuts.h                          | 3 +--
 src/northbridge/amd/agesa/Kconfig                                 | 3 +--
 src/northbridge/amd/agesa/Makefile.inc                            | 3 +--
 src/northbridge/amd/agesa/agesawrapper.c                          | 3 +--
 src/northbridge/amd/agesa/agesawrapper.h                          | 3 +--
 src/northbridge/amd/agesa/common/Makefile.inc                     | 3 +--
 src/northbridge/amd/agesa/common/common.c                         | 3 +--
 src/northbridge/amd/agesa/common/common.h                         | 3 +--
 src/northbridge/amd/agesa/def_callouts.c                          | 3 +--
 src/northbridge/amd/agesa/dimmSpd.h                               | 3 +--
 src/northbridge/amd/agesa/eventlog.c                              | 3 +--
 src/northbridge/amd/agesa/family10/Kconfig                        | 3 +--
 src/northbridge/amd/agesa/family10/Makefile.inc                   | 3 +--
 src/northbridge/amd/agesa/family10/amdfam10.h                     | 3 +--
 src/northbridge/amd/agesa/family10/northbridge.c                  | 3 +--
 src/northbridge/amd/agesa/family10/reset_test.h                   | 3 +--
 src/northbridge/amd/agesa/family12/Kconfig                        | 3 +--
 src/northbridge/amd/agesa/family12/Makefile.inc                   | 3 +--
 src/northbridge/amd/agesa/family12/amdfam12_conf.c                | 3 +--
 src/northbridge/amd/agesa/family12/northbridge.c                  | 3 +--
 src/northbridge/amd/agesa/family14/Kconfig                        | 3 +--
 src/northbridge/amd/agesa/family14/Makefile.inc                   | 3 +--
 src/northbridge/amd/agesa/family14/acpi/northbridge.asl           | 3 +--
 src/northbridge/amd/agesa/family14/amdfam14_conf.c                | 3 +--
 src/northbridge/amd/agesa/family14/chip.h                         | 3 +--
 src/northbridge/amd/agesa/family14/dimmSpd.c                      | 3 +--
 src/northbridge/amd/agesa/family14/northbridge.c                  | 3 +--
 src/northbridge/amd/agesa/family14/pci_devs.h                     | 3 +--
 src/northbridge/amd/agesa/family15/Kconfig                        | 3 +--
 src/northbridge/amd/agesa/family15/Makefile.inc                   | 3 +--
 src/northbridge/amd/agesa/family15/chip.h                         | 3 +--
 src/northbridge/amd/agesa/family15/dimmSpd.c                      | 3 +--
 src/northbridge/amd/agesa/family15/northbridge.c                  | 3 +--
 src/northbridge/amd/agesa/family15rl/Kconfig                      | 3 +--
 src/northbridge/amd/agesa/family15rl/Makefile.inc                 | 3 +--
 src/northbridge/amd/agesa/family15rl/acpi/northbridge.asl         | 3 +--
 src/northbridge/amd/agesa/family15rl/chip.h                       | 3 +--
 src/northbridge/amd/agesa/family15rl/dimmSpd.c                    | 3 +--
 src/northbridge/amd/agesa/family15rl/iommu.c                      | 3 +--
 src/northbridge/amd/agesa/family15rl/northbridge.c                | 3 +--
 src/northbridge/amd/agesa/family15tn/Kconfig                      | 3 +--
 src/northbridge/amd/agesa/family15tn/Makefile.inc                 | 3 +--
 src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl         | 3 +--
 src/northbridge/amd/agesa/family15tn/chip.h                       | 3 +--
 src/northbridge/amd/agesa/family15tn/dimmSpd.c                    | 3 +--
 src/northbridge/amd/agesa/family15tn/iommu.c                      | 3 +--
 src/northbridge/amd/agesa/family15tn/northbridge.c                | 3 +--
 src/northbridge/amd/agesa/family15tn/pci_devs.h                   | 3 +--
 src/northbridge/amd/agesa/family16kb/Kconfig                      | 3 +--
 src/northbridge/amd/agesa/family16kb/Makefile.inc                 | 3 +--
 src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl         | 3 +--
 src/northbridge/amd/agesa/family16kb/chip.h                       | 3 +--
 src/northbridge/amd/agesa/family16kb/dimmSpd.c                    | 3 +--
 src/northbridge/amd/agesa/family16kb/northbridge.c                | 3 +--
 src/northbridge/amd/agesa/family16kb/pci_devs.h                   | 3 +--
 src/northbridge/amd/agesa/oem_s3.c                                | 3 +--
 src/northbridge/amd/amdfam10/Kconfig                              | 3 +--
 src/northbridge/amd/amdfam10/acpi.c                               | 3 +--
 src/northbridge/amd/amdfam10/amdfam10.h                           | 3 +--
 src/northbridge/amd/amdfam10/amdfam10_util.asl                    | 3 +--
 src/northbridge/amd/amdfam10/amdfam10_util.c                      | 3 +--
 src/northbridge/amd/amdfam10/chip.h                               | 3 +--
 src/northbridge/amd/amdfam10/debug.c                              | 3 +--
 src/northbridge/amd/amdfam10/early_ht.c                           | 3 +--
 src/northbridge/amd/amdfam10/get_pci1234.c                        | 3 +--
 src/northbridge/amd/amdfam10/ht_config.c                          | 3 +--
 src/northbridge/amd/amdfam10/ht_config.h                          | 3 +--
 src/northbridge/amd/amdfam10/misc_control.c                       | 3 +--
 src/northbridge/amd/amdfam10/northbridge.c                        | 3 +--
 src/northbridge/amd/amdfam10/northbridge.h                        | 3 +--
 src/northbridge/amd/amdfam10/nums.h                               | 3 +--
 src/northbridge/amd/amdfam10/pci.c                                | 3 +--
 src/northbridge/amd/amdfam10/raminit.h                            | 3 +--
 src/northbridge/amd/amdfam10/raminit_amdmct.c                     | 3 +--
 src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c             | 3 +--
 src/northbridge/amd/amdfam10/reset_test.c                         | 3 +--
 src/northbridge/amd/amdfam10/resourcemap.c                        | 3 +--
 src/northbridge/amd/amdfam10/setup_resource_map.c                 | 3 +--
 src/northbridge/amd/amdfam10/thermal_mixin.asl                    | 3 +--
 src/northbridge/amd/amdfam10/util.c                               | 3 +--
 src/northbridge/amd/amdht/AsPsDefs.h                              | 3 +--
 src/northbridge/amd/amdht/AsPsNb.c                                | 3 +--
 src/northbridge/amd/amdht/AsPsNb.h                                | 3 +--
 src/northbridge/amd/amdht/comlib.c                                | 3 +--
 src/northbridge/amd/amdht/comlib.h                                | 3 +--
 src/northbridge/amd/amdht/h3ffeat.h                               | 3 +--
 src/northbridge/amd/amdht/h3finit.c                               | 3 +--
 src/northbridge/amd/amdht/h3finit.h                               | 3 +--
 src/northbridge/amd/amdht/h3gtopo.h                               | 3 +--
 src/northbridge/amd/amdht/h3ncmn.c                                | 3 +--
 src/northbridge/amd/amdht/h3ncmn.h                                | 3 +--
 src/northbridge/amd/amdht/ht_wrapper.c                            | 3 +--
 src/northbridge/amd/amdht/porting.h                               | 3 +--
 src/northbridge/amd/amdk8/Kconfig                                 | 3 +--
 src/northbridge/amd/amdk8/acpi.c                                  | 3 +--
 src/northbridge/amd/amdk8/acpi.h                                  | 3 +--
 src/northbridge/amd/amdk8/exit_from_self.c                        | 3 +--
 src/northbridge/amd/amdk8/get_sblk_pci1234.c                      | 3 +--
 src/northbridge/amd/amdk8/raminit_f.c                             | 3 +--
 src/northbridge/amd/amdk8/raminit_f_dqs.c                         | 3 +--
 src/northbridge/amd/amdk8/thermal_mixin.asl                       | 3 +--
 src/northbridge/amd/amdk8/util.c                                  | 3 +--
 src/northbridge/amd/amdmct/amddefs.h                              | 3 +--
 src/northbridge/amd/amdmct/mct/mct.h                              | 3 +--
 src/northbridge/amd/amdmct/mct/mct_d.c                            | 3 +--
 src/northbridge/amd/amdmct/mct/mct_d.h                            | 3 +--
 src/northbridge/amd/amdmct/mct/mct_d_gcc.h                        | 3 +--
 src/northbridge/amd/amdmct/mct/mctardk3.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctardk4.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctchi_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctcsi_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctdqs_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctecc_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctgr.c                            | 3 +--
 src/northbridge/amd/amdmct/mct/mcthdi.c                           | 3 +--
 src/northbridge/amd/amdmct/mct/mctmtr_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctndi_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctpro_d.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctsrc.c                           | 3 +--
 src/northbridge/amd/amdmct/mct/mctsrc1p.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mctsrc2p.c                         | 3 +--
 src/northbridge/amd/amdmct/mct/mcttmrl.c                          | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mct_d.c                       | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mct_d.h                       | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h                   | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctardk6.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c                      | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c                      | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctprob.c                     | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctproc.c                     | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctrci.c                      | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c                      | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c                      | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctsrc2p.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c                     | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mctwl.c                       | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c                     | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/modtrd.c                      | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mport_d.c                     | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c                    | 3 +--
 src/northbridge/amd/amdmct/mct_ddr3/mwlc_d.h                      | 3 +--
 src/northbridge/amd/amdmct/wrappers/mcti.h                        | 3 +--
 src/northbridge/amd/amdmct/wrappers/mcti_d.c                      | 3 +--
 src/northbridge/amd/cimx/Kconfig                                  | 3 +--
 src/northbridge/amd/cimx/Makefile.inc                             | 3 +--
 src/northbridge/amd/cimx/rd890/Kconfig                            | 3 +--
 src/northbridge/amd/cimx/rd890/Makefile.inc                       | 3 +--
 src/northbridge/amd/cimx/rd890/NbPlatform.h                       | 3 +--
 src/northbridge/amd/cimx/rd890/amd.h                              | 3 +--
 src/northbridge/amd/cimx/rd890/chip.h                             | 3 +--
 src/northbridge/amd/cimx/rd890/early.c                            | 3 +--
 src/northbridge/amd/cimx/rd890/late.c                             | 3 +--
 src/northbridge/amd/cimx/rd890/nb_cimx.h                          | 3 +--
 src/northbridge/amd/gx2/Kconfig                                   | 3 +--
 src/northbridge/amd/gx2/grphinit.c                                | 3 +--
 src/northbridge/amd/gx2/northbridge.c                             | 3 +--
 src/northbridge/amd/gx2/northbridgeinit.c                         | 3 +--
 src/northbridge/amd/gx2/pll_reset.c                               | 3 +--
 src/northbridge/amd/gx2/raminit.c                                 | 3 +--
 src/northbridge/amd/lx/grphinit.c                                 | 3 +--
 src/northbridge/amd/lx/northbridge.c                              | 3 +--
 src/northbridge/amd/lx/northbridge.h                              | 3 +--
 src/northbridge/amd/lx/northbridgeinit.c                          | 3 +--
 src/northbridge/amd/lx/pll_reset.c                                | 3 +--
 src/northbridge/amd/lx/raminit.c                                  | 3 +--
 src/northbridge/amd/lx/raminit.h                                  | 3 +--
 src/northbridge/amd/pi/00630F01/Kconfig                           | 3 +--
 src/northbridge/amd/pi/00630F01/Makefile.inc                      | 3 +--
 src/northbridge/amd/pi/00630F01/acpi/northbridge.asl              | 3 +--
 src/northbridge/amd/pi/00630F01/chip.h                            | 3 +--
 src/northbridge/amd/pi/00630F01/dimmSpd.c                         | 3 +--
 src/northbridge/amd/pi/00630F01/iommu.c                           | 3 +--
 src/northbridge/amd/pi/00630F01/northbridge.c                     | 3 +--
 src/northbridge/amd/pi/00630F01/northbridge.h                     | 3 +--
 src/northbridge/amd/pi/00630F01/pci_devs.h                        | 3 +--
 src/northbridge/amd/pi/00660F01/Kconfig                           | 3 +--
 src/northbridge/amd/pi/00660F01/Makefile.inc                      | 3 +--
 src/northbridge/amd/pi/00660F01/acpi/northbridge.asl              | 3 +--
 src/northbridge/amd/pi/00660F01/chip.h                            | 3 +--
 src/northbridge/amd/pi/00660F01/dimmSpd.c                         | 3 +--
 src/northbridge/amd/pi/00660F01/northbridge.c                     | 3 +--
 src/northbridge/amd/pi/00660F01/northbridge.h                     | 3 +--
 src/northbridge/amd/pi/00730F01/Kconfig                           | 3 +--
 src/northbridge/amd/pi/00730F01/Makefile.inc                      | 3 +--
 src/northbridge/amd/pi/00730F01/acpi/northbridge.asl              | 3 +--
 src/northbridge/amd/pi/00730F01/chip.h                            | 3 +--
 src/northbridge/amd/pi/00730F01/dimmSpd.c                         | 3 +--
 src/northbridge/amd/pi/00730F01/northbridge.c                     | 3 +--
 src/northbridge/amd/pi/00730F01/northbridge.h                     | 3 +--
 src/northbridge/amd/pi/BiosCallOuts.h                             | 3 +--
 src/northbridge/amd/pi/Kconfig                                    | 3 +--
 src/northbridge/amd/pi/Makefile.inc                               | 3 +--
 src/northbridge/amd/pi/agesawrapper.c                             | 3 +--
 src/northbridge/amd/pi/agesawrapper.h                             | 3 +--
 src/northbridge/amd/pi/agesawrapper_call.h                        | 3 +--
 src/northbridge/amd/pi/def_callouts.c                             | 3 +--
 src/northbridge/amd/pi/dimmSpd.h                                  | 3 +--
 src/northbridge/dmp/vortex86ex/Kconfig                            | 3 +--
 src/northbridge/dmp/vortex86ex/Makefile.inc                       | 3 +--
 src/northbridge/dmp/vortex86ex/chip.h                             | 3 +--
 src/northbridge/dmp/vortex86ex/northbridge.c                      | 3 +--
 src/northbridge/dmp/vortex86ex/northbridge.h                      | 3 +--
 src/northbridge/dmp/vortex86ex/raminit.c                          | 3 +--
 src/northbridge/dmp/vortex86ex/xgi_oprom.c                        | 3 +--
 src/northbridge/intel/e7501/e7501.h                               | 3 +--
 src/northbridge/intel/e7505/Kconfig                               | 3 +--
 src/northbridge/intel/e7505/e7505.h                               | 3 +--
 src/northbridge/intel/gm45/Kconfig                                | 3 +--
 src/northbridge/intel/gm45/Makefile.inc                           | 3 +--
 src/northbridge/intel/gm45/acpi.c                                 | 3 +--
 src/northbridge/intel/gm45/acpi/gm45.asl                          | 3 +--
 src/northbridge/intel/gm45/acpi/hostbridge.asl                    | 3 +--
 src/northbridge/intel/gm45/acpi/peg.asl                           | 3 +--
 src/northbridge/intel/gm45/chip.h                                 | 3 +--
 src/northbridge/intel/gm45/delay.c                                | 3 +--
 src/northbridge/intel/gm45/delay.h                                | 3 +--
 src/northbridge/intel/gm45/early_init.c                           | 3 +--
 src/northbridge/intel/gm45/early_reset.c                          | 3 +--
 src/northbridge/intel/gm45/gm45.h                                 | 3 +--
 src/northbridge/intel/gm45/gma.c                                  | 3 +--
 src/northbridge/intel/gm45/igd.c                                  | 3 +--
 src/northbridge/intel/gm45/iommu.c                                | 3 +--
 src/northbridge/intel/gm45/northbridge.c                          | 3 +--
 src/northbridge/intel/gm45/pcie.c                                 | 3 +--
 src/northbridge/intel/gm45/pm.c                                   | 3 +--
 src/northbridge/intel/gm45/ram_calc.c                             | 3 +--
 src/northbridge/intel/gm45/raminit.c                              | 3 +--
 src/northbridge/intel/gm45/raminit_rcomp_calibration.c            | 3 +--
 src/northbridge/intel/gm45/raminit_read_write_training.c          | 3 +--
 src/northbridge/intel/gm45/raminit_receive_enable_calibration.c   | 3 +--
 src/northbridge/intel/gm45/thermal.c                              | 3 +--
 src/northbridge/intel/haswell/Kconfig                             | 3 +--
 src/northbridge/intel/haswell/Makefile.inc                        | 3 +--
 src/northbridge/intel/haswell/acpi.c                              | 3 +--
 src/northbridge/intel/haswell/acpi/haswell.asl                    | 3 +--
 src/northbridge/intel/haswell/acpi/hostbridge.asl                 | 3 +--
 src/northbridge/intel/haswell/chip.h                              | 3 +--
 src/northbridge/intel/haswell/early_init.c                        | 3 +--
 src/northbridge/intel/haswell/finalize.c                          | 3 +--
 src/northbridge/intel/haswell/gma.c                               | 3 +--
 src/northbridge/intel/haswell/gma.h                               | 3 +--
 src/northbridge/intel/haswell/haswell.h                           | 3 +--
 src/northbridge/intel/haswell/minihd.c                            | 3 +--
 src/northbridge/intel/haswell/mrccache.c                          | 3 +--
 src/northbridge/intel/haswell/northbridge.c                       | 3 +--
 src/northbridge/intel/haswell/ram_calc.c                          | 3 +--
 src/northbridge/intel/haswell/raminit.c                           | 3 +--
 src/northbridge/intel/haswell/raminit.h                           | 3 +--
 src/northbridge/intel/haswell/report_platform.c                   | 3 +--
 src/northbridge/intel/i3100/chip.h                                | 3 +--
 src/northbridge/intel/i3100/ep80579.h                             | 3 +--
 src/northbridge/intel/i3100/i3100.h                               | 3 +--
 src/northbridge/intel/i3100/memory_initialized.c                  | 3 +--
 src/northbridge/intel/i3100/northbridge.c                         | 3 +--
 src/northbridge/intel/i3100/pciexp_porta.c                        | 3 +--
 src/northbridge/intel/i3100/pciexp_porta_ep80579.c                | 3 +--
 src/northbridge/intel/i3100/raminit.c                             | 3 +--
 src/northbridge/intel/i3100/raminit.h                             | 3 +--
 src/northbridge/intel/i3100/raminit_ep80579.c                     | 3 +--
 src/northbridge/intel/i3100/raminit_ep80579.h                     | 3 +--
 src/northbridge/intel/i440bx/Kconfig                              | 3 +--
 src/northbridge/intel/i440bx/Makefile.inc                         | 3 +--
 src/northbridge/intel/i440bx/acpi/sb_pci0_crs.asl                 | 3 +--
 src/northbridge/intel/i440bx/i440bx.h                             | 3 +--
 src/northbridge/intel/i440bx/northbridge.h                        | 3 +--
 src/northbridge/intel/i440bx/raminit.c                            | 3 +--
 src/northbridge/intel/i440bx/raminit.h                            | 3 +--
 src/northbridge/intel/i440lx/Kconfig                              | 3 +--
 src/northbridge/intel/i440lx/Makefile.inc                         | 3 +--
 src/northbridge/intel/i440lx/i440lx.h                             | 3 +--
 src/northbridge/intel/i440lx/northbridge.c                        | 3 +--
 src/northbridge/intel/i440lx/northbridge.h                        | 3 +--
 src/northbridge/intel/i440lx/raminit.c                            | 3 +--
 src/northbridge/intel/i440lx/raminit.h                            | 3 +--
 src/northbridge/intel/i5000/Kconfig                               | 3 +--
 src/northbridge/intel/i5000/Makefile.inc                          | 3 +--
 src/northbridge/intel/i5000/northbridge.c                         | 3 +--
 src/northbridge/intel/i5000/raminit.c                             | 3 +--
 src/northbridge/intel/i5000/raminit.h                             | 3 +--
 src/northbridge/intel/i82810/Kconfig                              | 3 +--
 src/northbridge/intel/i82810/Makefile.inc                         | 3 +--
 src/northbridge/intel/i82810/i82810.h                             | 3 +--
 src/northbridge/intel/i82810/northbridge.c                        | 3 +--
 src/northbridge/intel/i82810/northbridge.h                        | 3 +--
 src/northbridge/intel/i82810/raminit.c                            | 3 +--
 src/northbridge/intel/i82810/raminit.h                            | 3 +--
 src/northbridge/intel/i82830/i82830.h                             | 3 +--
 src/northbridge/intel/i82830/memory_initialized.c                 | 3 +--
 src/northbridge/intel/i82830/northbridge.c                        | 3 +--
 src/northbridge/intel/i82830/raminit.c                            | 3 +--
 src/northbridge/intel/i82830/raminit.h                            | 3 +--
 src/northbridge/intel/i82830/smihandler.c                         | 3 +--
 src/northbridge/intel/i82830/vga.c                                | 3 +--
 src/northbridge/intel/i855/debug.c                                | 3 +--
 src/northbridge/intel/i855/i855.h                                 | 3 +--
 src/northbridge/intel/i855/northbridge.c                          | 3 +--
 src/northbridge/intel/i855/raminit.c                              | 3 +--
 src/northbridge/intel/i855/raminit.h                              | 3 +--
 src/northbridge/intel/i855/reset_test.c                           | 3 +--
 src/northbridge/intel/i945/Kconfig                                | 3 +--
 src/northbridge/intel/i945/Makefile.inc                           | 3 +--
 src/northbridge/intel/i945/acpi.c                                 | 3 +--
 src/northbridge/intel/i945/acpi/hostbridge.asl                    | 3 +--
 src/northbridge/intel/i945/acpi/i945.asl                          | 3 +--
 src/northbridge/intel/i945/acpi/igd.asl                           | 3 +--
 src/northbridge/intel/i945/acpi/peg.asl                           | 3 +--
 src/northbridge/intel/i945/debug.c                                | 3 +--
 src/northbridge/intel/i945/early_init.c                           | 3 +--
 src/northbridge/intel/i945/errata.c                               | 3 +--
 src/northbridge/intel/i945/gma.c                                  | 3 +--
 src/northbridge/intel/i945/i945.h                                 | 3 +--
 src/northbridge/intel/i945/northbridge.c                          | 3 +--
 src/northbridge/intel/i945/ram_calc.c                             | 3 +--
 src/northbridge/intel/i945/raminit.c                              | 3 +--
 src/northbridge/intel/i945/raminit.h                              | 3 +--
 src/northbridge/intel/i945/rcven.c                                | 3 +--
 src/northbridge/intel/i945/udelay.c                               | 3 +--
 src/northbridge/intel/nehalem/Kconfig                             | 3 +--
 src/northbridge/intel/nehalem/Makefile.inc                        | 3 +--
 src/northbridge/intel/nehalem/acpi.c                              | 3 +--
 src/northbridge/intel/nehalem/acpi/hostbridge.asl                 | 3 +--
 src/northbridge/intel/nehalem/acpi/nehalem.asl                    | 3 +--
 src/northbridge/intel/nehalem/chip.h                              | 3 +--
 src/northbridge/intel/nehalem/early_init.c                        | 3 +--
 src/northbridge/intel/nehalem/finalize.c                          | 3 +--
 src/northbridge/intel/nehalem/gma.c                               | 3 +--
 src/northbridge/intel/nehalem/gma.h                               | 3 +--
 src/northbridge/intel/nehalem/nehalem.h                           | 3 +--
 src/northbridge/intel/nehalem/northbridge.c                       | 3 +--
 src/northbridge/intel/nehalem/ram_calc.c                          | 3 +--
 src/northbridge/intel/nehalem/raminit.c                           | 3 +--
 src/northbridge/intel/nehalem/raminit.h                           | 3 +--
 src/northbridge/intel/nehalem/raminit_tables.c                    | 3 +--
 src/northbridge/intel/sandybridge/Kconfig                         | 3 +--
 src/northbridge/intel/sandybridge/Makefile.inc                    | 3 +--
 src/northbridge/intel/sandybridge/acpi.c                          | 3 +--
 src/northbridge/intel/sandybridge/acpi/hostbridge.asl             | 3 +--
 src/northbridge/intel/sandybridge/acpi/sandybridge.asl            | 3 +--
 src/northbridge/intel/sandybridge/chip.h                          | 3 +--
 src/northbridge/intel/sandybridge/early_init.c                    | 3 +--
 src/northbridge/intel/sandybridge/finalize.c                      | 3 +--
 src/northbridge/intel/sandybridge/gma.c                           | 3 +--
 src/northbridge/intel/sandybridge/gma.h                           | 3 +--
 src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c            | 3 +--
 src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c          | 3 +--
 src/northbridge/intel/sandybridge/mrccache.c                      | 3 +--
 src/northbridge/intel/sandybridge/northbridge.c                   | 3 +--
 src/northbridge/intel/sandybridge/ram_calc.c                      | 3 +--
 src/northbridge/intel/sandybridge/raminit.c                       | 3 +--
 src/northbridge/intel/sandybridge/raminit.h                       | 3 +--
 src/northbridge/intel/sandybridge/raminit_mrc.c                   | 3 +--
 src/northbridge/intel/sandybridge/raminit_native.h                | 3 +--
 src/northbridge/intel/sandybridge/report_platform.c               | 3 +--
 src/northbridge/intel/sandybridge/romstage.c                      | 3 +--
 src/northbridge/intel/sandybridge/sandybridge.h                   | 3 +--
 src/northbridge/intel/sandybridge/udelay.c                        | 3 +--
 src/northbridge/intel/sch/Kconfig                                 | 3 +--
 src/northbridge/intel/sch/Makefile.inc                            | 3 +--
 src/northbridge/intel/sch/acpi.c                                  | 3 +--
 src/northbridge/intel/sch/acpi/hostbridge.asl                     | 3 +--
 src/northbridge/intel/sch/acpi/igd.asl                            | 3 +--
 src/northbridge/intel/sch/acpi/peg.asl                            | 3 +--
 src/northbridge/intel/sch/acpi/sch.asl                            | 3 +--
 src/northbridge/intel/sch/chip.h                                  | 3 +--
 src/northbridge/intel/sch/early_init.c                            | 3 +--
 src/northbridge/intel/sch/gma.c                                   | 3 +--
 src/northbridge/intel/sch/northbridge.c                           | 3 +--
 src/northbridge/intel/sch/nvs.h                                   | 3 +--
 src/northbridge/intel/sch/port_access.c                           | 3 +--
 src/northbridge/intel/sch/raminit.c                               | 3 +--
 src/northbridge/intel/sch/raminit.h                               | 3 +--
 src/northbridge/intel/sch/sch.h                                   | 3 +--
 src/northbridge/rdc/r8610/Makefile.inc                            | 3 +--
 src/northbridge/rdc/r8610/northbridge.c                           | 3 +--
 src/northbridge/via/cn700/Makefile.inc                            | 3 +--
 src/northbridge/via/cn700/agp.c                                   | 3 +--
 src/northbridge/via/cn700/cn700.h                                 | 3 +--
 src/northbridge/via/cn700/northbridge.c                           | 3 +--
 src/northbridge/via/cn700/northbridge.h                           | 3 +--
 src/northbridge/via/cn700/raminit.c                               | 3 +--
 src/northbridge/via/cn700/raminit.h                               | 3 +--
 src/northbridge/via/cn700/vga.c                                   | 3 +--
 src/northbridge/via/cx700/Makefile.inc                            | 3 +--
 src/northbridge/via/cx700/agp.c                                   | 3 +--
 src/northbridge/via/cx700/early_serial.c                          | 3 +--
 src/northbridge/via/cx700/early_smbus.c                           | 3 +--
 src/northbridge/via/cx700/lpc.c                                   | 3 +--
 src/northbridge/via/cx700/northbridge.c                           | 3 +--
 src/northbridge/via/cx700/raminit.c                               | 3 +--
 src/northbridge/via/cx700/raminit.h                               | 3 +--
 src/northbridge/via/cx700/registers.h                             | 3 +--
 src/northbridge/via/cx700/reset.c                                 | 3 +--
 src/northbridge/via/cx700/sata.c                                  | 3 +--
 src/northbridge/via/cx700/usb.c                                   | 3 +--
 src/northbridge/via/cx700/vga.c                                   | 3 +--
 src/northbridge/via/vx800/Makefile.inc                            | 3 +--
 src/northbridge/via/vx800/clk_ctrl.c                              | 3 +--
 src/northbridge/via/vx800/detection.c                             | 3 +--
 src/northbridge/via/vx800/dev_init.c                              | 3 +--
 src/northbridge/via/vx800/dqs_search.c                            | 3 +--
 src/northbridge/via/vx800/dram_init.c                             | 3 +--
 src/northbridge/via/vx800/dram_init.h                             | 3 +--
 src/northbridge/via/vx800/dram_util.c                             | 3 +--
 src/northbridge/via/vx800/dram_util.h                             | 3 +--
 src/northbridge/via/vx800/drdy_bl.c                               | 3 +--
 src/northbridge/via/vx800/driving_clk_phase_data.h                | 3 +--
 src/northbridge/via/vx800/driving_setting.c                       | 3 +--
 src/northbridge/via/vx800/early_serial.c                          | 3 +--
 src/northbridge/via/vx800/early_smbus.c                           | 3 +--
 src/northbridge/via/vx800/final_setting.c                         | 3 +--
 src/northbridge/via/vx800/freq_setting.c                          | 3 +--
 src/northbridge/via/vx800/ide.c                                   | 3 +--
 src/northbridge/via/vx800/lpc.c                                   | 3 +--
 src/northbridge/via/vx800/northbridge.c                           | 3 +--
 src/northbridge/via/vx800/pci_rawops.h                            | 3 +--
 src/northbridge/via/vx800/raminit.c                               | 3 +--
 src/northbridge/via/vx800/raminit.h                               | 3 +--
 src/northbridge/via/vx800/rank_map.c                              | 3 +--
 src/northbridge/via/vx800/romstrap.inc                            | 3 +--
 src/northbridge/via/vx800/romstrap.ld                             | 3 +--
 src/northbridge/via/vx800/timing_setting.c                        | 3 +--
 src/northbridge/via/vx800/translator_ddr2_init.c                  | 3 +--
 src/northbridge/via/vx800/uma_ram_setting.c                       | 3 +--
 src/northbridge/via/vx800/vga.c                                   | 3 +--
 src/northbridge/via/vx800/vx800.h                                 | 3 +--
 src/northbridge/via/vx900/romstrap.inc                            | 3 +--
 src/soc/broadcom/cygnus/Kconfig                                   | 3 +--
 src/soc/broadcom/cygnus/Makefile.inc                              | 3 +--
 src/soc/broadcom/cygnus/bootblock.c                               | 3 +--
 src/soc/broadcom/cygnus/cbmem.c                                   | 3 +--
 src/soc/broadcom/cygnus/hw_init.c                                 | 3 +--
 src/soc/broadcom/cygnus/i2c.c                                     | 3 +--
 src/soc/broadcom/cygnus/include/soc/addressmap.h                  | 3 +--
 src/soc/broadcom/cygnus/include/soc/cygnus.h                      | 3 +--
 src/soc/broadcom/cygnus/include/soc/hw_init.h                     | 3 +--
 src/soc/broadcom/cygnus/include/soc/i2c.h                         | 3 +--
 src/soc/broadcom/cygnus/include/soc/memlayout.ld                  | 3 +--
 src/soc/broadcom/cygnus/include/soc/ns16550.h                     | 3 +--
 src/soc/broadcom/cygnus/include/soc/sdram.h                       | 3 +--
 src/soc/broadcom/cygnus/include/soc/tz.h                          | 3 +--
 src/soc/broadcom/cygnus/ns16550.c                                 | 3 +--
 src/soc/broadcom/cygnus/romstage.c                                | 3 +--
 src/soc/broadcom/cygnus/sdram.c                                   | 3 +--
 src/soc/broadcom/cygnus/soc.c                                     | 3 +--
 src/soc/broadcom/cygnus/spi.c                                     | 3 +--
 src/soc/broadcom/cygnus/timer.c                                   | 3 +--
 src/soc/broadcom/cygnus/tz.c                                      | 3 +--
 src/soc/imgtec/pistachio/Kconfig                                  | 3 +--
 src/soc/imgtec/pistachio/Makefile.inc                             | 3 +--
 src/soc/imgtec/pistachio/bootblock.c                              | 3 +--
 src/soc/imgtec/pistachio/cbmem.c                                  | 3 +--
 src/soc/imgtec/pistachio/clocks.c                                 | 3 +--
 src/soc/imgtec/pistachio/ddr2_init.c                              | 3 +--
 src/soc/imgtec/pistachio/ddr3_init.c                              | 3 +--
 src/soc/imgtec/pistachio/include/soc/gpio.h                       | 3 +--
 src/soc/imgtec/pistachio/include/soc/memlayout.ld                 | 3 +--
 src/soc/imgtec/pistachio/monotonic_timer.c                        | 3 +--
 src/soc/imgtec/pistachio/romstage.c                               | 3 +--
 src/soc/imgtec/pistachio/soc.c                                    | 3 +--
 src/soc/imgtec/pistachio/uart.c                                   | 3 +--
 src/soc/intel/baytrail/acpi.c                                     | 3 +--
 src/soc/intel/baytrail/acpi/cpu.asl                               | 3 +--
 src/soc/intel/baytrail/acpi/device_nvs.asl                        | 3 +--
 src/soc/intel/baytrail/acpi/globalnvs.asl                         | 3 +--
 src/soc/intel/baytrail/acpi/gpio.asl                              | 3 +--
 src/soc/intel/baytrail/acpi/irq_helper.h                          | 3 +--
 src/soc/intel/baytrail/acpi/irqlinks.asl                          | 3 +--
 src/soc/intel/baytrail/acpi/irqroute.asl                          | 3 +--
 src/soc/intel/baytrail/acpi/lpc.asl                               | 3 +--
 src/soc/intel/baytrail/acpi/lpe.asl                               | 3 +--
 src/soc/intel/baytrail/acpi/lpss.asl                              | 3 +--
 src/soc/intel/baytrail/acpi/pcie.asl                              | 3 +--
 src/soc/intel/baytrail/acpi/platform.asl                          | 3 +--
 src/soc/intel/baytrail/acpi/scc.asl                               | 3 +--
 src/soc/intel/baytrail/acpi/sleepstates.asl                       | 3 +--
 src/soc/intel/baytrail/acpi/southcluster.asl                      | 3 +--
 src/soc/intel/baytrail/acpi/xhci.asl                              | 3 +--
 src/soc/intel/baytrail/bootblock/bootblock.c                      | 3 +--
 src/soc/intel/baytrail/chip.c                                     | 3 +--
 src/soc/intel/baytrail/chip.h                                     | 3 +--
 src/soc/intel/baytrail/cpu.c                                      | 3 +--
 src/soc/intel/baytrail/dptf.c                                     | 3 +--
 src/soc/intel/baytrail/ehci.c                                     | 3 +--
 src/soc/intel/baytrail/elog.c                                     | 3 +--
 src/soc/intel/baytrail/emmc.c                                     | 3 +--
 src/soc/intel/baytrail/gfx.c                                      | 3 +--
 src/soc/intel/baytrail/gpio.c                                     | 3 +--
 src/soc/intel/baytrail/hda.c                                      | 3 +--
 src/soc/intel/baytrail/include/soc/acpi.h                         | 3 +--
 src/soc/intel/baytrail/include/soc/device_nvs.h                   | 3 +--
 src/soc/intel/baytrail/include/soc/ehci.h                         | 3 +--
 src/soc/intel/baytrail/include/soc/gfx.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/gpio.h                         | 3 +--
 src/soc/intel/baytrail/include/soc/iomap.h                        | 3 +--
 src/soc/intel/baytrail/include/soc/iosf.h                         | 3 +--
 src/soc/intel/baytrail/include/soc/irq.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/lpc.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/msr.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/nvs.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/pattrs.h                       | 3 +--
 src/soc/intel/baytrail/include/soc/pci_devs.h                     | 3 +--
 src/soc/intel/baytrail/include/soc/pcie.h                         | 3 +--
 src/soc/intel/baytrail/include/soc/pmc.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/ramstage.h                     | 3 +--
 src/soc/intel/baytrail/include/soc/reset.h                        | 3 +--
 src/soc/intel/baytrail/include/soc/romstage.h                     | 3 +--
 src/soc/intel/baytrail/include/soc/sata.h                         | 3 +--
 src/soc/intel/baytrail/include/soc/smm.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/spi.h                          | 3 +--
 src/soc/intel/baytrail/include/soc/xhci.h                         | 3 +--
 src/soc/intel/baytrail/iosf.c                                     | 3 +--
 src/soc/intel/baytrail/lpe.c                                      | 3 +--
 src/soc/intel/baytrail/lpss.c                                     | 3 +--
 src/soc/intel/baytrail/memmap.c                                   | 3 +--
 src/soc/intel/baytrail/northcluster.c                             | 3 +--
 src/soc/intel/baytrail/pcie.c                                     | 3 +--
 src/soc/intel/baytrail/perf_power.c                               | 3 +--
 src/soc/intel/baytrail/pmutil.c                                   | 3 +--
 src/soc/intel/baytrail/ramstage.c                                 | 3 +--
 src/soc/intel/baytrail/refcode.c                                  | 3 +--
 src/soc/intel/baytrail/reset.c                                    | 3 +--
 src/soc/intel/baytrail/romstage/cache_as_ram.inc                  | 3 +--
 src/soc/intel/baytrail/romstage/early_spi.c                       | 3 +--
 src/soc/intel/baytrail/romstage/gfx.c                             | 3 +--
 src/soc/intel/baytrail/romstage/pmc.c                             | 3 +--
 src/soc/intel/baytrail/romstage/raminit.c                         | 3 +--
 src/soc/intel/baytrail/romstage/romstage.c                        | 3 +--
 src/soc/intel/baytrail/romstage/uart.c                            | 3 +--
 src/soc/intel/baytrail/sata.c                                     | 3 +--
 src/soc/intel/baytrail/scc.c                                      | 3 +--
 src/soc/intel/baytrail/sd.c                                       | 3 +--
 src/soc/intel/baytrail/smihandler.c                               | 3 +--
 src/soc/intel/baytrail/smm.c                                      | 3 +--
 src/soc/intel/baytrail/southcluster.c                             | 3 +--
 src/soc/intel/baytrail/spi.c                                      | 3 +--
 src/soc/intel/baytrail/stage_cache.c                              | 3 +--
 src/soc/intel/baytrail/tsc_freq.c                                 | 3 +--
 src/soc/intel/baytrail/xhci.c                                     | 3 +--
 src/soc/intel/braswell/acpi.c                                     | 3 +--
 src/soc/intel/braswell/acpi/cpu.asl                               | 3 +--
 src/soc/intel/braswell/acpi/device_nvs.asl                        | 3 +--
 src/soc/intel/braswell/acpi/dptf/cpu.asl                          | 3 +--
 src/soc/intel/braswell/acpi/globalnvs.asl                         | 3 +--
 src/soc/intel/braswell/acpi/gpio.asl                              | 3 +--
 src/soc/intel/braswell/acpi/irq_helper.h                          | 3 +--
 src/soc/intel/braswell/acpi/irqlinks.asl                          | 3 +--
 src/soc/intel/braswell/acpi/irqroute.asl                          | 3 +--
 src/soc/intel/braswell/acpi/lpc.asl                               | 3 +--
 src/soc/intel/braswell/acpi/lpe.asl                               | 3 +--
 src/soc/intel/braswell/acpi/lpss.asl                              | 3 +--
 src/soc/intel/braswell/acpi/platform.asl                          | 3 +--
 src/soc/intel/braswell/acpi/scc.asl                               | 3 +--
 src/soc/intel/braswell/acpi/sleepstates.asl                       | 3 +--
 src/soc/intel/braswell/acpi/southcluster.asl                      | 3 +--
 src/soc/intel/braswell/acpi/xhci.asl                              | 3 +--
 src/soc/intel/braswell/bootblock/bootblock.c                      | 3 +--
 src/soc/intel/braswell/chip.c                                     | 3 +--
 src/soc/intel/braswell/chip.h                                     | 3 +--
 src/soc/intel/braswell/cpu.c                                      | 3 +--
 src/soc/intel/braswell/elog.c                                     | 3 +--
 src/soc/intel/braswell/emmc.c                                     | 3 +--
 src/soc/intel/braswell/gfx.c                                      | 3 +--
 src/soc/intel/braswell/gpio.c                                     | 3 +--
 src/soc/intel/braswell/gpio_support.c                             | 3 +--
 src/soc/intel/braswell/hda.c                                      | 3 +--
 src/soc/intel/braswell/include/soc/acpi.h                         | 3 +--
 src/soc/intel/braswell/include/soc/device_nvs.h                   | 3 +--
 src/soc/intel/braswell/include/soc/ehci.h                         | 3 +--
 src/soc/intel/braswell/include/soc/gfx.h                          | 3 +--
 src/soc/intel/braswell/include/soc/gpio.h                         | 3 +--
 src/soc/intel/braswell/include/soc/hda.h                          | 3 +--
 src/soc/intel/braswell/include/soc/iomap.h                        | 3 +--
 src/soc/intel/braswell/include/soc/iosf.h                         | 3 +--
 src/soc/intel/braswell/include/soc/irq.h                          | 3 +--
 src/soc/intel/braswell/include/soc/lpc.h                          | 3 +--
 src/soc/intel/braswell/include/soc/msr.h                          | 3 +--
 src/soc/intel/braswell/include/soc/nvs.h                          | 3 +--
 src/soc/intel/braswell/include/soc/pattrs.h                       | 3 +--
 src/soc/intel/braswell/include/soc/pci_devs.h                     | 3 +--
 src/soc/intel/braswell/include/soc/pcie.h                         | 3 +--
 src/soc/intel/braswell/include/soc/pei_wrapper.h                  | 3 +--
 src/soc/intel/braswell/include/soc/pm.h                           | 3 +--
 src/soc/intel/braswell/include/soc/ramstage.h                     | 3 +--
 src/soc/intel/braswell/include/soc/romstage.h                     | 3 +--
 src/soc/intel/braswell/include/soc/sata.h                         | 3 +--
 src/soc/intel/braswell/include/soc/smm.h                          | 3 +--
 src/soc/intel/braswell/include/soc/spi.h                          | 3 +--
 src/soc/intel/braswell/include/soc/xhci.h                         | 3 +--
 src/soc/intel/braswell/iosf.c                                     | 3 +--
 src/soc/intel/braswell/lpc_init.c                                 | 3 +--
 src/soc/intel/braswell/lpe.c                                      | 3 +--
 src/soc/intel/braswell/lpss.c                                     | 3 +--
 src/soc/intel/braswell/memmap.c                                   | 3 +--
 src/soc/intel/braswell/northcluster.c                             | 3 +--
 src/soc/intel/braswell/pcie.c                                     | 3 +--
 src/soc/intel/braswell/pmutil.c                                   | 3 +--
 src/soc/intel/braswell/ramstage.c                                 | 3 +--
 src/soc/intel/braswell/romstage/early_spi.c                       | 3 +--
 src/soc/intel/braswell/romstage/pmc.c                             | 3 +--
 src/soc/intel/braswell/romstage/romstage.c                        | 3 +--
 src/soc/intel/braswell/sata.c                                     | 3 +--
 src/soc/intel/braswell/scc.c                                      | 3 +--
 src/soc/intel/braswell/sd.c                                       | 3 +--
 src/soc/intel/braswell/smihandler.c                               | 3 +--
 src/soc/intel/braswell/smm.c                                      | 3 +--
 src/soc/intel/braswell/southcluster.c                             | 3 +--
 src/soc/intel/braswell/spi.c                                      | 3 +--
 src/soc/intel/braswell/spi_loading.c                              | 3 +--
 src/soc/intel/braswell/tsc_freq.c                                 | 3 +--
 src/soc/intel/broadwell/acpi.c                                    | 3 +--
 src/soc/intel/broadwell/acpi/adsp.asl                             | 3 +--
 src/soc/intel/broadwell/acpi/cpu.asl                              | 3 +--
 src/soc/intel/broadwell/acpi/ctdp.asl                             | 3 +--
 src/soc/intel/broadwell/acpi/device_nvs.asl                       | 3 +--
 src/soc/intel/broadwell/acpi/ehci.asl                             | 3 +--
 src/soc/intel/broadwell/acpi/globalnvs.asl                        | 3 +--
 src/soc/intel/broadwell/acpi/gpio.asl                             | 3 +--
 src/soc/intel/broadwell/acpi/hda.asl                              | 3 +--
 src/soc/intel/broadwell/acpi/irqlinks.asl                         | 3 +--
 src/soc/intel/broadwell/acpi/lpc.asl                              | 3 +--
 src/soc/intel/broadwell/acpi/pch.asl                              | 3 +--
 src/soc/intel/broadwell/acpi/pci_irqs.asl                         | 3 +--
 src/soc/intel/broadwell/acpi/pcie.asl                             | 3 +--
 src/soc/intel/broadwell/acpi/pcie_port.asl                        | 3 +--
 src/soc/intel/broadwell/acpi/platform.asl                         | 3 +--
 src/soc/intel/broadwell/acpi/sata.asl                             | 3 +--
 src/soc/intel/broadwell/acpi/serialio.asl                         | 3 +--
 src/soc/intel/broadwell/acpi/sleepstates.asl                      | 3 +--
 src/soc/intel/broadwell/acpi/smbus.asl                            | 3 +--
 src/soc/intel/broadwell/acpi/systemagent.asl                      | 3 +--
 src/soc/intel/broadwell/acpi/xhci.asl                             | 3 +--
 src/soc/intel/broadwell/adsp.c                                    | 3 +--
 src/soc/intel/broadwell/bootblock/cpu.c                           | 3 +--
 src/soc/intel/broadwell/bootblock/pch.c                           | 3 +--
 src/soc/intel/broadwell/bootblock/systemagent.c                   | 3 +--
 src/soc/intel/broadwell/chip.c                                    | 3 +--
 src/soc/intel/broadwell/chip.h                                    | 3 +--
 src/soc/intel/broadwell/cpu.c                                     | 3 +--
 src/soc/intel/broadwell/cpu_info.c                                | 3 +--
 src/soc/intel/broadwell/ehci.c                                    | 3 +--
 src/soc/intel/broadwell/elog.c                                    | 3 +--
 src/soc/intel/broadwell/finalize.c                                | 3 +--
 src/soc/intel/broadwell/gpio.c                                    | 3 +--
 src/soc/intel/broadwell/hda.c                                     | 3 +--
 src/soc/intel/broadwell/igd.c                                     | 3 +--
 src/soc/intel/broadwell/include/soc/acpi.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/adsp.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/cpu.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/device_nvs.h                  | 3 +--
 src/soc/intel/broadwell/include/soc/ehci.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/gpio.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/iobp.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/iomap.h                       | 3 +--
 src/soc/intel/broadwell/include/soc/lpc.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/me.h                          | 3 +--
 src/soc/intel/broadwell/include/soc/msr.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/nvs.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/pch.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/pci_devs.h                    | 3 +--
 src/soc/intel/broadwell/include/soc/pei_wrapper.h                 | 3 +--
 src/soc/intel/broadwell/include/soc/pm.h                          | 3 +--
 src/soc/intel/broadwell/include/soc/ramstage.h                    | 3 +--
 src/soc/intel/broadwell/include/soc/rcba.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/reset.h                       | 3 +--
 src/soc/intel/broadwell/include/soc/romstage.h                    | 3 +--
 src/soc/intel/broadwell/include/soc/sata.h                        | 3 +--
 src/soc/intel/broadwell/include/soc/serialio.h                    | 3 +--
 src/soc/intel/broadwell/include/soc/smbus.h                       | 3 +--
 src/soc/intel/broadwell/include/soc/smm.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/spi.h                         | 3 +--
 src/soc/intel/broadwell/include/soc/systemagent.h                 | 3 +--
 src/soc/intel/broadwell/include/soc/xhci.h                        | 3 +--
 src/soc/intel/broadwell/iobp.c                                    | 3 +--
 src/soc/intel/broadwell/lpc.c                                     | 3 +--
 src/soc/intel/broadwell/me.c                                      | 3 +--
 src/soc/intel/broadwell/me_status.c                               | 3 +--
 src/soc/intel/broadwell/memmap.c                                  | 3 +--
 src/soc/intel/broadwell/minihd.c                                  | 3 +--
 src/soc/intel/broadwell/monotonic_timer.c                         | 3 +--
 src/soc/intel/broadwell/pch.c                                     | 3 +--
 src/soc/intel/broadwell/pcie.c                                    | 3 +--
 src/soc/intel/broadwell/pei_data.c                                | 3 +--
 src/soc/intel/broadwell/pmutil.c                                  | 3 +--
 src/soc/intel/broadwell/ramstage.c                                | 3 +--
 src/soc/intel/broadwell/refcode.c                                 | 3 +--
 src/soc/intel/broadwell/reset.c                                   | 3 +--
 src/soc/intel/broadwell/romstage/cache_as_ram.inc                 | 3 +--
 src/soc/intel/broadwell/romstage/cpu.c                            | 3 +--
 src/soc/intel/broadwell/romstage/pch.c                            | 3 +--
 src/soc/intel/broadwell/romstage/power_state.c                    | 3 +--
 src/soc/intel/broadwell/romstage/raminit.c                        | 3 +--
 src/soc/intel/broadwell/romstage/report_platform.c                | 3 +--
 src/soc/intel/broadwell/romstage/romstage.c                       | 3 +--
 src/soc/intel/broadwell/romstage/smbus.c                          | 3 +--
 src/soc/intel/broadwell/romstage/spi.c                            | 3 +--
 src/soc/intel/broadwell/romstage/stack.c                          | 3 +--
 src/soc/intel/broadwell/romstage/systemagent.c                    | 3 +--
 src/soc/intel/broadwell/romstage/uart.c                           | 3 +--
 src/soc/intel/broadwell/sata.c                                    | 3 +--
 src/soc/intel/broadwell/serialio.c                                | 3 +--
 src/soc/intel/broadwell/smbus.c                                   | 3 +--
 src/soc/intel/broadwell/smbus_common.c                            | 3 +--
 src/soc/intel/broadwell/smi.c                                     | 3 +--
 src/soc/intel/broadwell/smihandler.c                              | 3 +--
 src/soc/intel/broadwell/smmrelocate.c                             | 3 +--
 src/soc/intel/broadwell/spi.c                                     | 3 +--
 src/soc/intel/broadwell/stage_cache.c                             | 3 +--
 src/soc/intel/broadwell/systemagent.c                             | 3 +--
 src/soc/intel/broadwell/tsc_freq.c                                | 3 +--
 src/soc/intel/broadwell/usbdebug.c                                | 3 +--
 src/soc/intel/broadwell/xhci.c                                    | 3 +--
 src/soc/intel/common/acpi.h                                       | 3 +--
 src/soc/intel/common/acpi/acpi_wake_source.asl                    | 3 +--
 src/soc/intel/common/acpi_wake_source.c                           | 3 +--
 src/soc/intel/common/fsp_ramstage.c                               | 3 +--
 src/soc/intel/common/gma.h                                        | 3 +--
 src/soc/intel/common/hda_verb.c                                   | 3 +--
 src/soc/intel/common/hda_verb.h                                   | 3 +--
 src/soc/intel/common/memmap.h                                     | 3 +--
 src/soc/intel/common/mrc_cache.c                                  | 3 +--
 src/soc/intel/common/mrc_cache.h                                  | 3 +--
 src/soc/intel/common/nvm.c                                        | 3 +--
 src/soc/intel/common/nvm.h                                        | 3 +--
 src/soc/intel/common/raminit.c                                    | 3 +--
 src/soc/intel/common/ramstage.h                                   | 3 +--
 src/soc/intel/common/reset.c                                      | 3 +--
 src/soc/intel/common/romstage.c                                   | 3 +--
 src/soc/intel/common/romstage.h                                   | 3 +--
 src/soc/intel/common/stack.c                                      | 3 +--
 src/soc/intel/common/stack.h                                      | 3 +--
 src/soc/intel/common/stage_cache.c                                | 3 +--
 src/soc/intel/common/util.c                                       | 3 +--
 src/soc/intel/common/util.h                                       | 3 +--
 src/soc/intel/common/vbt.c                                        | 3 +--
 src/soc/intel/fsp_baytrail/Kconfig                                | 3 +--
 src/soc/intel/fsp_baytrail/Makefile.inc                           | 3 +--
 src/soc/intel/fsp_baytrail/acpi.c                                 | 3 +--
 src/soc/intel/fsp_baytrail/acpi/cpu.asl                           | 3 +--
 src/soc/intel/fsp_baytrail/acpi/device_nvs.asl                    | 3 +--
 src/soc/intel/fsp_baytrail/acpi/globalnvs.asl                     | 3 +--
 src/soc/intel/fsp_baytrail/acpi/gpio.asl                          | 3 +--
 src/soc/intel/fsp_baytrail/acpi/irq_helper.h                      | 3 +--
 src/soc/intel/fsp_baytrail/acpi/irqlinks.asl                      | 3 +--
 src/soc/intel/fsp_baytrail/acpi/irqroute.asl                      | 3 +--
 src/soc/intel/fsp_baytrail/acpi/lpc.asl                           | 3 +--
 src/soc/intel/fsp_baytrail/acpi/lpe.asl                           | 3 +--
 src/soc/intel/fsp_baytrail/acpi/lpss.asl                          | 3 +--
 src/soc/intel/fsp_baytrail/acpi/platform.asl                      | 3 +--
 src/soc/intel/fsp_baytrail/acpi/scc.asl                           | 3 +--
 src/soc/intel/fsp_baytrail/acpi/sleepstates.asl                   | 3 +--
 src/soc/intel/fsp_baytrail/acpi/southcluster.asl                  | 3 +--
 src/soc/intel/fsp_baytrail/acpi/usb.asl                           | 3 +--
 src/soc/intel/fsp_baytrail/acpi/xhci.asl                          | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/acpi.h                        | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/baytrail.h                    | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/device_nvs.h                  | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/ehci.h                        | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/gfx.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/gpio.h                        | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/i2c.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/iomap.h                       | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/iosf.h                        | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/irq.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/lpc.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/msr.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/nvm.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/nvs.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/pattrs.h                      | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/pci_devs.h                    | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/pcie.h                        | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/pmc.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/ramstage.h                    | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/reset.h                       | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/romstage.h                    | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/smm.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/spi.h                         | 3 +--
 src/soc/intel/fsp_baytrail/baytrail/xhci.h                        | 3 +--
 src/soc/intel/fsp_baytrail/bootblock/bootblock.c                  | 3 +--
 src/soc/intel/fsp_baytrail/chip.c                                 | 3 +--
 src/soc/intel/fsp_baytrail/chip.h                                 | 3 +--
 src/soc/intel/fsp_baytrail/cpu.c                                  | 3 +--
 src/soc/intel/fsp_baytrail/fsp/Kconfig                            | 3 +--
 src/soc/intel/fsp_baytrail/fsp/Makefile.inc                       | 3 +--
 src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c                 | 3 +--
 src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.h                 | 3 +--
 src/soc/intel/fsp_baytrail/gpio.c                                 | 3 +--
 src/soc/intel/fsp_baytrail/i2c.c                                  | 3 +--
 src/soc/intel/fsp_baytrail/iosf.c                                 | 3 +--
 src/soc/intel/fsp_baytrail/memmap.c                               | 3 +--
 src/soc/intel/fsp_baytrail/northcluster.c                         | 3 +--
 src/soc/intel/fsp_baytrail/nvm.c                                  | 3 +--
 src/soc/intel/fsp_baytrail/pmutil.c                               | 3 +--
 src/soc/intel/fsp_baytrail/ramstage.c                             | 3 +--
 src/soc/intel/fsp_baytrail/reset.c                                | 3 +--
 src/soc/intel/fsp_baytrail/romstage/Makefile.inc                  | 3 +--
 src/soc/intel/fsp_baytrail/romstage/pmc.c                         | 3 +--
 src/soc/intel/fsp_baytrail/romstage/report_platform.c             | 3 +--
 src/soc/intel/fsp_baytrail/romstage/romstage.c                    | 3 +--
 src/soc/intel/fsp_baytrail/romstage/uart.c                        | 3 +--
 src/soc/intel/fsp_baytrail/smihandler.c                           | 3 +--
 src/soc/intel/fsp_baytrail/smm.c                                  | 3 +--
 src/soc/intel/fsp_baytrail/southcluster.c                         | 3 +--
 src/soc/intel/fsp_baytrail/spi.c                                  | 3 +--
 src/soc/intel/fsp_baytrail/tsc_freq.c                             | 3 +--
 src/soc/intel/skylake/acpi.c                                      | 3 +--
 src/soc/intel/skylake/acpi/cpu.asl                                | 3 +--
 src/soc/intel/skylake/acpi/dptf/charger.asl                       | 3 +--
 src/soc/intel/skylake/acpi/dptf/cpu.asl                           | 3 +--
 src/soc/intel/skylake/acpi/dptf/dptf.asl                          | 3 +--
 src/soc/intel/skylake/acpi/dptf/thermal.asl                       | 3 +--
 src/soc/intel/skylake/acpi/globalnvs.asl                          | 3 +--
 src/soc/intel/skylake/acpi/gpio.asl                               | 3 +--
 src/soc/intel/skylake/acpi/irqlinks.asl                           | 3 +--
 src/soc/intel/skylake/acpi/lpc.asl                                | 3 +--
 src/soc/intel/skylake/acpi/pch.asl                                | 3 +--
 src/soc/intel/skylake/acpi/pci_irqs.asl                           | 3 +--
 src/soc/intel/skylake/acpi/pcie.asl                               | 3 +--
 src/soc/intel/skylake/acpi/pcr.asl                                | 3 +--
 src/soc/intel/skylake/acpi/platform.asl                           | 3 +--
 src/soc/intel/skylake/acpi/pmc.asl                                | 3 +--
 src/soc/intel/skylake/acpi/scs.asl                                | 3 +--
 src/soc/intel/skylake/acpi/serialio.asl                           | 3 +--
 src/soc/intel/skylake/acpi/sleepstates.asl                        | 3 +--
 src/soc/intel/skylake/acpi/smbus.asl                              | 3 +--
 src/soc/intel/skylake/acpi/systemagent.asl                        | 3 +--
 src/soc/intel/skylake/acpi/xhci.asl                               | 3 +--
 src/soc/intel/skylake/bootblock/cpu.c                             | 3 +--
 src/soc/intel/skylake/bootblock/pch.c                             | 3 +--
 src/soc/intel/skylake/bootblock/systemagent.c                     | 3 +--
 src/soc/intel/skylake/chip.c                                      | 3 +--
 src/soc/intel/skylake/chip.h                                      | 3 +--
 src/soc/intel/skylake/cpu.c                                       | 3 +--
 src/soc/intel/skylake/cpu_info.c                                  | 3 +--
 src/soc/intel/skylake/elog.c                                      | 3 +--
 src/soc/intel/skylake/finalize.c                                  | 3 +--
 src/soc/intel/skylake/flash_controller.c                          | 3 +--
 src/soc/intel/skylake/igd.c                                       | 3 +--
 src/soc/intel/skylake/include/soc/acpi.h                          | 3 +--
 src/soc/intel/skylake/include/soc/cpu.h                           | 3 +--
 src/soc/intel/skylake/include/soc/device_nvs.h                    | 3 +--
 src/soc/intel/skylake/include/soc/flash_controller.h              | 3 +--
 src/soc/intel/skylake/include/soc/gpe.h                           | 3 +--
 src/soc/intel/skylake/include/soc/gpio.h                          | 3 +--
 src/soc/intel/skylake/include/soc/gpio_defs.h                     | 3 +--
 src/soc/intel/skylake/include/soc/iomap.h                         | 3 +--
 src/soc/intel/skylake/include/soc/lpc.h                           | 3 +--
 src/soc/intel/skylake/include/soc/msr.h                           | 3 +--
 src/soc/intel/skylake/include/soc/nvs.h                           | 3 +--
 src/soc/intel/skylake/include/soc/pch.h                           | 3 +--
 src/soc/intel/skylake/include/soc/pci_devs.h                      | 3 +--
 src/soc/intel/skylake/include/soc/pei_wrapper.h                   | 3 +--
 src/soc/intel/skylake/include/soc/pm.h                            | 3 +--
 src/soc/intel/skylake/include/soc/ramstage.h                      | 3 +--
 src/soc/intel/skylake/include/soc/romstage.h                      | 3 +--
 src/soc/intel/skylake/include/soc/smbus.h                         | 3 +--
 src/soc/intel/skylake/include/soc/smm.h                           | 3 +--
 src/soc/intel/skylake/include/soc/spi.h                           | 3 +--
 src/soc/intel/skylake/include/soc/systemagent.h                   | 3 +--
 src/soc/intel/skylake/include/soc/xhci.h                          | 3 +--
 src/soc/intel/skylake/lpc.c                                       | 3 +--
 src/soc/intel/skylake/memmap.c                                    | 3 +--
 src/soc/intel/skylake/monotonic_timer.c                           | 3 +--
 src/soc/intel/skylake/pch.c                                       | 3 +--
 src/soc/intel/skylake/pcie.c                                      | 3 +--
 src/soc/intel/skylake/pei_data.c                                  | 3 +--
 src/soc/intel/skylake/pmutil.c                                    | 3 +--
 src/soc/intel/skylake/ramstage.c                                  | 3 +--
 src/soc/intel/skylake/romstage/cpu.c                              | 3 +--
 src/soc/intel/skylake/romstage/pch.c                              | 3 +--
 src/soc/intel/skylake/romstage/power_state.c                      | 3 +--
 src/soc/intel/skylake/romstage/report_platform.c                  | 3 +--
 src/soc/intel/skylake/romstage/romstage.c                         | 3 +--
 src/soc/intel/skylake/romstage/smbus.c                            | 3 +--
 src/soc/intel/skylake/romstage/spi.c                              | 3 +--
 src/soc/intel/skylake/romstage/systemagent.c                      | 3 +--
 src/soc/intel/skylake/romstage/uart.c                             | 3 +--
 src/soc/intel/skylake/smbus.c                                     | 3 +--
 src/soc/intel/skylake/smbus_common.c                              | 3 +--
 src/soc/intel/skylake/smi.c                                       | 3 +--
 src/soc/intel/skylake/smihandler.c                                | 3 +--
 src/soc/intel/skylake/smmrelocate.c                               | 3 +--
 src/soc/intel/skylake/systemagent.c                               | 3 +--
 src/soc/intel/skylake/tsc_freq.c                                  | 3 +--
 src/soc/intel/skylake/uart.c                                      | 3 +--
 src/soc/intel/skylake/uart_debug.c                                | 3 +--
 src/soc/intel/skylake/xhci.c                                      | 3 +--
 src/soc/marvell/bg4cd/Kconfig                                     | 3 +--
 src/soc/marvell/bg4cd/Makefile.inc                                | 3 +--
 src/soc/marvell/bg4cd/bootblock.c                                 | 3 +--
 src/soc/marvell/bg4cd/cbmem.c                                     | 3 +--
 src/soc/marvell/bg4cd/i2c.c                                       | 3 +--
 src/soc/marvell/bg4cd/include/soc/i2c.h                           | 3 +--
 src/soc/marvell/bg4cd/include/soc/memlayout.ld                    | 3 +--
 src/soc/marvell/bg4cd/include/soc/sdram.h                         | 3 +--
 src/soc/marvell/bg4cd/monotonic_timer.c                           | 3 +--
 src/soc/marvell/bg4cd/sdram.c                                     | 3 +--
 src/soc/marvell/bg4cd/spi.c                                       | 3 +--
 src/soc/nvidia/tegra/apbmisc.c                                    | 3 +--
 src/soc/nvidia/tegra/apbmisc.h                                    | 3 +--
 src/soc/nvidia/tegra/dc.h                                         | 3 +--
 src/soc/nvidia/tegra/gpio.c                                       | 3 +--
 src/soc/nvidia/tegra/gpio.h                                       | 3 +--
 src/soc/nvidia/tegra/i2c.c                                        | 3 +--
 src/soc/nvidia/tegra/i2c.h                                        | 3 +--
 src/soc/nvidia/tegra/pingroup.c                                   | 3 +--
 src/soc/nvidia/tegra/pingroup.h                                   | 3 +--
 src/soc/nvidia/tegra/pinmux.c                                     | 3 +--
 src/soc/nvidia/tegra/pinmux.h                                     | 3 +--
 src/soc/nvidia/tegra/pwm.h                                        | 3 +--
 src/soc/nvidia/tegra/software_i2c.c                               | 3 +--
 src/soc/nvidia/tegra/types.h                                      | 3 +--
 src/soc/nvidia/tegra/usb.c                                        | 3 +--
 src/soc/nvidia/tegra/usb.h                                        | 3 +--
 src/soc/nvidia/tegra124/bootblock.c                               | 3 +--
 src/soc/nvidia/tegra124/bootblock_asm.S                           | 3 +--
 src/soc/nvidia/tegra124/cache.c                                   | 3 +--
 src/soc/nvidia/tegra124/cbmem.c                                   | 3 +--
 src/soc/nvidia/tegra124/chip.h                                    | 3 +--
 src/soc/nvidia/tegra124/display.c                                 | 3 +--
 src/soc/nvidia/tegra124/i2c.c                                     | 3 +--
 src/soc/nvidia/tegra124/include/soc/cache.h                       | 3 +--
 src/soc/nvidia/tegra124/include/soc/early_configs.h               | 3 +--
 src/soc/nvidia/tegra124/include/soc/gpio.h                        | 3 +--
 src/soc/nvidia/tegra124/include/soc/maincpu.h                     | 3 +--
 src/soc/nvidia/tegra124/include/soc/memlayout.ld                  | 3 +--
 src/soc/nvidia/tegra124/include/soc/pingroup.h                    | 3 +--
 src/soc/nvidia/tegra124/include/soc/pinmux.h                      | 3 +--
 src/soc/nvidia/tegra124/include/soc/power.h                       | 3 +--
 src/soc/nvidia/tegra124/include/soc/sdram.h                       | 3 +--
 src/soc/nvidia/tegra124/include/soc/sysctr.h                      | 3 +--
 src/soc/nvidia/tegra124/lp0/Makefile                              | 3 +--
 src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.ld                   | 3 +--
 src/soc/nvidia/tegra124/monotonic_timer.c                         | 3 +--
 src/soc/nvidia/tegra124/power.c                                   | 3 +--
 src/soc/nvidia/tegra124/sdram.c                                   | 3 +--
 src/soc/nvidia/tegra124/soc.c                                     | 3 +--
 src/soc/nvidia/tegra124/spi.c                                     | 3 +--
 src/soc/nvidia/tegra124/uart.c                                    | 3 +--
 src/soc/nvidia/tegra124/verstage.c                                | 3 +--
 src/soc/nvidia/tegra132/32bit_reset.S                             | 3 +--
 src/soc/nvidia/tegra132/addressmap.c                              | 3 +--
 src/soc/nvidia/tegra132/bootblock.c                               | 3 +--
 src/soc/nvidia/tegra132/bootblock_asm.S                           | 3 +--
 src/soc/nvidia/tegra132/cbmem.c                                   | 3 +--
 src/soc/nvidia/tegra132/ccplex.c                                  | 3 +--
 src/soc/nvidia/tegra132/chip.h                                    | 3 +--
 src/soc/nvidia/tegra132/cpu.c                                     | 3 +--
 src/soc/nvidia/tegra132/cpu_lib.S                                 | 3 +--
 src/soc/nvidia/tegra132/dc.c                                      | 3 +--
 src/soc/nvidia/tegra132/dsi.c                                     | 3 +--
 src/soc/nvidia/tegra132/flow_ctrl.c                               | 3 +--
 src/soc/nvidia/tegra132/funitcfg.c                                | 3 +--
 src/soc/nvidia/tegra132/gic.c                                     | 3 +--
 src/soc/nvidia/tegra132/i2c.c                                     | 3 +--
 src/soc/nvidia/tegra132/i2c6.c                                    | 3 +--
 src/soc/nvidia/tegra132/include/soc/ccplex.h                      | 3 +--
 src/soc/nvidia/tegra132/include/soc/cpu.h                         | 3 +--
 src/soc/nvidia/tegra132/include/soc/flow_ctrl.h                   | 3 +--
 src/soc/nvidia/tegra132/include/soc/funitcfg.h                    | 3 +--
 src/soc/nvidia/tegra132/include/soc/gpio.h                        | 3 +--
 src/soc/nvidia/tegra132/include/soc/id.h                          | 3 +--
 src/soc/nvidia/tegra132/include/soc/maincpu.h                     | 3 +--
 src/soc/nvidia/tegra132/include/soc/memlayout.ld                  | 3 +--
 src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld           | 3 +--
 src/soc/nvidia/tegra132/include/soc/mipi-phy.h                    | 3 +--
 src/soc/nvidia/tegra132/include/soc/mipi_display.h                | 3 +--
 src/soc/nvidia/tegra132/include/soc/mipi_dsi.h                    | 3 +--
 src/soc/nvidia/tegra132/include/soc/mmu_operations.h              | 3 +--
 src/soc/nvidia/tegra132/include/soc/padconfig.h                   | 3 +--
 src/soc/nvidia/tegra132/include/soc/pinmux.h                      | 3 +--
 src/soc/nvidia/tegra132/include/soc/power.h                       | 3 +--
 src/soc/nvidia/tegra132/include/soc/romstage.h                    | 3 +--
 src/soc/nvidia/tegra132/include/soc/sdram.h                       | 3 +--
 src/soc/nvidia/tegra132/include/soc/sdram_configs.h               | 3 +--
 src/soc/nvidia/tegra132/include/soc/sysctr.h                      | 3 +--
 src/soc/nvidia/tegra132/include/soc/tegra_dsi.h                   | 3 +--
 src/soc/nvidia/tegra132/include/soc/verstage.h                    | 3 +--
 src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.c | 3 +--
 src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.h | 3 +--
 src/soc/nvidia/tegra132/lp0/Makefile                              | 3 +--
 src/soc/nvidia/tegra132/lp0/tegra_lp0_resume.ld                   | 3 +--
 src/soc/nvidia/tegra132/mipi-phy.c                                | 3 +--
 src/soc/nvidia/tegra132/mipi.c                                    | 3 +--
 src/soc/nvidia/tegra132/mipi_dsi.c                                | 3 +--
 src/soc/nvidia/tegra132/mmu_operations.c                          | 3 +--
 src/soc/nvidia/tegra132/monotonic_timer.c                         | 3 +--
 src/soc/nvidia/tegra132/padconfig.c                               | 3 +--
 src/soc/nvidia/tegra132/power.c                                   | 3 +--
 src/soc/nvidia/tegra132/psci.c                                    | 3 +--
 src/soc/nvidia/tegra132/ramstage.c                                | 3 +--
 src/soc/nvidia/tegra132/reset.c                                   | 3 +--
 src/soc/nvidia/tegra132/romstage.c                                | 3 +--
 src/soc/nvidia/tegra132/romstage_asm.S                            | 3 +--
 src/soc/nvidia/tegra132/sdram.c                                   | 3 +--
 src/soc/nvidia/tegra132/secmon.c                                  | 3 +--
 src/soc/nvidia/tegra132/soc.c                                     | 3 +--
 src/soc/nvidia/tegra132/spi.c                                     | 3 +--
 src/soc/nvidia/tegra132/stack.S                                   | 3 +--
 src/soc/nvidia/tegra132/uart.c                                    | 3 +--
 src/soc/nvidia/tegra210/addressmap.c                              | 3 +--
 src/soc/nvidia/tegra210/ape.c                                     | 3 +--
 src/soc/nvidia/tegra210/arm_tf.c                                  | 3 +--
 src/soc/nvidia/tegra210/bootblock.c                               | 3 +--
 src/soc/nvidia/tegra210/bootblock_asm.S                           | 3 +--
 src/soc/nvidia/tegra210/cbmem.c                                   | 3 +--
 src/soc/nvidia/tegra210/ccplex.c                                  | 3 +--
 src/soc/nvidia/tegra210/chip.h                                    | 3 +--
 src/soc/nvidia/tegra210/cpu.c                                     | 3 +--
 src/soc/nvidia/tegra210/cpu_lib.S                                 | 3 +--
 src/soc/nvidia/tegra210/dc.c                                      | 3 +--
 src/soc/nvidia/tegra210/dsi.c                                     | 3 +--
 src/soc/nvidia/tegra210/flow_ctrl.c                               | 3 +--
 src/soc/nvidia/tegra210/funitcfg.c                                | 3 +--
 src/soc/nvidia/tegra210/gic.c                                     | 3 +--
 src/soc/nvidia/tegra210/i2c.c                                     | 3 +--
 src/soc/nvidia/tegra210/i2c6.c                                    | 3 +--
 src/soc/nvidia/tegra210/include/soc/ccplex.h                      | 3 +--
 src/soc/nvidia/tegra210/include/soc/cpu.h                         | 3 +--
 src/soc/nvidia/tegra210/include/soc/flow_ctrl.h                   | 3 +--
 src/soc/nvidia/tegra210/include/soc/funitcfg.h                    | 3 +--
 src/soc/nvidia/tegra210/include/soc/gpio.h                        | 3 +--
 src/soc/nvidia/tegra210/include/soc/id.h                          | 3 +--
 src/soc/nvidia/tegra210/include/soc/maincpu.h                     | 3 +--
 src/soc/nvidia/tegra210/include/soc/memlayout.ld                  | 3 +--
 src/soc/nvidia/tegra210/include/soc/memlayout_vboot2.ld           | 3 +--
 src/soc/nvidia/tegra210/include/soc/mipi-phy.h                    | 3 +--
 src/soc/nvidia/tegra210/include/soc/mipi_display.h                | 3 +--
 src/soc/nvidia/tegra210/include/soc/mipi_dsi.h                    | 3 +--
 src/soc/nvidia/tegra210/include/soc/mmu_operations.h              | 3 +--
 src/soc/nvidia/tegra210/include/soc/mtc.h                         | 3 +--
 src/soc/nvidia/tegra210/include/soc/padconfig.h                   | 3 +--
 src/soc/nvidia/tegra210/include/soc/pinmux.h                      | 3 +--
 src/soc/nvidia/tegra210/include/soc/power.h                       | 3 +--
 src/soc/nvidia/tegra210/include/soc/romstage.h                    | 3 +--
 src/soc/nvidia/tegra210/include/soc/sdram.h                       | 3 +--
 src/soc/nvidia/tegra210/include/soc/sdram_configs.h               | 3 +--
 src/soc/nvidia/tegra210/include/soc/sysctr.h                      | 3 +--
 src/soc/nvidia/tegra210/include/soc/tegra_dsi.h                   | 3 +--
 src/soc/nvidia/tegra210/include/soc/verstage.h                    | 3 +--
 src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c | 3 +--
 src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.h | 3 +--
 src/soc/nvidia/tegra210/lp0/Makefile                              | 3 +--
 src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.ld                   | 3 +--
 src/soc/nvidia/tegra210/mipi-phy.c                                | 3 +--
 src/soc/nvidia/tegra210/mipi.c                                    | 3 +--
 src/soc/nvidia/tegra210/mipi_dsi.c                                | 3 +--
 src/soc/nvidia/tegra210/mmu_operations.c                          | 3 +--
 src/soc/nvidia/tegra210/monotonic_timer.c                         | 3 +--
 src/soc/nvidia/tegra210/mtc.c                                     | 3 +--
 src/soc/nvidia/tegra210/padconfig.c                               | 3 +--
 src/soc/nvidia/tegra210/power.c                                   | 3 +--
 src/soc/nvidia/tegra210/psci.c                                    | 3 +--
 src/soc/nvidia/tegra210/ramstage.c                                | 3 +--
 src/soc/nvidia/tegra210/reset.c                                   | 3 +--
 src/soc/nvidia/tegra210/romstage.c                                | 3 +--
 src/soc/nvidia/tegra210/romstage_asm.S                            | 3 +--
 src/soc/nvidia/tegra210/secmon.c                                  | 3 +--
 src/soc/nvidia/tegra210/soc.c                                     | 3 +--
 src/soc/nvidia/tegra210/spi.c                                     | 3 +--
 src/soc/nvidia/tegra210/stack.S                                   | 3 +--
 src/soc/nvidia/tegra210/stage_entry.S                             | 3 +--
 src/soc/nvidia/tegra210/uart.c                                    | 3 +--
 src/soc/qualcomm/ipq806x/Makefile.inc                             | 3 +--
 src/soc/qualcomm/ipq806x/blobs_init.c                             | 3 +--
 src/soc/qualcomm/ipq806x/cbmem.c                                  | 3 +--
 src/soc/qualcomm/ipq806x/include/soc/memlayout.ld                 | 3 +--
 src/soc/qualcomm/ipq806x/include/soc/soc_services.h               | 3 +--
 src/soc/qualcomm/ipq806x/include/soc/usb.h                        | 3 +--
 src/soc/qualcomm/ipq806x/mbn_header.h                             | 3 +--
 src/soc/qualcomm/ipq806x/soc.c                                    | 3 +--
 src/soc/qualcomm/ipq806x/usb.c                                    | 3 +--
 src/soc/rockchip/rk3288/Kconfig                                   | 3 +--
 src/soc/rockchip/rk3288/Makefile.inc                              | 3 +--
 src/soc/rockchip/rk3288/bootblock.c                               | 3 +--
 src/soc/rockchip/rk3288/cbmem.c                                   | 3 +--
 src/soc/rockchip/rk3288/chip.h                                    | 3 +--
 src/soc/rockchip/rk3288/clock.c                                   | 3 +--
 src/soc/rockchip/rk3288/crypto.c                                  | 3 +--
 src/soc/rockchip/rk3288/display.c                                 | 3 +--
 src/soc/rockchip/rk3288/edp.c                                     | 3 +--
 src/soc/rockchip/rk3288/gpio.c                                    | 3 +--
 src/soc/rockchip/rk3288/i2c.c                                     | 3 +--
 src/soc/rockchip/rk3288/include/soc/addressmap.h                  | 3 +--
 src/soc/rockchip/rk3288/include/soc/clock.h                       | 3 +--
 src/soc/rockchip/rk3288/include/soc/display.h                     | 3 +--
 src/soc/rockchip/rk3288/include/soc/edp.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/gpio.h                        | 3 +--
 src/soc/rockchip/rk3288/include/soc/grf.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/i2c.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/memlayout.ld                  | 3 +--
 src/soc/rockchip/rk3288/include/soc/pmu.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/pwm.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/rk808.h                       | 3 +--
 src/soc/rockchip/rk3288/include/soc/sdram.h                       | 3 +--
 src/soc/rockchip/rk3288/include/soc/soc.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/spi.h                         | 3 +--
 src/soc/rockchip/rk3288/include/soc/timer.h                       | 3 +--
 src/soc/rockchip/rk3288/include/soc/tsadc.h                       | 3 +--
 src/soc/rockchip/rk3288/include/soc/vop.h                         | 3 +--
 src/soc/rockchip/rk3288/pwm.c                                     | 3 +--
 src/soc/rockchip/rk3288/rk808.c                                   | 3 +--
 src/soc/rockchip/rk3288/sdram.c                                   | 3 +--
 src/soc/rockchip/rk3288/soc.c                                     | 3 +--
 src/soc/rockchip/rk3288/software_i2c.c                            | 3 +--
 src/soc/rockchip/rk3288/spi.c                                     | 3 +--
 src/soc/rockchip/rk3288/timer.c                                   | 3 +--
 src/soc/rockchip/rk3288/tsadc.c                                   | 3 +--
 src/soc/rockchip/rk3288/uart.c                                    | 3 +--
 src/soc/rockchip/rk3288/vop.c                                     | 3 +--
 src/soc/samsung/exynos5250/alternate_cbfs.c                       | 3 +--
 src/soc/samsung/exynos5250/bootblock.c                            | 3 +--
 src/soc/samsung/exynos5250/cbmem.c                                | 3 +--
 src/soc/samsung/exynos5250/chip.h                                 | 3 +--
 src/soc/samsung/exynos5250/clock.c                                | 3 +--
 src/soc/samsung/exynos5250/clock_init.c                           | 3 +--
 src/soc/samsung/exynos5250/cpu.c                                  | 3 +--
 src/soc/samsung/exynos5250/dmc_common.c                           | 3 +--
 src/soc/samsung/exynos5250/dmc_init_ddr3.c                        | 3 +--
 src/soc/samsung/exynos5250/dp-reg.c                               | 3 +--
 src/soc/samsung/exynos5250/fb.c                                   | 3 +--
 src/soc/samsung/exynos5250/gpio.c                                 | 3 +--
 src/soc/samsung/exynos5250/i2c.c                                  | 3 +--
 src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h           | 3 +--
 src/soc/samsung/exynos5250/include/soc/clk.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/cpu.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/dmc.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/dp-core.h                  | 3 +--
 src/soc/samsung/exynos5250/include/soc/dp.h                       | 3 +--
 src/soc/samsung/exynos5250/include/soc/dsim.h                     | 3 +--
 src/soc/samsung/exynos5250/include/soc/fimd.h                     | 3 +--
 src/soc/samsung/exynos5250/include/soc/gpio.h                     | 3 +--
 src/soc/samsung/exynos5250/include/soc/i2c.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/i2s-regs.h                 | 3 +--
 src/soc/samsung/exynos5250/include/soc/memlayout.ld               | 3 +--
 src/soc/samsung/exynos5250/include/soc/periph.h                   | 3 +--
 src/soc/samsung/exynos5250/include/soc/pinmux.h                   | 3 +--
 src/soc/samsung/exynos5250/include/soc/power.h                    | 3 +--
 src/soc/samsung/exynos5250/include/soc/setup.h                    | 3 +--
 src/soc/samsung/exynos5250/include/soc/spi.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/sysreg.h                   | 3 +--
 src/soc/samsung/exynos5250/include/soc/tmu.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/trustzone.h                | 3 +--
 src/soc/samsung/exynos5250/include/soc/uart.h                     | 3 +--
 src/soc/samsung/exynos5250/include/soc/usb.h                      | 3 +--
 src/soc/samsung/exynos5250/include/soc/wakeup.h                   | 3 +--
 src/soc/samsung/exynos5250/pinmux.c                               | 3 +--
 src/soc/samsung/exynos5250/power.c                                | 3 +--
 src/soc/samsung/exynos5250/spi.c                                  | 3 +--
 src/soc/samsung/exynos5250/timer.c                                | 3 +--
 src/soc/samsung/exynos5250/tmu.c                                  | 3 +--
 src/soc/samsung/exynos5250/trustzone.c                            | 3 +--
 src/soc/samsung/exynos5250/uart.c                                 | 3 +--
 src/soc/samsung/exynos5250/usb.c                                  | 3 +--
 src/soc/samsung/exynos5250/wakeup.c                               | 3 +--
 src/soc/samsung/exynos5420/alternate_cbfs.c                       | 3 +--
 src/soc/samsung/exynos5420/bootblock.c                            | 3 +--
 src/soc/samsung/exynos5420/cbmem.c                                | 3 +--
 src/soc/samsung/exynos5420/chip.h                                 | 3 +--
 src/soc/samsung/exynos5420/clock.c                                | 3 +--
 src/soc/samsung/exynos5420/clock_init.c                           | 3 +--
 src/soc/samsung/exynos5420/cpu.c                                  | 3 +--
 src/soc/samsung/exynos5420/dmc_common.c                           | 3 +--
 src/soc/samsung/exynos5420/dmc_init_ddr3.c                        | 3 +--
 src/soc/samsung/exynos5420/dp.c                                   | 3 +--
 src/soc/samsung/exynos5420/dp_lowlevel.c                          | 3 +--
 src/soc/samsung/exynos5420/fimd.c                                 | 3 +--
 src/soc/samsung/exynos5420/gpio.c                                 | 3 +--
 src/soc/samsung/exynos5420/i2c.c                                  | 3 +--
 src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h           | 3 +--
 src/soc/samsung/exynos5420/include/soc/clk.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/cpu.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/dmc.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/dp.h                       | 3 +--
 src/soc/samsung/exynos5420/include/soc/dsim.h                     | 3 +--
 src/soc/samsung/exynos5420/include/soc/fimd.h                     | 3 +--
 src/soc/samsung/exynos5420/include/soc/gpio.h                     | 3 +--
 src/soc/samsung/exynos5420/include/soc/i2c.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/i2s-regs.h                 | 3 +--
 src/soc/samsung/exynos5420/include/soc/memlayout.ld               | 3 +--
 src/soc/samsung/exynos5420/include/soc/periph.h                   | 3 +--
 src/soc/samsung/exynos5420/include/soc/pinmux.h                   | 3 +--
 src/soc/samsung/exynos5420/include/soc/power.h                    | 3 +--
 src/soc/samsung/exynos5420/include/soc/setup.h                    | 3 +--
 src/soc/samsung/exynos5420/include/soc/spi.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/sysreg.h                   | 3 +--
 src/soc/samsung/exynos5420/include/soc/tmu.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/trustzone.h                | 3 +--
 src/soc/samsung/exynos5420/include/soc/uart.h                     | 3 +--
 src/soc/samsung/exynos5420/include/soc/usb.h                      | 3 +--
 src/soc/samsung/exynos5420/include/soc/wakeup.h                   | 3 +--
 src/soc/samsung/exynos5420/pinmux.c                               | 3 +--
 src/soc/samsung/exynos5420/power.c                                | 3 +--
 src/soc/samsung/exynos5420/smp.c                                  | 3 +--
 src/soc/samsung/exynos5420/spi.c                                  | 3 +--
 src/soc/samsung/exynos5420/timer.c                                | 3 +--
 src/soc/samsung/exynos5420/tmu.c                                  | 3 +--
 src/soc/samsung/exynos5420/trustzone.c                            | 3 +--
 src/soc/samsung/exynos5420/uart.c                                 | 3 +--
 src/soc/samsung/exynos5420/usb.c                                  | 3 +--
 src/soc/samsung/exynos5420/wakeup.c                               | 3 +--
 src/soc/ucb/riscv/cbmem.c                                         | 3 +--
 src/southbridge/amd/agesa/Kconfig                                 | 3 +--
 src/southbridge/amd/agesa/Makefile.inc                            | 3 +--
 src/southbridge/amd/agesa/hudson/Kconfig                          | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/audio.asl                   | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/fch.asl                     | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/lpc.asl                     | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/pci_int.asl                 | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/pcie.asl                    | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/sleepstates.asl             | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/smbus.asl                   | 3 +--
 src/southbridge/amd/agesa/hudson/acpi/usb.asl                     | 3 +--
 src/southbridge/amd/agesa/hudson/agesawrapper.c                   | 3 +--
 src/southbridge/amd/agesa/hudson/amd_pci_int_defs.h               | 3 +--
 src/southbridge/amd/agesa/hudson/amd_pci_int_types.h              | 3 +--
 src/southbridge/amd/agesa/hudson/bootblock.c                      | 3 +--
 src/southbridge/amd/agesa/hudson/chip.h                           | 3 +--
 src/southbridge/amd/agesa/hudson/early_setup.c                    | 3 +--
 src/southbridge/amd/agesa/hudson/enable_usbdebug.c                | 3 +--
 src/southbridge/amd/agesa/hudson/fadt.c                           | 3 +--
 src/southbridge/amd/agesa/hudson/hda.c                            | 3 +--
 src/southbridge/amd/agesa/hudson/hudson.c                         | 3 +--
 src/southbridge/amd/agesa/hudson/hudson.h                         | 3 +--
 src/southbridge/amd/agesa/hudson/ide.c                            | 3 +--
 src/southbridge/amd/agesa/hudson/imc.c                            | 3 +--
 src/southbridge/amd/agesa/hudson/imc.h                            | 3 +--
 src/southbridge/amd/agesa/hudson/lpc.c                            | 3 +--
 src/southbridge/amd/agesa/hudson/pci.c                            | 3 +--
 src/southbridge/amd/agesa/hudson/pci_devs.h                       | 3 +--
 src/southbridge/amd/agesa/hudson/pcie.c                           | 3 +--
 src/southbridge/amd/agesa/hudson/ramtop.c                         | 3 +--
 src/southbridge/amd/agesa/hudson/reset.c                          | 3 +--
 src/southbridge/amd/agesa/hudson/resume.c                         | 3 +--
 src/southbridge/amd/agesa/hudson/sata.c                           | 3 +--
 src/southbridge/amd/agesa/hudson/sd.c                             | 3 +--
 src/southbridge/amd/agesa/hudson/sm.c                             | 3 +--
 src/southbridge/amd/agesa/hudson/smbus.c                          | 3 +--
 src/southbridge/amd/agesa/hudson/smbus.h                          | 3 +--
 src/southbridge/amd/agesa/hudson/smbus_spd.c                      | 3 +--
 src/southbridge/amd/agesa/hudson/spi.c                            | 3 +--
 src/southbridge/amd/agesa/hudson/usb.c                            | 3 +--
 src/southbridge/amd/amd8111/Kconfig                               | 3 +--
 src/southbridge/amd/amd8111/bootblock.c                           | 3 +--
 src/southbridge/amd/amd8131/Kconfig                               | 3 +--
 src/southbridge/amd/amd8132/bridge.c                              | 3 +--
 src/southbridge/amd/amd8151/agp3.c                                | 3 +--
 src/southbridge/amd/cimx/Kconfig                                  | 3 +--
 src/southbridge/amd/cimx/Makefile.inc                             | 3 +--
 src/southbridge/amd/cimx/cimx_util.c                              | 3 +--
 src/southbridge/amd/cimx/cimx_util.h                              | 3 +--
 src/southbridge/amd/cimx/sb700/Amd.h                              | 3 +--
 src/southbridge/amd/cimx/sb700/AmdSbLib.h                         | 3 +--
 src/southbridge/amd/cimx/sb700/Kconfig                            | 3 +--
 src/southbridge/amd/cimx/sb700/Makefile.inc                       | 3 +--
 src/southbridge/amd/cimx/sb700/Platform.h                         | 3 +--
 src/southbridge/amd/cimx/sb700/amd_pci_int_defs.h                 | 3 +--
 src/southbridge/amd/cimx/sb700/amd_pci_int_types.h                | 3 +--
 src/southbridge/amd/cimx/sb700/bootblock.c                        | 3 +--
 src/southbridge/amd/cimx/sb700/chip.h                             | 3 +--
 src/southbridge/amd/cimx/sb700/early.c                            | 3 +--
 src/southbridge/amd/cimx/sb700/late.c                             | 3 +--
 src/southbridge/amd/cimx/sb700/lpc.c                              | 3 +--
 src/southbridge/amd/cimx/sb700/lpc.h                              | 3 +--
 src/southbridge/amd/cimx/sb700/reset.c                            | 3 +--
 src/southbridge/amd/cimx/sb700/sb_cimx.h                          | 3 +--
 src/southbridge/amd/cimx/sb700/smbus.c                            | 3 +--
 src/southbridge/amd/cimx/sb700/smbus.h                            | 3 +--
 src/southbridge/amd/cimx/sb700/smbus_spd.c                        | 3 +--
 src/southbridge/amd/cimx/sb700/smbus_spd.h                        | 3 +--
 src/southbridge/amd/cimx/sb800/Amd.h                              | 3 +--
 src/southbridge/amd/cimx/sb800/AmdSbLib.h                         | 3 +--
 src/southbridge/amd/cimx/sb800/Kconfig                            | 3 +--
 src/southbridge/amd/cimx/sb800/Makefile.inc                       | 3 +--
 src/southbridge/amd/cimx/sb800/SBPLATFORM.h                       | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/audio.asl                     | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/fch.asl                       | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/lpc.asl                       | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/pcie.asl                      | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/sleepstates.asl               | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/smbus.asl                     | 3 +--
 src/southbridge/amd/cimx/sb800/acpi/usb.asl                       | 3 +--
 src/southbridge/amd/cimx/sb800/amd_pci_int_defs.h                 | 3 +--
 src/southbridge/amd/cimx/sb800/amd_pci_int_types.h                | 3 +--
 src/southbridge/amd/cimx/sb800/bootblock.c                        | 3 +--
 src/southbridge/amd/cimx/sb800/cfg.c                              | 3 +--
 src/southbridge/amd/cimx/sb800/cfg.h                              | 3 +--
 src/southbridge/amd/cimx/sb800/chip.h                             | 3 +--
 src/southbridge/amd/cimx/sb800/early.c                            | 3 +--
 src/southbridge/amd/cimx/sb800/fadt.c                             | 3 +--
 src/southbridge/amd/cimx/sb800/fan.c                              | 3 +--
 src/southbridge/amd/cimx/sb800/fan.h                              | 3 +--
 src/southbridge/amd/cimx/sb800/late.c                             | 3 +--
 src/southbridge/amd/cimx/sb800/lpc.c                              | 3 +--
 src/southbridge/amd/cimx/sb800/lpc.h                              | 3 +--
 src/southbridge/amd/cimx/sb800/pci_devs.h                         | 3 +--
 src/southbridge/amd/cimx/sb800/ramtop.c                           | 3 +--
 src/southbridge/amd/cimx/sb800/reset.c                            | 3 +--
 src/southbridge/amd/cimx/sb800/sb_cimx.h                          | 3 +--
 src/southbridge/amd/cimx/sb800/smbus.c                            | 3 +--
 src/southbridge/amd/cimx/sb800/smbus.h                            | 3 +--
 src/southbridge/amd/cimx/sb800/smbus_spd.c                        | 3 +--
 src/southbridge/amd/cimx/sb800/smbus_spd.h                        | 3 +--
 src/southbridge/amd/cimx/sb800/spi.c                              | 3 +--
 src/southbridge/amd/cimx/sb900/Amd.h                              | 3 +--
 src/southbridge/amd/cimx/sb900/AmdSbLib.h                         | 3 +--
 src/southbridge/amd/cimx/sb900/Kconfig                            | 3 +--
 src/southbridge/amd/cimx/sb900/Makefile.inc                       | 3 +--
 src/southbridge/amd/cimx/sb900/SbPlatform.h                       | 3 +--
 src/southbridge/amd/cimx/sb900/amd_pci_int_defs.h                 | 3 +--
 src/southbridge/amd/cimx/sb900/amd_pci_int_types.h                | 3 +--
 src/southbridge/amd/cimx/sb900/bootblock.c                        | 3 +--
 src/southbridge/amd/cimx/sb900/cfg.c                              | 3 +--
 src/southbridge/amd/cimx/sb900/chip.h                             | 3 +--
 src/southbridge/amd/cimx/sb900/early.c                            | 3 +--
 src/southbridge/amd/cimx/sb900/late.c                             | 3 +--
 src/southbridge/amd/cimx/sb900/lpc.c                              | 3 +--
 src/southbridge/amd/cimx/sb900/lpc.h                              | 3 +--
 src/southbridge/amd/cimx/sb900/reset.c                            | 3 +--
 src/southbridge/amd/cimx/sb900/sb_cimx.h                          | 3 +--
 src/southbridge/amd/cimx/sb900/smbus.c                            | 3 +--
 src/southbridge/amd/cimx/sb900/smbus.h                            | 3 +--
 src/southbridge/amd/common/amd_pci_util.c                         | 3 +--
 src/southbridge/amd/common/amd_pci_util.h                         | 3 +--
 src/southbridge/amd/cs5535/cs5535.h                               | 3 +--
 src/southbridge/amd/cs5536/Kconfig                                | 3 +--
 src/southbridge/amd/cs5536/Makefile.inc                           | 3 +--
 src/southbridge/amd/cs5536/chip.h                                 | 3 +--
 src/southbridge/amd/cs5536/cs5536.c                               | 3 +--
 src/southbridge/amd/cs5536/cs5536.h                               | 3 +--
 src/southbridge/amd/cs5536/early_setup.c                          | 3 +--
 src/southbridge/amd/cs5536/early_smbus.c                          | 3 +--
 src/southbridge/amd/cs5536/ide.c                                  | 3 +--
 src/southbridge/amd/cs5536/pirq.c                                 | 3 +--
 src/southbridge/amd/cs5536/smbus.c                                | 3 +--
 src/southbridge/amd/cs5536/smbus.h                                | 3 +--
 src/southbridge/amd/pi/Kconfig                                    | 3 +--
 src/southbridge/amd/pi/Makefile.inc                               | 3 +--
 src/southbridge/amd/pi/hudson/Kconfig                             | 3 +--
 src/southbridge/amd/pi/hudson/acpi/audio.asl                      | 3 +--
 src/southbridge/amd/pi/hudson/acpi/fch.asl                        | 3 +--
 src/southbridge/amd/pi/hudson/acpi/lpc.asl                        | 3 +--
 src/southbridge/amd/pi/hudson/acpi/pci_int.asl                    | 3 +--
 src/southbridge/amd/pi/hudson/acpi/pcie.asl                       | 3 +--
 src/southbridge/amd/pi/hudson/acpi/sleepstates.asl                | 3 +--
 src/southbridge/amd/pi/hudson/acpi/smbus.asl                      | 3 +--
 src/southbridge/amd/pi/hudson/acpi/usb.asl                        | 3 +--
 src/southbridge/amd/pi/hudson/amd_pci_int_defs.h                  | 3 +--
 src/southbridge/amd/pi/hudson/amd_pci_int_types.h                 | 3 +--
 src/southbridge/amd/pi/hudson/bootblock.c                         | 3 +--
 src/southbridge/amd/pi/hudson/chip.h                              | 3 +--
 src/southbridge/amd/pi/hudson/early_setup.c                       | 3 +--
 src/southbridge/amd/pi/hudson/enable_usbdebug.c                   | 3 +--
 src/southbridge/amd/pi/hudson/fadt.c                              | 3 +--
 src/southbridge/amd/pi/hudson/hda.c                               | 3 +--
 src/southbridge/amd/pi/hudson/hudson.c                            | 3 +--
 src/southbridge/amd/pi/hudson/hudson.h                            | 3 +--
 src/southbridge/amd/pi/hudson/ide.c                               | 3 +--
 src/southbridge/amd/pi/hudson/imc.c                               | 3 +--
 src/southbridge/amd/pi/hudson/imc.h                               | 3 +--
 src/southbridge/amd/pi/hudson/lpc.c                               | 3 +--
 src/southbridge/amd/pi/hudson/pci.c                               | 3 +--
 src/southbridge/amd/pi/hudson/pci_devs.h                          | 3 +--
 src/southbridge/amd/pi/hudson/pcie.c                              | 3 +--
 src/southbridge/amd/pi/hudson/reset.c                             | 3 +--
 src/southbridge/amd/pi/hudson/sata.c                              | 3 +--
 src/southbridge/amd/pi/hudson/sd.c                                | 3 +--
 src/southbridge/amd/pi/hudson/sm.c                                | 3 +--
 src/southbridge/amd/pi/hudson/smbus.c                             | 3 +--
 src/southbridge/amd/pi/hudson/smbus.h                             | 3 +--
 src/southbridge/amd/pi/hudson/smbus_spd.c                         | 3 +--
 src/southbridge/amd/pi/hudson/usb.c                               | 3 +--
 src/southbridge/amd/rs690/Kconfig                                 | 3 +--
 src/southbridge/amd/rs690/chip.h                                  | 3 +--
 src/southbridge/amd/rs690/cmn.c                                   | 3 +--
 src/southbridge/amd/rs690/early_setup.c                           | 3 +--
 src/southbridge/amd/rs690/gfx.c                                   | 3 +--
 src/southbridge/amd/rs690/ht.c                                    | 3 +--
 src/southbridge/amd/rs690/pcie.c                                  | 3 +--
 src/southbridge/amd/rs690/rs690.c                                 | 3 +--
 src/southbridge/amd/rs690/rs690.h                                 | 3 +--
 src/southbridge/amd/rs780/Kconfig                                 | 3 +--
 src/southbridge/amd/rs780/chip.h                                  | 3 +--
 src/southbridge/amd/rs780/cmn.c                                   | 3 +--
 src/southbridge/amd/rs780/early_setup.c                           | 3 +--
 src/southbridge/amd/rs780/gfx.c                                   | 3 +--
 src/southbridge/amd/rs780/ht.c                                    | 3 +--
 src/southbridge/amd/rs780/pcie.c                                  | 3 +--
 src/southbridge/amd/rs780/rev.h                                   | 3 +--
 src/southbridge/amd/rs780/rs780.c                                 | 3 +--
 src/southbridge/amd/rs780/rs780.h                                 | 3 +--
 src/southbridge/amd/sb600/Kconfig                                 | 3 +--
 src/southbridge/amd/sb600/ac97.c                                  | 3 +--
 src/southbridge/amd/sb600/bootblock.c                             | 3 +--
 src/southbridge/amd/sb600/chip.h                                  | 3 +--
 src/southbridge/amd/sb600/early_setup.c                           | 3 +--
 src/southbridge/amd/sb600/enable_usbdebug.c                       | 3 +--
 src/southbridge/amd/sb600/hda.c                                   | 3 +--
 src/southbridge/amd/sb600/ide.c                                   | 3 +--
 src/southbridge/amd/sb600/lpc.c                                   | 3 +--
 src/southbridge/amd/sb600/pci.c                                   | 3 +--
 src/southbridge/amd/sb600/reset.c                                 | 3 +--
 src/southbridge/amd/sb600/sata.c                                  | 3 +--
 src/southbridge/amd/sb600/sb600.c                                 | 3 +--
 src/southbridge/amd/sb600/sb600.h                                 | 3 +--
 src/southbridge/amd/sb600/sm.c                                    | 3 +--
 src/southbridge/amd/sb600/smbus.c                                 | 3 +--
 src/southbridge/amd/sb600/smbus.h                                 | 3 +--
 src/southbridge/amd/sb600/usb.c                                   | 3 +--
 src/southbridge/amd/sb700/Kconfig                                 | 3 +--
 src/southbridge/amd/sb700/bootblock.c                             | 3 +--
 src/southbridge/amd/sb700/chip.h                                  | 3 +--
 src/southbridge/amd/sb700/early_setup.c                           | 3 +--
 src/southbridge/amd/sb700/enable_usbdebug.c                       | 3 +--
 src/southbridge/amd/sb700/fadt.c                                  | 3 +--
 src/southbridge/amd/sb700/hda.c                                   | 3 +--
 src/southbridge/amd/sb700/ide.c                                   | 3 +--
 src/southbridge/amd/sb700/lpc.c                                   | 3 +--
 src/southbridge/amd/sb700/pci.c                                   | 3 +--
 src/southbridge/amd/sb700/pmio.c                                  | 3 +--
 src/southbridge/amd/sb700/pmio.h                                  | 3 +--
 src/southbridge/amd/sb700/reset.c                                 | 3 +--
 src/southbridge/amd/sb700/sata.c                                  | 3 +--
 src/southbridge/amd/sb700/sb700.c                                 | 3 +--
 src/southbridge/amd/sb700/sb700.h                                 | 3 +--
 src/southbridge/amd/sb700/sm.c                                    | 3 +--
 src/southbridge/amd/sb700/smbus.c                                 | 3 +--
 src/southbridge/amd/sb700/smbus.h                                 | 3 +--
 src/southbridge/amd/sb700/usb.c                                   | 3 +--
 src/southbridge/amd/sb800/Kconfig                                 | 3 +--
 src/southbridge/amd/sb800/bootblock.c                             | 3 +--
 src/southbridge/amd/sb800/chip.h                                  | 3 +--
 src/southbridge/amd/sb800/early_setup.c                           | 3 +--
 src/southbridge/amd/sb800/enable_usbdebug.c                       | 3 +--
 src/southbridge/amd/sb800/fadt.c                                  | 3 +--
 src/southbridge/amd/sb800/hda.c                                   | 3 +--
 src/southbridge/amd/sb800/ide.c                                   | 3 +--
 src/southbridge/amd/sb800/lpc.c                                   | 3 +--
 src/southbridge/amd/sb800/pci.c                                   | 3 +--
 src/southbridge/amd/sb800/pcie.c                                  | 3 +--
 src/southbridge/amd/sb800/reset.c                                 | 3 +--
 src/southbridge/amd/sb800/sata.c                                  | 3 +--
 src/southbridge/amd/sb800/sb800.c                                 | 3 +--
 src/southbridge/amd/sb800/sb800.h                                 | 3 +--
 src/southbridge/amd/sb800/sm.c                                    | 3 +--
 src/southbridge/amd/sb800/smbus.c                                 | 3 +--
 src/southbridge/amd/sb800/smbus.h                                 | 3 +--
 src/southbridge/amd/sb800/usb.c                                   | 3 +--
 src/southbridge/amd/sr5650/Kconfig                                | 3 +--
 src/southbridge/amd/sr5650/chip.h                                 | 3 +--
 src/southbridge/amd/sr5650/cmn.h                                  | 3 +--
 src/southbridge/amd/sr5650/early_setup.c                          | 3 +--
 src/southbridge/amd/sr5650/ht.c                                   | 3 +--
 src/southbridge/amd/sr5650/pcie.c                                 | 3 +--
 src/southbridge/amd/sr5650/rev.h                                  | 3 +--
 src/southbridge/amd/sr5650/sr5650.c                               | 3 +--
 src/southbridge/amd/sr5650/sr5650.h                               | 3 +--
 src/southbridge/broadcom/bcm21000/pcie.c                          | 3 +--
 src/southbridge/broadcom/bcm5780/nic.c                            | 3 +--
 src/southbridge/broadcom/bcm5780/pcie.c                           | 3 +--
 src/southbridge/broadcom/bcm5780/pcix.c                           | 3 +--
 src/southbridge/broadcom/bcm5785/bcm5785.c                        | 3 +--
 src/southbridge/broadcom/bcm5785/bcm5785.h                        | 3 +--
 src/southbridge/broadcom/bcm5785/bootblock.c                      | 3 +--
 src/southbridge/broadcom/bcm5785/chip.h                           | 3 +--
 src/southbridge/broadcom/bcm5785/early_setup.c                    | 3 +--
 src/southbridge/broadcom/bcm5785/early_smbus.c                    | 3 +--
 src/southbridge/broadcom/bcm5785/ide.c                            | 3 +--
 src/southbridge/broadcom/bcm5785/lpc.c                            | 3 +--
 src/southbridge/broadcom/bcm5785/reset.c                          | 3 +--
 src/southbridge/broadcom/bcm5785/sata.c                           | 3 +--
 src/southbridge/broadcom/bcm5785/sb_pci_main.c                    | 3 +--
 src/southbridge/broadcom/bcm5785/smbus.h                          | 3 +--
 src/southbridge/broadcom/bcm5785/usb.c                            | 3 +--
 src/southbridge/dmp/vortex86ex/Kconfig                            | 3 +--
 src/southbridge/dmp/vortex86ex/Makefile.inc                       | 3 +--
 src/southbridge/dmp/vortex86ex/audio.c                            | 3 +--
 src/southbridge/dmp/vortex86ex/chip.h                             | 3 +--
 src/southbridge/dmp/vortex86ex/hard_reset.c                       | 3 +--
 src/southbridge/dmp/vortex86ex/ide_sd_sata.c                      | 3 +--
 src/southbridge/dmp/vortex86ex/southbridge.c                      | 3 +--
 src/southbridge/dmp/vortex86ex/southbridge.h                      | 3 +--
 src/southbridge/intel/bd82x6x/Kconfig                             | 3 +--
 src/southbridge/intel/bd82x6x/Makefile.inc                        | 3 +--
 src/southbridge/intel/bd82x6x/acpi/audio.asl                      | 3 +--
 src/southbridge/intel/bd82x6x/acpi/default_irq_route.asl          | 3 +--
 src/southbridge/intel/bd82x6x/acpi/globalnvs.asl                  | 3 +--
 src/southbridge/intel/bd82x6x/acpi/irqlinks.asl                   | 3 +--
 src/southbridge/intel/bd82x6x/acpi/lpc.asl                        | 3 +--
 src/southbridge/intel/bd82x6x/acpi/pch.asl                        | 3 +--
 src/southbridge/intel/bd82x6x/acpi/pcie.asl                       | 3 +--
 src/southbridge/intel/bd82x6x/acpi/pcie_port.asl                  | 3 +--
 src/southbridge/intel/bd82x6x/acpi/platform.asl                   | 3 +--
 src/southbridge/intel/bd82x6x/acpi/sata.asl                       | 3 +--
 src/southbridge/intel/bd82x6x/acpi/sleepstates.asl                | 3 +--
 src/southbridge/intel/bd82x6x/acpi/smbus.asl                      | 3 +--
 src/southbridge/intel/bd82x6x/acpi/usb.asl                        | 3 +--
 src/southbridge/intel/bd82x6x/azalia.c                            | 3 +--
 src/southbridge/intel/bd82x6x/bootblock.c                         | 3 +--
 src/southbridge/intel/bd82x6x/chip.h                              | 3 +--
 src/southbridge/intel/bd82x6x/early_me.c                          | 3 +--
 src/southbridge/intel/bd82x6x/early_me_mrc.c                      | 3 +--
 src/southbridge/intel/bd82x6x/early_pch.c                         | 3 +--
 src/southbridge/intel/bd82x6x/early_pch_common.c                  | 3 +--
 src/southbridge/intel/bd82x6x/early_rcba.c                        | 3 +--
 src/southbridge/intel/bd82x6x/early_smbus.c                       | 3 +--
 src/southbridge/intel/bd82x6x/early_spi.c                         | 3 +--
 src/southbridge/intel/bd82x6x/early_thermal.c                     | 3 +--
 src/southbridge/intel/bd82x6x/early_usb.c                         | 3 +--
 src/southbridge/intel/bd82x6x/early_usb_mrc.c                     | 3 +--
 src/southbridge/intel/bd82x6x/elog.c                              | 3 +--
 src/southbridge/intel/bd82x6x/finalize.c                          | 3 +--
 src/southbridge/intel/bd82x6x/gpio.c                              | 3 +--
 src/southbridge/intel/bd82x6x/gpio.h                              | 3 +--
 src/southbridge/intel/bd82x6x/lpc.c                               | 3 +--
 src/southbridge/intel/bd82x6x/madt.c                              | 3 +--
 src/southbridge/intel/bd82x6x/me.c                                | 3 +--
 src/southbridge/intel/bd82x6x/me.h                                | 3 +--
 src/southbridge/intel/bd82x6x/me_8.x.c                            | 3 +--
 src/southbridge/intel/bd82x6x/me_status.c                         | 3 +--
 src/southbridge/intel/bd82x6x/nvs.h                               | 3 +--
 src/southbridge/intel/bd82x6x/pch.c                               | 3 +--
 src/southbridge/intel/bd82x6x/pch.h                               | 3 +--
 src/southbridge/intel/bd82x6x/pci.c                               | 3 +--
 src/southbridge/intel/bd82x6x/pcie.c                              | 3 +--
 src/southbridge/intel/bd82x6x/reset.c                             | 3 +--
 src/southbridge/intel/bd82x6x/sata.c                              | 3 +--
 src/southbridge/intel/bd82x6x/smbus.c                             | 3 +--
 src/southbridge/intel/bd82x6x/smbus.h                             | 3 +--
 src/southbridge/intel/bd82x6x/smi.c                               | 3 +--
 src/southbridge/intel/bd82x6x/smihandler.c                        | 3 +--
 src/southbridge/intel/bd82x6x/usb_ehci.c                          | 3 +--
 src/southbridge/intel/bd82x6x/usb_xhci.c                          | 3 +--
 src/southbridge/intel/bd82x6x/watchdog.c                          | 3 +--
 src/southbridge/intel/common/Makefile.inc                         | 3 +--
 src/southbridge/intel/common/firmware/Kconfig                     | 3 +--
 src/southbridge/intel/common/firmware/Makefile.inc                | 3 +--
 src/southbridge/intel/common/pciehp.c                             | 3 +--
 src/southbridge/intel/common/spi.c                                | 3 +--
 src/southbridge/intel/common/usb_debug.c                          | 3 +--
 src/southbridge/intel/esb6300/reset.c                             | 3 +--
 src/southbridge/intel/i3100/chip.h                                | 3 +--
 src/southbridge/intel/i3100/early_lpc.c                           | 3 +--
 src/southbridge/intel/i3100/early_smbus.c                         | 3 +--
 src/southbridge/intel/i3100/ehci.c                                | 3 +--
 src/southbridge/intel/i3100/i3100.c                               | 3 +--
 src/southbridge/intel/i3100/i3100.h                               | 3 +--
 src/southbridge/intel/i3100/ioapic.c                              | 3 +--
 src/southbridge/intel/i3100/lpc.c                                 | 3 +--
 src/southbridge/intel/i3100/pci.c                                 | 3 +--
 src/southbridge/intel/i3100/pciexp_portb.c                        | 3 +--
 src/southbridge/intel/i3100/reset.c                               | 3 +--
 src/southbridge/intel/i3100/sata.c                                | 3 +--
 src/southbridge/intel/i3100/smbus.c                               | 3 +--
 src/southbridge/intel/i3100/smbus.h                               | 3 +--
 src/southbridge/intel/i3100/uhci.c                                | 3 +--
 src/southbridge/intel/i82371eb/Makefile.inc                       | 3 +--
 src/southbridge/intel/i82371eb/acpi/isabridge.asl                 | 3 +--
 src/southbridge/intel/i82371eb/acpi/pirq.asl                      | 3 +--
 src/southbridge/intel/i82371eb/acpi_tables.c                      | 3 +--
 src/southbridge/intel/i82371eb/bootblock.c                        | 3 +--
 src/southbridge/intel/i82371eb/chip.h                             | 3 +--
 src/southbridge/intel/i82371eb/early_pm.c                         | 3 +--
 src/southbridge/intel/i82371eb/early_smbus.c                      | 3 +--
 src/southbridge/intel/i82371eb/fadt.c                             | 3 +--
 src/southbridge/intel/i82371eb/i82371eb.c                         | 3 +--
 src/southbridge/intel/i82371eb/i82371eb.h                         | 3 +--
 src/southbridge/intel/i82371eb/ide.c                              | 3 +--
 src/southbridge/intel/i82371eb/isa.c                              | 3 +--
 src/southbridge/intel/i82371eb/reset.c                            | 3 +--
 src/southbridge/intel/i82371eb/smbus.c                            | 3 +--
 src/southbridge/intel/i82371eb/usb.c                              | 3 +--
 src/southbridge/intel/i82371eb/wakeup.c                           | 3 +--
 src/southbridge/intel/i82801ax/Kconfig                            | 3 +--
 src/southbridge/intel/i82801ax/Makefile.inc                       | 3 +--
 src/southbridge/intel/i82801ax/ac97.c                             | 3 +--
 src/southbridge/intel/i82801ax/chip.h                             | 3 +--
 src/southbridge/intel/i82801ax/early_smbus.c                      | 3 +--
 src/southbridge/intel/i82801ax/i82801ax.c                         | 3 +--
 src/southbridge/intel/i82801ax/i82801ax.h                         | 3 +--
 src/southbridge/intel/i82801ax/ide.c                              | 3 +--
 src/southbridge/intel/i82801ax/lpc.c                              | 3 +--
 src/southbridge/intel/i82801ax/pci.c                              | 3 +--
 src/southbridge/intel/i82801ax/reset.c                            | 3 +--
 src/southbridge/intel/i82801ax/smbus.c                            | 3 +--
 src/southbridge/intel/i82801ax/smbus.h                            | 3 +--
 src/southbridge/intel/i82801ax/usb.c                              | 3 +--
 src/southbridge/intel/i82801ax/watchdog.c                         | 3 +--
 src/southbridge/intel/i82801bx/Kconfig                            | 3 +--
 src/southbridge/intel/i82801bx/Makefile.inc                       | 3 +--
 src/southbridge/intel/i82801bx/ac97.c                             | 3 +--
 src/southbridge/intel/i82801bx/chip.h                             | 3 +--
 src/southbridge/intel/i82801bx/early_smbus.c                      | 3 +--
 src/southbridge/intel/i82801bx/i82801bx.c                         | 3 +--
 src/southbridge/intel/i82801bx/i82801bx.h                         | 3 +--
 src/southbridge/intel/i82801bx/ide.c                              | 3 +--
 src/southbridge/intel/i82801bx/lpc.c                              | 3 +--
 src/southbridge/intel/i82801bx/nic.c                              | 3 +--
 src/southbridge/intel/i82801bx/pci.c                              | 3 +--
 src/southbridge/intel/i82801bx/reset.c                            | 3 +--
 src/southbridge/intel/i82801bx/smbus.c                            | 3 +--
 src/southbridge/intel/i82801bx/smbus.h                            | 3 +--
 src/southbridge/intel/i82801bx/usb.c                              | 3 +--
 src/southbridge/intel/i82801bx/watchdog.c                         | 3 +--
 src/southbridge/intel/i82801dx/Kconfig                            | 3 +--
 src/southbridge/intel/i82801dx/Makefile.inc                       | 3 +--
 src/southbridge/intel/i82801dx/ac97.c                             | 3 +--
 src/southbridge/intel/i82801dx/chip.h                             | 3 +--
 src/southbridge/intel/i82801dx/early_smbus.c                      | 3 +--
 src/southbridge/intel/i82801dx/i82801dx.c                         | 3 +--
 src/southbridge/intel/i82801dx/i82801dx.h                         | 3 +--
 src/southbridge/intel/i82801dx/ide.c                              | 3 +--
 src/southbridge/intel/i82801dx/lpc.c                              | 3 +--
 src/southbridge/intel/i82801dx/nvs.h                              | 3 +--
 src/southbridge/intel/i82801dx/pci.c                              | 3 +--
 src/southbridge/intel/i82801dx/reset.c                            | 3 +--
 src/southbridge/intel/i82801dx/smbus.c                            | 3 +--
 src/southbridge/intel/i82801dx/smi.c                              | 3 +--
 src/southbridge/intel/i82801dx/smihandler.c                       | 3 +--
 src/southbridge/intel/i82801dx/tco_timer.c                        | 3 +--
 src/southbridge/intel/i82801dx/usb.c                              | 3 +--
 src/southbridge/intel/i82801dx/usb2.c                             | 3 +--
 src/southbridge/intel/i82801gx/Kconfig                            | 3 +--
 src/southbridge/intel/i82801gx/Makefile.inc                       | 3 +--
 src/southbridge/intel/i82801gx/ac97.c                             | 3 +--
 src/southbridge/intel/i82801gx/acpi/ac97.asl                      | 3 +--
 src/southbridge/intel/i82801gx/acpi/audio.asl                     | 3 +--
 src/southbridge/intel/i82801gx/acpi/globalnvs.asl                 | 3 +--
 src/southbridge/intel/i82801gx/acpi/ich7.asl                      | 3 +--
 src/southbridge/intel/i82801gx/acpi/irqlinks.asl                  | 3 +--
 src/southbridge/intel/i82801gx/acpi/lpc.asl                       | 3 +--
 src/southbridge/intel/i82801gx/acpi/pata.asl                      | 3 +--
 src/southbridge/intel/i82801gx/acpi/pci.asl                       | 3 +--
 src/southbridge/intel/i82801gx/acpi/pcie.asl                      | 3 +--
 src/southbridge/intel/i82801gx/acpi/platform.asl                  | 3 +--
 src/southbridge/intel/i82801gx/acpi/sata.asl                      | 3 +--
 src/southbridge/intel/i82801gx/acpi/sleepstates.asl               | 3 +--
 src/southbridge/intel/i82801gx/acpi/smbus.asl                     | 3 +--
 src/southbridge/intel/i82801gx/acpi/usb.asl                       | 3 +--
 src/southbridge/intel/i82801gx/azalia.c                           | 3 +--
 src/southbridge/intel/i82801gx/bootblock.c                        | 3 +--
 src/southbridge/intel/i82801gx/chip.h                             | 3 +--
 src/southbridge/intel/i82801gx/early_lpc.c                        | 3 +--
 src/southbridge/intel/i82801gx/early_smbus.c                      | 3 +--
 src/southbridge/intel/i82801gx/i82801gx.c                         | 3 +--
 src/southbridge/intel/i82801gx/i82801gx.h                         | 3 +--
 src/southbridge/intel/i82801gx/ide.c                              | 3 +--
 src/southbridge/intel/i82801gx/lpc.c                              | 3 +--
 src/southbridge/intel/i82801gx/nic.c                              | 3 +--
 src/southbridge/intel/i82801gx/nvs.h                              | 3 +--
 src/southbridge/intel/i82801gx/pci.c                              | 3 +--
 src/southbridge/intel/i82801gx/pcie.c                             | 3 +--
 src/southbridge/intel/i82801gx/reset.c                            | 3 +--
 src/southbridge/intel/i82801gx/sata.c                             | 3 +--
 src/southbridge/intel/i82801gx/smbus.c                            | 3 +--
 src/southbridge/intel/i82801gx/smbus.h                            | 3 +--
 src/southbridge/intel/i82801gx/smi.c                              | 3 +--
 src/southbridge/intel/i82801gx/smihandler.c                       | 3 +--
 src/southbridge/intel/i82801gx/usb.c                              | 3 +--
 src/southbridge/intel/i82801gx/usb_ehci.c                         | 3 +--
 src/southbridge/intel/i82801gx/watchdog.c                         | 3 +--
 src/southbridge/intel/i82801ix/Kconfig                            | 3 +--
 src/southbridge/intel/i82801ix/Makefile.inc                       | 3 +--
 src/southbridge/intel/i82801ix/acpi/audio.asl                     | 3 +--
 src/southbridge/intel/i82801ix/acpi/globalnvs.asl                 | 3 +--
 src/southbridge/intel/i82801ix/acpi/ich9.asl                      | 3 +--
 src/southbridge/intel/i82801ix/acpi/irqlinks.asl                  | 3 +--
 src/southbridge/intel/i82801ix/acpi/lpc.asl                       | 3 +--
 src/southbridge/intel/i82801ix/acpi/pci.asl                       | 3 +--
 src/southbridge/intel/i82801ix/acpi/pcie.asl                      | 3 +--
 src/southbridge/intel/i82801ix/acpi/pcie_port.asl                 | 3 +--
 src/southbridge/intel/i82801ix/acpi/sata.asl                      | 3 +--
 src/southbridge/intel/i82801ix/acpi/sleepstates.asl               | 3 +--
 src/southbridge/intel/i82801ix/acpi/smbus.asl                     | 3 +--
 src/southbridge/intel/i82801ix/acpi/usb.asl                       | 3 +--
 src/southbridge/intel/i82801ix/bootblock.c                        | 3 +--
 src/southbridge/intel/i82801ix/chip.h                             | 3 +--
 src/southbridge/intel/i82801ix/dmi_setup.c                        | 3 +--
 src/southbridge/intel/i82801ix/early_init.c                       | 3 +--
 src/southbridge/intel/i82801ix/early_smbus.c                      | 3 +--
 src/southbridge/intel/i82801ix/hdaudio.c                          | 3 +--
 src/southbridge/intel/i82801ix/i82801ix.c                         | 3 +--
 src/southbridge/intel/i82801ix/i82801ix.h                         | 3 +--
 src/southbridge/intel/i82801ix/lpc.c                              | 3 +--
 src/southbridge/intel/i82801ix/nvs.h                              | 3 +--
 src/southbridge/intel/i82801ix/pci.c                              | 3 +--
 src/southbridge/intel/i82801ix/pcie.c                             | 3 +--
 src/southbridge/intel/i82801ix/sata.c                             | 3 +--
 src/southbridge/intel/i82801ix/smbus.c                            | 3 +--
 src/southbridge/intel/i82801ix/smbus.h                            | 3 +--
 src/southbridge/intel/i82801ix/smi.c                              | 3 +--
 src/southbridge/intel/i82801ix/smihandler.c                       | 3 +--
 src/southbridge/intel/i82801ix/thermal.c                          | 3 +--
 src/southbridge/intel/i82801ix/usb_ehci.c                         | 3 +--
 src/southbridge/intel/ibexpeak/Kconfig                            | 3 +--
 src/southbridge/intel/ibexpeak/Makefile.inc                       | 3 +--
 src/southbridge/intel/ibexpeak/azalia.c                           | 3 +--
 src/southbridge/intel/ibexpeak/chip.h                             | 3 +--
 src/southbridge/intel/ibexpeak/early_smbus.c                      | 3 +--
 src/southbridge/intel/ibexpeak/early_thermal.c                    | 3 +--
 src/southbridge/intel/ibexpeak/lpc.c                              | 3 +--
 src/southbridge/intel/ibexpeak/madt.c                             | 3 +--
 src/southbridge/intel/ibexpeak/me.c                               | 3 +--
 src/southbridge/intel/ibexpeak/me.h                               | 3 +--
 src/southbridge/intel/ibexpeak/nvs.h                              | 3 +--
 src/southbridge/intel/ibexpeak/pch.h                              | 3 +--
 src/southbridge/intel/ibexpeak/sata.c                             | 3 +--
 src/southbridge/intel/ibexpeak/smbus.c                            | 3 +--
 src/southbridge/intel/ibexpeak/smbus.h                            | 3 +--
 src/southbridge/intel/ibexpeak/smi.c                              | 3 +--
 src/southbridge/intel/ibexpeak/smihandler.c                       | 3 +--
 src/southbridge/intel/ibexpeak/thermal.c                          | 3 +--
 src/southbridge/intel/ibexpeak/usb_ehci.c                         | 3 +--
 src/southbridge/intel/lynxpoint/Kconfig                           | 3 +--
 src/southbridge/intel/lynxpoint/Makefile.inc                      | 3 +--
 src/southbridge/intel/lynxpoint/acpi.c                            | 3 +--
 src/southbridge/intel/lynxpoint/acpi/audio.asl                    | 3 +--
 src/southbridge/intel/lynxpoint/acpi/globalnvs.asl                | 3 +--
 src/southbridge/intel/lynxpoint/acpi/irqlinks.asl                 | 3 +--
 src/southbridge/intel/lynxpoint/acpi/lpc.asl                      | 3 +--
 src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl                   | 3 +--
 src/southbridge/intel/lynxpoint/acpi/pch.asl                      | 3 +--
 src/southbridge/intel/lynxpoint/acpi/pcie.asl                     | 3 +--
 src/southbridge/intel/lynxpoint/acpi/pcie_port.asl                | 3 +--
 src/southbridge/intel/lynxpoint/acpi/sata.asl                     | 3 +--
 src/southbridge/intel/lynxpoint/acpi/serialio.asl                 | 3 +--
 src/southbridge/intel/lynxpoint/acpi/sleepstates.asl              | 3 +--
 src/southbridge/intel/lynxpoint/acpi/smbus.asl                    | 3 +--
 src/southbridge/intel/lynxpoint/acpi/usb.asl                      | 3 +--
 src/southbridge/intel/lynxpoint/azalia.c                          | 3 +--
 src/southbridge/intel/lynxpoint/bootblock.c                       | 3 +--
 src/southbridge/intel/lynxpoint/chip.h                            | 3 +--
 src/southbridge/intel/lynxpoint/early_me.c                        | 3 +--
 src/southbridge/intel/lynxpoint/early_pch.c                       | 3 +--
 src/southbridge/intel/lynxpoint/early_smbus.c                     | 3 +--
 src/southbridge/intel/lynxpoint/early_spi.c                       | 3 +--
 src/southbridge/intel/lynxpoint/early_usb.c                       | 3 +--
 src/southbridge/intel/lynxpoint/elog.c                            | 3 +--
 src/southbridge/intel/lynxpoint/finalize.c                        | 3 +--
 src/southbridge/intel/lynxpoint/gpio.c                            | 3 +--
 src/southbridge/intel/lynxpoint/gpio.h                            | 3 +--
 src/southbridge/intel/lynxpoint/hda_verb.c                        | 3 +--
 src/southbridge/intel/lynxpoint/hda_verb.h                        | 3 +--
 src/southbridge/intel/lynxpoint/lp_gpio.c                         | 3 +--
 src/southbridge/intel/lynxpoint/lp_gpio.h                         | 3 +--
 src/southbridge/intel/lynxpoint/lpc.c                             | 3 +--
 src/southbridge/intel/lynxpoint/me.h                              | 3 +--
 src/southbridge/intel/lynxpoint/me_9.x.c                          | 3 +--
 src/southbridge/intel/lynxpoint/me_status.c                       | 3 +--
 src/southbridge/intel/lynxpoint/nvs.h                             | 3 +--
 src/southbridge/intel/lynxpoint/pch.c                             | 3 +--
 src/southbridge/intel/lynxpoint/pch.h                             | 3 +--
 src/southbridge/intel/lynxpoint/pci.c                             | 3 +--
 src/southbridge/intel/lynxpoint/pcie.c                            | 3 +--
 src/southbridge/intel/lynxpoint/pmutil.c                          | 3 +--
 src/southbridge/intel/lynxpoint/rcba.c                            | 3 +--
 src/southbridge/intel/lynxpoint/reset.c                           | 3 +--
 src/southbridge/intel/lynxpoint/sata.c                            | 3 +--
 src/southbridge/intel/lynxpoint/serialio.c                        | 3 +--
 src/southbridge/intel/lynxpoint/smbus.c                           | 3 +--
 src/southbridge/intel/lynxpoint/smbus.h                           | 3 +--
 src/southbridge/intel/lynxpoint/smi.c                             | 3 +--
 src/southbridge/intel/lynxpoint/smihandler.c                      | 3 +--
 src/southbridge/intel/lynxpoint/usb_ehci.c                        | 3 +--
 src/southbridge/intel/lynxpoint/usb_xhci.c                        | 3 +--
 src/southbridge/intel/lynxpoint/watchdog.c                        | 3 +--
 src/southbridge/intel/sch/Kconfig                                 | 3 +--
 src/southbridge/intel/sch/Makefile.inc                            | 3 +--
 src/southbridge/intel/sch/acpi/ac97.asl                           | 3 +--
 src/southbridge/intel/sch/acpi/audio.asl                          | 3 +--
 src/southbridge/intel/sch/acpi/globalnvs.asl                      | 3 +--
 src/southbridge/intel/sch/acpi/irqlinks.asl                       | 3 +--
 src/southbridge/intel/sch/acpi/lpc.asl                            | 3 +--
 src/southbridge/intel/sch/acpi/pata.asl                           | 3 +--
 src/southbridge/intel/sch/acpi/pci.asl                            | 3 +--
 src/southbridge/intel/sch/acpi/pcie.asl                           | 3 +--
 src/southbridge/intel/sch/acpi/sch.asl                            | 3 +--
 src/southbridge/intel/sch/acpi/sleepstates.asl                    | 3 +--
 src/southbridge/intel/sch/acpi/smbus.asl                          | 3 +--
 src/southbridge/intel/sch/acpi/usb.asl                            | 3 +--
 src/southbridge/intel/sch/audio.c                                 | 3 +--
 src/southbridge/intel/sch/chip.h                                  | 3 +--
 src/southbridge/intel/sch/early_smbus.c                           | 3 +--
 src/southbridge/intel/sch/ide.c                                   | 3 +--
 src/southbridge/intel/sch/lpc.c                                   | 3 +--
 src/southbridge/intel/sch/mmc.c                                   | 3 +--
 src/southbridge/intel/sch/nvs.h                                   | 3 +--
 src/southbridge/intel/sch/pcie.c                                  | 3 +--
 src/southbridge/intel/sch/reset.c                                 | 3 +--
 src/southbridge/intel/sch/sch.h                                   | 3 +--
 src/southbridge/intel/sch/smbus.c                                 | 3 +--
 src/southbridge/intel/sch/smbus.h                                 | 3 +--
 src/southbridge/intel/sch/smi.c                                   | 3 +--
 src/southbridge/intel/sch/smihandler.c                            | 3 +--
 src/southbridge/intel/sch/south.c                                 | 3 +--
 src/southbridge/intel/sch/usb.c                                   | 3 +--
 src/southbridge/intel/sch/usb_client.c                            | 3 +--
 src/southbridge/intel/sch/usb_ehci.c                              | 3 +--
 src/southbridge/nvidia/ck804/ac97.c                               | 3 +--
 src/southbridge/nvidia/ck804/bootblock.c                          | 3 +--
 src/southbridge/nvidia/ck804/chip.h                               | 3 +--
 src/southbridge/nvidia/ck804/ck804.c                              | 3 +--
 src/southbridge/nvidia/ck804/ck804.h                              | 3 +--
 src/southbridge/nvidia/ck804/early_setup.c                        | 3 +--
 src/southbridge/nvidia/ck804/early_setup_car.c                    | 3 +--
 src/southbridge/nvidia/ck804/early_setup_ss.h                     | 3 +--
 src/southbridge/nvidia/ck804/early_smbus.c                        | 3 +--
 src/southbridge/nvidia/ck804/enable_usbdebug.c                    | 3 +--
 src/southbridge/nvidia/ck804/ht.c                                 | 3 +--
 src/southbridge/nvidia/ck804/ide.c                                | 3 +--
 src/southbridge/nvidia/ck804/lpc.c                                | 3 +--
 src/southbridge/nvidia/ck804/nic.c                                | 3 +--
 src/southbridge/nvidia/ck804/pci.c                                | 3 +--
 src/southbridge/nvidia/ck804/pcie.c                               | 3 +--
 src/southbridge/nvidia/ck804/reset.c                              | 3 +--
 src/southbridge/nvidia/ck804/romstrap.inc                         | 3 +--
 src/southbridge/nvidia/ck804/romstrap.ld                          | 3 +--
 src/southbridge/nvidia/ck804/sata.c                               | 3 +--
 src/southbridge/nvidia/ck804/smbus.c                              | 3 +--
 src/southbridge/nvidia/ck804/smbus.h                              | 3 +--
 src/southbridge/nvidia/ck804/usb.c                                | 3 +--
 src/southbridge/nvidia/ck804/usb2.c                               | 3 +--
 src/southbridge/nvidia/mcp55/azalia.c                             | 3 +--
 src/southbridge/nvidia/mcp55/bootblock.c                          | 3 +--
 src/southbridge/nvidia/mcp55/chip.h                               | 3 +--
 src/southbridge/nvidia/mcp55/early_ctrl.c                         | 3 +--
 src/southbridge/nvidia/mcp55/early_setup_car.c                    | 3 +--
 src/southbridge/nvidia/mcp55/early_setup_ss.h                     | 3 +--
 src/southbridge/nvidia/mcp55/early_smbus.c                        | 3 +--
 src/southbridge/nvidia/mcp55/enable_usbdebug.c                    | 3 +--
 src/southbridge/nvidia/mcp55/fadt.c                               | 3 +--
 src/southbridge/nvidia/mcp55/ht.c                                 | 3 +--
 src/southbridge/nvidia/mcp55/ide.c                                | 3 +--
 src/southbridge/nvidia/mcp55/lpc.c                                | 3 +--
 src/southbridge/nvidia/mcp55/mcp55.c                              | 3 +--
 src/southbridge/nvidia/mcp55/mcp55.h                              | 3 +--
 src/southbridge/nvidia/mcp55/nic.c                                | 3 +--
 src/southbridge/nvidia/mcp55/pci.c                                | 3 +--
 src/southbridge/nvidia/mcp55/pcie.c                               | 3 +--
 src/southbridge/nvidia/mcp55/reset.c                              | 3 +--
 src/southbridge/nvidia/mcp55/romstrap.inc                         | 3 +--
 src/southbridge/nvidia/mcp55/romstrap.ld                          | 3 +--
 src/southbridge/nvidia/mcp55/sata.c                               | 3 +--
 src/southbridge/nvidia/mcp55/smbus.c                              | 3 +--
 src/southbridge/nvidia/mcp55/smbus.h                              | 3 +--
 src/southbridge/nvidia/mcp55/usb.c                                | 3 +--
 src/southbridge/nvidia/mcp55/usb2.c                               | 3 +--
 src/southbridge/rdc/r8610/Kconfig                                 | 3 +--
 src/southbridge/rdc/r8610/Makefile.inc                            | 3 +--
 src/southbridge/rdc/r8610/bootblock.c                             | 3 +--
 src/southbridge/rdc/r8610/r8610.c                                 | 3 +--
 src/southbridge/ricoh/rl5c476/Kconfig                             | 3 +--
 src/southbridge/ricoh/rl5c476/rl5c476.c                           | 3 +--
 src/southbridge/ricoh/rl5c476/rl5c476.h                           | 3 +--
 src/southbridge/sis/sis966/aza.c                                  | 3 +--
 src/southbridge/sis/sis966/bootblock.c                            | 3 +--
 src/southbridge/sis/sis966/chip.h                                 | 3 +--
 src/southbridge/sis/sis966/early_ctrl.c                           | 3 +--
 src/southbridge/sis/sis966/early_setup_car.c                      | 3 +--
 src/southbridge/sis/sis966/early_setup_ss.h                       | 3 +--
 src/southbridge/sis/sis966/early_smbus.c                          | 3 +--
 src/southbridge/sis/sis966/enable_usbdebug.c                      | 3 +--
 src/southbridge/sis/sis966/ide.c                                  | 3 +--
 src/southbridge/sis/sis966/lpc.c                                  | 3 +--
 src/southbridge/sis/sis966/nic.c                                  | 3 +--
 src/southbridge/sis/sis966/pcie.c                                 | 3 +--
 src/southbridge/sis/sis966/reset.c                                | 3 +--
 src/southbridge/sis/sis966/romstrap.inc                           | 3 +--
 src/southbridge/sis/sis966/romstrap.ld                            | 3 +--
 src/southbridge/sis/sis966/sata.c                                 | 3 +--
 src/southbridge/sis/sis966/sis761.c                               | 3 +--
 src/southbridge/sis/sis966/sis966.c                               | 3 +--
 src/southbridge/sis/sis966/sis966.h                               | 3 +--
 src/southbridge/sis/sis966/smbus.h                                | 3 +--
 src/southbridge/sis/sis966/usb.c                                  | 3 +--
 src/southbridge/sis/sis966/usb2.c                                 | 3 +--
 src/southbridge/ti/pci1x2x/pci1x2x.c                              | 3 +--
 src/southbridge/ti/pci7420/Kconfig                                | 3 +--
 src/southbridge/ti/pci7420/Makefile.inc                           | 3 +--
 src/southbridge/ti/pci7420/cardbus.c                              | 3 +--
 src/southbridge/ti/pci7420/chip.h                                 | 3 +--
 src/southbridge/ti/pci7420/firewire.c                             | 3 +--
 src/southbridge/ti/pci7420/pci7420.h                              | 3 +--
 src/southbridge/ti/pcixx12/Kconfig                                | 3 +--
 src/southbridge/ti/pcixx12/Makefile.inc                           | 3 +--
 src/southbridge/ti/pcixx12/pcixx12.c                              | 3 +--
 src/southbridge/via/k8t890/bridge.c                               | 3 +--
 src/southbridge/via/k8t890/chrome.c                               | 3 +--
 src/southbridge/via/k8t890/ctrl.c                                 | 3 +--
 src/southbridge/via/k8t890/dram.c                                 | 3 +--
 src/southbridge/via/k8t890/early_car.c                            | 3 +--
 src/southbridge/via/k8t890/error.c                                | 3 +--
 src/southbridge/via/k8t890/host.c                                 | 3 +--
 src/southbridge/via/k8t890/host_ctrl.c                            | 3 +--
 src/southbridge/via/k8t890/k8t890.h                               | 3 +--
 src/southbridge/via/k8t890/k8x8xx.h                               | 3 +--
 src/southbridge/via/k8t890/pcie.c                                 | 3 +--
 src/southbridge/via/k8t890/romstrap.inc                           | 3 +--
 src/southbridge/via/k8t890/romstrap.ld                            | 3 +--
 src/southbridge/via/k8t890/traf_ctrl.c                            | 3 +--
 src/southbridge/via/vt8237r/Kconfig                               | 3 +--
 src/southbridge/via/vt8237r/Makefile.inc                          | 3 +--
 src/southbridge/via/vt8237r/bootblock.c                           | 3 +--
 src/southbridge/via/vt8237r/chip.h                                | 3 +--
 src/southbridge/via/vt8237r/ctrl.c                                | 3 +--
 src/southbridge/via/vt8237r/early_smbus.c                         | 3 +--
 src/southbridge/via/vt8237r/fadt.c                                | 3 +--
 src/southbridge/via/vt8237r/ide.c                                 | 3 +--
 src/southbridge/via/vt8237r/lpc.c                                 | 3 +--
 src/southbridge/via/vt8237r/nic.c                                 | 3 +--
 src/southbridge/via/vt8237r/nvs.h                                 | 3 +--
 src/southbridge/via/vt8237r/pirq.c                                | 3 +--
 src/southbridge/via/vt8237r/sata.c                                | 3 +--
 src/southbridge/via/vt8237r/smi.c                                 | 3 +--
 src/southbridge/via/vt8237r/smihandler.c                          | 3 +--
 src/southbridge/via/vt8237r/usb.c                                 | 3 +--
 src/southbridge/via/vt8237r/vt8237r.c                             | 3 +--
 src/southbridge/via/vt8237r/vt8237r.h                             | 3 +--
 src/southbridge/via/vt82c686/early_serial.c                       | 3 +--
 src/southbridge/via/vt82c686/vt82c686.h                           | 3 +--
 src/superio/Makefile.inc                                          | 3 +--
 src/superio/acpi/pnp.asl                                          | 3 +--
 src/superio/acpi/pnp_config.asl                                   | 3 +--
 src/superio/acpi/pnp_generic.asl                                  | 3 +--
 src/superio/acpi/pnp_kbc.asl                                      | 3 +--
 src/superio/acpi/pnp_uart.asl                                     | 3 +--
 src/superio/common/conf_mode.c                                    | 3 +--
 src/superio/fintek/Kconfig                                        | 3 +--
 src/superio/fintek/Makefile.inc                                   | 3 +--
 src/superio/fintek/common/early_serial.c                          | 3 +--
 src/superio/fintek/common/fintek.h                                | 3 +--
 src/superio/fintek/f71805f/Makefile.inc                           | 3 +--
 src/superio/fintek/f71805f/f71805f.h                              | 3 +--
 src/superio/fintek/f71805f/superio.c                              | 3 +--
 src/superio/fintek/f71859/Makefile.inc                            | 3 +--
 src/superio/fintek/f71859/f71859.h                                | 3 +--
 src/superio/fintek/f71859/superio.c                               | 3 +--
 src/superio/fintek/f71863fg/Makefile.inc                          | 3 +--
 src/superio/fintek/f71863fg/f71863fg.h                            | 3 +--
 src/superio/fintek/f71863fg/superio.c                             | 3 +--
 src/superio/fintek/f71869ad/Makefile.inc                          | 3 +--
 src/superio/fintek/f71869ad/chip.h                                | 3 +--
 src/superio/fintek/f71869ad/f71869ad.h                            | 3 +--
 src/superio/fintek/f71869ad/f71869ad_hwm.c                        | 3 +--
 src/superio/fintek/f71869ad/f71869ad_multifunc.c                  | 3 +--
 src/superio/fintek/f71869ad/fintek_internal.h                     | 3 +--
 src/superio/fintek/f71869ad/superio.c                             | 3 +--
 src/superio/fintek/f71872/Makefile.inc                            | 3 +--
 src/superio/fintek/f71872/f71872.h                                | 3 +--
 src/superio/fintek/f71872/superio.c                               | 3 +--
 src/superio/fintek/f71889/Makefile.inc                            | 3 +--
 src/superio/fintek/f71889/f71889.h                                | 3 +--
 src/superio/fintek/f71889/superio.c                               | 3 +--
 src/superio/fintek/f81216h/Makefile.inc                           | 3 +--
 src/superio/fintek/f81216h/chip.h                                 | 3 +--
 src/superio/fintek/f81216h/early_serial.c                         | 3 +--
 src/superio/fintek/f81216h/f81216h.h                              | 3 +--
 src/superio/fintek/f81216h/superio.c                              | 3 +--
 src/superio/fintek/f81865f/Makefile.inc                           | 3 +--
 src/superio/fintek/f81865f/f81865f.h                              | 3 +--
 src/superio/fintek/f81865f/superio.c                              | 3 +--
 src/superio/fintek/f81866d/Makefile.inc                           | 3 +--
 src/superio/fintek/f81866d/chip.h                                 | 3 +--
 src/superio/fintek/f81866d/f81866d.h                              | 3 +--
 src/superio/fintek/f81866d/f81866d_hwm.c                          | 3 +--
 src/superio/fintek/f81866d/fintek_internal.h                      | 3 +--
 src/superio/fintek/f81866d/superio.c                              | 3 +--
 src/superio/intel/Kconfig                                         | 3 +--
 src/superio/intel/Makefile.inc                                    | 3 +--
 src/superio/intel/i3100/Makefile.inc                              | 3 +--
 src/superio/intel/i3100/early_serial.c                            | 3 +--
 src/superio/intel/i3100/i3100.h                                   | 3 +--
 src/superio/intel/i3100/superio.c                                 | 3 +--
 src/superio/ite/Kconfig                                           | 3 +--
 src/superio/ite/Makefile.inc                                      | 3 +--
 src/superio/ite/common/early_serial.c                             | 3 +--
 src/superio/ite/common/ite.h                                      | 3 +--
 src/superio/ite/it8661f/Makefile.inc                              | 3 +--
 src/superio/ite/it8661f/early_serial.c                            | 3 +--
 src/superio/ite/it8661f/it8661f.h                                 | 3 +--
 src/superio/ite/it8661f/superio.c                                 | 3 +--
 src/superio/ite/it8671f/Makefile.inc                              | 3 +--
 src/superio/ite/it8671f/early_serial.c                            | 3 +--
 src/superio/ite/it8671f/it8671f.h                                 | 3 +--
 src/superio/ite/it8671f/superio.c                                 | 3 +--
 src/superio/ite/it8712f/Makefile.inc                              | 3 +--
 src/superio/ite/it8712f/it8712f.h                                 | 3 +--
 src/superio/ite/it8712f/superio.c                                 | 3 +--
 src/superio/ite/it8716f/Makefile.inc                              | 3 +--
 src/superio/ite/it8716f/it8716f.h                                 | 3 +--
 src/superio/ite/it8716f/superio.c                                 | 3 +--
 src/superio/ite/it8718f/Makefile.inc                              | 3 +--
 src/superio/ite/it8718f/early_serial.c                            | 3 +--
 src/superio/ite/it8718f/it8718f.h                                 | 3 +--
 src/superio/ite/it8718f/superio.c                                 | 3 +--
 src/superio/ite/it8721f/Makefile.inc                              | 3 +--
 src/superio/ite/it8721f/it8721f.h                                 | 3 +--
 src/superio/ite/it8721f/superio.c                                 | 3 +--
 src/superio/ite/it8728f/Makefile.inc                              | 3 +--
 src/superio/ite/it8728f/chip.h                                    | 3 +--
 src/superio/ite/it8728f/it8728f.h                                 | 3 +--
 src/superio/ite/it8728f/it8728f_hwm.c                             | 3 +--
 src/superio/ite/it8728f/it8728f_internal.h                        | 3 +--
 src/superio/ite/it8728f/superio.c                                 | 3 +--
 src/superio/ite/it8772f/Makefile.inc                              | 3 +--
 src/superio/ite/it8772f/acpi/superio.asl                          | 3 +--
 src/superio/ite/it8772f/chip.h                                    | 3 +--
 src/superio/ite/it8772f/early_init.c                              | 3 +--
 src/superio/ite/it8772f/it8772f.h                                 | 3 +--
 src/superio/ite/it8772f/superio.c                                 | 3 +--
 src/superio/nsc/Kconfig                                           | 3 +--
 src/superio/nsc/Makefile.inc                                      | 3 +--
 src/superio/nsc/pc8374/Makefile.inc                               | 3 +--
 src/superio/nsc/pc8374/early_init.c                               | 3 +--
 src/superio/nsc/pc8374/pc8374.h                                   | 3 +--
 src/superio/nsc/pc8374/superio.c                                  | 3 +--
 src/superio/nsc/pc87309/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87309/early_serial.c                            | 3 +--
 src/superio/nsc/pc87309/pc87309.h                                 | 3 +--
 src/superio/nsc/pc87309/superio.c                                 | 3 +--
 src/superio/nsc/pc87360/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87360/early_serial.c                            | 3 +--
 src/superio/nsc/pc87360/pc87360.h                                 | 3 +--
 src/superio/nsc/pc87360/superio.c                                 | 3 +--
 src/superio/nsc/pc87366/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87366/early_serial.c                            | 3 +--
 src/superio/nsc/pc87366/pc87366.h                                 | 3 +--
 src/superio/nsc/pc87366/superio.c                                 | 3 +--
 src/superio/nsc/pc87382/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87382/pc87382.h                                 | 3 +--
 src/superio/nsc/pc87382/superio.c                                 | 3 +--
 src/superio/nsc/pc87384/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87384/pc87384.h                                 | 3 +--
 src/superio/nsc/pc87384/superio.c                                 | 3 +--
 src/superio/nsc/pc87392/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87392/early_serial.c                            | 3 +--
 src/superio/nsc/pc87392/pc87392.h                                 | 3 +--
 src/superio/nsc/pc87392/superio.c                                 | 3 +--
 src/superio/nsc/pc87417/Makefile.inc                              | 3 +--
 src/superio/nsc/pc87417/early_init.c                              | 3 +--
 src/superio/nsc/pc87417/early_serial.c                            | 3 +--
 src/superio/nsc/pc87417/pc87417.h                                 | 3 +--
 src/superio/nsc/pc87417/superio.c                                 | 3 +--
 src/superio/nsc/pc97307/Makefile.inc                              | 3 +--
 src/superio/nsc/pc97307/pc97307.h                                 | 3 +--
 src/superio/nsc/pc97307/superio.c                                 | 3 +--
 src/superio/nsc/pc97317/Makefile.inc                              | 3 +--
 src/superio/nsc/pc97317/early_serial.c                            | 3 +--
 src/superio/nsc/pc97317/pc97317.h                                 | 3 +--
 src/superio/nsc/pc97317/superio.c                                 | 3 +--
 src/superio/nuvoton/Kconfig                                       | 3 +--
 src/superio/nuvoton/Makefile.inc                                  | 3 +--
 src/superio/nuvoton/common/early_serial.c                         | 3 +--
 src/superio/nuvoton/common/nuvoton.h                              | 3 +--
 src/superio/nuvoton/nct5104d/Makefile.inc                         | 3 +--
 src/superio/nuvoton/nct5104d/chip.h                               | 3 +--
 src/superio/nuvoton/nct5104d/early_init.c                         | 3 +--
 src/superio/nuvoton/nct5104d/nct5104d.h                           | 3 +--
 src/superio/nuvoton/nct5104d/superio.c                            | 3 +--
 src/superio/nuvoton/nct5572d/Makefile.inc                         | 3 +--
 src/superio/nuvoton/nct5572d/nct5572d.h                           | 3 +--
 src/superio/nuvoton/nct5572d/superio.c                            | 3 +--
 src/superio/nuvoton/nct6776/Makefile.inc                          | 3 +--
 src/superio/nuvoton/nct6776/nct6776.h                             | 3 +--
 src/superio/nuvoton/nct6776/superio.c                             | 3 +--
 src/superio/nuvoton/nct6779d/Makefile.inc                         | 3 +--
 src/superio/nuvoton/nct6779d/nct6779d.h                           | 3 +--
 src/superio/nuvoton/nct6779d/superio.c                            | 3 +--
 src/superio/nuvoton/wpcm450/Makefile.inc                          | 3 +--
 src/superio/nuvoton/wpcm450/early_init.c                          | 3 +--
 src/superio/nuvoton/wpcm450/superio.c                             | 3 +--
 src/superio/nuvoton/wpcm450/wpcm450.h                             | 3 +--
 src/superio/renesas/Kconfig                                       | 3 +--
 src/superio/renesas/Makefile.inc                                  | 3 +--
 src/superio/renesas/m3885x/Makefile.inc                           | 3 +--
 src/superio/renesas/m3885x/superio.c                              | 3 +--
 src/superio/serverengines/Kconfig                                 | 3 +--
 src/superio/serverengines/Makefile.inc                            | 3 +--
 src/superio/serverengines/pilot/Makefile.inc                      | 3 +--
 src/superio/serverengines/pilot/early_init.c                      | 3 +--
 src/superio/serverengines/pilot/early_serial.c                    | 3 +--
 src/superio/serverengines/pilot/pilot.h                           | 3 +--
 src/superio/smsc/Kconfig                                          | 3 +--
 src/superio/smsc/Makefile.inc                                     | 3 +--
 src/superio/smsc/dme1737/Makefile.inc                             | 3 +--
 src/superio/smsc/dme1737/dme1737.h                                | 3 +--
 src/superio/smsc/dme1737/early_serial.c                           | 3 +--
 src/superio/smsc/dme1737/superio.c                                | 3 +--
 src/superio/smsc/fdc37m60x/Makefile.inc                           | 3 +--
 src/superio/smsc/fdc37m60x/early_serial.c                         | 3 +--
 src/superio/smsc/fdc37m60x/fdc37m60x.h                            | 3 +--
 src/superio/smsc/fdc37m60x/superio.c                              | 3 +--
 src/superio/smsc/fdc37n972/Makefile.inc                           | 3 +--
 src/superio/smsc/fdc37n972/fdc37n972.c                            | 3 +--
 src/superio/smsc/fdc37n972/fdc37n972.h                            | 3 +--
 src/superio/smsc/kbc1100/Makefile.inc                             | 3 +--
 src/superio/smsc/kbc1100/early_init.c                             | 3 +--
 src/superio/smsc/kbc1100/kbc1100.h                                | 3 +--
 src/superio/smsc/kbc1100/superio.c                                | 3 +--
 src/superio/smsc/lpc47b272/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47b272/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47b272/lpc47b272.h                            | 3 +--
 src/superio/smsc/lpc47b272/superio.c                              | 3 +--
 src/superio/smsc/lpc47b397/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47b397/early_gpio.c                           | 3 +--
 src/superio/smsc/lpc47b397/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47b397/lpc47b397.h                            | 3 +--
 src/superio/smsc/lpc47b397/superio.c                              | 3 +--
 src/superio/smsc/lpc47m10x/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47m10x/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47m10x/lpc47m10x.h                            | 3 +--
 src/superio/smsc/lpc47m10x/superio.c                              | 3 +--
 src/superio/smsc/lpc47m15x/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47m15x/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47m15x/lpc47m15x.h                            | 3 +--
 src/superio/smsc/lpc47m15x/superio.c                              | 3 +--
 src/superio/smsc/lpc47n207/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47n207/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47n207/lpc47n207.h                            | 3 +--
 src/superio/smsc/lpc47n217/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47n217/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47n217/lpc47n217.h                            | 3 +--
 src/superio/smsc/lpc47n217/superio.c                              | 3 +--
 src/superio/smsc/lpc47n227/Makefile.inc                           | 3 +--
 src/superio/smsc/lpc47n227/early_serial.c                         | 3 +--
 src/superio/smsc/lpc47n227/lpc47n227.h                            | 3 +--
 src/superio/smsc/lpc47n227/superio.c                              | 3 +--
 src/superio/smsc/mec1308/Makefile.inc                             | 3 +--
 src/superio/smsc/mec1308/acpi/superio.asl                         | 3 +--
 src/superio/smsc/mec1308/mec1308.h                                | 3 +--
 src/superio/smsc/mec1308/superio.c                                | 3 +--
 src/superio/smsc/sch4037/Makefile.inc                             | 3 +--
 src/superio/smsc/sch4037/sch4037.h                                | 3 +--
 src/superio/smsc/sch4037/sch4037_early_init.c                     | 3 +--
 src/superio/smsc/sch4037/superio.c                                | 3 +--
 src/superio/smsc/sio1007/Makefile.inc                             | 3 +--
 src/superio/smsc/sio1007/acpi/superio.asl                         | 3 +--
 src/superio/smsc/sio1007/chip.h                                   | 3 +--
 src/superio/smsc/sio1007/early_serial.c                           | 3 +--
 src/superio/smsc/sio1036/Makefile.inc                             | 3 +--
 src/superio/smsc/sio1036/sio1036.h                                | 3 +--
 src/superio/smsc/sio1036/sio1036_early_init.c                     | 3 +--
 src/superio/smsc/sio1036/superio.c                                | 3 +--
 src/superio/smsc/sio10n268/Makefile.inc                           | 3 +--
 src/superio/smsc/sio10n268/sio10n268.c                            | 3 +--
 src/superio/smsc/sio10n268/sio10n268.h                            | 3 +--
 src/superio/smsc/smscsuperio/Makefile.inc                         | 3 +--
 src/superio/smsc/smscsuperio/early_serial.c                       | 3 +--
 src/superio/smsc/smscsuperio/smscsuperio.h                        | 3 +--
 src/superio/smsc/smscsuperio/superio.c                            | 3 +--
 src/superio/via/Kconfig                                           | 3 +--
 src/superio/via/Makefile.inc                                      | 3 +--
 src/superio/via/vt1211/Makefile.inc                               | 3 +--
 src/superio/via/vt1211/vt1211.c                                   | 3 +--
 src/superio/via/vt1211/vt1211.h                                   | 3 +--
 src/superio/winbond/Kconfig                                       | 3 +--
 src/superio/winbond/Makefile.inc                                  | 3 +--
 src/superio/winbond/common/early_serial.c                         | 3 +--
 src/superio/winbond/common/winbond.h                              | 3 +--
 src/superio/winbond/w83627dhg/Makefile.inc                        | 3 +--
 src/superio/winbond/w83627dhg/acpi/superio.asl                    | 3 +--
 src/superio/winbond/w83627dhg/early_serial.c                      | 3 +--
 src/superio/winbond/w83627dhg/superio.c                           | 3 +--
 src/superio/winbond/w83627dhg/w83627dhg.h                         | 3 +--
 src/superio/winbond/w83627ehg/Makefile.inc                        | 3 +--
 src/superio/winbond/w83627ehg/early_serial.c                      | 3 +--
 src/superio/winbond/w83627ehg/superio.c                           | 3 +--
 src/superio/winbond/w83627ehg/w83627ehg.h                         | 3 +--
 src/superio/winbond/w83627hf/Makefile.inc                         | 3 +--
 src/superio/winbond/w83627hf/acpi/superio.asl                     | 3 +--
 src/superio/winbond/w83627hf/early_init.c                         | 3 +--
 src/superio/winbond/w83627hf/early_serial.c                       | 3 +--
 src/superio/winbond/w83627hf/superio.c                            | 3 +--
 src/superio/winbond/w83627hf/w83627hf.h                           | 3 +--
 src/superio/winbond/w83627thg/Makefile.inc                        | 3 +--
 src/superio/winbond/w83627thg/superio.c                           | 3 +--
 src/superio/winbond/w83627thg/w83627thg.h                         | 3 +--
 src/superio/winbond/w83627uhg/Makefile.inc                        | 3 +--
 src/superio/winbond/w83627uhg/superio.c                           | 3 +--
 src/superio/winbond/w83627uhg/w83627uhg.h                         | 3 +--
 src/superio/winbond/w83697hf/Makefile.inc                         | 3 +--
 src/superio/winbond/w83697hf/chip.h                               | 3 +--
 src/superio/winbond/w83697hf/early_serial.c                       | 3 +--
 src/superio/winbond/w83697hf/superio.c                            | 3 +--
 src/superio/winbond/w83697hf/w83697hf.h                           | 3 +--
 src/superio/winbond/w83977tf/Makefile.inc                         | 3 +--
 src/superio/winbond/w83977tf/early_serial.c                       | 3 +--
 src/superio/winbond/w83977tf/superio.c                            | 3 +--
 src/superio/winbond/w83977tf/w83977tf.h                           | 3 +--
 src/vendorcode/amd/Kconfig                                        | 3 +--
 src/vendorcode/amd/agesa/f10/Makefile.inc                         | 3 +--
 src/vendorcode/amd/agesa/f15/Makefile.inc                         | 3 +--
 src/vendorcode/amd/cimx/sb800/Makefile.inc                        | 3 +--
 src/vendorcode/amd/cimx/sb900/Makefile.inc                        | 3 +--
 src/vendorcode/google/Kconfig                                     | 3 +--
 src/vendorcode/google/Makefile.inc                                | 3 +--
 src/vendorcode/google/chromeos/Kconfig                            | 3 +--
 src/vendorcode/google/chromeos/Makefile.inc                       | 3 +--
 src/vendorcode/google/chromeos/acpi/chromeos.asl                  | 3 +--
 src/vendorcode/google/chromeos/acpi/gnvs.asl                      | 3 +--
 src/vendorcode/google/chromeos/acpi/ramoops.asl                   | 3 +--
 src/vendorcode/google/chromeos/chromeos.c                         | 3 +--
 src/vendorcode/google/chromeos/chromeos.h                         | 3 +--
 src/vendorcode/google/chromeos/elog.c                             | 3 +--
 src/vendorcode/google/chromeos/fmap.c                             | 3 +--
 src/vendorcode/google/chromeos/gnvs.c                             | 3 +--
 src/vendorcode/google/chromeos/gnvs.h                             | 3 +--
 src/vendorcode/google/chromeos/ramoops.c                          | 3 +--
 src/vendorcode/google/chromeos/symbols.h                          | 3 +--
 src/vendorcode/google/chromeos/vbnv_cmos.c                        | 3 +--
 src/vendorcode/google/chromeos/vbnv_ec.c                          | 3 +--
 src/vendorcode/google/chromeos/vbnv_flash.c                       | 3 +--
 src/vendorcode/google/chromeos/vbnv_layout.h                      | 3 +--
 src/vendorcode/google/chromeos/vboot2/Kconfig                     | 3 +--
 src/vendorcode/google/chromeos/vboot2/Makefile.inc                | 3 +--
 src/vendorcode/google/chromeos/vboot2/common.c                    | 3 +--
 src/vendorcode/google/chromeos/vboot2/misc.h                      | 3 +--
 src/vendorcode/google/chromeos/vboot2/vboot_handoff.c             | 3 +--
 src/vendorcode/google/chromeos/vboot2/vboot_loader.c              | 3 +--
 src/vendorcode/google/chromeos/vboot2/vboot_logic.c               | 3 +--
 src/vendorcode/google/chromeos/vboot2/verstage.c                  | 3 +--
 src/vendorcode/google/chromeos/vboot_common.c                     | 3 +--
 src/vendorcode/google/chromeos/vboot_common.h                     | 3 +--
 src/vendorcode/google/chromeos/vboot_handoff.h                    | 3 +--
 src/vendorcode/google/chromeos/vpd_calibration.c                  | 3 +--
 src/vendorcode/google/chromeos/vpd_mac.c                          | 3 +--
 src/vendorcode/google/chromeos/vpd_serialno.c                     | 3 +--
 src/vendorcode/google/chromeos/watchdog.c                         | 3 +--
 src/vendorcode/intel/Kconfig                                      | 3 +--
 src/vendorcode/intel/Makefile.inc                                 | 3 +--
 toolchain.inc                                                     | 3 +--
 util/acpi/acpidump-all                                            | 3 +--
 util/autoport/ec_lenovo.go                                        | 3 +--
 util/bimgtool/bimgtool.c                                          | 3 +--
 util/board_status/getrevision.sh                                  | 3 +--
 util/cbfstool/cbfs-mkpayload.c                                    | 3 +--
 util/cbfstool/cbfs-mkstage.c                                      | 3 +--
 util/cbfstool/cbfs-payload-linux.c                                | 3 +--
 util/cbfstool/cbfs.h                                              | 3 +--
 util/cbfstool/cbfs_image.c                                        | 3 +--
 util/cbfstool/cbfs_image.h                                        | 3 +--
 util/cbfstool/cbfs_sections.c                                     | 3 +--
 util/cbfstool/cbfs_sections.h                                     | 3 +--
 util/cbfstool/cbfstool.c                                          | 3 +--
 util/cbfstool/coff.h                                              | 3 +--
 util/cbfstool/common.c                                            | 3 +--
 util/cbfstool/common.h                                            | 3 +--
 util/cbfstool/compress.c                                          | 3 +--
 util/cbfstool/console/console.h                                   | 3 +--
 util/cbfstool/elf.h                                               | 3 +--
 util/cbfstool/elfheaders.c                                        | 3 +--
 util/cbfstool/elfparsing.h                                        | 3 +--
 util/cbfstool/fit.c                                               | 3 +--
 util/cbfstool/fit.h                                               | 3 +--
 util/cbfstool/flashmap_tests.c                                    | 3 +--
 util/cbfstool/fmap_from_fmd.c                                     | 3 +--
 util/cbfstool/fmap_from_fmd.h                                     | 3 +--
 util/cbfstool/fmaptool.c                                          | 3 +--
 util/cbfstool/fmd.c                                               | 3 +--
 util/cbfstool/fmd.h                                               | 3 +--
 util/cbfstool/fmd_parser.y                                        | 3 +--
 util/cbfstool/fmd_scanner.l                                       | 3 +--
 util/cbfstool/fv.h                                                | 3 +--
 util/cbfstool/linux.h                                             | 3 +--
 util/cbfstool/linux_trampoline.c                                  | 3 +--
 util/cbfstool/linux_trampoline.h                                  | 3 +--
 util/cbfstool/option.h                                            | 3 +--
 util/cbfstool/partitioned_file.c                                  | 3 +--
 util/cbfstool/partitioned_file.h                                  | 3 +--
 util/cbfstool/rmodtool.c                                          | 3 +--
 util/cbfstool/rmodule.c                                           | 3 +--
 util/cbfstool/rmodule.h                                           | 3 +--
 util/cbfstool/xdr.c                                               | 3 +--
 util/cbmem/Makefile                                               | 3 +--
 util/cbmem/cbmem.c                                                | 3 +--
 util/crossgcc/buildgcc                                            | 3 +--
 util/dtd_parser/dtd_parser.py                                     | 3 +--
 util/ectool/Makefile                                              | 3 +--
 util/ectool/ec.c                                                  | 3 +--
 util/ectool/ec.h                                                  | 3 +--
 util/ectool/ectool.c                                              | 3 +--
 util/genbuild_h/genbuild_h.sh                                     | 3 +--
 util/ifdfake/Makefile                                             | 3 +--
 util/ifdfake/ifdfake.c                                            | 3 +--
 util/ifdtool/Makefile                                             | 3 +--
 util/ifdtool/ifdtool.c                                            | 3 +--
 util/ifdtool/ifdtool.h                                            | 3 +--
 util/inteltool/Makefile                                           | 3 +--
 util/inteltool/amb.c                                              | 3 +--
 util/inteltool/cpu.c                                              | 3 +--
 util/inteltool/gfx.c                                              | 3 +--
 util/inteltool/gpio.c                                             | 3 +--
 util/inteltool/inteltool.c                                        | 3 +--
 util/inteltool/inteltool.h                                        | 3 +--
 util/inteltool/ivy_memory.c                                       | 3 +--
 util/inteltool/memory.c                                           | 3 +--
 util/inteltool/pcie.c                                             | 3 +--
 util/inteltool/powermgt.c                                         | 3 +--
 util/inteltool/rootcmplx.c                                        | 3 +--
 util/intelvbttool/intelvbttool.c                                  | 3 +--
 util/k8resdump/Makefile                                           | 3 +--
 util/k8resdump/k8resdump.c                                        | 3 +--
 util/lint/lint-000-license-headers                                | 3 +--
 util/lint/lint-001-no-global-config-in-romstage                   | 3 +--
 util/lint/lint-stable-003-whitespace                              | 3 +--
 util/lint/lint-stable-004-style-labels                            | 3 +--
 util/lint/lint-stable-005-board-status                            | 3 +--
 util/msrtool/Makefile.in                                          | 3 +--
 util/msrtool/configure                                            | 3 +--
 util/msrtool/cs5536.c                                             | 3 +--
 util/msrtool/darwin.c                                             | 3 +--
 util/msrtool/freebsd.c                                            | 3 +--
 util/msrtool/geodegx2.c                                           | 3 +--
 util/msrtool/geodelx.c                                            | 3 +--
 util/msrtool/intel_atom.c                                         | 3 +--
 util/msrtool/intel_core1.c                                        | 3 +--
 util/msrtool/intel_core2_early.c                                  | 3 +--
 util/msrtool/intel_core2_later.c                                  | 3 +--
 util/msrtool/intel_nehalem.c                                      | 3 +--
 util/msrtool/intel_pentium3.c                                     | 3 +--
 util/msrtool/intel_pentium3_early.c                               | 3 +--
 util/msrtool/intel_pentium4_early.c                               | 3 +--
 util/msrtool/intel_pentium4_later.c                               | 3 +--
 util/msrtool/k8.c                                                 | 3 +--
 util/msrtool/linux.c                                              | 3 +--
 util/msrtool/msrtool.c                                            | 3 +--
 util/msrtool/msrtool.h                                            | 3 +--
 util/msrtool/msrutils.c                                           | 3 +--
 util/msrtool/sys.c                                                | 3 +--
 util/nvramtool/Makefile                                           | 3 +--
 util/nvramtool/Makefile.inc                                       | 3 +--
 util/nvramtool/accessors/layout-bin.c                             | 2 +-
 util/nvramtool/accessors/layout-common.c                          | 2 +-
 util/nvramtool/accessors/layout-text.c                            | 2 +-
 util/nvramtool/accessors/layout-text.h                            | 2 +-
 util/nvramtool/cbfs.c                                             | 3 +--
 util/nvramtool/cbfs.h                                             | 3 +--
 util/nvramtool/cli/nvramtool.8                                    | 2 +-
 util/nvramtool/cli/nvramtool.c                                    | 2 +-
 util/nvramtool/cli/opts.c                                         | 2 +-
 util/nvramtool/cli/opts.h                                         | 2 +-
 util/nvramtool/cmos_lowlevel.c                                    | 2 +-
 util/nvramtool/cmos_lowlevel.h                                    | 2 +-
 util/nvramtool/cmos_ops.c                                         | 2 +-
 util/nvramtool/cmos_ops.h                                         | 2 +-
 util/nvramtool/common.c                                           | 2 +-
 util/nvramtool/common.h                                           | 2 +-
 util/nvramtool/input_file.c                                       | 2 +-
 util/nvramtool/input_file.h                                       | 2 +-
 util/nvramtool/layout.c                                           | 2 +-
 util/nvramtool/layout.h                                           | 2 +-
 util/nvramtool/lbtable.c                                          | 2 +-
 util/nvramtool/lbtable.h                                          | 2 +-
 util/nvramtool/reg_expr.c                                         | 2 +-
 util/nvramtool/reg_expr.h                                         | 2 +-
 util/optionlist/Makefile                                          | 3 +--
 util/optionlist/kconfig2wiki                                      | 3 +--
 util/sconfig/main.c                                               | 3 +--
 util/sconfig/sconfig.h                                            | 3 +--
 util/sconfig/sconfig.l                                            | 3 +--
 util/sconfig/sconfig.y                                            | 3 +--
 util/showdevicetree/showdt.c                                      | 3 +--
 util/superiotool/Makefile                                         | 3 +--
 util/superiotool/ali.c                                            | 3 +--
 util/superiotool/amd.c                                            | 3 +--
 util/superiotool/fintek.c                                         | 3 +--
 util/superiotool/infineon.c                                       | 3 +--
 util/superiotool/ite.c                                            | 3 +--
 util/superiotool/nsc.c                                            | 3 +--
 util/superiotool/nuvoton.c                                        | 3 +--
 util/superiotool/pci.c                                            | 3 +--
 util/superiotool/serverengines.c                                  | 3 +--
 util/superiotool/smsc.c                                           | 3 +--
 util/superiotool/superiotool.c                                    | 3 +--
 util/superiotool/superiotool.h                                    | 3 +--
 util/superiotool/via.c                                            | 3 +--
 util/superiotool/winbond.c                                        | 3 +--
 util/uio_usbdebug/console/printk.c                                | 3 +--
 util/uio_usbdebug/drivers/usb/pci_ehci.c                          | 3 +--
 util/uio_usbdebug/include/device/device.h                         | 3 +--
 util/uio_usbdebug/linux/uio_ehci_pci.c                            | 3 +--
 util/uio_usbdebug/uio_usbdebug.c                                  | 3 +--
 util/uio_usbdebug/uio_usbdebug_intel.c                            | 3 +--
 util/viatool/Makefile                                             | 3 +--
 util/viatool/cpu.c                                                | 3 +--
 util/viatool/viatool.c                                            | 3 +--
 util/viatool/viatool.h                                            | 3 +--
 util/xcompile/xcompile                                            | 3 +--
 5849 files changed, 5849 insertions(+), 11672 deletions(-)

diff --git a/Documentation/mainboard_io_trap_handler_sample.c b/Documentation/mainboard_io_trap_handler_sample.c
index b7839b7..544fb0e 100644
--- a/Documentation/mainboard_io_trap_handler_sample.c
+++ b/Documentation/mainboard_io_trap_handler_sample.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/Makefile.inc b/Makefile.inc
index d84bf19..2a8448f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 GIT:=$(shell [ -d "$(top)/.git" ] && command -v git)
diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile
index bc94803..fb9aac1 100644
--- a/payloads/bayou/Makefile
+++ b/payloads/bayou/Makefile
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 CONFIG_LZMA=y
diff --git a/payloads/bayou/bayou.h b/payloads/bayou/bayou.h
index 56cd613..1162b65 100644
--- a/payloads/bayou/bayou.h
+++ b/payloads/bayou/bayou.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BAYOU_H_
diff --git a/payloads/bayou/bayou.xml.example b/payloads/bayou/bayou.xml.example
index e9c27ee..53723e3 100644
--- a/payloads/bayou/bayou.xml.example
+++ b/payloads/bayou/bayou.xml.example
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 -->
 
 <!-- Sample Bayou config file. Adapt as needed, then rename to bayou.xml. -->
diff --git a/payloads/bayou/config.c b/payloads/bayou/config.c
index 719fcbd..b945cf4 100644
--- a/payloads/bayou/config.c
+++ b/payloads/bayou/config.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "bayou.h"
diff --git a/payloads/bayou/main.c b/payloads/bayou/main.c
index a99537e..c8f971a 100644
--- a/payloads/bayou/main.c
+++ b/payloads/bayou/main.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "bayou.h"
diff --git a/payloads/bayou/menu.c b/payloads/bayou/menu.c
index 0502634..5e73e70 100644
--- a/payloads/bayou/menu.c
+++ b/payloads/bayou/menu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload.h>
diff --git a/payloads/bayou/payload.c b/payloads/bayou/payload.c
index 6ade5c9..7b4f734 100644
--- a/payloads/bayou/payload.c
+++ b/payloads/bayou/payload.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "bayou.h"
diff --git a/payloads/bayou/self.c b/payloads/bayou/self.c
index 04db3f6..fabc85e 100644
--- a/payloads/bayou/self.c
+++ b/payloads/bayou/self.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "bayou.h"
diff --git a/payloads/bayou/self.h b/payloads/bayou/self.h
index 5210357..0a11e53 100644
--- a/payloads/bayou/self.h
+++ b/payloads/bayou/self.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SELF_H_
diff --git a/payloads/bayou/util/pbuilder/Makefile b/payloads/bayou/util/pbuilder/Makefile
index 5e17b77..dce4a7b 100644
--- a/payloads/bayou/util/pbuilder/Makefile
+++ b/payloads/bayou/util/pbuilder/Makefile
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 PBUILDOBJS := config.o create.o show.o main.o
diff --git a/payloads/bayou/util/pbuilder/config.c b/payloads/bayou/util/pbuilder/config.c
index b26168f..c061ef3 100644
--- a/payloads/bayou/util/pbuilder/config.c
+++ b/payloads/bayou/util/pbuilder/config.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define _GNU_SOURCE
diff --git a/payloads/bayou/util/pbuilder/create.c b/payloads/bayou/util/pbuilder/create.c
index c866079..e6abd66 100644
--- a/payloads/bayou/util/pbuilder/create.c
+++ b/payloads/bayou/util/pbuilder/create.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/payloads/bayou/util/pbuilder/liblar/Makefile b/payloads/bayou/util/pbuilder/liblar/Makefile
index a72dc8d..7940cbe 100644
--- a/payloads/bayou/util/pbuilder/liblar/Makefile
+++ b/payloads/bayou/util/pbuilder/liblar/Makefile
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 HOSTCC = gcc
diff --git a/payloads/bayou/util/pbuilder/liblar/elf.h b/payloads/bayou/util/pbuilder/liblar/elf.h
index 48415bd..7dcc75d 100644
--- a/payloads/bayou/util/pbuilder/liblar/elf.h
+++ b/payloads/bayou/util/pbuilder/liblar/elf.h
@@ -13,8 +13,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc. */
+   License along with the GNU C Library. */
 
 #ifndef _ELF_H
 #define	_ELF_H 1
diff --git a/payloads/bayou/util/pbuilder/liblar/lar.h b/payloads/bayou/util/pbuilder/liblar/lar.h
index e82f5f0..c057478 100644
--- a/payloads/bayou/util/pbuilder/liblar/lar.h
+++ b/payloads/bayou/util/pbuilder/liblar/lar.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/payloads/bayou/util/pbuilder/liblar/lib.c b/payloads/bayou/util/pbuilder/liblar/lib.c
index 1ad452f..b4330da 100644
--- a/payloads/bayou/util/pbuilder/liblar/lib.c
+++ b/payloads/bayou/util/pbuilder/liblar/lib.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/payloads/bayou/util/pbuilder/liblar/liblar.h b/payloads/bayou/util/pbuilder/liblar/liblar.h
index c0e8a9c..f30fe27 100644
--- a/payloads/bayou/util/pbuilder/liblar/liblar.h
+++ b/payloads/bayou/util/pbuilder/liblar/liblar.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _LIBLAR_H_
diff --git a/payloads/bayou/util/pbuilder/liblar/self.h b/payloads/bayou/util/pbuilder/liblar/self.h
index c24a125..edf347d 100644
--- a/payloads/bayou/util/pbuilder/liblar/self.h
+++ b/payloads/bayou/util/pbuilder/liblar/self.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SELF_H_
diff --git a/payloads/bayou/util/pbuilder/lzma/Makefile b/payloads/bayou/util/pbuilder/lzma/Makefile
index abac198..7c06b40 100644
--- a/payloads/bayou/util/pbuilder/lzma/Makefile
+++ b/payloads/bayou/util/pbuilder/lzma/Makefile
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 LZMA_OBJ := $(obj)/util/lzma/LZMAEncoder.o $(obj)/util/lzma/LZInWindow.o
diff --git a/payloads/bayou/util/pbuilder/lzma/minilzma.cc b/payloads/bayou/util/pbuilder/lzma/minilzma.cc
index f9a3adb..8d195d8 100644
--- a/payloads/bayou/util/pbuilder/lzma/minilzma.cc
+++ b/payloads/bayou/util/pbuilder/lzma/minilzma.cc
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "C/Common/MyInitGuid.h"
diff --git a/payloads/bayou/util/pbuilder/main.c b/payloads/bayou/util/pbuilder/main.c
index b1d7943..c7aa463 100644
--- a/payloads/bayou/util/pbuilder/main.c
+++ b/payloads/bayou/util/pbuilder/main.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/payloads/bayou/util/pbuilder/pbuilder.h b/payloads/bayou/util/pbuilder/pbuilder.h
index 00393e0..2b401da 100644
--- a/payloads/bayou/util/pbuilder/pbuilder.h
+++ b/payloads/bayou/util/pbuilder/pbuilder.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/payloads/bayou/util/pbuilder/show.c b/payloads/bayou/util/pbuilder/show.c
index a74dfdd..cb092bf 100644
--- a/payloads/bayou/util/pbuilder/show.c
+++ b/payloads/bayou/util/pbuilder/show.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/payloads/coreinfo/Kconfig b/payloads/coreinfo/Kconfig
index 2a8184e..af82274 100644
--- a/payloads/coreinfo/Kconfig
+++ b/payloads/coreinfo/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 #
diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile
index d63f515..e7e3292 100644
--- a/payloads/coreinfo/Makefile
+++ b/payloads/coreinfo/Makefile
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 src := $(shell pwd)
diff --git a/payloads/coreinfo/bootlog_module.c b/payloads/coreinfo/bootlog_module.c
index 791446b..954a791 100644
--- a/payloads/coreinfo/bootlog_module.c
+++ b/payloads/coreinfo/bootlog_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c
index 8cb76a4..fd55fd2 100644
--- a/payloads/coreinfo/cbfs_module.c
+++ b/payloads/coreinfo/cbfs_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/coreboot_module.c b/payloads/coreinfo/coreboot_module.c
index 00b6faf..f2f7235 100644
--- a/payloads/coreinfo/coreboot_module.c
+++ b/payloads/coreinfo/coreboot_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c
index 5bd1068..817ba15 100644
--- a/payloads/coreinfo/coreinfo.c
+++ b/payloads/coreinfo/coreinfo.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/coreinfo.h b/payloads/coreinfo/coreinfo.h
index b69a7e1..9359f76 100644
--- a/payloads/coreinfo/coreinfo.h
+++ b/payloads/coreinfo/coreinfo.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef COREINFO_H_
diff --git a/payloads/coreinfo/cpuid.S b/payloads/coreinfo/cpuid.S
index 333473c..5b7a72b 100644
--- a/payloads/coreinfo/cpuid.S
+++ b/payloads/coreinfo/cpuid.S
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* calling syntax:  docpuid(idx,eax,ebx,ecx,edx) */
diff --git a/payloads/coreinfo/cpuinfo_module.c b/payloads/coreinfo/cpuinfo_module.c
index a209141..8c5f198 100644
--- a/payloads/coreinfo/cpuinfo_module.c
+++ b/payloads/coreinfo/cpuinfo_module.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/lar_module.c b/payloads/coreinfo/lar_module.c
index e50d98f..0bb37b6 100644
--- a/payloads/coreinfo/lar_module.c
+++ b/payloads/coreinfo/lar_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/multiboot_module.c b/payloads/coreinfo/multiboot_module.c
index 225b401..2f53e4c 100644
--- a/payloads/coreinfo/multiboot_module.c
+++ b/payloads/coreinfo/multiboot_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <multiboot_tables.h>
diff --git a/payloads/coreinfo/nvram_module.c b/payloads/coreinfo/nvram_module.c
index 8d9eefe..16fdf6b 100644
--- a/payloads/coreinfo/nvram_module.c
+++ b/payloads/coreinfo/nvram_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/coreinfo/pci_module.c b/payloads/coreinfo/pci_module.c
index d3d037c..0cf220a 100644
--- a/payloads/coreinfo/pci_module.c
+++ b/payloads/coreinfo/pci_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/payloads/coreinfo/ramdump_module.c b/payloads/coreinfo/ramdump_module.c
index 6a691b3..50954f6 100644
--- a/payloads/coreinfo/ramdump_module.c
+++ b/payloads/coreinfo/ramdump_module.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "coreinfo.h"
diff --git a/payloads/external/Makefile.inc b/payloads/external/Makefile.inc
index 4bda38a..9b5b379 100644
--- a/payloads/external/Makefile.inc
+++ b/payloads/external/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_PAYLOAD_ELF),y)
diff --git a/payloads/libpayload/arch/arm/gdb.c b/payloads/libpayload/arch/arm/gdb.c
index 277641f..30ec030 100644
--- a/payloads/libpayload/arch/arm/gdb.c
+++ b/payloads/libpayload/arch/arm/gdb.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <exception.h>
diff --git a/payloads/libpayload/arch/arm64/gdb.c b/payloads/libpayload/arch/arm64/gdb.c
index c270fc4..0c2e4de 100644
--- a/payloads/libpayload/arch/arm64/gdb.c
+++ b/payloads/libpayload/arch/arm64/gdb.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <exception.h>
diff --git a/payloads/libpayload/arch/mips/Kconfig b/payloads/libpayload/arch/mips/Kconfig
index 8462218..b79070a 100644
--- a/payloads/libpayload/arch/mips/Kconfig
+++ b/payloads/libpayload/arch/mips/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 
diff --git a/payloads/libpayload/arch/mips/Makefile.inc b/payloads/libpayload/arch/mips/Makefile.inc
index 53b954b..bf81c68 100644
--- a/payloads/libpayload/arch/mips/Makefile.inc
+++ b/payloads/libpayload/arch/mips/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ###############################################################################
diff --git a/payloads/libpayload/arch/mips/cache.c b/payloads/libpayload/arch/mips/cache.c
index df61846..0ba7598 100644
--- a/payloads/libpayload/arch/mips/cache.c
+++ b/payloads/libpayload/arch/mips/cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/payloads/libpayload/arch/mips/coreboot.c b/payloads/libpayload/arch/mips/coreboot.c
index cdd2fc0..4fe151e 100644
--- a/payloads/libpayload/arch/mips/coreboot.c
+++ b/payloads/libpayload/arch/mips/coreboot.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload-config.h>
diff --git a/payloads/libpayload/arch/mips/exception.c b/payloads/libpayload/arch/mips/exception.c
index 1c06f85..ae19bd0 100644
--- a/payloads/libpayload/arch/mips/exception.c
+++ b/payloads/libpayload/arch/mips/exception.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/payloads/libpayload/arch/mips/exception_asm.S b/payloads/libpayload/arch/mips/exception_asm.S
index 36a1a05..b3e30b0 100644
--- a/payloads/libpayload/arch/mips/exception_asm.S
+++ b/payloads/libpayload/arch/mips/exception_asm.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define	STATUS_REGISTER		$12,0
diff --git a/payloads/libpayload/arch/mips/gdb.c b/payloads/libpayload/arch/mips/gdb.c
index 8f333b7..52ed431 100644
--- a/payloads/libpayload/arch/mips/gdb.c
+++ b/payloads/libpayload/arch/mips/gdb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/payloads/libpayload/arch/mips/head.S b/payloads/libpayload/arch/mips/head.S
index 1927919..d6a3c5c 100644
--- a/payloads/libpayload/arch/mips/head.S
+++ b/payloads/libpayload/arch/mips/head.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/payloads/libpayload/arch/mips/libpayload.ldscript b/payloads/libpayload/arch/mips/libpayload.ldscript
index 586cbdc..55d6a15 100644
--- a/payloads/libpayload/arch/mips/libpayload.ldscript
+++ b/payloads/libpayload/arch/mips/libpayload.ldscript
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 OUTPUT_ARCH(mips)
diff --git a/payloads/libpayload/arch/mips/main.c b/payloads/libpayload/arch/mips/main.c
index 598eb8e..9940514 100644
--- a/payloads/libpayload/arch/mips/main.c
+++ b/payloads/libpayload/arch/mips/main.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <exception.h>
diff --git a/payloads/libpayload/arch/mips/string.c b/payloads/libpayload/arch/mips/string.c
index fd78ac3..6c48227 100644
--- a/payloads/libpayload/arch/mips/string.c
+++ b/payloads/libpayload/arch/mips/string.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/payloads/libpayload/arch/mips/sysinfo.c b/payloads/libpayload/arch/mips/sysinfo.c
index 75017cf..b669b89 100644
--- a/payloads/libpayload/arch/mips/sysinfo.c
+++ b/payloads/libpayload/arch/mips/sysinfo.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload-config.h>
diff --git a/payloads/libpayload/arch/mips/timer.c b/payloads/libpayload/arch/mips/timer.c
index 1aa2179..fe7796a 100644
--- a/payloads/libpayload/arch/mips/timer.c
+++ b/payloads/libpayload/arch/mips/timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload.h>
diff --git a/payloads/libpayload/arch/mips/util.S b/payloads/libpayload/arch/mips/util.S
index 2c7b915..6509aed 100644
--- a/payloads/libpayload/arch/mips/util.S
+++ b/payloads/libpayload/arch/mips/util.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	.global halt
diff --git a/payloads/libpayload/arch/x86/gdb.c b/payloads/libpayload/arch/x86/gdb.c
index 521a798..a79e7ce 100644
--- a/payloads/libpayload/arch/x86/gdb.c
+++ b/payloads/libpayload/arch/x86/gdb.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <exception.h>
diff --git a/payloads/libpayload/arch/x86/string.c b/payloads/libpayload/arch/x86/string.c
index a646db4..ea33f76 100644
--- a/payloads/libpayload/arch/x86/string.c
+++ b/payloads/libpayload/arch/x86/string.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* From glibc-2.14, sysdeps/i386/memset.c */
diff --git a/payloads/libpayload/drivers/serial/bg4cd.c b/payloads/libpayload/drivers/serial/bg4cd.c
index 1c715c0..e48fb10 100644
--- a/payloads/libpayload/drivers/serial/bg4cd.c
+++ b/payloads/libpayload/drivers/serial/bg4cd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <libpayload-config.h>
 #include <libpayload.h>
diff --git a/payloads/libpayload/drivers/timer/bg4cd.c b/payloads/libpayload/drivers/timer/bg4cd.c
index 4eea107..d6eab34 100644
--- a/payloads/libpayload/drivers/timer/bg4cd.c
+++ b/payloads/libpayload/drivers/timer/bg4cd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <libpayload.h>
 
diff --git a/payloads/libpayload/drivers/timer/cygnus.c b/payloads/libpayload/drivers/timer/cygnus.c
index 7770f85..344607e 100644
--- a/payloads/libpayload/drivers/timer/cygnus.c
+++ b/payloads/libpayload/drivers/timer/cygnus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <libpayload.h>
 
diff --git a/payloads/libpayload/drivers/timer/img_pistachio.c b/payloads/libpayload/drivers/timer/img_pistachio.c
index 7cb34ea..229d8f2 100644
--- a/payloads/libpayload/drivers/timer/img_pistachio.c
+++ b/payloads/libpayload/drivers/timer/img_pistachio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload.h>
diff --git a/payloads/libpayload/drivers/timer/mtk_timer.c b/payloads/libpayload/drivers/timer/mtk_timer.c
index b5b8048..d1269a7 100644
--- a/payloads/libpayload/drivers/timer/mtk_timer.c
+++ b/payloads/libpayload/drivers/timer/mtk_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <libpayload.h>
diff --git a/payloads/libpayload/drivers/timer/rktimer.c b/payloads/libpayload/drivers/timer/rktimer.c
index 43606b1..2b3522c 100644
--- a/payloads/libpayload/drivers/timer/rktimer.c
+++ b/payloads/libpayload/drivers/timer/rktimer.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <libpayload.h>
diff --git a/payloads/libpayload/drivers/udc/dwc2.c b/payloads/libpayload/drivers/udc/dwc2.c
index ff5ea3f..c081cd1 100644
--- a/payloads/libpayload/drivers/udc/dwc2.c
+++ b/payloads/libpayload/drivers/udc/dwc2.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload.h>
diff --git a/payloads/libpayload/drivers/udc/dwc2_priv.h b/payloads/libpayload/drivers/udc/dwc2_priv.h
index 8d39e4e..499ec79 100644
--- a/payloads/libpayload/drivers/udc/dwc2_priv.h
+++ b/payloads/libpayload/drivers/udc/dwc2_priv.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DWC2_PRIV_H__
diff --git a/payloads/libpayload/drivers/usb/dwc2.c b/payloads/libpayload/drivers/usb/dwc2.c
index c51c0e7..1b32785 100644
--- a/payloads/libpayload/drivers/usb/dwc2.c
+++ b/payloads/libpayload/drivers/usb/dwc2.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <libpayload.h>
diff --git a/payloads/libpayload/drivers/usb/dwc2.h b/payloads/libpayload/drivers/usb/dwc2.h
index 63b11ea..c7dc7fb 100644
--- a/payloads/libpayload/drivers/usb/dwc2.h
+++ b/payloads/libpayload/drivers/usb/dwc2.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DWC2_HCD_H__
diff --git a/payloads/libpayload/drivers/usb/dwc2_private.h b/payloads/libpayload/drivers/usb/dwc2_private.h
index 73b6371..f39cf28 100644
--- a/payloads/libpayload/drivers/usb/dwc2_private.h
+++ b/payloads/libpayload/drivers/usb/dwc2_private.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DWC2_REGS_H__
diff --git a/payloads/libpayload/drivers/usb/dwc2_rh.c b/payloads/libpayload/drivers/usb/dwc2_rh.c
index 86b2c60..eae6810 100644
--- a/payloads/libpayload/drivers/usb/dwc2_rh.c
+++ b/payloads/libpayload/drivers/usb/dwc2_rh.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/payloads/libpayload/gdb/Makefile.inc b/payloads/libpayload/gdb/Makefile.inc
index c8fecf6..368b65b 100644
--- a/payloads/libpayload/gdb/Makefile.inc
+++ b/payloads/libpayload/gdb/Makefile.inc
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 
 libgdb-y += commands.c
 libgdb-y += stub.c
diff --git a/payloads/libpayload/gdb/commands.c b/payloads/libpayload/gdb/commands.c
index 7287cb5..1fc2a8d 100644
--- a/payloads/libpayload/gdb/commands.c
+++ b/payloads/libpayload/gdb/commands.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/payloads/libpayload/gdb/stub.c b/payloads/libpayload/gdb/stub.c
index 219b326..9edb2be 100644
--- a/payloads/libpayload/gdb/stub.c
+++ b/payloads/libpayload/gdb/stub.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gdb.h>
diff --git a/payloads/libpayload/gdb/transport.c b/payloads/libpayload/gdb/transport.c
index 95bd49c..9a81c5e 100644
--- a/payloads/libpayload/gdb/transport.c
+++ b/payloads/libpayload/gdb/transport.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <endian.h>
diff --git a/payloads/libpayload/include/arm/arch/asm.h b/payloads/libpayload/include/arm/arch/asm.h
index 802264b..46fa1f4 100644
--- a/payloads/libpayload/include/arm/arch/asm.h
+++ b/payloads/libpayload/include/arm/arch/asm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARM_ASM_H
diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h
index f57dce0..ae6430c 100644
--- a/payloads/libpayload/include/cbfs.h
+++ b/payloads/libpayload/include/cbfs.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h
index e25a89e..dd50198 100644
--- a/payloads/libpayload/include/cbfs_core.h
+++ b/payloads/libpayload/include/cbfs_core.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/payloads/libpayload/include/cbfs_ram.h b/payloads/libpayload/include/cbfs_ram.h
index a377421..295e06d 100644
--- a/payloads/libpayload/include/cbfs_ram.h
+++ b/payloads/libpayload/include/cbfs_ram.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/payloads/libpayload/include/gdb.h b/payloads/libpayload/include/gdb.h
index 3995390..2936748 100644
--- a/payloads/libpayload/include/gdb.h
+++ b/payloads/libpayload/include/gdb.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _GDB_H_
diff --git a/payloads/libpayload/include/mips/arch/byteorder.h b/payloads/libpayload/include/mips/arch/byteorder.h
index ff329bd..79cced8 100644
--- a/payloads/libpayload/include/mips/arch/byteorder.h
+++ b/payloads/libpayload/include/mips/arch/byteorder.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_BYTEORDER_H__
diff --git a/payloads/libpayload/include/mips/arch/cache.h b/payloads/libpayload/include/mips/arch/cache.h
index 1d8cf82..959e846 100644
--- a/payloads/libpayload/include/mips/arch/cache.h
+++ b/payloads/libpayload/include/mips/arch/cache.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_CACHE_H__
diff --git a/payloads/libpayload/include/mips/arch/exception.h b/payloads/libpayload/include/mips/arch/exception.h
index 2b64387..ff5f08f 100644
--- a/payloads/libpayload/include/mips/arch/exception.h
+++ b/payloads/libpayload/include/mips/arch/exception.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_EXCEPTION_H__
diff --git a/payloads/libpayload/include/mips/arch/io.h b/payloads/libpayload/include/mips/arch/io.h
index e9020bb..ab637cc 100644
--- a/payloads/libpayload/include/mips/arch/io.h
+++ b/payloads/libpayload/include/mips/arch/io.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_IO_H__
diff --git a/payloads/libpayload/include/mips/arch/stdint.h b/payloads/libpayload/include/mips/arch/stdint.h
index ab492b4..484b685 100644
--- a/payloads/libpayload/include/mips/arch/stdint.h
+++ b/payloads/libpayload/include/mips/arch/stdint.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_STDINT_H__
diff --git a/payloads/libpayload/include/mips/arch/types.h b/payloads/libpayload/include/mips/arch/types.h
index 8c164b5..cb87d82 100644
--- a/payloads/libpayload/include/mips/arch/types.h
+++ b/payloads/libpayload/include/mips/arch/types.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_TYPES_H
diff --git a/payloads/libpayload/include/mips/arch/virtual.h b/payloads/libpayload/include/mips/arch/virtual.h
index 289c5c1..57ab1aa 100644
--- a/payloads/libpayload/include/mips/arch/virtual.h
+++ b/payloads/libpayload/include/mips/arch/virtual.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_VIRTUAL_H
diff --git a/payloads/libpayload/include/udc/dwc2_udc.h b/payloads/libpayload/include/udc/dwc2_udc.h
index b6be86d..5cc9a88 100644
--- a/payloads/libpayload/include/udc/dwc2_udc.h
+++ b/payloads/libpayload/include/udc/dwc2_udc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DESIGNWARE_H__
diff --git a/payloads/libpayload/include/usb/dwc2_registers.h b/payloads/libpayload/include/usb/dwc2_registers.h
index 4b44899..ae6f4ec 100644
--- a/payloads/libpayload/include/usb/dwc2_registers.h
+++ b/payloads/libpayload/include/usb/dwc2_registers.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef __DWC2_REGISTERS__
 #define __DWC2_REGISTERS__
diff --git a/payloads/nvramcui/nvramcui.c b/payloads/nvramcui/nvramcui.c
index ff7c801..147b0c6 100644
--- a/payloads/nvramcui/nvramcui.c
+++ b/payloads/nvramcui/nvramcui.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/Kconfig b/src/Kconfig
index 2822bfe..8466dc9 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 mainmenu "coreboot configuration"
diff --git a/src/acpi/sata.c b/src/acpi/sata.c
index 60c7992..36ffe6b 100644
--- a/src/acpi/sata.c
+++ b/src/acpi/sata.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "sata.h"
diff --git a/src/arch/arm/Makefile.inc b/src/arch/arm/Makefile.inc
index 34c447d..54e06d6 100644
--- a/src/arch/arm/Makefile.inc
+++ b/src/arch/arm/Makefile.inc
@@ -17,8 +17,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ###############################################################################
diff --git a/src/arch/arm/armv4/Makefile.inc b/src/arch/arm/armv4/Makefile.inc
index 75d9b9b..05e3039 100644
--- a/src/arch/arm/armv4/Makefile.inc
+++ b/src/arch/arm/armv4/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ###############################################################################
 
diff --git a/src/arch/arm/armv4/bootblock.S b/src/arch/arm/armv4/bootblock.S
index 1450907..b98b9bb 100644
--- a/src/arch/arm/armv4/bootblock.S
+++ b/src/arch/arm/armv4/bootblock.S
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/arch/arm/armv4/bootblock_simple.c b/src/arch/arm/armv4/bootblock_simple.c
index f878255..9fa5840 100644
--- a/src/arch/arm/armv4/bootblock_simple.c
+++ b/src/arch/arm/armv4/bootblock_simple.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/arch/arm/armv7/Makefile.inc b/src/arch/arm/armv7/Makefile.inc
index 089ef79..0d17230 100644
--- a/src/arch/arm/armv7/Makefile.inc
+++ b/src/arch/arm/armv7/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ###############################################################################
 
diff --git a/src/arch/arm/armv7/bootblock.S b/src/arch/arm/armv7/bootblock.S
index 60413ed..537ee50 100644
--- a/src/arch/arm/armv7/bootblock.S
+++ b/src/arch/arm/armv7/bootblock.S
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c
index 4dc0975..af8c9ab 100644
--- a/src/arch/arm/armv7/bootblock_simple.c
+++ b/src/arch/arm/armv7/bootblock_simple.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/arch/arm/armv7/thread.c b/src/arch/arm/armv7/thread.c
index cf415ca..64cf617 100644
--- a/src/arch/arm/armv7/thread.c
+++ b/src/arch/arm/armv7/thread.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <thread.h>
diff --git a/src/arch/arm/boot.c b/src/arch/arm/boot.c
index 7d4e647..28c7718 100644
--- a/src/arch/arm/boot.c
+++ b/src/arch/arm/boot.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/arm/div0.c b/src/arch/arm/div0.c
index 6550142..ee8b4e6 100644
--- a/src/arch/arm/div0.c
+++ b/src/arch/arm/div0.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/arm/include/arch/asm.h b/src/arch/arm/include/arch/asm.h
index 8747264..ee97c2d 100644
--- a/src/arch/arm/include/arch/asm.h
+++ b/src/arch/arm/include/arch/asm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARM_ASM_H
diff --git a/src/arch/arm/include/arch/clock.h b/src/arch/arm/include/arch/clock.h
index c068161..ca0ee03 100644
--- a/src/arch/arm/include/arch/clock.h
+++ b/src/arch/arm/include/arch/clock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARM_CLOCK_H_
diff --git a/src/arch/arm/include/arch/early_variables.h b/src/arch/arm/include/arch/early_variables.h
index 5e09448..a625826 100644
--- a/src/arch/arm/include/arch/early_variables.h
+++ b/src/arch/arm/include/arch/early_variables.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_EARLY_VARIABLES_H
diff --git a/src/arch/arm/include/arch/header.ld b/src/arch/arm/include/arch/header.ld
index 16defe5..42f104c 100644
--- a/src/arch/arm/include/arch/header.ld
+++ b/src/arch/arm/include/arch/header.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/arch/arm/include/arch/memlayout.h b/src/arch/arm/include/arch/memlayout.h
index 86f5585..6ca733c 100644
--- a/src/arch/arm/include/arch/memlayout.h
+++ b/src/arch/arm/include/arch/memlayout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains macro definitions for memlayout.ld linker scripts. */
diff --git a/src/arch/arm/include/arch/pci_ops.h b/src/arch/arm/include/arch/pci_ops.h
index cff6545..6d66558 100644
--- a/src/arch/arm/include/arch/pci_ops.h
+++ b/src/arch/arm/include/arch/pci_ops.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_ARM_PCI_OPS_H
diff --git a/src/arch/arm/include/arch/stages.h b/src/arch/arm/include/arch/stages.h
index da06030..b3493c5 100644
--- a/src/arch/arm/include/arch/stages.h
+++ b/src/arch/arm/include/arch/stages.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_STAGES_H
diff --git a/src/arch/arm/include/armv4/arch/cpu.h b/src/arch/arm/include/armv4/arch/cpu.h
index 736ec4d..364b8da 100644
--- a/src/arch/arm/include/armv4/arch/cpu.h
+++ b/src/arch/arm/include/armv4/arch/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_CPU_H__
diff --git a/src/arch/arm/include/armv7.h b/src/arch/arm/include/armv7.h
index 47faaa1..54ec722 100644
--- a/src/arch/arm/include/armv7.h
+++ b/src/arch/arm/include/armv7.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef ARMV7_H
 #define ARMV7_H
diff --git a/src/arch/arm/include/armv7/arch/cpu.h b/src/arch/arm/include/armv7/arch/cpu.h
index 845cce4..f870692 100644
--- a/src/arch/arm/include/armv7/arch/cpu.h
+++ b/src/arch/arm/include/armv7/arch/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_CPU_H__
diff --git a/src/arch/arm/include/bootblock_common.h b/src/arch/arm/include/bootblock_common.h
index acd7741..b0b86dd 100644
--- a/src/arch/arm/include/bootblock_common.h
+++ b/src/arch/arm/include/bootblock_common.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_BOOTBLOCK_COMMON_H
diff --git a/src/arch/arm/include/clocks.h b/src/arch/arm/include/clocks.h
index eadd58a..074819d 100644
--- a/src/arch/arm/include/clocks.h
+++ b/src/arch/arm/include/clocks.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Standard clock speeds */
diff --git a/src/arch/arm/libgcc/Makefile.inc b/src/arch/arm/libgcc/Makefile.inc
index 6724ee6..70e26e4 100644
--- a/src/arch/arm/libgcc/Makefile.inc
+++ b/src/arch/arm/libgcc/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/arm/libgcc/libgcc.h b/src/arch/arm/libgcc/libgcc.h
index afd219c..13f0af9 100644
--- a/src/arch/arm/libgcc/libgcc.h
+++ b/src/arch/arm/libgcc/libgcc.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_ARM_LIBGCC_LIBGCC_H__
diff --git a/src/arch/arm/libgcc/udivmoddi4.c b/src/arch/arm/libgcc/udivmoddi4.c
index afc91f4..153a087 100644
--- a/src/arch/arm/libgcc/udivmoddi4.c
+++ b/src/arch/arm/libgcc/udivmoddi4.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "libgcc.h"
diff --git a/src/arch/arm/libgcc/umoddi3.c b/src/arch/arm/libgcc/umoddi3.c
index 4064427..6daff26 100644
--- a/src/arch/arm/libgcc/umoddi3.c
+++ b/src/arch/arm/libgcc/umoddi3.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "libgcc.h"
diff --git a/src/arch/arm/stages.c b/src/arch/arm/stages.c
index 01506d9..09710a5 100644
--- a/src/arch/arm/stages.c
+++ b/src/arch/arm/stages.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/arm/tables.c b/src/arch/arm/tables.c
index 1350d2a..0c5d656 100644
--- a/src/arch/arm/tables.c
+++ b/src/arch/arm/tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc
index 694d49d..e8c26f2 100644
--- a/src/arch/arm64/Makefile.inc
+++ b/src/arch/arm64/Makefile.inc
@@ -18,8 +18,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/arm64/arm_tf.c b/src/arch/arm64/arm_tf.c
index 9b0f19f..09de7f5 100644
--- a/src/arch/arm64/arm_tf.c
+++ b/src/arch/arm64/arm_tf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/arm64/armv8/Makefile.inc b/src/arch/arm64/armv8/Makefile.inc
index 0c4778d..2e4da8a 100644
--- a/src/arch/arm64/armv8/Makefile.inc
+++ b/src/arch/arm64/armv8/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/arm64/armv8/bootblock.S b/src/arch/arm64/armv8/bootblock.S
index b49f769..64af086 100644
--- a/src/arch/arm64/armv8/bootblock.S
+++ b/src/arch/arm64/armv8/bootblock.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	.section ".id", "a", %progbits
diff --git a/src/arch/arm64/armv8/bootblock_simple.c b/src/arch/arm64/armv8/bootblock_simple.c
index 6cb55e6..c49d21a 100644
--- a/src/arch/arm64/armv8/bootblock_simple.c
+++ b/src/arch/arm64/armv8/bootblock_simple.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootblock_common.h>
diff --git a/src/arch/arm64/armv8/cpu.S b/src/arch/arm64/armv8/cpu.S
index 9319ff0..9fa60a6 100644
--- a/src/arch/arm64/armv8/cpu.S
+++ b/src/arch/arm64/armv8/cpu.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/arch/arm64/armv8/lib/Makefile.inc b/src/arch/arm64/armv8/lib/Makefile.inc
index 583d023..9b222e8 100644
--- a/src/arch/arm64/armv8/lib/Makefile.inc
+++ b/src/arch/arm64/armv8/lib/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/arm64/armv8/lib/cache.c b/src/arch/arm64/armv8/lib/cache.c
index ac7e13b..5e8c561 100644
--- a/src/arch/arm64/armv8/lib/cache.c
+++ b/src/arch/arm64/armv8/lib/cache.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * cache.c: Cache Maintenance Instructions
  * Reference: ARM Architecture Reference Manual, ARMv8-A edition
diff --git a/src/arch/arm64/armv8/lib/clock.c b/src/arch/arm64/armv8/lib/clock.c
index 4fe3cf6..b63f086 100644
--- a/src/arch/arm64/armv8/lib/clock.c
+++ b/src/arch/arm64/armv8/lib/clock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * clock.c: Functions for accessing clock and timer related registers
  * Reference: ARM Architecture Reference Manual, ARMv8-A edition
diff --git a/src/arch/arm64/armv8/lib/pstate.c b/src/arch/arm64/armv8/lib/pstate.c
index f99698a..6c246a6 100644
--- a/src/arch/arm64/armv8/lib/pstate.c
+++ b/src/arch/arm64/armv8/lib/pstate.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * Reference: ARM Architecture Reference Manual, ARMv8-A edition
  * pstate.c: This file defines all the library functions for accessing
diff --git a/src/arch/arm64/armv8/lib/sysctrl.c b/src/arch/arm64/armv8/lib/sysctrl.c
index 42d67fe..7bbfcf3 100644
--- a/src/arch/arm64/armv8/lib/sysctrl.c
+++ b/src/arch/arm64/armv8/lib/sysctrl.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * Reference: ARM Architecture Reference Manual, ARMv8-A edition
  * sysctrl.c: This file defines all the library functions for accessing system
diff --git a/src/arch/arm64/armv8/lib/tlb.c b/src/arch/arm64/armv8/lib/tlb.c
index cc85b32..0e9683f 100644
--- a/src/arch/arm64/armv8/lib/tlb.c
+++ b/src/arch/arm64/armv8/lib/tlb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * tlb.c: System intructions for TLB maintenance.
  * Reference: ARM Architecture Reference Manual, ARMv8-A edition
diff --git a/src/arch/arm64/armv8/secmon/Makefile.inc b/src/arch/arm64/armv8/secmon/Makefile.inc
index e9924a6..064e119 100644
--- a/src/arch/arm64/armv8/secmon/Makefile.inc
+++ b/src/arch/arm64/armv8/secmon/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/arm64/armv8/secmon/psci.c b/src/arch/arm64/armv8/secmon/psci.c
index 1a9c252..167cd40 100644
--- a/src/arch/arm64/armv8/secmon/psci.c
+++ b/src/arch/arm64/armv8/secmon/psci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gic.h>
diff --git a/src/arch/arm64/armv8/secmon/secmon.h b/src/arch/arm64/armv8/secmon/secmon.h
index bc7dcc9..10017af 100644
--- a/src/arch/arm64/armv8/secmon/secmon.h
+++ b/src/arch/arm64/armv8/secmon/secmon.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SECMON_SECMON_H__
diff --git a/src/arch/arm64/armv8/secmon/secmon_init.c b/src/arch/arm64/armv8/secmon/secmon_init.c
index 42f55b6..8096c24 100644
--- a/src/arch/arm64/armv8/secmon/secmon_init.c
+++ b/src/arch/arm64/armv8/secmon/secmon_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/barrier.h>
diff --git a/src/arch/arm64/armv8/secmon/smc.c b/src/arch/arm64/armv8/secmon/smc.c
index a1b0209..76b38fe 100644
--- a/src/arch/arm64/armv8/secmon/smc.c
+++ b/src/arch/arm64/armv8/secmon/smc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/arch/arm64/armv8/secmon/trampoline.S b/src/arch/arm64/armv8/secmon/trampoline.S
index 6a1702a..a2ddd14 100644
--- a/src/arch/arm64/armv8/secmon/trampoline.S
+++ b/src/arch/arm64/armv8/secmon/trampoline.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/arch/arm64/armv8/secmon_loader.c b/src/arch/arm64/armv8/secmon_loader.c
index 988be99..6d1f1e8 100644
--- a/src/arch/arm64/armv8/secmon_loader.c
+++ b/src/arch/arm64/armv8/secmon_loader.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * secmon_loader.c: Responsible for loading the rmodule, providing entry point
  * and parameter location for the rmodule.
diff --git a/src/arch/arm64/boot.c b/src/arch/arm64/boot.c
index b22f029..657bc6b 100644
--- a/src/arch/arm64/boot.c
+++ b/src/arch/arm64/boot.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/arm64/c_entry.c b/src/arch/arm64/c_entry.c
index d51bfcc..3b4088d 100644
--- a/src/arch/arm64/c_entry.c
+++ b/src/arch/arm64/c_entry.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/arm64/cpu-internal.h b/src/arch/arm64/cpu-internal.h
index df61245..9ed0b98 100644
--- a/src/arch/arm64/cpu-internal.h
+++ b/src/arch/arm64/cpu-internal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_CPU_INTERNAL_H
diff --git a/src/arch/arm64/cpu-stubs.c b/src/arch/arm64/cpu-stubs.c
index 8dc4312..fff7697 100644
--- a/src/arch/arm64/cpu-stubs.c
+++ b/src/arch/arm64/cpu-stubs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void arm64_cpu_early_setup(void);
diff --git a/src/arch/arm64/cpu.c b/src/arch/arm64/cpu.c
index 1b33c10..aa5d49c 100644
--- a/src/arch/arm64/cpu.c
+++ b/src/arch/arm64/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/arch/arm64/cpu/Kconfig b/src/arch/arm64/cpu/Kconfig
index 8e12aa7..89dfcc6 100644
--- a/src/arch/arm64/cpu/Kconfig
+++ b/src/arch/arm64/cpu/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config ARCH_ARM64_CPU_CORTEX_A57
diff --git a/src/arch/arm64/cpu/Makefile.inc b/src/arch/arm64/cpu/Makefile.inc
index 2c008e4..88da266 100644
--- a/src/arch/arm64/cpu/Makefile.inc
+++ b/src/arch/arm64/cpu/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/arm64/cpu/cortex_a57.S b/src/arch/arm64/cpu/cortex_a57.S
index 4535d2b..96b01ef 100644
--- a/src/arch/arm64/cpu/cortex_a57.S
+++ b/src/arch/arm64/cpu/cortex_a57.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/arch/arm64/cpu_ramstage.c b/src/arch/arm64/cpu_ramstage.c
index a49bf48..c6d1814 100644
--- a/src/arch/arm64/cpu_ramstage.c
+++ b/src/arch/arm64/cpu_ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/arch/arm64/div0.c b/src/arch/arm64/div0.c
index 6550142..ee8b4e6 100644
--- a/src/arch/arm64/div0.c
+++ b/src/arch/arm64/div0.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/arm64/include/arch/asm.h b/src/arch/arm64/include/arch/asm.h
index 878509e..422667e 100644
--- a/src/arch/arm64/include/arch/asm.h
+++ b/src/arch/arm64/include/arch/asm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARM_ARM64_ASM_H
diff --git a/src/arch/arm64/include/arch/clock.h b/src/arch/arm64/include/arch/clock.h
index c068161..ca0ee03 100644
--- a/src/arch/arm64/include/arch/clock.h
+++ b/src/arch/arm64/include/arch/clock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARM_CLOCK_H_
diff --git a/src/arch/arm64/include/arch/early_variables.h b/src/arch/arm64/include/arch/early_variables.h
index 5e09448..a625826 100644
--- a/src/arch/arm64/include/arch/early_variables.h
+++ b/src/arch/arm64/include/arch/early_variables.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_EARLY_VARIABLES_H
diff --git a/src/arch/arm64/include/arch/header.ld b/src/arch/arm64/include/arch/header.ld
index 55b4cb7..6899af9 100644
--- a/src/arch/arm64/include/arch/header.ld
+++ b/src/arch/arm64/include/arch/header.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <rules.h>
diff --git a/src/arch/arm64/include/arch/memlayout.h b/src/arch/arm64/include/arch/memlayout.h
index 30db848..f159e50 100644
--- a/src/arch/arm64/include/arch/memlayout.h
+++ b/src/arch/arm64/include/arch/memlayout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains macro definitions for memlayout.ld linker scripts. */
diff --git a/src/arch/arm64/include/arch/mpidr.h b/src/arch/arm64/include/arch/mpidr.h
index a561332..f350a4a 100644
--- a/src/arch/arm64/include/arch/mpidr.h
+++ b/src/arch/arm64/include/arch/mpidr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_MPIDR_H__
diff --git a/src/arch/arm64/include/arch/pci_ops.h b/src/arch/arm64/include/arch/pci_ops.h
index a5118f2..d1b59f3 100644
--- a/src/arch/arm64/include/arch/pci_ops.h
+++ b/src/arch/arm64/include/arch/pci_ops.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_ARM64_PCI_OPS_H
diff --git a/src/arch/arm64/include/arch/psci.h b/src/arch/arm64/include/arch/psci.h
index 088c85a..db17306 100644
--- a/src/arch/arm64/include/arch/psci.h
+++ b/src/arch/arm64/include/arch/psci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_PSCI_H__
diff --git a/src/arch/arm64/include/arch/smc.h b/src/arch/arm64/include/arch/smc.h
index 4e1d7e4..aab020e 100644
--- a/src/arch/arm64/include/arch/smc.h
+++ b/src/arch/arm64/include/arch/smc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_SMC_H__
diff --git a/src/arch/arm64/include/arch/spintable.h b/src/arch/arm64/include/arch/spintable.h
index b19d551..4137675 100644
--- a/src/arch/arm64/include/arch/spintable.h
+++ b/src/arch/arm64/include/arch/spintable.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_SPINTABLE_H__
diff --git a/src/arch/arm64/include/arch/stages.h b/src/arch/arm64/include/arch/stages.h
index cb2f66c..bdc2e42 100644
--- a/src/arch/arm64/include/arch/stages.h
+++ b/src/arch/arm64/include/arch/stages.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_STAGES_H
diff --git a/src/arch/arm64/include/arch/startup.h b/src/arch/arm64/include/arch/startup.h
index 48f86f2..23b111c 100644
--- a/src/arch/arm64/include/arch/startup.h
+++ b/src/arch/arm64/include/arch/startup.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_ARM64_INCLUDE_ARCH_STARTUP_H__
diff --git a/src/arch/arm64/include/arch/transition.h b/src/arch/arm64/include/arch/transition.h
index 7d21d55..a0d272e 100644
--- a/src/arch/arm64/include/arch/transition.h
+++ b/src/arch/arm64/include/arch/transition.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_ARM64_TRANSITION_H__
diff --git a/src/arch/arm64/include/arm_tf.h b/src/arch/arm64/include/arm_tf.h
index e80bb87..1e5ce6b 100644
--- a/src/arch/arm64/include/arm_tf.h
+++ b/src/arch/arm64/include/arm_tf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARM_TF_H__
diff --git a/src/arch/arm64/include/armv8/arch/cpu.h b/src/arch/arm64/include/armv8/arch/cpu.h
index ae16fa1..750025e 100644
--- a/src/arch/arm64/include/armv8/arch/cpu.h
+++ b/src/arch/arm64/include/armv8/arch/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_CPU_H__
diff --git a/src/arch/arm64/include/armv8/arch/lib_helpers.h b/src/arch/arm64/include/armv8/arch/lib_helpers.h
index 8c5d2ea..b66d0e8 100644
--- a/src/arch/arm64/include/armv8/arch/lib_helpers.h
+++ b/src/arch/arm64/include/armv8/arch/lib_helpers.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * lib_helpers.h: All library function prototypes and macros are defined in this
  * file.
diff --git a/src/arch/arm64/include/armv8/arch/mmu.h b/src/arch/arm64/include/armv8/arch/mmu.h
index f697ddb..2c2caa8 100644
--- a/src/arch/arm64/include/armv8/arch/mmu.h
+++ b/src/arch/arm64/include/armv8/arch/mmu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_ARM64_MMU_H__
diff --git a/src/arch/arm64/include/armv8/arch/rules.h b/src/arch/arm64/include/armv8/arch/rules.h
index b446479..f48cd51 100644
--- a/src/arch/arm64/include/armv8/arch/rules.h
+++ b/src/arch/arm64/include/armv8/arch/rules.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _ARCH_RULES_H
diff --git a/src/arch/arm64/include/armv8/arch/secmon.h b/src/arch/arm64/include/armv8/arch/secmon.h
index f8351b5..28d79e5 100644
--- a/src/arch/arm64/include/armv8/arch/secmon.h
+++ b/src/arch/arm64/include/armv8/arch/secmon.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_ARM64_ARMV8_SECMON__
diff --git a/src/arch/arm64/include/clocks.h b/src/arch/arm64/include/clocks.h
index eadd58a..074819d 100644
--- a/src/arch/arm64/include/clocks.h
+++ b/src/arch/arm64/include/clocks.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Standard clock speeds */
diff --git a/src/arch/arm64/include/cpu/cortex_a57.h b/src/arch/arm64/include/cpu/cortex_a57.h
index 113a6ff..691c9ba 100644
--- a/src/arch/arm64/include/cpu/cortex_a57.h
+++ b/src/arch/arm64/include/cpu/cortex_a57.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_ARM64_CORTEX_A57_H__
diff --git a/src/arch/arm64/spintable.c b/src/arch/arm64/spintable.c
index 46a78d7..6326f7e 100644
--- a/src/arch/arm64/spintable.c
+++ b/src/arch/arm64/spintable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/arm64/spintable_asm.S b/src/arch/arm64/spintable_asm.S
index e78b0af..aa95e0d 100644
--- a/src/arch/arm64/spintable_asm.S
+++ b/src/arch/arm64/spintable_asm.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/arch/arm64/stage_entry.S b/src/arch/arm64/stage_entry.S
index dbc6cad..a8f4f2d 100644
--- a/src/arch/arm64/stage_entry.S
+++ b/src/arch/arm64/stage_entry.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/arm64/stages.c b/src/arch/arm64/stages.c
index ea146d7..c44fd05 100644
--- a/src/arch/arm64/stages.c
+++ b/src/arch/arm64/stages.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/arm64/startup.c b/src/arch/arm64/startup.c
index 5208b10..d7f9f9f 100644
--- a/src/arch/arm64/startup.c
+++ b/src/arch/arm64/startup.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/arm64/tables.c b/src/arch/arm64/tables.c
index 1350d2a..0c5d656 100644
--- a/src/arch/arm64/tables.c
+++ b/src/arch/arm64/tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/arm64/transition.c b/src/arch/arm64/transition.c
index efb0e88..ae60d7a 100644
--- a/src/arch/arm64/transition.c
+++ b/src/arch/arm64/transition.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/lib_helpers.h>
diff --git a/src/arch/arm64/transition_asm.S b/src/arch/arm64/transition_asm.S
index 9d5c0b5..e28012e 100644
--- a/src/arch/arm64/transition_asm.S
+++ b/src/arch/arm64/transition_asm.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/mips/Kconfig b/src/arch/mips/Kconfig
index 622fc82..10707e5 100644
--- a/src/arch/mips/Kconfig
+++ b/src/arch/mips/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config ARCH_MIPS
diff --git a/src/arch/mips/Makefile.inc b/src/arch/mips/Makefile.inc
index fab8a05..fbac17b 100644
--- a/src/arch/mips/Makefile.inc
+++ b/src/arch/mips/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ###############################################################################
diff --git a/src/arch/mips/ashldi3.c b/src/arch/mips/ashldi3.c
index de9f738..5698220 100644
--- a/src/arch/mips/ashldi3.c
+++ b/src/arch/mips/ashldi3.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ORDER_LITTLE_ENDIAN__
diff --git a/src/arch/mips/boot.c b/src/arch/mips/boot.c
index c09af05..5a84d7b 100644
--- a/src/arch/mips/boot.c
+++ b/src/arch/mips/boot.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/stages.h>
diff --git a/src/arch/mips/bootblock.S b/src/arch/mips/bootblock.S
index e24848d..b93ef5c 100644
--- a/src/arch/mips/bootblock.S
+++ b/src/arch/mips/bootblock.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 .set	noreorder	/* Prevent assembler from "optimizing" this code. */
diff --git a/src/arch/mips/bootblock_simple.c b/src/arch/mips/bootblock_simple.c
index 1a3c677..fb113dc 100644
--- a/src/arch/mips/bootblock_simple.c
+++ b/src/arch/mips/bootblock_simple.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootblock_common.h>
diff --git a/src/arch/mips/cache.c b/src/arch/mips/cache.c
index c7a125f..00f4d91 100644
--- a/src/arch/mips/cache.c
+++ b/src/arch/mips/cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/arch/mips/include/arch/byteorder.h b/src/arch/mips/include/arch/byteorder.h
index a4360ed..d481d4b 100644
--- a/src/arch/mips/include/arch/byteorder.h
+++ b/src/arch/mips/include/arch/byteorder.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_BYTEORDER_H
diff --git a/src/arch/mips/include/arch/cache.h b/src/arch/mips/include/arch/cache.h
index a6fda1e..21f5750 100644
--- a/src/arch/mips/include/arch/cache.h
+++ b/src/arch/mips/include/arch/cache.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_CACHE_H
diff --git a/src/arch/mips/include/arch/cpu.h b/src/arch/mips/include/arch/cpu.h
index a13113c..aaa65bb 100644
--- a/src/arch/mips/include/arch/cpu.h
+++ b/src/arch/mips/include/arch/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_CPU_H
diff --git a/src/arch/mips/include/arch/early_variables.h b/src/arch/mips/include/arch/early_variables.h
index c21fa8c..cb1d05b 100644
--- a/src/arch/mips/include/arch/early_variables.h
+++ b/src/arch/mips/include/arch/early_variables.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_EARLY_VARIABLES_H
diff --git a/src/arch/mips/include/arch/exception.h b/src/arch/mips/include/arch/exception.h
index a872c04..c6fc8a7 100644
--- a/src/arch/mips/include/arch/exception.h
+++ b/src/arch/mips/include/arch/exception.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_EXCEPTION_H
diff --git a/src/arch/mips/include/arch/header.ld b/src/arch/mips/include/arch/header.ld
index 9310e33..619f89d 100644
--- a/src/arch/mips/include/arch/header.ld
+++ b/src/arch/mips/include/arch/header.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/arch/mips/include/arch/hlt.h b/src/arch/mips/include/arch/hlt.h
index 3d66beb..8afa9ba 100644
--- a/src/arch/mips/include/arch/hlt.h
+++ b/src/arch/mips/include/arch/hlt.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_HLT_H
diff --git a/src/arch/mips/include/arch/io.h b/src/arch/mips/include/arch/io.h
index 95c40d8..b306fdf 100644
--- a/src/arch/mips/include/arch/io.h
+++ b/src/arch/mips/include/arch/io.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_IO_H
diff --git a/src/arch/mips/include/arch/memlayout.h b/src/arch/mips/include/arch/memlayout.h
index 946fcf3..799f00c 100644
--- a/src/arch/mips/include/arch/memlayout.h
+++ b/src/arch/mips/include/arch/memlayout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains macro definitions for memlayout.ld linker scripts. */
diff --git a/src/arch/mips/include/arch/mmu.h b/src/arch/mips/include/arch/mmu.h
index e931ad9..6f3dfc8 100644
--- a/src/arch/mips/include/arch/mmu.h
+++ b/src/arch/mips/include/arch/mmu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_MMU_H
diff --git a/src/arch/mips/include/arch/pci_ops.h b/src/arch/mips/include/arch/pci_ops.h
index df51a5a..d81d3bf 100644
--- a/src/arch/mips/include/arch/pci_ops.h
+++ b/src/arch/mips/include/arch/pci_ops.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_MIPS_PCI_OPS_H
diff --git a/src/arch/mips/include/arch/stages.h b/src/arch/mips/include/arch/stages.h
index 17115cb..7a32b6f 100644
--- a/src/arch/mips/include/arch/stages.h
+++ b/src/arch/mips/include/arch/stages.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_STAGES_H
diff --git a/src/arch/mips/include/arch/types.h b/src/arch/mips/include/arch/types.h
index 4e12181..453de19 100644
--- a/src/arch/mips/include/arch/types.h
+++ b/src/arch/mips/include/arch/types.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_ARCH_TYPES_H
diff --git a/src/arch/mips/include/bootblock_common.h b/src/arch/mips/include/bootblock_common.h
index 4b2fd08..b16696b 100644
--- a/src/arch/mips/include/bootblock_common.h
+++ b/src/arch/mips/include/bootblock_common.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifdef CONFIG_BOOTBLOCK_CPU_INIT
diff --git a/src/arch/mips/include/stdint.h b/src/arch/mips/include/stdint.h
index a9579f5..a2e0500 100644
--- a/src/arch/mips/include/stdint.h
+++ b/src/arch/mips/include/stdint.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MIPS_STDINT_H
diff --git a/src/arch/mips/mmu.c b/src/arch/mips/mmu.c
index 706d05e..9e1fabc 100644
--- a/src/arch/mips/mmu.c
+++ b/src/arch/mips/mmu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/arch/mips/stages.c b/src/arch/mips/stages.c
index f6cefbb..a94bf8f 100644
--- a/src/arch/mips/stages.c
+++ b/src/arch/mips/stages.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/stages.h>
diff --git a/src/arch/mips/tables.c b/src/arch/mips/tables.c
index 3d6d701..813dcff 100644
--- a/src/arch/mips/tables.c
+++ b/src/arch/mips/tables.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/riscv/Makefile.inc b/src/arch/riscv/Makefile.inc
index de6eb91..7f3a33e 100644
--- a/src/arch/riscv/Makefile.inc
+++ b/src/arch/riscv/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index ab4ae95..762a880 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <program_loading.h>
diff --git a/src/arch/riscv/bootblock.S b/src/arch/riscv/bootblock.S
index 4caeea6..090d6e6 100644
--- a/src/arch/riscv/bootblock.S
+++ b/src/arch/riscv/bootblock.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 // See LICENSE for license details. relating to the _start code in this file.
 #include <arch/encoding.h>
diff --git a/src/arch/riscv/bootblock_simple.c b/src/arch/riscv/bootblock_simple.c
index a10cdaf..c8431f6 100644
--- a/src/arch/riscv/bootblock_simple.c
+++ b/src/arch/riscv/bootblock_simple.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootblock_common.h>
diff --git a/src/arch/riscv/include/arch/cpu.h b/src/arch/riscv/include/arch/cpu.h
index d8fd751..477118a 100644
--- a/src/arch/riscv/include/arch/cpu.h
+++ b/src/arch/riscv/include/arch/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_CPU_H__
diff --git a/src/arch/riscv/include/arch/early_variables.h b/src/arch/riscv/include/arch/early_variables.h
index 725650a..5b03730 100644
--- a/src/arch/riscv/include/arch/early_variables.h
+++ b/src/arch/riscv/include/arch/early_variables.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_EARLY_VARIABLES_H
diff --git a/src/arch/riscv/include/arch/header.ld b/src/arch/riscv/include/arch/header.ld
index 92dec4f..c4850cb 100644
--- a/src/arch/riscv/include/arch/header.ld
+++ b/src/arch/riscv/include/arch/header.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/arch/riscv/include/arch/memlayout.h b/src/arch/riscv/include/arch/memlayout.h
index afe72ec..7dbd3e5 100644
--- a/src/arch/riscv/include/arch/memlayout.h
+++ b/src/arch/riscv/include/arch/memlayout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains macro definitions for memlayout.ld linker scripts. */
diff --git a/src/arch/riscv/include/arch/stages.h b/src/arch/riscv/include/arch/stages.h
index 0dba162..673d56b 100644
--- a/src/arch/riscv/include/arch/stages.h
+++ b/src/arch/riscv/include/arch/stages.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_STAGES_H
diff --git a/src/arch/riscv/include/spike_util.h b/src/arch/riscv/include/spike_util.h
index e9c0300..8b72129 100644
--- a/src/arch/riscv/include/spike_util.h
+++ b/src/arch/riscv/include/spike_util.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SPIKE_UTIL_H
diff --git a/src/arch/riscv/prologue.inc b/src/arch/riscv/prologue.inc
index 517a285..a378b03 100644
--- a/src/arch/riscv/prologue.inc
+++ b/src/arch/riscv/prologue.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 .section ".rom.data", "a", @progbits
diff --git a/src/arch/riscv/rom_media.c b/src/arch/riscv/rom_media.c
index dd57849..29c24cf 100644
--- a/src/arch/riscv/rom_media.c
+++ b/src/arch/riscv/rom_media.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <boot_device.h>
 
diff --git a/src/arch/riscv/stages.c b/src/arch/riscv/stages.c
index d7c55ae..57d0ded 100644
--- a/src/arch/riscv/stages.c
+++ b/src/arch/riscv/stages.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/riscv/tables.c b/src/arch/riscv/tables.c
index b7f2ae8..fbe465f 100644
--- a/src/arch/riscv/tables.c
+++ b/src/arch/riscv/tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/riscv/trap_handler.c b/src/arch/riscv/trap_handler.c
index 6148037..75c9cb7 100644
--- a/src/arch/riscv/trap_handler.c
+++ b/src/arch/riscv/trap_handler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S
index 274dca6..f62d717 100644
--- a/src/arch/riscv/trap_util.S
+++ b/src/arch/riscv/trap_util.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bits.h>
diff --git a/src/arch/riscv/virtual_memory.c b/src/arch/riscv/virtual_memory.c
index 0163a45..2096d07 100644
--- a/src/arch/riscv/virtual_memory.c
+++ b/src/arch/riscv/virtual_memory.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <vm.h>
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 56b176d..1690274 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ################################################################################
diff --git a/src/arch/x86/acpi/debug.asl b/src/arch/x86/acpi/debug.asl
index 7262a6a..36ebfdf 100644
--- a/src/arch/x86/acpi/debug.asl
+++ b/src/arch/x86/acpi/debug.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/x86/acpi/globutil.asl b/src/arch/x86/acpi/globutil.asl
index 55d1305..0acc767 100644
--- a/src/arch/x86/acpi/globutil.asl
+++ b/src/arch/x86/acpi/globutil.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/x86/acpi/statdef.asl b/src/arch/x86/acpi/statdef.asl
index b5ab2ff..41ae9f0 100644
--- a/src/arch/x86/acpi/statdef.asl
+++ b/src/arch/x86/acpi/statdef.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/arch/x86/acpigen.c b/src/arch/x86/acpigen.c
index 3aa823c..33310e8 100644
--- a/src/arch/x86/acpigen.c
+++ b/src/arch/x86/acpigen.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* How much nesting do we support? */
diff --git a/src/arch/x86/assembly_entry.S b/src/arch/x86/assembly_entry.S
index c23d177..e3bd4a4 100644
--- a/src/arch/x86/assembly_entry.S
+++ b/src/arch/x86/assembly_entry.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file assembles the start of the romstage program by the order of the
diff --git a/src/arch/x86/bootblock.S b/src/arch/x86/bootblock.S
index 645e491..2566519 100644
--- a/src/arch/x86/bootblock.S
+++ b/src/arch/x86/bootblock.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file assembles the bootblock program by the order of the includes. Thus,
diff --git a/src/arch/x86/bootblock.ld b/src/arch/x86/bootblock.ld
index 6835430..b792c1a 100644
--- a/src/arch/x86/bootblock.ld
+++ b/src/arch/x86/bootblock.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/x86/failover.ld>
diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 5da9dcf..f07a8a1 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is included inside a SECTIONS block */
diff --git a/src/arch/x86/cbfs_and_run.c b/src/arch/x86/cbfs_and_run.c
index b6d3426..a69508c 100644
--- a/src/arch/x86/cbfs_and_run.c
+++ b/src/arch/x86/cbfs_and_run.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/stages.h>
diff --git a/src/arch/x86/cbmem.c b/src/arch/x86/cbmem.c
index e279db9..0342f57 100644
--- a/src/arch/x86/cbmem.c
+++ b/src/arch/x86/cbmem.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/arch/x86/ebda.c b/src/arch/x86/ebda.c
index 47dfbdb..9875a1e 100644
--- a/src/arch/x86/ebda.c
+++ b/src/arch/x86/ebda.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/arch/x86/failover.ld b/src/arch/x86/failover.ld
index bbff36e..467d3e7 100644
--- a/src/arch/x86/failover.ld
+++ b/src/arch/x86/failover.ld
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 ENTRY(reset_vector)
diff --git a/src/arch/x86/gdt.c b/src/arch/x86/gdt.c
index a21fab2..c92b0af 100644
--- a/src/arch/x86/gdt.c
+++ b/src/arch/x86/gdt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/arch/x86/include/arch/acpi.h b/src/arch/x86/include/arch/acpi.h
index 28f650c..3867016 100644
--- a/src/arch/x86/include/arch/acpi.h
+++ b/src/arch/x86/include/arch/acpi.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/arch/x86/include/arch/acpigen.h b/src/arch/x86/include/arch/acpigen.h
index a3e65eb..dd2597a 100644
--- a/src/arch/x86/include/arch/acpigen.h
+++ b/src/arch/x86/include/arch/acpigen.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LIBACPI_H
diff --git a/src/arch/x86/include/arch/cbfs.h b/src/arch/x86/include/arch/cbfs.h
index 195c06f..ad447dd 100644
--- a/src/arch/x86/include/arch/cbfs.h
+++ b/src/arch/x86/include/arch/cbfs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __INCLUDE_ARCH_CBFS__
diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h
index 7ccb340..6891993 100644
--- a/src/arch/x86/include/arch/early_variables.h
+++ b/src/arch/x86/include/arch/early_variables.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ARCH_EARLY_VARIABLES_H
diff --git a/src/arch/x86/include/arch/ebda.h b/src/arch/x86/include/arch/ebda.h
index 7bd67c9..72b4392 100644
--- a/src/arch/x86/include/arch/ebda.h
+++ b/src/arch/x86/include/arch/ebda.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_EBDA_H
diff --git a/src/arch/x86/include/arch/header.ld b/src/arch/x86/include/arch/header.ld
index 0262c92..23cba4a 100644
--- a/src/arch/x86/include/arch/header.ld
+++ b/src/arch/x86/include/arch/header.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <rules.h>
diff --git a/src/arch/x86/include/arch/interrupt.h b/src/arch/x86/include/arch/interrupt.h
index f29c1d0..ddb8f6f 100644
--- a/src/arch/x86/include/arch/interrupt.h
+++ b/src/arch/x86/include/arch/interrupt.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef INTERRUPT_H
diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h
index 27b0bdc..7205a0b 100644
--- a/src/arch/x86/include/arch/ioapic.h
+++ b/src/arch/x86/include/arch/ioapic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __I386_ARCH_IOAPIC_H
diff --git a/src/arch/x86/include/arch/memlayout.h b/src/arch/x86/include/arch/memlayout.h
index 91cfc8e..e07d6a1 100644
--- a/src/arch/x86/include/arch/memlayout.h
+++ b/src/arch/x86/include/arch/memlayout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_MEMLAYOUT_H
diff --git a/src/arch/x86/include/arch/pci_io_cfg.h b/src/arch/x86/include/arch/pci_io_cfg.h
index 745bcfd..8071296 100644
--- a/src/arch/x86/include/arch/pci_io_cfg.h
+++ b/src/arch/x86/include/arch/pci_io_cfg.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PCI_IO_CFG_H
diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index eec9d97..661296d 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PCI_MMIO_CFG_H
diff --git a/src/arch/x86/include/arch/registers.h b/src/arch/x86/include/arch/registers.h
index b9b4471..6b2494b 100644
--- a/src/arch/x86/include/arch/registers.h
+++ b/src/arch/x86/include/arch/registers.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_REGISTERS_H
diff --git a/src/arch/x86/include/arch/smp/mpspec.h b/src/arch/x86/include/arch/smp/mpspec.h
index 412a449..8f215f8 100644
--- a/src/arch/x86/include/arch/smp/mpspec.h
+++ b/src/arch/x86/include/arch/smp/mpspec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ASM_MPSPEC_H
diff --git a/src/arch/x86/include/arch/stages.h b/src/arch/x86/include/arch/stages.h
index dfdb592..0df7150 100644
--- a/src/arch/x86/include/arch/stages.h
+++ b/src/arch/x86/include/arch/stages.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ARCH_STAGES_H
diff --git a/src/arch/x86/ioapic.c b/src/arch/x86/ioapic.c
index 1b13127..a152893 100644
--- a/src/arch/x86/ioapic.c
+++ b/src/arch/x86/ioapic.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/arch/x86/memlayout.ld b/src/arch/x86/memlayout.ld
index 475f9bc..c0a2950 100644
--- a/src/arch/x86/memlayout.ld
+++ b/src/arch/x86/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/arch/x86/memset.c b/src/arch/x86/memset.c
index 6ae6c6b..54c14e2 100644
--- a/src/arch/x86/memset.c
+++ b/src/arch/x86/memset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* From glibc-2.14, sysdeps/i386/memset.c */
diff --git a/src/arch/x86/mmap_boot.c b/src/arch/x86/mmap_boot.c
index 53973f9..c54c224 100644
--- a/src/arch/x86/mmap_boot.c
+++ b/src/arch/x86/mmap_boot.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot_device.h>
diff --git a/src/arch/x86/mpspec.c b/src/arch/x86/mpspec.c
index 1a0ac31..b80ab05 100644
--- a/src/arch/x86/mpspec.c
+++ b/src/arch/x86/mpspec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/x86/prologue.inc b/src/arch/x86/prologue.inc
index e0100b5..8efd70e 100644
--- a/src/arch/x86/prologue.inc
+++ b/src/arch/x86/prologue.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/post_code.h>
diff --git a/src/arch/x86/romcc_console.c b/src/arch/x86/romcc_console.c
index fda08cb..366894a 100644
--- a/src/arch/x86/romcc_console.c
+++ b/src/arch/x86/romcc_console.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <build.h>
diff --git a/src/arch/x86/smbios.c b/src/arch/x86/smbios.c
index a1f05da..73a32f4 100644
--- a/src/arch/x86/smbios.c
+++ b/src/arch/x86/smbios.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/arch/x86/stages.c b/src/arch/x86/stages.c
index c06abe6..6701ab7 100644
--- a/src/arch/x86/stages.c
+++ b/src/arch/x86/stages.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void skip_romstage(void)
diff --git a/src/arch/x86/tables.c b/src/arch/x86/tables.c
index 3d64563..fd68cfb 100644
--- a/src/arch/x86/tables.c
+++ b/src/arch/x86/tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/arch/x86/thread.c b/src/arch/x86/thread.c
index f81a2d2..3b2596d 100644
--- a/src/arch/x86/thread.c
+++ b/src/arch/x86/thread.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <thread.h>
diff --git a/src/arch/x86/thread_switch.S b/src/arch/x86/thread_switch.S
index 52d4d30..1b675c1 100644
--- a/src/arch/x86/thread_switch.S
+++ b/src/arch/x86/thread_switch.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 .code32
 .text
diff --git a/src/arch/x86/timestamp.c b/src/arch/x86/timestamp.c
index d308146..ef4ed6c 100644
--- a/src/arch/x86/timestamp.c
+++ b/src/arch/x86/timestamp.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/tsc.h>
diff --git a/src/arch/x86/wakeup.S b/src/arch/x86/wakeup.S
index 38d6ea4..3348673 100644
--- a/src/arch/x86/wakeup.S
+++ b/src/arch/x86/wakeup.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define WAKEUP_BASE		0x600
diff --git a/src/commonlib/fsp1_1_relocate.c b/src/commonlib/fsp1_1_relocate.c
index 994da09..68a3a07 100644
--- a/src/commonlib/fsp1_1_relocate.c
+++ b/src/commonlib/fsp1_1_relocate.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/commonlib/include/commonlib/cbfs_serialized.h b/src/commonlib/include/commonlib/cbfs_serialized.h
index f672095..c4f5b67 100644
--- a/src/commonlib/include/commonlib/cbfs_serialized.h
+++ b/src/commonlib/include/commonlib/cbfs_serialized.h
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/commonlib/include/commonlib/cbmem_id.h b/src/commonlib/include/commonlib/cbmem_id.h
index 4a5b660..7719e4e 100644
--- a/src/commonlib/include/commonlib/cbmem_id.h
+++ b/src/commonlib/include/commonlib/cbmem_id.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CBMEM_ID_H_
diff --git a/src/commonlib/include/commonlib/endian.h b/src/commonlib/include/commonlib/endian.h
index bcd3b39..0457886 100644
--- a/src/commonlib/include/commonlib/endian.h
+++ b/src/commonlib/include/commonlib/endian.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMONLIB_ENDIAN_H_
diff --git a/src/commonlib/include/commonlib/fsp1_1.h b/src/commonlib/include/commonlib/fsp1_1.h
index 8d8dcf0..ef473da 100644
--- a/src/commonlib/include/commonlib/fsp1_1.h
+++ b/src/commonlib/include/commonlib/fsp1_1.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMONLIB_FSP1_1_H_
diff --git a/src/commonlib/include/commonlib/loglevel.h b/src/commonlib/include/commonlib/loglevel.h
index e147490..f5d53ad 100644
--- a/src/commonlib/include/commonlib/loglevel.h
+++ b/src/commonlib/include/commonlib/loglevel.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LOGLEVEL_H
diff --git a/src/commonlib/include/commonlib/mem_pool.h b/src/commonlib/include/commonlib/mem_pool.h
index c57b707..57a181e 100644
--- a/src/commonlib/include/commonlib/mem_pool.h
+++ b/src/commonlib/include/commonlib/mem_pool.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _MEM_POOL_H_
diff --git a/src/commonlib/include/commonlib/region.h b/src/commonlib/include/commonlib/region.h
index d3e7ebd..d983da2 100644
--- a/src/commonlib/include/commonlib/region.h
+++ b/src/commonlib/include/commonlib/region.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _REGION_H_
diff --git a/src/commonlib/include/commonlib/rmodule-defs.h b/src/commonlib/include/commonlib/rmodule-defs.h
index d61837f..48fe4fa 100644
--- a/src/commonlib/include/commonlib/rmodule-defs.h
+++ b/src/commonlib/include/commonlib/rmodule-defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef RMODULE_DEFS_H
 #define RMODULE_DEFS_H
diff --git a/src/commonlib/include/commonlib/timestamp_serialized.h b/src/commonlib/include/commonlib/timestamp_serialized.h
index 8728caf..4545106 100644
--- a/src/commonlib/include/commonlib/timestamp_serialized.h
+++ b/src/commonlib/include/commonlib/timestamp_serialized.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __TIMESTAMP_SERIALIZED_H__
diff --git a/src/commonlib/mem_pool.c b/src/commonlib/mem_pool.c
index a7292f3..b0c6ea1 100644
--- a/src/commonlib/mem_pool.c
+++ b/src/commonlib/mem_pool.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <commonlib/mem_pool.h>
diff --git a/src/commonlib/region.c b/src/commonlib/region.c
index 352f92e..7604024 100644
--- a/src/commonlib/region.c
+++ b/src/commonlib/region.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <commonlib/region.h>
diff --git a/src/console/console.c b/src/console/console.c
index 855de64..39b5f2f 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/cbmem_console.h>
diff --git a/src/console/die.c b/src/console/die.c
index 128fe6b..0d6a9a7 100644
--- a/src/console/die.c
+++ b/src/console/die.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/console/early_print.c b/src/console/early_print.c
index 978cae9..fda05ca 100644
--- a/src/console/early_print.c
+++ b/src/console/early_print.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/streams.h>
diff --git a/src/console/init.c b/src/console/init.c
index 98a9d43..3beaff0 100644
--- a/src/console/init.c
+++ b/src/console/init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/console/post.c b/src/console/post.c
index 44ff857..514e2c0 100644
--- a/src/console/post.c
+++ b/src/console/post.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/console/vsprintf.c b/src/console/vsprintf.c
index 5d19235..3bbefbb 100644
--- a/src/console/vsprintf.c
+++ b/src/console/vsprintf.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/vtxprintf.h>
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index 282e1ed..7c8315f 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA
diff --git a/src/cpu/amd/agesa/Makefile.inc b/src/cpu/amd/agesa/Makefile.inc
index 89af28c..8a91d64 100644
--- a/src/cpu/amd/agesa/Makefile.inc
+++ b/src/cpu/amd/agesa/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY10) += family10
 subdirs-$(CONFIG_CPU_AMD_AGESA_FAMILY12) += family12
diff --git a/src/cpu/amd/agesa/amd_late_init.c b/src/cpu/amd/agesa/amd_late_init.c
index 13283c1..b7dba08 100644
--- a/src/cpu/amd/agesa/amd_late_init.c
+++ b/src/cpu/amd/agesa/amd_late_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/cpu/amd/agesa/cache_as_ram.inc b/src/cpu/amd/agesa/cache_as_ram.inc
index b19f03b..a6e38e7 100644
--- a/src/cpu/amd/agesa/cache_as_ram.inc
+++ b/src/cpu/amd/agesa/cache_as_ram.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /******************************************************************************
diff --git a/src/cpu/amd/agesa/family10/Kconfig b/src/cpu/amd/agesa/family10/Kconfig
index 80cd157..4ca55f2 100644
--- a/src/cpu/amd/agesa/family10/Kconfig
+++ b/src/cpu/amd/agesa/family10/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY10
diff --git a/src/cpu/amd/agesa/family10/Makefile.inc b/src/cpu/amd/agesa/family10/Makefile.inc
index 891bae5..b0a1fc8 100644
--- a/src/cpu/amd/agesa/family10/Makefile.inc
+++ b/src/cpu/amd/agesa/family10/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ramstage-y += chip_name.c
diff --git a/src/cpu/amd/agesa/family10/chip_name.c b/src/cpu/amd/agesa/family10/chip_name.c
index 8858728..6ee45a4 100644
--- a/src/cpu/amd/agesa/family10/chip_name.c
+++ b/src/cpu/amd/agesa/family10/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/agesa/family10/model_10_init.c b/src/cpu/amd/agesa/family10/model_10_init.c
index 5e09db8..319e7c7 100644
--- a/src/cpu/amd/agesa/family10/model_10_init.c
+++ b/src/cpu/amd/agesa/family10/model_10_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/family12/Kconfig b/src/cpu/amd/agesa/family12/Kconfig
index e03a8fe..a884973 100644
--- a/src/cpu/amd/agesa/family12/Kconfig
+++ b/src/cpu/amd/agesa/family12/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY12
diff --git a/src/cpu/amd/agesa/family12/chip_name.c b/src/cpu/amd/agesa/family12/chip_name.c
index 7169ad9..e873de8 100644
--- a/src/cpu/amd/agesa/family12/chip_name.c
+++ b/src/cpu/amd/agesa/family12/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/agesa/family12/fixme.c b/src/cpu/amd/agesa/family12/fixme.c
index dcb8266..0fb22f1 100644
--- a/src/cpu/amd/agesa/family12/fixme.c
+++ b/src/cpu/amd/agesa/family12/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/agesa/family12/model_12_init.c b/src/cpu/amd/agesa/family12/model_12_init.c
index 456e960..9052b75 100644
--- a/src/cpu/amd/agesa/family12/model_12_init.c
+++ b/src/cpu/amd/agesa/family12/model_12_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/family14/Kconfig b/src/cpu/amd/agesa/family14/Kconfig
index 5ef9295..d8c7392d 100644
--- a/src/cpu/amd/agesa/family14/Kconfig
+++ b/src/cpu/amd/agesa/family14/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY14
diff --git a/src/cpu/amd/agesa/family14/Makefile.inc b/src/cpu/amd/agesa/family14/Makefile.inc
index e135e27..59feb25 100644
--- a/src/cpu/amd/agesa/family14/Makefile.inc
+++ b/src/cpu/amd/agesa/family14/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/agesa/family14/acpi/cpu.asl b/src/cpu/amd/agesa/family14/acpi/cpu.asl
index 06a7652..b624a48 100644
--- a/src/cpu/amd/agesa/family14/acpi/cpu.asl
+++ b/src/cpu/amd/agesa/family14/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/amd/agesa/family14/chip_name.c b/src/cpu/amd/agesa/family14/chip_name.c
index 6568e34..e0bdfa6 100644
--- a/src/cpu/amd/agesa/family14/chip_name.c
+++ b/src/cpu/amd/agesa/family14/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/agesa/family14/fixme.c b/src/cpu/amd/agesa/family14/fixme.c
index 274e5ba..e98939c 100644
--- a/src/cpu/amd/agesa/family14/fixme.c
+++ b/src/cpu/amd/agesa/family14/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/agesa/family14/model_14_init.c b/src/cpu/amd/agesa/family14/model_14_init.c
index a087d2e..b171289 100644
--- a/src/cpu/amd/agesa/family14/model_14_init.c
+++ b/src/cpu/amd/agesa/family14/model_14_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/family15/Kconfig b/src/cpu/amd/agesa/family15/Kconfig
index 75065c4..309c14b 100644
--- a/src/cpu/amd/agesa/family15/Kconfig
+++ b/src/cpu/amd/agesa/family15/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY15
diff --git a/src/cpu/amd/agesa/family15/Makefile.inc b/src/cpu/amd/agesa/family15/Makefile.inc
index c66ab39..ff78953 100644
--- a/src/cpu/amd/agesa/family15/Makefile.inc
+++ b/src/cpu/amd/agesa/family15/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 subdirs-y += ../../mtrr
diff --git a/src/cpu/amd/agesa/family15/chip_name.c b/src/cpu/amd/agesa/family15/chip_name.c
index cb67f34..7817ce7 100644
--- a/src/cpu/amd/agesa/family15/chip_name.c
+++ b/src/cpu/amd/agesa/family15/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/agesa/family15/fixme.c b/src/cpu/amd/agesa/family15/fixme.c
index e6854c6..57340ee 100644
--- a/src/cpu/amd/agesa/family15/fixme.c
+++ b/src/cpu/amd/agesa/family15/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/agesa/family15/model_15_init.c b/src/cpu/amd/agesa/family15/model_15_init.c
index 53e0ab2..2106054 100644
--- a/src/cpu/amd/agesa/family15/model_15_init.c
+++ b/src/cpu/amd/agesa/family15/model_15_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/family15rl/Kconfig b/src/cpu/amd/agesa/family15rl/Kconfig
index 6524118..3fe4561 100644
--- a/src/cpu/amd/agesa/family15rl/Kconfig
+++ b/src/cpu/amd/agesa/family15rl/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY15_RL
diff --git a/src/cpu/amd/agesa/family15rl/Makefile.inc b/src/cpu/amd/agesa/family15rl/Makefile.inc
index 45f9787..39e01ea 100644
--- a/src/cpu/amd/agesa/family15rl/Makefile.inc
+++ b/src/cpu/amd/agesa/family15rl/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/agesa/family15rl/acpi/cpu.asl b/src/cpu/amd/agesa/family15rl/acpi/cpu.asl
index a3bf8f5..be8eacb 100644
--- a/src/cpu/amd/agesa/family15rl/acpi/cpu.asl
+++ b/src/cpu/amd/agesa/family15rl/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/*
diff --git a/src/cpu/amd/agesa/family15rl/fixme.c b/src/cpu/amd/agesa/family15rl/fixme.c
index 10c5f86..51b5c79 100644
--- a/src/cpu/amd/agesa/family15rl/fixme.c
+++ b/src/cpu/amd/agesa/family15rl/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/agesa/family15rl/model_15_init.c b/src/cpu/amd/agesa/family15rl/model_15_init.c
index 2190a3e..5ce83f6 100644
--- a/src/cpu/amd/agesa/family15rl/model_15_init.c
+++ b/src/cpu/amd/agesa/family15rl/model_15_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/family15tn/Kconfig b/src/cpu/amd/agesa/family15tn/Kconfig
index 8e274a3..a883c16 100644
--- a/src/cpu/amd/agesa/family15tn/Kconfig
+++ b/src/cpu/amd/agesa/family15tn/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY15_TN
diff --git a/src/cpu/amd/agesa/family15tn/Makefile.inc b/src/cpu/amd/agesa/family15tn/Makefile.inc
index 45f9787..39e01ea 100644
--- a/src/cpu/amd/agesa/family15tn/Makefile.inc
+++ b/src/cpu/amd/agesa/family15tn/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/agesa/family15tn/acpi/cpu.asl b/src/cpu/amd/agesa/family15tn/acpi/cpu.asl
index a3bf8f5..be8eacb 100644
--- a/src/cpu/amd/agesa/family15tn/acpi/cpu.asl
+++ b/src/cpu/amd/agesa/family15tn/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/*
diff --git a/src/cpu/amd/agesa/family15tn/chip_name.c b/src/cpu/amd/agesa/family15tn/chip_name.c
index 1f63cb6..777613c 100644
--- a/src/cpu/amd/agesa/family15tn/chip_name.c
+++ b/src/cpu/amd/agesa/family15tn/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/agesa/family15tn/fixme.c b/src/cpu/amd/agesa/family15tn/fixme.c
index 10c5f86..51b5c79 100644
--- a/src/cpu/amd/agesa/family15tn/fixme.c
+++ b/src/cpu/amd/agesa/family15tn/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/agesa/family15tn/model_15_init.c b/src/cpu/amd/agesa/family15tn/model_15_init.c
index f4b0a26..cd91c4c 100644
--- a/src/cpu/amd/agesa/family15tn/model_15_init.c
+++ b/src/cpu/amd/agesa/family15tn/model_15_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/family16kb/Kconfig b/src/cpu/amd/agesa/family16kb/Kconfig
index 9315571..f304362 100644
--- a/src/cpu/amd/agesa/family16kb/Kconfig
+++ b/src/cpu/amd/agesa/family16kb/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_AGESA_FAMILY16_KB
diff --git a/src/cpu/amd/agesa/family16kb/Makefile.inc b/src/cpu/amd/agesa/family16kb/Makefile.inc
index 3394112..8f5c472 100644
--- a/src/cpu/amd/agesa/family16kb/Makefile.inc
+++ b/src/cpu/amd/agesa/family16kb/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/agesa/family16kb/acpi/cpu.asl b/src/cpu/amd/agesa/family16kb/acpi/cpu.asl
index 1267ce9..8423254 100644
--- a/src/cpu/amd/agesa/family16kb/acpi/cpu.asl
+++ b/src/cpu/amd/agesa/family16kb/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/amd/agesa/family16kb/chip_name.c b/src/cpu/amd/agesa/family16kb/chip_name.c
index ecc915e..2a828c5 100644
--- a/src/cpu/amd/agesa/family16kb/chip_name.c
+++ b/src/cpu/amd/agesa/family16kb/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/agesa/family16kb/fixme.c b/src/cpu/amd/agesa/family16kb/fixme.c
index 0a9289d..a73a9ab 100644
--- a/src/cpu/amd/agesa/family16kb/fixme.c
+++ b/src/cpu/amd/agesa/family16kb/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/agesa/family16kb/model_16_init.c b/src/cpu/amd/agesa/family16kb/model_16_init.c
index ae2e0be..8ad5b44 100644
--- a/src/cpu/amd/agesa/family16kb/model_16_init.c
+++ b/src/cpu/amd/agesa/family16kb/model_16_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/s3_mtrr.c b/src/cpu/amd/agesa/s3_mtrr.c
index af23125..3f69c1d 100644
--- a/src/cpu/amd/agesa/s3_mtrr.c
+++ b/src/cpu/amd/agesa/s3_mtrr.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c
index 98671f4..5645acc 100644
--- a/src/cpu/amd/agesa/s3_resume.c
+++ b/src/cpu/amd/agesa/s3_resume.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/agesa/s3_resume.h b/src/cpu/amd/agesa/s3_resume.h
index 8a855e2..f4c580a 100644
--- a/src/cpu/amd/agesa/s3_resume.h
+++ b/src/cpu/amd/agesa/s3_resume.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef S3_RESUME_H
diff --git a/src/cpu/amd/car/cache_as_ram.inc b/src/cpu/amd/car/cache_as_ram.inc
index 133daac..a3ea2ae 100644
--- a/src/cpu/amd/car/cache_as_ram.inc
+++ b/src/cpu/amd/car/cache_as_ram.inc
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/car/disable_cache_as_ram.c b/src/cpu/amd/car/disable_cache_as_ram.c
index d3a3812..50cbbd6 100644
--- a/src/cpu/amd/car/disable_cache_as_ram.c
+++ b/src/cpu/amd/car/disable_cache_as_ram.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * be warned, this file will be used other cores and core 0 / node 0
  */
diff --git a/src/cpu/amd/geode_gx2/Kconfig b/src/cpu/amd/geode_gx2/Kconfig
index 1b56d5d..93cae41 100644
--- a/src/cpu/amd/geode_gx2/Kconfig
+++ b/src/cpu/amd/geode_gx2/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_AMD_GEODE_GX2
diff --git a/src/cpu/amd/geode_gx2/cache_as_ram.inc b/src/cpu/amd/geode_gx2/cache_as_ram.inc
index 837352f..1203fba 100644
--- a/src/cpu/amd/geode_gx2/cache_as_ram.inc
+++ b/src/cpu/amd/geode_gx2/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define	GX2_STACK_BASE		CONFIG_DCACHE_RAM_BASE		/* this is where the DCache will be mapped and be used as stack, It would be cool if it was the same base as coreboot normal stack */
diff --git a/src/cpu/amd/geode_lx/cache_as_ram.inc b/src/cpu/amd/geode_lx/cache_as_ram.inc
index 11eda54..d831e1f 100644
--- a/src/cpu/amd/geode_lx/cache_as_ram.inc
+++ b/src/cpu/amd/geode_lx/cache_as_ram.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define	LX_STACK_BASE		CONFIG_DCACHE_RAM_BASE		/* this is where the DCache will be mapped and be used as stack, It would be cool if it was the same base as coreboot normal stack */
diff --git a/src/cpu/amd/geode_lx/cpubug.c b/src/cpu/amd/geode_lx/cpubug.c
index 8fa139a..23499aa 100644
--- a/src/cpu/amd/geode_lx/cpubug.c
+++ b/src/cpu/amd/geode_lx/cpubug.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/geode_lx/cpureginit.c b/src/cpu/amd/geode_lx/cpureginit.c
index 9bc7f80..6454af8 100644
--- a/src/cpu/amd/geode_lx/cpureginit.c
+++ b/src/cpu/amd/geode_lx/cpureginit.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SetDelayControl */
diff --git a/src/cpu/amd/geode_lx/geode_lx_init.c b/src/cpu/amd/geode_lx/geode_lx_init.c
index 1a1986e..c1a6608 100644
--- a/src/cpu/amd/geode_lx/geode_lx_init.c
+++ b/src/cpu/amd/geode_lx/geode_lx_init.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/geode_lx/msrinit.c b/src/cpu/amd/geode_lx/msrinit.c
index 9539797..d4db9f1 100644
--- a/src/cpu/amd/geode_lx/msrinit.c
+++ b/src/cpu/amd/geode_lx/msrinit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/cpu/amd/geode_lx/syspreinit.c b/src/cpu/amd/geode_lx/syspreinit.c
index 34fb37e..5acfa04 100644
--- a/src/cpu/amd/geode_lx/syspreinit.c
+++ b/src/cpu/amd/geode_lx/syspreinit.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/cpu/amd/microcode/microcode.c b/src/cpu/amd/microcode/microcode.c
index 45e4bf0..c4a505e 100644
--- a/src/cpu/amd/microcode/microcode.c
+++ b/src/cpu/amd/microcode/microcode.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/amd/model_10xxx/defaults.h b/src/cpu/amd/model_10xxx/defaults.h
index 6fd1a7e..fd61ad1 100644
--- a/src/cpu/amd/model_10xxx/defaults.h
+++ b/src/cpu/amd/model_10xxx/defaults.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/amdmct/amddefs.h>
diff --git a/src/cpu/amd/model_10xxx/fidvid.c b/src/cpu/amd/model_10xxx/fidvid.c
index 36bdf36..58826f2 100644
--- a/src/cpu/amd/model_10xxx/fidvid.c
+++ b/src/cpu/amd/model_10xxx/fidvid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * This file initializes the CPU cores for voltage and frequency settings
diff --git a/src/cpu/amd/model_10xxx/init_cpus.c b/src/cpu/amd/model_10xxx/init_cpus.c
index 4c72848..7ac36f0 100644
--- a/src/cpu/amd/model_10xxx/init_cpus.c
+++ b/src/cpu/amd/model_10xxx/init_cpus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "cpu/amd/car/post_cache_as_ram.c"
diff --git a/src/cpu/amd/model_10xxx/model_10xxx_init.c b/src/cpu/amd/model_10xxx/model_10xxx_init.c
index 590b89d..2605d9c 100644
--- a/src/cpu/amd/model_10xxx/model_10xxx_init.c
+++ b/src/cpu/amd/model_10xxx/model_10xxx_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/model_10xxx/monotonic_timer.c b/src/cpu/amd/model_10xxx/monotonic_timer.c
index 8c02fd1..0b276cb 100644
--- a/src/cpu/amd/model_10xxx/monotonic_timer.c
+++ b/src/cpu/amd/model_10xxx/monotonic_timer.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stdint.h>
 #include <arch/cpu.h>
diff --git a/src/cpu/amd/model_10xxx/powernow_acpi.c b/src/cpu/amd/model_10xxx/powernow_acpi.c
index 98ef08a..7e87e93 100644
--- a/src/cpu/amd/model_10xxx/powernow_acpi.c
+++ b/src/cpu/amd/model_10xxx/powernow_acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/model_10xxx/processor_name.c b/src/cpu/amd/model_10xxx/processor_name.c
index a25e3a9..a5ebe8b 100644
--- a/src/cpu/amd/model_10xxx/processor_name.c
+++ b/src/cpu/amd/model_10xxx/processor_name.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/amd/model_10xxx/ram_calc.c b/src/cpu/amd/model_10xxx/ram_calc.c
index c8637c9..1e4f014 100644
--- a/src/cpu/amd/model_10xxx/ram_calc.c
+++ b/src/cpu/amd/model_10xxx/ram_calc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/cpu.h>
diff --git a/src/cpu/amd/model_10xxx/ram_calc.h b/src/cpu/amd/model_10xxx/ram_calc.h
index 61da328..5f9bca7 100644
--- a/src/cpu/amd/model_10xxx/ram_calc.h
+++ b/src/cpu/amd/model_10xxx/ram_calc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_MODEL_10XXX_RAM_CALC_H_
diff --git a/src/cpu/amd/model_10xxx/update_microcode.c b/src/cpu/amd/model_10xxx/update_microcode.c
index 51aca35..751373d 100644
--- a/src/cpu/amd/model_10xxx/update_microcode.c
+++ b/src/cpu/amd/model_10xxx/update_microcode.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/amd/model_fxx/model_fxx_update_microcode.c b/src/cpu/amd/model_fxx/model_fxx_update_microcode.c
index eb9e9eb..1437fcf 100644
--- a/src/cpu/amd/model_fxx/model_fxx_update_microcode.c
+++ b/src/cpu/amd/model_fxx/model_fxx_update_microcode.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c
index ac505ee..312ecd2 100644
--- a/src/cpu/amd/model_fxx/powernow_acpi.c
+++ b/src/cpu/amd/model_fxx/powernow_acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/model_fxx/processor_name.c b/src/cpu/amd/model_fxx/processor_name.c
index 8f40752..c1f8a29 100644
--- a/src/cpu/amd/model_fxx/processor_name.c
+++ b/src/cpu/amd/model_fxx/processor_name.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/amd/pi/00630F01/Kconfig b/src/cpu/amd/pi/00630F01/Kconfig
index efb5f80..8118fbd 100644
--- a/src/cpu/amd/pi/00630F01/Kconfig
+++ b/src/cpu/amd/pi/00630F01/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_PI_00630F01
diff --git a/src/cpu/amd/pi/00630F01/Makefile.inc b/src/cpu/amd/pi/00630F01/Makefile.inc
index 45f9787..39e01ea 100644
--- a/src/cpu/amd/pi/00630F01/Makefile.inc
+++ b/src/cpu/amd/pi/00630F01/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/pi/00630F01/acpi/cpu.asl b/src/cpu/amd/pi/00630F01/acpi/cpu.asl
index ed1c975..789a88b 100644
--- a/src/cpu/amd/pi/00630F01/acpi/cpu.asl
+++ b/src/cpu/amd/pi/00630F01/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/*
diff --git a/src/cpu/amd/pi/00630F01/chip_name.c b/src/cpu/amd/pi/00630F01/chip_name.c
index 2765d22..e69bdf5 100644
--- a/src/cpu/amd/pi/00630F01/chip_name.c
+++ b/src/cpu/amd/pi/00630F01/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/pi/00630F01/fixme.c b/src/cpu/amd/pi/00630F01/fixme.c
index 10c5f86..51b5c79 100644
--- a/src/cpu/amd/pi/00630F01/fixme.c
+++ b/src/cpu/amd/pi/00630F01/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/pi/00630F01/model_15_init.c b/src/cpu/amd/pi/00630F01/model_15_init.c
index e2ba65e..118a80c 100644
--- a/src/cpu/amd/pi/00630F01/model_15_init.c
+++ b/src/cpu/amd/pi/00630F01/model_15_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/pi/00660F01/Kconfig b/src/cpu/amd/pi/00660F01/Kconfig
index 5bf791a..c3c8b4a 100644
--- a/src/cpu/amd/pi/00660F01/Kconfig
+++ b/src/cpu/amd/pi/00660F01/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_PI_00660F01
diff --git a/src/cpu/amd/pi/00660F01/Makefile.inc b/src/cpu/amd/pi/00660F01/Makefile.inc
index bb4518b..1789511 100644
--- a/src/cpu/amd/pi/00660F01/Makefile.inc
+++ b/src/cpu/amd/pi/00660F01/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/pi/00660F01/acpi/cpu.asl b/src/cpu/amd/pi/00660F01/acpi/cpu.asl
index 1267ce9..8423254 100644
--- a/src/cpu/amd/pi/00660F01/acpi/cpu.asl
+++ b/src/cpu/amd/pi/00660F01/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/amd/pi/00660F01/chip_name.c b/src/cpu/amd/pi/00660F01/chip_name.c
index e1fda3b..73ea15d 100644
--- a/src/cpu/amd/pi/00660F01/chip_name.c
+++ b/src/cpu/amd/pi/00660F01/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/pi/00660F01/fixme.c b/src/cpu/amd/pi/00660F01/fixme.c
index a9858c2..07f1b63 100644
--- a/src/cpu/amd/pi/00660F01/fixme.c
+++ b/src/cpu/amd/pi/00660F01/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/pi/00660F01/model_15_init.c b/src/cpu/amd/pi/00660F01/model_15_init.c
index 602b900..51be529 100644
--- a/src/cpu/amd/pi/00660F01/model_15_init.c
+++ b/src/cpu/amd/pi/00660F01/model_15_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/pi/00730F01/Kconfig b/src/cpu/amd/pi/00730F01/Kconfig
index 9fc98b0..be56cf3 100644
--- a/src/cpu/amd/pi/00730F01/Kconfig
+++ b/src/cpu/amd/pi/00730F01/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_PI_00730F01
diff --git a/src/cpu/amd/pi/00730F01/Makefile.inc b/src/cpu/amd/pi/00730F01/Makefile.inc
index 54df5f1..5de0706 100644
--- a/src/cpu/amd/pi/00730F01/Makefile.inc
+++ b/src/cpu/amd/pi/00730F01/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += fixme.c
diff --git a/src/cpu/amd/pi/00730F01/acpi/cpu.asl b/src/cpu/amd/pi/00730F01/acpi/cpu.asl
index a3bf8f5..be8eacb 100644
--- a/src/cpu/amd/pi/00730F01/acpi/cpu.asl
+++ b/src/cpu/amd/pi/00730F01/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/*
diff --git a/src/cpu/amd/pi/00730F01/chip_name.c b/src/cpu/amd/pi/00730F01/chip_name.c
index c895dea..3bb9eab 100644
--- a/src/cpu/amd/pi/00730F01/chip_name.c
+++ b/src/cpu/amd/pi/00730F01/chip_name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/amd/pi/00730F01/fixme.c b/src/cpu/amd/pi/00730F01/fixme.c
index 2ec2237..5c15787 100644
--- a/src/cpu/amd/pi/00730F01/fixme.c
+++ b/src/cpu/amd/pi/00730F01/fixme.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/amd/pi/00730F01/model_16_init.c b/src/cpu/amd/pi/00730F01/model_16_init.c
index 453d985..d7a9348 100644
--- a/src/cpu/amd/pi/00730F01/model_16_init.c
+++ b/src/cpu/amd/pi/00730F01/model_16_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig
index 6bf3785..1b67400 100644
--- a/src/cpu/amd/pi/Kconfig
+++ b/src/cpu/amd/pi/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_AMD_PI
diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.inc
index 2b9c3ff..eb04368 100644
--- a/src/cpu/amd/pi/Makefile.inc
+++ b/src/cpu/amd/pi/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 subdirs-$(CONFIG_CPU_AMD_PI_00630F01) += 00630F01
diff --git a/src/cpu/amd/pi/amd_late_init.c b/src/cpu/amd/pi/amd_late_init.c
index 299b655..5644de9 100644
--- a/src/cpu/amd/pi/amd_late_init.c
+++ b/src/cpu/amd/pi/amd_late_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/cpu/amd/pi/cache_as_ram.inc b/src/cpu/amd/pi/cache_as_ram.inc
index a8dbee8..df607c2 100644
--- a/src/cpu/amd/pi/cache_as_ram.inc
+++ b/src/cpu/amd/pi/cache_as_ram.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /******************************************************************************
diff --git a/src/cpu/amd/pi/s3_resume.c b/src/cpu/amd/pi/s3_resume.c
index 943fd97..bce5e34 100644
--- a/src/cpu/amd/pi/s3_resume.c
+++ b/src/cpu/amd/pi/s3_resume.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <AGESA.h>
diff --git a/src/cpu/amd/pi/s3_resume.h b/src/cpu/amd/pi/s3_resume.h
index d7b3b89..5a2fef6 100644
--- a/src/cpu/amd/pi/s3_resume.h
+++ b/src/cpu/amd/pi/s3_resume.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef S3_RESUME_H
diff --git a/src/cpu/amd/pi/spi.c b/src/cpu/amd/pi/spi.c
index 05a29d7..a6cf7eb 100644
--- a/src/cpu/amd/pi/spi.c
+++ b/src/cpu/amd/pi/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/quadcore/amd_sibling.c b/src/cpu/amd/quadcore/amd_sibling.c
index 21eb7a6..e811acd 100644
--- a/src/cpu/amd/quadcore/amd_sibling.c
+++ b/src/cpu/amd/quadcore/amd_sibling.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/cpu/amd/quadcore/quadcore.c b/src/cpu/amd/quadcore/quadcore.c
index 9c21e94..ac05456 100644
--- a/src/cpu/amd/quadcore/quadcore.c
+++ b/src/cpu/amd/quadcore/quadcore.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/amd/quadcore/quadcore_id.c b/src/cpu/amd/quadcore/quadcore_id.c
index cf45196..2ed7c27 100644
--- a/src/cpu/amd/quadcore/quadcore_id.c
+++ b/src/cpu/amd/quadcore/quadcore_id.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/cpu/amd/smm/smm_init.c b/src/cpu/amd/smm/smm_init.c
index 2e9a4c9..2205191 100644
--- a/src/cpu/amd/smm/smm_init.c
+++ b/src/cpu/amd/smm/smm_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/dmp/Kconfig b/src/cpu/dmp/Kconfig
index 618f7b4..9277f3c 100644
--- a/src/cpu/dmp/Kconfig
+++ b/src/cpu/dmp/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 source src/cpu/dmp/vortex86ex/Kconfig
diff --git a/src/cpu/dmp/Makefile.inc b/src/cpu/dmp/Makefile.inc
index f63ce3a..8709509 100644
--- a/src/cpu/dmp/Makefile.inc
+++ b/src/cpu/dmp/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-$(CONFIG_CPU_DMP_VORTEX86EX) += vortex86ex
diff --git a/src/cpu/dmp/dmp_post_code.h b/src/cpu/dmp/dmp_post_code.h
index 5ec01f6..18da4cb 100644
--- a/src/cpu/dmp/dmp_post_code.h
+++ b/src/cpu/dmp/dmp_post_code.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DMP_POST_CODE_H
diff --git a/src/cpu/dmp/vortex86ex/Kconfig b/src/cpu/dmp/vortex86ex/Kconfig
index 3bd6c2c..285fb87 100644
--- a/src/cpu/dmp/vortex86ex/Kconfig
+++ b/src/cpu/dmp/vortex86ex/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_DMP_VORTEX86EX
diff --git a/src/cpu/dmp/vortex86ex/Makefile.inc b/src/cpu/dmp/vortex86ex/Makefile.inc
index 15ea4ea..7642022 100644
--- a/src/cpu/dmp/vortex86ex/Makefile.inc
+++ b/src/cpu/dmp/vortex86ex/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += ../../x86/tsc
diff --git a/src/cpu/dmp/vortex86ex/biosdata.inc b/src/cpu/dmp/vortex86ex/biosdata.inc
index 4f408b4..dcd2512 100644
--- a/src/cpu/dmp/vortex86ex/biosdata.inc
+++ b/src/cpu/dmp/vortex86ex/biosdata.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	.section ".dmp_reserved", "a", @progbits
diff --git a/src/cpu/dmp/vortex86ex/biosdata.ld b/src/cpu/dmp/vortex86ex/biosdata.ld
index c1f50c4..16d72d7 100644
--- a/src/cpu/dmp/vortex86ex/biosdata.ld
+++ b/src/cpu/dmp/vortex86ex/biosdata.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 SECTIONS {
diff --git a/src/cpu/dmp/vortex86ex/biosdata_ex.inc b/src/cpu/dmp/vortex86ex/biosdata_ex.inc
index 2c248ea..512b776 100644
--- a/src/cpu/dmp/vortex86ex/biosdata_ex.inc
+++ b/src/cpu/dmp/vortex86ex/biosdata_ex.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "config.h"
diff --git a/src/cpu/dmp/vortex86ex/biosdata_ex.ld b/src/cpu/dmp/vortex86ex/biosdata_ex.ld
index 8930d80..eb0ea3b 100644
--- a/src/cpu/dmp/vortex86ex/biosdata_ex.ld
+++ b/src/cpu/dmp/vortex86ex/biosdata_ex.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 SECTIONS {
diff --git a/src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc b/src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc
index fae80ef..1c1d30d 100644
--- a/src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc
+++ b/src/cpu/dmp/vortex86ex/dmp_kbd_fw_part1.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
         .byte  0x02, 0x04, 0xa3, 0x02, 0x0a, 0xfb, 0xef, 0x75
diff --git a/src/cpu/intel/car/cache_as_ram.inc b/src/cpu/intel/car/cache_as_ram.inc
index f9be6e8..4320c7b 100644
--- a/src/cpu/intel/car/cache_as_ram.inc
+++ b/src/cpu/intel/car/cache_as_ram.inc
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/car/cache_as_ram_ht.inc b/src/cpu/intel/car/cache_as_ram_ht.inc
index 193ad41..0e97d72 100644
--- a/src/cpu/intel/car/cache_as_ram_ht.inc
+++ b/src/cpu/intel/car/cache_as_ram_ht.inc
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/ep80579/ep80579.c b/src/cpu/intel/ep80579/ep80579.c
index 9365f2b..5938c24 100644
--- a/src/cpu/intel/ep80579/ep80579.c
+++ b/src/cpu/intel/ep80579/ep80579.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/intel/ep80579/ep80579_init.c b/src/cpu/intel/ep80579/ep80579_init.c
index 2a0ced9..ef98732 100644
--- a/src/cpu/intel/ep80579/ep80579_init.c
+++ b/src/cpu/intel/ep80579/ep80579_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index c072075..3d3a648 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/intel/haswell/acpi/cpu.asl b/src/cpu/intel/haswell/acpi/cpu.asl
index 114dbe3..8c0c1bb 100644
--- a/src/cpu/intel/haswell/acpi/cpu.asl
+++ b/src/cpu/intel/haswell/acpi/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/cpu/intel/haswell/bootblock.c b/src/cpu/intel/haswell/bootblock.c
index f5d0f6c..e01ef17 100644
--- a/src/cpu/intel/haswell/bootblock.c
+++ b/src/cpu/intel/haswell/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/haswell/cache_as_ram.inc b/src/cpu/intel/haswell/cache_as_ram.inc
index 0978bfb..5a12809 100644
--- a/src/cpu/intel/haswell/cache_as_ram.inc
+++ b/src/cpu/intel/haswell/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/haswell/chip.h b/src/cpu/intel/haswell/chip.h
index 89d168d..01036cf 100644
--- a/src/cpu/intel/haswell/chip.h
+++ b/src/cpu/intel/haswell/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 extern struct chip_operations cpu_intel_haswell_ops;
diff --git a/src/cpu/intel/haswell/finalize.c b/src/cpu/intel/haswell/finalize.c
index 5c56c26..fe8d3db 100644
--- a/src/cpu/intel/haswell/finalize.c
+++ b/src/cpu/intel/haswell/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/haswell/haswell.h b/src/cpu/intel/haswell/haswell.h
index abcea21..14662ab 100644
--- a/src/cpu/intel/haswell/haswell.h
+++ b/src/cpu/intel/haswell/haswell.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CPU_INTEL_HASWELL_H
diff --git a/src/cpu/intel/haswell/haswell_init.c b/src/cpu/intel/haswell/haswell_init.c
index 2f9370b..e024be6 100644
--- a/src/cpu/intel/haswell/haswell_init.c
+++ b/src/cpu/intel/haswell/haswell_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/haswell/monotonic_timer.c b/src/cpu/intel/haswell/monotonic_timer.c
index 8f26d2b..d9889be 100644
--- a/src/cpu/intel/haswell/monotonic_timer.c
+++ b/src/cpu/intel/haswell/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stdint.h>
 #include <cpu/x86/msr.h>
diff --git a/src/cpu/intel/haswell/romstage.c b/src/cpu/intel/haswell/romstage.c
index 9c238ca..a14ef06 100644
--- a/src/cpu/intel/haswell/romstage.c
+++ b/src/cpu/intel/haswell/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/haswell/smmrelocate.c b/src/cpu/intel/haswell/smmrelocate.c
index ab94f9a..b2e1547 100644
--- a/src/cpu/intel/haswell/smmrelocate.c
+++ b/src/cpu/intel/haswell/smmrelocate.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/intel/haswell/stage_cache.c b/src/cpu/intel/haswell/stage_cache.c
index 162a244..21a179a 100644
--- a/src/cpu/intel/haswell/stage_cache.c
+++ b/src/cpu/intel/haswell/stage_cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/cpu/intel/haswell/tsc_freq.c b/src/cpu/intel/haswell/tsc_freq.c
index fef9588..edb5a39 100644
--- a/src/cpu/intel/haswell/tsc_freq.c
+++ b/src/cpu/intel/haswell/tsc_freq.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/microcode/microcode.c b/src/cpu/intel/microcode/microcode.c
index 8791a2e..938986f 100644
--- a/src/cpu/intel/microcode/microcode.c
+++ b/src/cpu/intel/microcode/microcode.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Microcode update for Intel PIII and later CPUs */
diff --git a/src/cpu/intel/model_1067x/chip.h b/src/cpu/intel/model_1067x/chip.h
index eb4803d..5b5e677 100644
--- a/src/cpu/intel/model_1067x/chip.h
+++ b/src/cpu/intel/model_1067x/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 struct cpu_intel_model_1067x_config {
diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c
index 462c4de..50a9374 100644
--- a/src/cpu/intel/model_1067x/model_1067x_init.c
+++ b/src/cpu/intel/model_1067x/model_1067x_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c
index 21987b3..40a1d7e 100644
--- a/src/cpu/intel/model_106cx/model_106cx_init.c
+++ b/src/cpu/intel/model_106cx/model_106cx_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index da8ba4e..3b49404 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/intel/model_2065x/bootblock.c b/src/cpu/intel/model_2065x/bootblock.c
index b6a2442..c66abcf 100644
--- a/src/cpu/intel/model_2065x/bootblock.c
+++ b/src/cpu/intel/model_2065x/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/model_2065x/cache_as_ram.inc b/src/cpu/intel/model_2065x/cache_as_ram.inc
index cfa3b6b..2b86680 100644
--- a/src/cpu/intel/model_2065x/cache_as_ram.inc
+++ b/src/cpu/intel/model_2065x/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_2065x/chip.h b/src/cpu/intel/model_2065x/chip.h
index 550d478..3e99742 100644
--- a/src/cpu/intel/model_2065x/chip.h
+++ b/src/cpu/intel/model_2065x/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Magic value used to locate this chip in the device tree */
diff --git a/src/cpu/intel/model_2065x/finalize.c b/src/cpu/intel/model_2065x/finalize.c
index f2fb8da..226dccd 100644
--- a/src/cpu/intel/model_2065x/finalize.c
+++ b/src/cpu/intel/model_2065x/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/model_2065x/model_2065x.h b/src/cpu/intel/model_2065x/model_2065x.h
index 0ea7a54..f72c43e 100644
--- a/src/cpu/intel/model_2065x/model_2065x.h
+++ b/src/cpu/intel/model_2065x/model_2065x.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CPU_INTEL_MODEL_2065X_H
diff --git a/src/cpu/intel/model_2065x/model_2065x_init.c b/src/cpu/intel/model_2065x/model_2065x_init.c
index 991bab8..625bdcc 100644
--- a/src/cpu/intel/model_2065x/model_2065x_init.c
+++ b/src/cpu/intel/model_2065x/model_2065x_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_2065x/tsc_freq.c b/src/cpu/intel/model_2065x/tsc_freq.c
index 9245736..606d181 100644
--- a/src/cpu/intel/model_2065x/tsc_freq.c
+++ b/src/cpu/intel/model_2065x/tsc_freq.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 94cc6de..add62dd 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/intel/model_206ax/acpi/cpu.asl b/src/cpu/intel/model_206ax/acpi/cpu.asl
index 114dbe3..8c0c1bb 100644
--- a/src/cpu/intel/model_206ax/acpi/cpu.asl
+++ b/src/cpu/intel/model_206ax/acpi/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/cpu/intel/model_206ax/bootblock.c b/src/cpu/intel/model_206ax/bootblock.c
index d41afb2..1b1d9ba 100644
--- a/src/cpu/intel/model_206ax/bootblock.c
+++ b/src/cpu/intel/model_206ax/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/model_206ax/cache_as_ram.inc b/src/cpu/intel/model_206ax/cache_as_ram.inc
index a3f1c64..cd48c5e 100644
--- a/src/cpu/intel/model_206ax/cache_as_ram.inc
+++ b/src/cpu/intel/model_206ax/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_206ax/chip.h b/src/cpu/intel/model_206ax/chip.h
index c690d52..8527377 100644
--- a/src/cpu/intel/model_206ax/chip.h
+++ b/src/cpu/intel/model_206ax/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Magic value used to locate this chip in the device tree */
diff --git a/src/cpu/intel/model_206ax/finalize.c b/src/cpu/intel/model_206ax/finalize.c
index 06cf09a..d87b2e6 100644
--- a/src/cpu/intel/model_206ax/finalize.c
+++ b/src/cpu/intel/model_206ax/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/model_206ax/model_206ax.h b/src/cpu/intel/model_206ax/model_206ax.h
index 671f359..59912b3 100644
--- a/src/cpu/intel/model_206ax/model_206ax.h
+++ b/src/cpu/intel/model_206ax/model_206ax.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CPU_INTEL_MODEL_206AX_H
diff --git a/src/cpu/intel/model_206ax/model_206ax_init.c b/src/cpu/intel/model_206ax/model_206ax_init.c
index 922eb49..ecb8aee 100644
--- a/src/cpu/intel/model_206ax/model_206ax_init.c
+++ b/src/cpu/intel/model_206ax/model_206ax_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_65x/Makefile.inc b/src/cpu/intel/model_65x/Makefile.inc
index 98697c7..2c6e72b 100644
--- a/src/cpu/intel/model_65x/Makefile.inc
+++ b/src/cpu/intel/model_65x/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += model_65x_init.c
diff --git a/src/cpu/intel/model_65x/model_65x_init.c b/src/cpu/intel/model_65x/model_65x_init.c
index 1b7fbaa..1e485c9 100644
--- a/src/cpu/intel/model_65x/model_65x_init.c
+++ b/src/cpu/intel/model_65x/model_65x_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/intel/model_67x/Makefile.inc b/src/cpu/intel/model_67x/Makefile.inc
index 6a748fa..f149ddf 100644
--- a/src/cpu/intel/model_67x/Makefile.inc
+++ b/src/cpu/intel/model_67x/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += model_67x_init.c
diff --git a/src/cpu/intel/model_67x/model_67x_init.c b/src/cpu/intel/model_67x/model_67x_init.c
index a9f5021..9de06d7 100644
--- a/src/cpu/intel/model_67x/model_67x_init.c
+++ b/src/cpu/intel/model_67x/model_67x_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_68x/Kconfig b/src/cpu/intel/model_68x/Kconfig
index acb3bce..efeeef9 100644
--- a/src/cpu/intel/model_68x/Kconfig
+++ b/src/cpu/intel/model_68x/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_INTEL_MODEL_68X
diff --git a/src/cpu/intel/model_68x/Makefile.inc b/src/cpu/intel/model_68x/Makefile.inc
index e7390ba..ffdcf9b 100644
--- a/src/cpu/intel/model_68x/Makefile.inc
+++ b/src/cpu/intel/model_68x/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += model_68x_init.c
diff --git a/src/cpu/intel/model_68x/model_68x_init.c b/src/cpu/intel/model_68x/model_68x_init.c
index 992ee2c..ce4eb29 100644
--- a/src/cpu/intel/model_68x/model_68x_init.c
+++ b/src/cpu/intel/model_68x/model_68x_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_6bx/model_6bx_init.c b/src/cpu/intel/model_6bx/model_6bx_init.c
index 3075328..9329e63 100644
--- a/src/cpu/intel/model_6bx/model_6bx_init.c
+++ b/src/cpu/intel/model_6bx/model_6bx_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc
index 271b756..16e2d2a 100644
--- a/src/cpu/intel/model_6ex/cache_as_ram.inc
+++ b/src/cpu/intel/model_6ex/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c
index ffb9d26..c331cfb 100644
--- a/src/cpu/intel/model_6ex/model_6ex_init.c
+++ b/src/cpu/intel/model_6ex/model_6ex_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c
index a1681f1..8fd4def 100644
--- a/src/cpu/intel/model_6fx/model_6fx_init.c
+++ b/src/cpu/intel/model_6fx/model_6fx_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/intel/slot_1/Kconfig b/src/cpu/intel/slot_1/Kconfig
index 801624f..0f743a7 100644
--- a/src/cpu/intel/slot_1/Kconfig
+++ b/src/cpu/intel/slot_1/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_INTEL_SLOT_1
diff --git a/src/cpu/intel/slot_1/Makefile.inc b/src/cpu/intel/slot_1/Makefile.inc
index 1487f5e..3c1c2cf 100644
--- a/src/cpu/intel/slot_1/Makefile.inc
+++ b/src/cpu/intel/slot_1/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += slot_1.c
diff --git a/src/cpu/intel/slot_1/l2_cache.c b/src/cpu/intel/slot_1/l2_cache.c
index e41e132..ef52afe 100644
--- a/src/cpu/intel/slot_1/l2_cache.c
+++ b/src/cpu/intel/slot_1/l2_cache.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/intel/slot_1/slot_1.c b/src/cpu/intel/slot_1/slot_1.c
index d3e3d31..93ae0ca 100644
--- a/src/cpu/intel/slot_1/slot_1.c
+++ b/src/cpu/intel/slot_1/slot_1.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/intel/slot_2/Kconfig b/src/cpu/intel/slot_2/Kconfig
index 436230b..12895b9 100644
--- a/src/cpu/intel/slot_2/Kconfig
+++ b/src/cpu/intel/slot_2/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_INTEL_SLOT_2
diff --git a/src/cpu/intel/slot_2/Makefile.inc b/src/cpu/intel/slot_2/Makefile.inc
index 4a84fa0..1f9eaa1 100644
--- a/src/cpu/intel/slot_2/Makefile.inc
+++ b/src/cpu/intel/slot_2/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += slot_2.c
diff --git a/src/cpu/intel/smm/gen1/smmrelocate.c b/src/cpu/intel/smm/gen1/smmrelocate.c
index bc14444..215d8d0 100644
--- a/src/cpu/intel/smm/gen1/smmrelocate.c
+++ b/src/cpu/intel/smm/gen1/smmrelocate.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMM relocation with intention to work for i945-ivybridge.
diff --git a/src/cpu/intel/socket_FC_PGA370/Kconfig b/src/cpu/intel/socket_FC_PGA370/Kconfig
index c0af915..91c964e 100644
--- a/src/cpu/intel/socket_FC_PGA370/Kconfig
+++ b/src/cpu/intel/socket_FC_PGA370/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_INTEL_SOCKET_FC_PGA370
diff --git a/src/cpu/intel/socket_FC_PGA370/Makefile.inc b/src/cpu/intel/socket_FC_PGA370/Makefile.inc
index d9bb227..4bb8e77 100644
--- a/src/cpu/intel/socket_FC_PGA370/Makefile.inc
+++ b/src/cpu/intel/socket_FC_PGA370/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += ../model_68x
diff --git a/src/cpu/intel/socket_PGA370/Kconfig b/src/cpu/intel/socket_PGA370/Kconfig
index 9c3ba56..1e8afde 100644
--- a/src/cpu/intel/socket_PGA370/Kconfig
+++ b/src/cpu/intel/socket_PGA370/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_INTEL_SOCKET_PGA370
diff --git a/src/cpu/intel/socket_PGA370/Makefile.inc b/src/cpu/intel/socket_PGA370/Makefile.inc
index 98b4394..321b595 100644
--- a/src/cpu/intel/socket_PGA370/Makefile.inc
+++ b/src/cpu/intel/socket_PGA370/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += ../model_6xx
diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c
index 1c3cb9d..7e5be1c 100644
--- a/src/cpu/intel/speedstep/acpi.c
+++ b/src/cpu/intel/speedstep/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/intel/speedstep/speedstep.c b/src/cpu/intel/speedstep/speedstep.c
index 704989f3..4f4c79f 100644
--- a/src/cpu/intel/speedstep/speedstep.c
+++ b/src/cpu/intel/speedstep/speedstep.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/intel/turbo/turbo.c b/src/cpu/intel/turbo/turbo.c
index df17c9a..27cb625 100644
--- a/src/cpu/intel/turbo/turbo.c
+++ b/src/cpu/intel/turbo/turbo.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/mips/Kconfig b/src/cpu/mips/Kconfig
index d0fa1ac..49b8719 100644
--- a/src/cpu/mips/Kconfig
+++ b/src/cpu/mips/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_MIPS
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 67c9ce7..3961843 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config CPU_QEMU_X86
diff --git a/src/cpu/qemu-x86/Makefile.inc b/src/cpu/qemu-x86/Makefile.inc
index 143f4fe..0270ea3 100644
--- a/src/cpu/qemu-x86/Makefile.inc
+++ b/src/cpu/qemu-x86/Makefile.inc
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += qemu.c
diff --git a/src/cpu/qemu-x86/qemu.c b/src/cpu/qemu-x86/qemu.c
index b6f0ad5..cb44e2f 100644
--- a/src/cpu/qemu-x86/qemu.c
+++ b/src/cpu/qemu-x86/qemu.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/cpu.h>
diff --git a/src/cpu/ti/am335x/bootblock.c b/src/cpu/ti/am335x/bootblock.c
index 98668cc..1073e5e 100644
--- a/src/cpu/ti/am335x/bootblock.c
+++ b/src/cpu/ti/am335x/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/cpu/ti/am335x/bootblock_media.c b/src/cpu/ti/am335x/bootblock_media.c
index 0a8ccb6..0bc95f7 100644
--- a/src/cpu/ti/am335x/bootblock_media.c
+++ b/src/cpu/ti/am335x/bootblock_media.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot_device.h>
diff --git a/src/cpu/ti/am335x/cbmem.c b/src/cpu/ti/am335x/cbmem.c
index d3a2d6f..b1773a4 100644
--- a/src/cpu/ti/am335x/cbmem.c
+++ b/src/cpu/ti/am335x/cbmem.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/cpu/ti/am335x/dmtimer.c b/src/cpu/ti/am335x/dmtimer.c
index 7f70fe2..cebe356 100644
--- a/src/cpu/ti/am335x/dmtimer.c
+++ b/src/cpu/ti/am335x/dmtimer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "dmtimer.h"
diff --git a/src/cpu/ti/am335x/dmtimer.h b/src/cpu/ti/am335x/dmtimer.h
index f153e17..19a27ad 100644
--- a/src/cpu/ti/am335x/dmtimer.h
+++ b/src/cpu/ti/am335x/dmtimer.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CPU_TI_AM335X_DMTIMER_H__
diff --git a/src/cpu/ti/am335x/header.c b/src/cpu/ti/am335x/header.c
index ae3afad..7fc03f4 100644
--- a/src/cpu/ti/am335x/header.c
+++ b/src/cpu/ti/am335x/header.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <config.h>
diff --git a/src/cpu/ti/am335x/header.h b/src/cpu/ti/am335x/header.h
index f750d96..86aabbe 100644
--- a/src/cpu/ti/am335x/header.h
+++ b/src/cpu/ti/am335x/header.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CPU_TI_AM335X_HEADER_H
diff --git a/src/cpu/ti/am335x/header.ld b/src/cpu/ti/am335x/header.ld
index 7d50a0e..b48ee95 100644
--- a/src/cpu/ti/am335x/header.ld
+++ b/src/cpu/ti/am335x/header.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/cpu/ti/am335x/memlayout.ld b/src/cpu/ti/am335x/memlayout.ld
index 7947fa2..fa83d17 100644
--- a/src/cpu/ti/am335x/memlayout.ld
+++ b/src/cpu/ti/am335x/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/cpu/ti/am335x/monotonic_timer.c b/src/cpu/ti/am335x/monotonic_timer.c
index 1dc7b49..c40058e 100644
--- a/src/cpu/ti/am335x/monotonic_timer.c
+++ b/src/cpu/ti/am335x/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/ti/am335x/nand.c b/src/cpu/ti/am335x/nand.c
index 4ac359d..9a00e8c 100644
--- a/src/cpu/ti/am335x/nand.c
+++ b/src/cpu/ti/am335x/nand.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot_device.h>
diff --git a/src/cpu/ti/am335x/pinmux.c b/src/cpu/ti/am335x/pinmux.c
index 88b3140..4fd0724 100644
--- a/src/cpu/ti/am335x/pinmux.c
+++ b/src/cpu/ti/am335x/pinmux.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "pinmux.h"
diff --git a/src/cpu/ti/am335x/pinmux.h b/src/cpu/ti/am335x/pinmux.h
index b3d0130..8ba063e 100644
--- a/src/cpu/ti/am335x/pinmux.h
+++ b/src/cpu/ti/am335x/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CPU_TI_AM335X_PINMUX_H
diff --git a/src/cpu/ti/am335x/uart.c b/src/cpu/ti/am335x/uart.c
index b731fa4..071913d 100644
--- a/src/cpu/ti/am335x/uart.c
+++ b/src/cpu/ti/am335x/uart.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/cpu/ti/am335x/uart.h b/src/cpu/ti/am335x/uart.h
index 59c2a8e..cbd0682 100644
--- a/src/cpu/ti/am335x/uart.h
+++ b/src/cpu/ti/am335x/uart.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AM335X_UART_H
diff --git a/src/cpu/via/c3/c3_init.c b/src/cpu/via/c3/c3_init.c
index fccd7e5..f108879 100644
--- a/src/cpu/via/c3/c3_init.c
+++ b/src/cpu/via/c3/c3_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/via/c7/c7_init.c b/src/cpu/via/c7/c7_init.c
index 47d5a21..debf09b 100644
--- a/src/cpu/via/c7/c7_init.c
+++ b/src/cpu/via/c7/c7_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc
index e8a4ee2..bad4a32 100644
--- a/src/cpu/via/car/cache_as_ram.inc
+++ b/src/cpu/via/car/cache_as_ram.inc
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c
index cdf7cfc..43278a5 100644
--- a/src/cpu/x86/car.c
+++ b/src/cpu/x86/car.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/cpu/x86/fpu_enable.inc b/src/cpu/x86/fpu_enable.inc
index 7a66b73..6f0db45 100644
--- a/src/cpu/x86/fpu_enable.inc
+++ b/src/cpu/x86/fpu_enable.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 __fpu_start:
diff --git a/src/cpu/x86/lapic/apic_timer.c b/src/cpu/x86/lapic/apic_timer.c
index a44a9f5..b38366f 100644
--- a/src/cpu/x86/lapic/apic_timer.c
+++ b/src/cpu/x86/lapic/apic_timer.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 7fedd00..89a249d 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/cr.h>
diff --git a/src/cpu/x86/mirror_payload.c b/src/cpu/x86/mirror_payload.c
index 6a46841..e26b4f5 100644
--- a/src/cpu/x86/mirror_payload.c
+++ b/src/cpu/x86/mirror_payload.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/cpu/x86/mp_init.c b/src/cpu/x86/mp_init.c
index 3c8450f..7411d13 100644
--- a/src/cpu/x86/mp_init.c
+++ b/src/cpu/x86/mp_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/cpu/x86/mtrr/mtrr.c b/src/cpu/x86/mtrr/mtrr.c
index 1994a56..3fba5df 100644
--- a/src/cpu/x86/mtrr/mtrr.c
+++ b/src/cpu/x86/mtrr/mtrr.c
@@ -17,8 +17,7 @@
  *	GNU General Public License for more details.
  *
  *	You should have received a copy of the GNU General Public License
- *	along with this program; if not, write to the Free Software
- *	Foundation, Inc.
+ *	along with this program.
  *
  *
  * Reference: Intel Architecture Software Developer's Manual, Volume 3: System Programming
diff --git a/src/cpu/x86/name/Makefile.inc b/src/cpu/x86/name/Makefile.inc
index 95501a9..46b82ae 100644
--- a/src/cpu/x86/name/Makefile.inc
+++ b/src/cpu/x86/name/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += name.c
diff --git a/src/cpu/x86/name/name.c b/src/cpu/x86/name/name.c
index a8e4dc7..9728b9f 100644
--- a/src/cpu/x86/name/name.c
+++ b/src/cpu/x86/name/name.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/cpu/x86/sipi_vector.S b/src/cpu/x86/sipi_vector.S
index 0887b0a..e61bcca 100644
--- a/src/cpu/x86/sipi_vector.S
+++ b/src/cpu/x86/sipi_vector.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The SIPI vector is responsible for initializing the APs in the sytem. It
diff --git a/src/cpu/x86/smm/Makefile.inc b/src/cpu/x86/smm/Makefile.inc
index 7b4ad59..b201d5a 100644
--- a/src/cpu/x86/smm/Makefile.inc
+++ b/src/cpu/x86/smm/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_BACKUP_DEFAULT_SMM_REGION) += backup_default_smm.c
diff --git a/src/cpu/x86/smm/backup_default_smm.c b/src/cpu/x86/smm/backup_default_smm.c
index fa8b11d..0536393 100644
--- a/src/cpu/x86/smm/backup_default_smm.c
+++ b/src/cpu/x86/smm/backup_default_smm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c
index 9c282c3..41010f3 100644
--- a/src/cpu/x86/smm/smihandler.c
+++ b/src/cpu/x86/smm/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/cpu/x86/smm/smm_module_handler.c b/src/cpu/x86/smm/smm_module_handler.c
index b23f28d..03da894 100644
--- a/src/cpu/x86/smm/smm_module_handler.c
+++ b/src/cpu/x86/smm/smm_module_handler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/cpu/x86/smm/smm_module_loader.c b/src/cpu/x86/smm/smm_module_loader.c
index 6564b28..558772f 100644
--- a/src/cpu/x86/smm/smm_module_loader.c
+++ b/src/cpu/x86/smm/smm_module_loader.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/cpu/x86/smm/smm_stub.S b/src/cpu/x86/smm/smm_stub.S
index ead597c..68b4763 100644
--- a/src/cpu/x86/smm/smm_stub.S
+++ b/src/cpu/x86/smm/smm_stub.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/cpu/x86/smm/smmhandler.S b/src/cpu/x86/smm/smmhandler.S
index 7b70ce9..8ef9dca 100644
--- a/src/cpu/x86/smm/smmhandler.S
+++ b/src/cpu/x86/smm/smmhandler.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* NOTE: This handler assumes the SMM window goes from 0xa0000
diff --git a/src/cpu/x86/smm/smmrelocate.S b/src/cpu/x86/smm/smmrelocate.S
index f197287..29965aa 100644
--- a/src/cpu/x86/smm/smmrelocate.S
+++ b/src/cpu/x86/smm/smmrelocate.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Make sure no stage 2 code is included:
diff --git a/src/cpu/x86/sse_enable.inc b/src/cpu/x86/sse_enable.inc
index ef358ca..5c971c6 100644
--- a/src/cpu/x86/sse_enable.inc
+++ b/src/cpu/x86/sse_enable.inc
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Preserve BIST. */
diff --git a/src/device/Kconfig b/src/device/Kconfig
index 613461b..dd3c1a1 100644
--- a/src/device/Kconfig
+++ b/src/device/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 menu "Devices"
diff --git a/src/device/azalia_device.c b/src/device/azalia_device.c
index 71eb040..c64ae33 100644
--- a/src/device/azalia_device.c
+++ b/src/device/azalia_device.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/cardbus_device.c b/src/device/cardbus_device.c
index bf0372a..7a22130 100644
--- a/src/device/cardbus_device.c
+++ b/src/device/cardbus_device.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/cpu_device.c b/src/device/cpu_device.c
index f48946f..9121618 100644
--- a/src/device/cpu_device.c
+++ b/src/device/cpu_device.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/device/device_romstage.c b/src/device/device_romstage.c
index 5610b39..499046c 100644
--- a/src/device/device_romstage.c
+++ b/src/device/device_romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/device/device_util.c b/src/device/device_util.c
index 7567aac..46aad8c 100644
--- a/src/device/device_util.c
+++ b/src/device/device_util.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/dram/spd_cache.c b/src/device/dram/spd_cache.c
index c8222de..149c108 100644
--- a/src/device/dram/spd_cache.c
+++ b/src/device/dram/spd_cache.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/device/hypertransport.c b/src/device/hypertransport.c
index 07a320d..c4728b1 100644
--- a/src/device/hypertransport.c
+++ b/src/device/hypertransport.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/device/oprom/Makefile.inc b/src/device/oprom/Makefile.inc
index b5586ec..27a04e4 100644
--- a/src/device/oprom/Makefile.inc
+++ b/src/device/oprom/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-$(CONFIG_PCI_OPTION_ROM_RUN_YABEL) += x86emu
diff --git a/src/device/oprom/realmode/Makefile.inc b/src/device/oprom/realmode/Makefile.inc
index eea6a1e..1300957 100644
--- a/src/device/oprom/realmode/Makefile.inc
+++ b/src/device/oprom/realmode/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += x86.c
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index b8f54f3..efa9c8c 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc..
+ * along with this program..
  */
 
 #include <arch/io.h>
diff --git a/src/device/oprom/realmode/x86.h b/src/device/oprom/realmode/x86.h
index 83fc19d..48d15c5 100644
--- a/src/device/oprom/realmode/x86.h
+++ b/src/device/oprom/realmode/x86.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc..
+ * along with this program..
  */
 
 #ifndef __DEVICE_OPROM_REALMODE_X86_H__
diff --git a/src/device/oprom/realmode/x86_asm.S b/src/device/oprom/realmode/x86_asm.S
index 54221a5..9222b48 100644
--- a/src/device/oprom/realmode/x86_asm.S
+++ b/src/device/oprom/realmode/x86_asm.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc..
+ * along with this program..
  */
 
 #define REALMODE_BASE		0x600
diff --git a/src/device/oprom/realmode/x86_interrupts.c b/src/device/oprom/realmode/x86_interrupts.c
index 139245e..7c7cf93 100644
--- a/src/device/oprom/realmode/x86_interrupts.c
+++ b/src/device/oprom/realmode/x86_interrupts.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc..
+ * along with this program..
  */
 
 #include <arch/io.h>
diff --git a/src/device/pci_class.c b/src/device/pci_class.c
index cadf75a..8bca9b8 100644
--- a/src/device/pci_class.c
+++ b/src/device/pci_class.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/device/pci_early.c b/src/device/pci_early.c
index 1b8058f..66a0a77 100644
--- a/src/device/pci_early.c
+++ b/src/device/pci_early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c
index 7d49716..57e3e3a 100644
--- a/src/device/pci_ops.c
+++ b/src/device/pci_ops.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/pci_rom.c b/src/device/pci_rom.c
index 80b2a51..b6779ad 100644
--- a/src/device/pci_rom.c
+++ b/src/device/pci_rom.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/pciexp_device.c b/src/device/pciexp_device.c
index aa3a457..da3195f 100644
--- a/src/device/pciexp_device.c
+++ b/src/device/pciexp_device.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/pcix_device.c b/src/device/pcix_device.c
index 7ed64df..6f6825c 100644
--- a/src/device/pcix_device.c
+++ b/src/device/pcix_device.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/pnp_device.c b/src/device/pnp_device.c
index 2ffe193..afad765 100644
--- a/src/device/pnp_device.c
+++ b/src/device/pnp_device.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/root_device.c b/src/device/root_device.c
index 0185275..b3d0bbc 100644
--- a/src/device/root_device.c
+++ b/src/device/root_device.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/smbus_ops.c b/src/device/smbus_ops.c
index 184a06a..64a08db 100644
--- a/src/device/smbus_ops.c
+++ b/src/device/smbus_ops.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/device/software_i2c.c b/src/device/software_i2c.c
index f71e5ae..9007eeb 100644
--- a/src/device/software_i2c.c
+++ b/src/device/software_i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/drivers/ams/as3722rtc.c b/src/drivers/ams/as3722rtc.c
index 6a1ca94..e09f112 100644
--- a/src/drivers/ams/as3722rtc.c
+++ b/src/drivers/ams/as3722rtc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bcd.h>
diff --git a/src/drivers/dec/21143/21143.c b/src/drivers/dec/21143/21143.c
index 840daaf..4937c06 100644
--- a/src/drivers/dec/21143/21143.c
+++ b/src/drivers/dec/21143/21143.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/drivers/elog/Kconfig b/src/drivers/elog/Kconfig
index c4d07ff..bf1c356 100644
--- a/src/drivers/elog/Kconfig
+++ b/src/drivers/elog/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config ELOG
diff --git a/src/drivers/elog/boot_count.c b/src/drivers/elog/boot_count.c
index e853e36..1724130 100644
--- a/src/drivers/elog/boot_count.c
+++ b/src/drivers/elog/boot_count.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/elog/elog.c b/src/drivers/elog/elog.c
index 8dce86b..6c89b84 100644
--- a/src/drivers/elog/elog.c
+++ b/src/drivers/elog/elog.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #if CONFIG_HAVE_ACPI_RESUME == 1
diff --git a/src/drivers/elog/elog_internal.h b/src/drivers/elog/elog_internal.h
index 4ae08de..0500743 100644
--- a/src/drivers/elog/elog_internal.h
+++ b/src/drivers/elog/elog_internal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ELOG_INTERNAL_H_
diff --git a/src/drivers/elog/gsmi.c b/src/drivers/elog/gsmi.c
index e22d045..5e9d0b7 100644
--- a/src/drivers/elog/gsmi.c
+++ b/src/drivers/elog/gsmi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/drivers/emulation/qemu/cirrus.c b/src/drivers/emulation/qemu/cirrus.c
index be8afdf..a58476d 100644
--- a/src/drivers/emulation/qemu/cirrus.c
+++ b/src/drivers/emulation/qemu/cirrus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/drivers/emulation/qemu/qemu_debugcon.c b/src/drivers/emulation/qemu/qemu_debugcon.c
index 3bd58eb..8ecc7ad 100644
--- a/src/drivers/emulation/qemu/qemu_debugcon.c
+++ b/src/drivers/emulation/qemu/qemu_debugcon.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/generic/ioapic/chip.h b/src/drivers/generic/ioapic/chip.h
index bcec84a..aa12382 100644
--- a/src/drivers/generic/ioapic/chip.h
+++ b/src/drivers/generic/ioapic/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DRIVERS_GENERIC_IOAPIC_CHIP_H
diff --git a/src/drivers/gic/gic.c b/src/drivers/gic/gic.c
index e8c7018..a7d6b9a 100644
--- a/src/drivers/gic/gic.c
+++ b/src/drivers/gic/gic.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/drivers/gic/gic.h b/src/drivers/gic/gic.h
index 22d973b..892695d 100644
--- a/src/drivers/gic/gic.h
+++ b/src/drivers/gic/gic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DRIVERS_GIC_H
diff --git a/src/drivers/i2c/adt7463/adt7463.c b/src/drivers/i2c/adt7463/adt7463.c
index 8cab896..badd676 100644
--- a/src/drivers/i2c/adt7463/adt7463.c
+++ b/src/drivers/i2c/adt7463/adt7463.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/drivers/i2c/at24rf08c/at24rf08c.c b/src/drivers/i2c/at24rf08c/at24rf08c.c
index c54ae9e..f8323bd 100644
--- a/src/drivers/i2c/at24rf08c/at24rf08c.c
+++ b/src/drivers/i2c/at24rf08c/at24rf08c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/drivers/i2c/at24rf08c/lenovo_serials.c b/src/drivers/i2c/at24rf08c/lenovo_serials.c
index 6595dd3..74ed554 100644
--- a/src/drivers/i2c/at24rf08c/lenovo_serials.c
+++ b/src/drivers/i2c/at24rf08c/lenovo_serials.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/drivers/i2c/rtd2132/chip.h b/src/drivers/i2c/rtd2132/chip.h
index 07f2d4d..08682a6 100644
--- a/src/drivers/i2c/rtd2132/chip.h
+++ b/src/drivers/i2c/rtd2132/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 struct drivers_i2c_rtd2132_config {
diff --git a/src/drivers/i2c/rtd2132/rtd2132.c b/src/drivers/i2c/rtd2132/rtd2132.c
index 8aed320..d154c6d 100644
--- a/src/drivers/i2c/rtd2132/rtd2132.c
+++ b/src/drivers/i2c/rtd2132/rtd2132.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/drivers/i2c/tpm/tis.c b/src/drivers/i2c/tpm/tis.c
index 1e17275..aa7ab10 100644
--- a/src/drivers/i2c/tpm/tis.c
+++ b/src/drivers/i2c/tpm/tis.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/drivers/i2c/tpm/tpm.c b/src/drivers/i2c/tpm/tpm.c
index d02604b..80d2d39 100644
--- a/src/drivers/i2c/tpm/tpm.c
+++ b/src/drivers/i2c/tpm/tpm.c
@@ -28,8 +28,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/drivers/i2c/tpm/tpm.h b/src/drivers/i2c/tpm/tpm.h
index 6650996..d2de262 100644
--- a/src/drivers/i2c/tpm/tpm.h
+++ b/src/drivers/i2c/tpm/tpm.h
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DRIVERS_TPM_SLB9635_I2C_TPM_H__
diff --git a/src/drivers/i2c/w83793/w83793.c b/src/drivers/i2c/w83793/w83793.c
index c9b7983..1f3db48 100644
--- a/src/drivers/i2c/w83793/w83793.c
+++ b/src/drivers/i2c/w83793/w83793.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/drivers/i2c/w83793/w83793.h b/src/drivers/i2c/w83793/w83793.h
index 2fe2176..70ab8c4 100644
--- a/src/drivers/i2c/w83793/w83793.h
+++ b/src/drivers/i2c/w83793/w83793.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef W83793_H
diff --git a/src/drivers/i2c/w83795/w83795.c b/src/drivers/i2c/w83795/w83795.c
index 2bbe0be..926d95c 100644
--- a/src/drivers/i2c/w83795/w83795.c
+++ b/src/drivers/i2c/w83795/w83795.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/drivers/i2c/w83795/w83795.h b/src/drivers/i2c/w83795/w83795.h
index cac4d5f..a0cfe11 100644
--- a/src/drivers/i2c/w83795/w83795.h
+++ b/src/drivers/i2c/w83795/w83795.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _W83795_H_
diff --git a/src/drivers/ics/954309/chip.h b/src/drivers/ics/954309/chip.h
index cca53df..4a55706 100644
--- a/src/drivers/ics/954309/chip.h
+++ b/src/drivers/ics/954309/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 struct drivers_ics_954309_config {
diff --git a/src/drivers/ics/954309/ics954309.c b/src/drivers/ics/954309/ics954309.c
index 930831e..cf1eca7 100644
--- a/src/drivers/ics/954309/ics954309.c
+++ b/src/drivers/ics/954309/ics954309.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/intel/Kconfig b/src/drivers/intel/Kconfig
index a37ab73..8d860fe 100644
--- a/src/drivers/intel/Kconfig
+++ b/src/drivers/intel/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 source src/drivers/intel/fsp1_1/Kconfig
diff --git a/src/drivers/intel/fsp1_0/Kconfig b/src/drivers/intel/fsp1_0/Kconfig
index 8d3bf4c..20b1e26 100644
--- a/src/drivers/intel/fsp1_0/Kconfig
+++ b/src/drivers/intel/fsp1_0/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if PLATFORM_USES_FSP1_0
diff --git a/src/drivers/intel/fsp1_0/Makefile.inc b/src/drivers/intel/fsp1_0/Makefile.inc
index deae45b..65ad638 100644
--- a/src/drivers/intel/fsp1_0/Makefile.inc
+++ b/src/drivers/intel/fsp1_0/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ramstage-y += fsp_util.c hob.c
diff --git a/src/drivers/intel/fsp1_0/cache_as_ram.inc b/src/drivers/intel/fsp1_0/cache_as_ram.inc
index d1167b1..7e08fb3 100644
--- a/src/drivers/intel/fsp1_0/cache_as_ram.inc
+++ b/src/drivers/intel/fsp1_0/cache_as_ram.inc
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/drivers/intel/fsp1_0/fastboot_cache.c b/src/drivers/intel/fsp1_0/fastboot_cache.c
index 5093810..3f142d3 100644
--- a/src/drivers/intel/fsp1_0/fastboot_cache.c
+++ b/src/drivers/intel/fsp1_0/fastboot_cache.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/drivers/intel/fsp1_0/fsp_util.c b/src/drivers/intel/fsp1_0/fsp_util.c
index 9dbd502..c3d20de 100644
--- a/src/drivers/intel/fsp1_0/fsp_util.c
+++ b/src/drivers/intel/fsp1_0/fsp_util.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/drivers/intel/fsp1_0/fsp_util.h b/src/drivers/intel/fsp1_0/fsp_util.h
index 054de1c..3307dea 100644
--- a/src/drivers/intel/fsp1_0/fsp_util.h
+++ b/src/drivers/intel/fsp1_0/fsp_util.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FSP_UTIL_H
diff --git a/src/drivers/intel/fsp1_0/fsp_values.h b/src/drivers/intel/fsp1_0/fsp_values.h
index 1e83d40..22c2212 100644
--- a/src/drivers/intel/fsp1_0/fsp_values.h
+++ b/src/drivers/intel/fsp1_0/fsp_values.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FSP_VALUES_H
diff --git a/src/drivers/intel/fsp1_0/hob.c b/src/drivers/intel/fsp1_0/hob.c
index ecc6bad..a9eb212 100644
--- a/src/drivers/intel/fsp1_0/hob.c
+++ b/src/drivers/intel/fsp1_0/hob.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig
index d23d966..4e30536 100644
--- a/src/drivers/intel/fsp1_1/Kconfig
+++ b/src/drivers/intel/fsp1_1/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config PLATFORM_USES_FSP1_1
diff --git a/src/drivers/intel/fsp1_1/Makefile.inc b/src/drivers/intel/fsp1_1/Makefile.inc
index 78e1006..c48812b 100644
--- a/src/drivers/intel/fsp1_1/Makefile.inc
+++ b/src/drivers/intel/fsp1_1/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += car.c
diff --git a/src/drivers/intel/fsp1_1/after_raminit.S b/src/drivers/intel/fsp1_1/after_raminit.S
index 2cc4ef3..b7404b5 100644
--- a/src/drivers/intel/fsp1_1/after_raminit.S
+++ b/src/drivers/intel/fsp1_1/after_raminit.S
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/drivers/intel/fsp1_1/cache_as_ram.inc b/src/drivers/intel/fsp1_1/cache_as_ram.inc
index dd45221..b042d7a 100644
--- a/src/drivers/intel/fsp1_1/cache_as_ram.inc
+++ b/src/drivers/intel/fsp1_1/cache_as_ram.inc
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/drivers/intel/fsp1_1/car.c b/src/drivers/intel/fsp1_1/car.c
index 9f87983..82d996b 100644
--- a/src/drivers/intel/fsp1_1/car.c
+++ b/src/drivers/intel/fsp1_1/car.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/intel/fsp1_1/fsp_gop.c b/src/drivers/intel/fsp1_1/fsp_gop.c
index c5b515c..d8d213f 100644
--- a/src/drivers/intel/fsp1_1/fsp_gop.c
+++ b/src/drivers/intel/fsp1_1/fsp_gop.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/drivers/intel/fsp1_1/fsp_relocate.c b/src/drivers/intel/fsp1_1/fsp_relocate.c
index 80dc825..63dfbdf 100644
--- a/src/drivers/intel/fsp1_1/fsp_relocate.c
+++ b/src/drivers/intel/fsp1_1/fsp_relocate.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c
index d44f0f0..b9c21fa 100644
--- a/src/drivers/intel/fsp1_1/fsp_util.c
+++ b/src/drivers/intel/fsp1_1/fsp_util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/drivers/intel/fsp1_1/hob.c b/src/drivers/intel/fsp1_1/hob.c
index 467d4af..12722b2 100644
--- a/src/drivers/intel/fsp1_1/hob.c
+++ b/src/drivers/intel/fsp1_1/hob.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/early_variables.h>
diff --git a/src/drivers/intel/fsp1_1/include/fsp/api.h b/src/drivers/intel/fsp1_1/include/fsp/api.h
index ec227b5..3a04221 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/api.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/api.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _FSP1_1_API_H_
diff --git a/src/drivers/intel/fsp1_1/include/fsp/car.h b/src/drivers/intel/fsp1_1/include/fsp/car.h
index 8234b37..3c8b116 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/car.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/car.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FSP1_1_CAR_H
diff --git a/src/drivers/intel/fsp1_1/include/fsp/gop.h b/src/drivers/intel/fsp1_1/include/fsp/gop.h
index 14bada6..dd6b070 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/gop.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/gop.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _FSP1_1_GOP_H_
diff --git a/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h b/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h
index 1625040..cf61a00 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/soc_binding.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _FSP1_1_SOC_BINDING_H_
diff --git a/src/drivers/intel/fsp1_1/include/fsp/uefi_binding.h b/src/drivers/intel/fsp1_1/include/fsp/uefi_binding.h
index 73a8a4a..ca580fa 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/uefi_binding.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/uefi_binding.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _FSP1_1_UEFI_BINDING_H_
diff --git a/src/drivers/intel/fsp1_1/include/fsp/util.h b/src/drivers/intel/fsp1_1/include/fsp/util.h
index b3772a2..cc06cc8 100644
--- a/src/drivers/intel/fsp1_1/include/fsp/util.h
+++ b/src/drivers/intel/fsp1_1/include/fsp/util.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FSP1_1_UTIL_H
diff --git a/src/drivers/intel/gma/Kconfig b/src/drivers/intel/gma/Kconfig
index f726e6f..22abc33 100644
--- a/src/drivers/intel/gma/Kconfig
+++ b/src/drivers/intel/gma/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config INTEL_DP
diff --git a/src/drivers/intel/gma/Makefile.inc b/src/drivers/intel/gma/Makefile.inc
index 6bd9b71..ce30f24 100644
--- a/src/drivers/intel/gma/Makefile.inc
+++ b/src/drivers/intel/gma/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_INTEL_DP) += intel_dp.c drm_dp_helper.c display.c
diff --git a/src/drivers/intel/gma/acpi/common.asl b/src/drivers/intel/gma/acpi/common.asl
index 88cc2cd..e70fff2 100644
--- a/src/drivers/intel/gma/acpi/common.asl
+++ b/src/drivers/intel/gma/acpi/common.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	External(LCD0, DeviceObj)
diff --git a/src/drivers/intel/gma/acpi/non-pch.asl b/src/drivers/intel/gma/acpi/non-pch.asl
index 0e15627..680e9c4 100644
--- a/src/drivers/intel/gma/acpi/non-pch.asl
+++ b/src/drivers/intel/gma/acpi/non-pch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (GFX0)
diff --git a/src/drivers/intel/gma/acpi/pch.asl b/src/drivers/intel/gma/acpi/pch.asl
index 98746e8..ac9f5e3 100644
--- a/src/drivers/intel/gma/acpi/pch.asl
+++ b/src/drivers/intel/gma/acpi/pch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (GFX0)
diff --git a/src/drivers/intel/gma/edid.c b/src/drivers/intel/gma/edid.c
index 534ed75..492b52b 100644
--- a/src/drivers/intel/gma/edid.c
+++ b/src/drivers/intel/gma/edid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/drivers/intel/gma/i915.h b/src/drivers/intel/gma/i915.h
index 35f9c25..1de6460 100644
--- a/src/drivers/intel/gma/i915.h
+++ b/src/drivers/intel/gma/i915.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef INTEL_I915_H
diff --git a/src/drivers/intel/gma/int15.c b/src/drivers/intel/gma/int15.c
index bf43af8..bd46e97 100644
--- a/src/drivers/intel/gma/int15.c
+++ b/src/drivers/intel/gma/int15.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <x86emu/x86emu.h>
diff --git a/src/drivers/intel/gma/vbt.c b/src/drivers/intel/gma/vbt.c
index 2737f24..3d99ee9 100644
--- a/src/drivers/intel/gma/vbt.c
+++ b/src/drivers/intel/gma/vbt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/drivers/intel/i210/i210.c b/src/drivers/intel/i210/i210.c
index 0676592..44c045c 100644
--- a/src/drivers/intel/i210/i210.c
+++ b/src/drivers/intel/i210/i210.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "i210.h"
diff --git a/src/drivers/intel/i210/i210.h b/src/drivers/intel/i210/i210.h
index 8c3d322..4e365cb 100644
--- a/src/drivers/intel/i210/i210.h
+++ b/src/drivers/intel/i210/i210.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_I210_H_
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index ce4d3d3..6c6b9f7 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/ipmi/ipmi_kcs.c b/src/drivers/ipmi/ipmi_kcs.c
index 6598d38..3d4db1c 100644
--- a/src/drivers/ipmi/ipmi_kcs.c
+++ b/src/drivers/ipmi/ipmi_kcs.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/ipmi/ipmi_kcs.h b/src/drivers/ipmi/ipmi_kcs.h
index 21872e9..7dfd2cd 100644
--- a/src/drivers/ipmi/ipmi_kcs.h
+++ b/src/drivers/ipmi/ipmi_kcs.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define IPMI_NETFN_CHASSIS 0x00
diff --git a/src/drivers/lenovo/wacom.c b/src/drivers/lenovo/wacom.c
index 98f08c5..e3957ea 100644
--- a/src/drivers/lenovo/wacom.c
+++ b/src/drivers/lenovo/wacom.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/drivers/maxim/Kconfig b/src/drivers/maxim/Kconfig
index d8455ee..e0db87d 100644
--- a/src/drivers/maxim/Kconfig
+++ b/src/drivers/maxim/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 source src/drivers/maxim/max77686/Kconfig
diff --git a/src/drivers/maxim/Makefile.inc b/src/drivers/maxim/Makefile.inc
index 23f4525..085b5ff 100644
--- a/src/drivers/maxim/Makefile.inc
+++ b/src/drivers/maxim/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-$(CONFIG_DRIVER_MAXIM_MAX77686) += max77686/
diff --git a/src/drivers/maxim/max77686/Kconfig b/src/drivers/maxim/max77686/Kconfig
index 7620589..330bfa9 100644
--- a/src/drivers/maxim/max77686/Kconfig
+++ b/src/drivers/maxim/max77686/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config DRIVER_MAXIM_MAX77686
diff --git a/src/drivers/maxim/max77686/Makefile.inc b/src/drivers/maxim/max77686/Makefile.inc
index 60886f1..32722fa 100644
--- a/src/drivers/maxim/max77686/Makefile.inc
+++ b/src/drivers/maxim/max77686/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_DRIVER_MAXIM_MAX77686) += max77686.c
diff --git a/src/drivers/maxim/max77686/max77686.c b/src/drivers/maxim/max77686/max77686.c
index 8638bf6..7d7ca8e 100644
--- a/src/drivers/maxim/max77686/max77686.c
+++ b/src/drivers/maxim/max77686/max77686.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/maxim/max77686/max77686.h b/src/drivers/maxim/max77686/max77686.h
index a35b9cc..c0168ff 100644
--- a/src/drivers/maxim/max77686/max77686.h
+++ b/src/drivers/maxim/max77686/max77686.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAX77686_H_
diff --git a/src/drivers/maxim/max77802/max77802.h b/src/drivers/maxim/max77802/max77802.h
index 8bd35f3..f1c770f 100644
--- a/src/drivers/maxim/max77802/max77802.h
+++ b/src/drivers/maxim/max77802/max77802.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAX77802_H_
diff --git a/src/drivers/parade/Kconfig b/src/drivers/parade/Kconfig
index 60b736c..ea032bf 100644
--- a/src/drivers/parade/Kconfig
+++ b/src/drivers/parade/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 source src/drivers/parade/ps8625/Kconfig
diff --git a/src/drivers/parade/Makefile.inc b/src/drivers/parade/Makefile.inc
index 0325205..ead541f 100644
--- a/src/drivers/parade/Makefile.inc
+++ b/src/drivers/parade/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-$(CONFIG_DRIVER_PARADE_PS8625) += ps8625/
diff --git a/src/drivers/parade/ps8625/Kconfig b/src/drivers/parade/ps8625/Kconfig
index 6d20847..4108d64 100644
--- a/src/drivers/parade/ps8625/Kconfig
+++ b/src/drivers/parade/ps8625/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config DRIVER_PARADE_PS8625
diff --git a/src/drivers/parade/ps8625/Makefile.inc b/src/drivers/parade/ps8625/Makefile.inc
index 7ac3a94..95e0f65 100644
--- a/src/drivers/parade/ps8625/Makefile.inc
+++ b/src/drivers/parade/ps8625/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_DRIVER_PARADE_PS8625) += ps8625.c
diff --git a/src/drivers/parade/ps8625/ps8625.c b/src/drivers/parade/ps8625/ps8625.c
index 91412ec..222eb11 100644
--- a/src/drivers/parade/ps8625/ps8625.c
+++ b/src/drivers/parade/ps8625/ps8625.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/i2c.h>
diff --git a/src/drivers/parade/ps8625/ps8625.h b/src/drivers/parade/ps8625/ps8625.h
index 409fa8b..775509b 100644
--- a/src/drivers/parade/ps8625/ps8625.h
+++ b/src/drivers/parade/ps8625/ps8625.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __PS8625_H__
diff --git a/src/drivers/pc80/i8254.c b/src/drivers/pc80/i8254.c
index 70f71d9..9f4f2e3 100644
--- a/src/drivers/pc80/i8254.c
+++ b/src/drivers/pc80/i8254.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/drivers/pc80/i8259.c b/src/drivers/pc80/i8259.c
index e547ca8..9b9b3d2 100644
--- a/src/drivers/pc80/i8259.c
+++ b/src/drivers/pc80/i8259.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/drivers/pc80/keyboard.c b/src/drivers/pc80/keyboard.c
index 534e7af..f555acd 100644
--- a/src/drivers/pc80/keyboard.c
+++ b/src/drivers/pc80/keyboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c
index 07fc884..43f80ad 100644
--- a/src/drivers/pc80/mc146818rtc.c
+++ b/src/drivers/pc80/mc146818rtc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/drivers/pc80/ps2_controller.asl b/src/drivers/pc80/ps2_controller.asl
index 3d8900e..0274202 100644
--- a/src/drivers/pc80/ps2_controller.asl
+++ b/src/drivers/pc80/ps2_controller.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Device (PS2K)		// Keyboard
 	{
diff --git a/src/drivers/pc80/spkmodem.c b/src/drivers/pc80/spkmodem.c
index 8a84948..8709840 100644
--- a/src/drivers/pc80/spkmodem.c
+++ b/src/drivers/pc80/spkmodem.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/pc80/tpm/acpi/tpm.asl b/src/drivers/pc80/tpm/acpi/tpm.asl
index 489fec7..b06ffee 100644
--- a/src/drivers/pc80/tpm/acpi/tpm.asl
+++ b/src/drivers/pc80/tpm/acpi/tpm.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Trusted Platform Module */
diff --git a/src/drivers/pc80/tpm/chip.h b/src/drivers/pc80/tpm/chip.h
index 1a63b98..f584fc4 100644
--- a/src/drivers/pc80/tpm/chip.h
+++ b/src/drivers/pc80/tpm/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DRIVERS_PC80_TPM_CHIP_H
diff --git a/src/drivers/pc80/tpm/romstage.c b/src/drivers/pc80/tpm/romstage.c
index 96760e2..ef8b988 100644
--- a/src/drivers/pc80/tpm/romstage.c
+++ b/src/drivers/pc80/tpm/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/drivers/pc80/tpm/tpm.c b/src/drivers/pc80/tpm/tpm.c
index be616a2..7785e45 100644
--- a/src/drivers/pc80/tpm/tpm.c
+++ b/src/drivers/pc80/tpm/tpm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/drivers/pc80/vga/vga.c b/src/drivers/pc80/vga/vga.c
index 3ec8f54..b96fb1e 100644
--- a/src/drivers/pc80/vga/vga.c
+++ b/src/drivers/pc80/vga/vga.c
@@ -12,7 +12,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.
+ * this program.
  */
 
 #include <pc80/vga.h>
diff --git a/src/drivers/pc80/vga/vga_font_8x16.c b/src/drivers/pc80/vga/vga_font_8x16.c
index 9efb9e1..c581192 100644
--- a/src/drivers/pc80/vga/vga_font_8x16.c
+++ b/src/drivers/pc80/vga/vga_font_8x16.c
@@ -12,7 +12,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.
+ * this program.
  */
 
 #include "vga.h"
diff --git a/src/drivers/pc80/vga/vga_io.c b/src/drivers/pc80/vga/vga_io.c
index a47b33a..8690bcd 100644
--- a/src/drivers/pc80/vga/vga_io.c
+++ b/src/drivers/pc80/vga/vga_io.c
@@ -12,7 +12,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.
+ * this program.
  */
 
 /*
diff --git a/src/drivers/pc80/vga/vga_palette.c b/src/drivers/pc80/vga/vga_palette.c
index ff8cf72..435780a 100644
--- a/src/drivers/pc80/vga/vga_palette.c
+++ b/src/drivers/pc80/vga/vga_palette.c
@@ -12,7 +12,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc.
+ * this program.
  */
 
 #include "vga.h"
diff --git a/src/drivers/ricoh/rce822/chip.h b/src/drivers/ricoh/rce822/chip.h
index 8bca75b..da7e847 100644
--- a/src/drivers/ricoh/rce822/chip.h
+++ b/src/drivers/ricoh/rce822/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DRIVERS_RICOH_RC822_CHIP_H
diff --git a/src/drivers/ricoh/rce822/rce822.c b/src/drivers/ricoh/rce822/rce822.c
index 2d29730..e97e491 100644
--- a/src/drivers/ricoh/rce822/rce822.c
+++ b/src/drivers/ricoh/rce822/rce822.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <kconfig.h>
diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig
index dedb88f..9464a69 100644
--- a/src/drivers/spi/Kconfig
+++ b/src/drivers/spi/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SPI_FLASH
diff --git a/src/drivers/spi/gigadevice.c b/src/drivers/spi/gigadevice.c
index cd5d35d..a30bb21 100644
--- a/src/drivers/spi/gigadevice.c
+++ b/src/drivers/spi/gigadevice.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/drivers/spi/macronix.c b/src/drivers/spi/macronix.c
index 256b24e..b9b0831 100644
--- a/src/drivers/spi/macronix.c
+++ b/src/drivers/spi/macronix.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/drivers/spi/spansion.c b/src/drivers/spi/spansion.c
index 0d4a7fa..6f9c99d 100644
--- a/src/drivers/spi/spansion.c
+++ b/src/drivers/spi/spansion.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/drivers/spi/spiconsole.c b/src/drivers/spi/spiconsole.c
index 39a574c..dee8d80 100644
--- a/src/drivers/spi/spiconsole.c
+++ b/src/drivers/spi/spiconsole.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spi-generic.h>
diff --git a/src/drivers/spi/stmicro.c b/src/drivers/spi/stmicro.c
index 0779517..f19e43f 100644
--- a/src/drivers/spi/stmicro.c
+++ b/src/drivers/spi/stmicro.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/drivers/ti/Kconfig b/src/drivers/ti/Kconfig
index f57f63a..394b996 100644
--- a/src/drivers/ti/Kconfig
+++ b/src/drivers/ti/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 source src/drivers/ti/tps65090/Kconfig
diff --git a/src/drivers/ti/Makefile.inc b/src/drivers/ti/Makefile.inc
index 22104bd..95c66a4 100644
--- a/src/drivers/ti/Makefile.inc
+++ b/src/drivers/ti/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-$(CONFIG_DRIVER_TI_TPS65090) += tps65090/
diff --git a/src/drivers/ti/tps65090/Kconfig b/src/drivers/ti/tps65090/Kconfig
index a904300..83547bb 100644
--- a/src/drivers/ti/tps65090/Kconfig
+++ b/src/drivers/ti/tps65090/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config DRIVER_TI_TPS65090
diff --git a/src/drivers/ti/tps65090/Makefile.inc b/src/drivers/ti/tps65090/Makefile.inc
index 663a14b..359c0fd 100644
--- a/src/drivers/ti/tps65090/Makefile.inc
+++ b/src/drivers/ti/tps65090/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_DRIVER_TI_TPS65090) += tps65090.c
diff --git a/src/drivers/ti/tps65913/Kconfig b/src/drivers/ti/tps65913/Kconfig
index 6679c3a..43b6f0a 100644
--- a/src/drivers/ti/tps65913/Kconfig
+++ b/src/drivers/ti/tps65913/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config DRIVERS_TI_TPS65913
diff --git a/src/drivers/ti/tps65913/Makefile.inc b/src/drivers/ti/tps65913/Makefile.inc
index 9429be7..db01f65 100644
--- a/src/drivers/ti/tps65913/Makefile.inc
+++ b/src/drivers/ti/tps65913/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_DRIVERS_TI_TPS65913_RTC) += tps65913rtc.c
diff --git a/src/drivers/ti/tps65913/tps65913rtc.c b/src/drivers/ti/tps65913/tps65913rtc.c
index d50eee8..3cea663 100644
--- a/src/drivers/ti/tps65913/tps65913rtc.c
+++ b/src/drivers/ti/tps65913/tps65913rtc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bcd.h>
diff --git a/src/drivers/uart/oxpcie.c b/src/drivers/uart/oxpcie.c
index 5afb554..b9ea5c7 100644
--- a/src/drivers/uart/oxpcie.c
+++ b/src/drivers/uart/oxpcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/drivers/uart/oxpcie_early.c b/src/drivers/uart/oxpcie_early.c
index 390a5be..bf5fa70 100644
--- a/src/drivers/uart/oxpcie_early.c
+++ b/src/drivers/uart/oxpcie_early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/drivers/uart/uart8250io.c b/src/drivers/uart/uart8250io.c
index d6605dd..82bae3a 100644
--- a/src/drivers/uart/uart8250io.c
+++ b/src/drivers/uart/uart8250io.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <rules.h>
diff --git a/src/drivers/uart/uart8250mem.c b/src/drivers/uart/uart8250mem.c
index fb7327e..a72dfeb 100644
--- a/src/drivers/uart/uart8250mem.c
+++ b/src/drivers/uart/uart8250mem.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/drivers/uart/uart8250reg.h b/src/drivers/uart/uart8250reg.h
index 14df753..9815f8c 100644
--- a/src/drivers/uart/uart8250reg.h
+++ b/src/drivers/uart/uart8250reg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef UART8250REG_H
diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c
index da41ba1..1a8c4ea 100644
--- a/src/drivers/uart/util.c
+++ b/src/drivers/uart/util.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/drivers/usb/console.c b/src/drivers/usb/console.c
index 8f07dbc..6b89168 100644
--- a/src/drivers/usb/console.c
+++ b/src/drivers/usb/console.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/usb.h>
diff --git a/src/drivers/usb/ehci.h b/src/drivers/usb/ehci.h
index da58813..d31ff7d 100644
--- a/src/drivers/usb/ehci.h
+++ b/src/drivers/usb/ehci.h
@@ -16,8 +16,7 @@
  * for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc.
+ * along with this program.
  */
 
 #ifndef EHCI_H
diff --git a/src/drivers/usb/ehci_debug.c b/src/drivers/usb/ehci_debug.c
index 5098f97..d286a5b 100644
--- a/src/drivers/usb/ehci_debug.c
+++ b/src/drivers/usb/ehci_debug.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/drivers/usb/ehci_debug.h b/src/drivers/usb/ehci_debug.h
index 8f7d7eb..2292025 100644
--- a/src/drivers/usb/ehci_debug.h
+++ b/src/drivers/usb/ehci_debug.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EHCI_DEBUG_H_
diff --git a/src/drivers/usb/gadget.c b/src/drivers/usb/gadget.c
index 782ab5e..c0b862c 100644
--- a/src/drivers/usb/gadget.c
+++ b/src/drivers/usb/gadget.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/drivers/usb/pci_ehci.c b/src/drivers/usb/pci_ehci.c
index 8c0422f..b4945b0 100644
--- a/src/drivers/usb/pci_ehci.c
+++ b/src/drivers/usb/pci_ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/drivers/usb/usb_ch9.h b/src/drivers/usb/usb_ch9.h
index d6c97e7..14f0ae6 100644
--- a/src/drivers/usb/usb_ch9.h
+++ b/src/drivers/usb/usb_ch9.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef USB_CH9_H
diff --git a/src/drivers/xgi/common/XGI_main.c b/src/drivers/xgi/common/XGI_main.c
index f8152fe..2323f5c 100644
--- a/src/drivers/xgi/common/XGI_main.c
+++ b/src/drivers/xgi/common/XGI_main.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/drivers/xgi/common/XGI_main.h b/src/drivers/xgi/common/XGI_main.h
index cdc83ea..d8c2a13 100644
--- a/src/drivers/xgi/common/XGI_main.h
+++ b/src/drivers/xgi/common/XGI_main.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _XGIFB_MAIN
diff --git a/src/drivers/xgi/common/XGIfb.h b/src/drivers/xgi/common/XGIfb.h
index 2968eeb..40739aa 100644
--- a/src/drivers/xgi/common/XGIfb.h
+++ b/src/drivers/xgi/common/XGIfb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _LINUX_XGIFB
diff --git a/src/drivers/xgi/common/initdef.h b/src/drivers/xgi/common/initdef.h
index b8c13d4..b42c5b0 100644
--- a/src/drivers/xgi/common/initdef.h
+++ b/src/drivers/xgi/common/initdef.h
@@ -19,8 +19,7 @@
  * * GNU General Public License for more details.
  * *
  * * You should have received a copy of the GNU General Public License
- * * along with this program; if not, write to the Free Software
- * * Foundation, Inc.
+ * * along with this program.
  *
  * Otherwise, the following license terms apply:
  *
diff --git a/src/drivers/xgi/common/vb_def.h b/src/drivers/xgi/common/vb_def.h
index d7766d2..340bf79 100644
--- a/src/drivers/xgi/common/vb_def.h
+++ b/src/drivers/xgi/common/vb_def.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VB_DEF_
diff --git a/src/drivers/xgi/common/vb_init.c b/src/drivers/xgi/common/vb_init.c
index fa318d2..cf38c37 100644
--- a/src/drivers/xgi/common/vb_init.c
+++ b/src/drivers/xgi/common/vb_init.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "xgi_coreboot.h"
diff --git a/src/drivers/xgi/common/vb_init.h b/src/drivers/xgi/common/vb_init.h
index cc4ede7..05a7e01 100644
--- a/src/drivers/xgi/common/vb_init.h
+++ b/src/drivers/xgi/common/vb_init.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VBINIT_
diff --git a/src/drivers/xgi/common/vb_setmode.c b/src/drivers/xgi/common/vb_setmode.c
index 39ef013..7779a88 100644
--- a/src/drivers/xgi/common/vb_setmode.c
+++ b/src/drivers/xgi/common/vb_setmode.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "xgi_coreboot.h"
diff --git a/src/drivers/xgi/common/vb_setmode.h b/src/drivers/xgi/common/vb_setmode.h
index 8b2cb69..2df3242 100644
--- a/src/drivers/xgi/common/vb_setmode.h
+++ b/src/drivers/xgi/common/vb_setmode.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VBSETMODE_
diff --git a/src/drivers/xgi/common/vb_struct.h b/src/drivers/xgi/common/vb_struct.h
index 365f781..f46eac1 100644
--- a/src/drivers/xgi/common/vb_struct.h
+++ b/src/drivers/xgi/common/vb_struct.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VB_STRUCT_
diff --git a/src/drivers/xgi/common/vb_table.h b/src/drivers/xgi/common/vb_table.h
index 2f375e7..d12f8ce 100644
--- a/src/drivers/xgi/common/vb_table.h
+++ b/src/drivers/xgi/common/vb_table.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VB_TABLE_
diff --git a/src/drivers/xgi/common/vb_util.c b/src/drivers/xgi/common/vb_util.c
index 31609f0..5a4f7e8 100644
--- a/src/drivers/xgi/common/vb_util.c
+++ b/src/drivers/xgi/common/vb_util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "xgi_coreboot.h"
diff --git a/src/drivers/xgi/common/vb_util.h b/src/drivers/xgi/common/vb_util.h
index 77c986f..36e7d7a 100644
--- a/src/drivers/xgi/common/vb_util.h
+++ b/src/drivers/xgi/common/vb_util.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VBUTIL_
diff --git a/src/drivers/xgi/common/vgatypes.h b/src/drivers/xgi/common/vgatypes.h
index 2019d54..47da1bf 100644
--- a/src/drivers/xgi/common/vgatypes.h
+++ b/src/drivers/xgi/common/vgatypes.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _VGATYPES_
diff --git a/src/drivers/xgi/common/vstruct.h b/src/drivers/xgi/common/vstruct.h
index b4f0939..ce58b92 100644
--- a/src/drivers/xgi/common/vstruct.h
+++ b/src/drivers/xgi/common/vstruct.h
@@ -19,8 +19,7 @@
  * * GNU General Public License for more details.
  * *
  * * You should have received a copy of the GNU General Public License
- * * along with this program; if not, write to the Free Software
- * * Foundation, Inc.
+ * * along with this program.
  *
  * Otherwise, the following license terms apply:
  *
diff --git a/src/drivers/xgi/common/xgi_coreboot.c b/src/drivers/xgi/common/xgi_coreboot.c
index 98857e9..0441d89 100644
--- a/src/drivers/xgi/common/xgi_coreboot.c
+++ b/src/drivers/xgi/common/xgi_coreboot.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <delay.h>
 #include <stdlib.h>
diff --git a/src/drivers/xgi/common/xgi_coreboot.h b/src/drivers/xgi/common/xgi_coreboot.h
index 80a5fa3..939bf90 100644
--- a/src/drivers/xgi/common/xgi_coreboot.h
+++ b/src/drivers/xgi/common/xgi_coreboot.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Portions marked below taken from XGI/SiS Linux kernel drivers */
diff --git a/src/drivers/xgi/z9s/z9s.c b/src/drivers/xgi/z9s/z9s.c
index 3fe2988..34b43a2 100644
--- a/src/drivers/xgi/z9s/z9s.c
+++ b/src/drivers/xgi/z9s/z9s.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <delay.h>
 #include <stdlib.h>
diff --git a/src/ec/acpi/ec.asl b/src/ec/acpi/ec.asl
index 5bd4eda..dcde934 100644
--- a/src/ec/acpi/ec.asl
+++ b/src/ec/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/acpi/ec.c b/src/ec/acpi/ec.c
index 6bd4707..b068d44 100644
--- a/src/ec/acpi/ec.c
+++ b/src/ec/acpi/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/ec/acpi/ec.h b/src/ec/acpi/ec.h
index 41dfc3b..80a8295 100644
--- a/src/ec/acpi/ec.h
+++ b/src/ec/acpi/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EC_ACPI_H
diff --git a/src/ec/compal/ene932/acpi/ac.asl b/src/ec/compal/ene932/acpi/ac.asl
index 2e49ac5..1999717 100644
--- a/src/ec/compal/ene932/acpi/ac.asl
+++ b/src/ec/compal/ene932/acpi/ac.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/compal/ene932/acpi/battery.asl b/src/ec/compal/ene932/acpi/battery.asl
index a4ca80e..adb5fe2 100644
--- a/src/ec/compal/ene932/acpi/battery.asl
+++ b/src/ec/compal/ene932/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/compal/ene932/acpi/ec.asl b/src/ec/compal/ene932/acpi/ec.asl
index 4d30720..2f4df37 100644
--- a/src/ec/compal/ene932/acpi/ec.asl
+++ b/src/ec/compal/ene932/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/compal/ene932/acpi/superio.asl b/src/ec/compal/ene932/acpi/superio.asl
index 91e6039..1dafa93 100644
--- a/src/ec/compal/ene932/acpi/superio.asl
+++ b/src/ec/compal/ene932/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/ec/compal/ene932/chip.h b/src/ec/compal/ene932/chip.h
index e8df583..72e817f 100644
--- a/src/ec/compal/ene932/chip.h
+++ b/src/ec/compal/ene932/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EC_COMPAL_ENE932_CHIP_H
diff --git a/src/ec/compal/ene932/ec.c b/src/ec/compal/ene932/ec.c
index 71d8520..3b4b7fe 100644
--- a/src/ec/compal/ene932/ec.c
+++ b/src/ec/compal/ene932/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __PRE_RAM__
diff --git a/src/ec/compal/ene932/ec.h b/src/ec/compal/ene932/ec.h
index 0716e8a..5ccea53 100644
--- a/src/ec/compal/ene932/ec.h
+++ b/src/ec/compal/ene932/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/google/chromeec/acpi/ac.asl b/src/ec/google/chromeec/acpi/ac.asl
index 5e1619f..91079efd 100644
--- a/src/ec/google/chromeec/acpi/ac.asl
+++ b/src/ec/google/chromeec/acpi/ac.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/google/chromeec/acpi/als.asl b/src/ec/google/chromeec/acpi/als.asl
index 76d622e..38ddf56 100644
--- a/src/ec/google/chromeec/acpi/als.asl
+++ b/src/ec/google/chromeec/acpi/als.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (ALS)
diff --git a/src/ec/google/chromeec/acpi/battery.asl b/src/ec/google/chromeec/acpi/battery.asl
index e3a4c2e..2957727 100644
--- a/src/ec/google/chromeec/acpi/battery.asl
+++ b/src/ec/google/chromeec/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/google/chromeec/acpi/ec.asl b/src/ec/google/chromeec/acpi/ec.asl
index 4afb1bc..e001ec0 100644
--- a/src/ec/google/chromeec/acpi/ec.asl
+++ b/src/ec/google/chromeec/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/google/chromeec/acpi/emem.asl b/src/ec/google/chromeec/acpi/emem.asl
index 9769618..7db6e85 100644
--- a/src/ec/google/chromeec/acpi/emem.asl
+++ b/src/ec/google/chromeec/acpi/emem.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/google/chromeec/acpi/keyboard_backlight.asl b/src/ec/google/chromeec/acpi/keyboard_backlight.asl
index 608994e..7ef4b59 100644
--- a/src/ec/google/chromeec/acpi/keyboard_backlight.asl
+++ b/src/ec/google/chromeec/acpi/keyboard_backlight.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/ec/google/chromeec/acpi/pd.asl b/src/ec/google/chromeec/acpi/pd.asl
index a9a0a49..3ffb19b 100644
--- a/src/ec/google/chromeec/acpi/pd.asl
+++ b/src/ec/google/chromeec/acpi/pd.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (ECPD)
diff --git a/src/ec/google/chromeec/acpi/superio.asl b/src/ec/google/chromeec/acpi/superio.asl
index b27f6d6..896917c 100644
--- a/src/ec/google/chromeec/acpi/superio.asl
+++ b/src/ec/google/chromeec/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/google/chromeec/chip.h b/src/ec/google/chromeec/chip.h
index 62b6a7c..e5addd7 100644
--- a/src/ec/google/chromeec/chip.h
+++ b/src/ec/google/chromeec/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_GOOGLE_CHROMEEC_CHIP_H
diff --git a/src/ec/google/chromeec/crosec_proto.c b/src/ec/google/chromeec/crosec_proto.c
index 9da80c7..41ca598 100644
--- a/src/ec/google/chromeec/crosec_proto.c
+++ b/src/ec/google/chromeec/crosec_proto.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c
index 3af5325..271d376 100644
--- a/src/ec/google/chromeec/ec.c
+++ b/src/ec/google/chromeec/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/ec/google/chromeec/ec.h b/src/ec/google/chromeec/ec.h
index 3bc62c9..daf531f 100644
--- a/src/ec/google/chromeec/ec.h
+++ b/src/ec/google/chromeec/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * Mailbox EC communication interface for Google Chrome Embedded Controller.
  */
diff --git a/src/ec/google/chromeec/ec_i2c.c b/src/ec/google/chromeec/ec_i2c.c
index caefcf8..4ef7754 100644
--- a/src/ec/google/chromeec/ec_i2c.c
+++ b/src/ec/google/chromeec/ec_i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c
index 003a5f2..d3e4676 100644
--- a/src/ec/google/chromeec/ec_lpc.c
+++ b/src/ec/google/chromeec/ec_lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/google/chromeec/ec_mec.c b/src/ec/google/chromeec/ec_mec.c
index 5d1ec3c..f0ba676 100644
--- a/src/ec/google/chromeec/ec_mec.c
+++ b/src/ec/google/chromeec/ec_mec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/google/chromeec/ec_message.h b/src/ec/google/chromeec/ec_message.h
index ee15749..1bbbfb4 100644
--- a/src/ec/google/chromeec/ec_message.h
+++ b/src/ec/google/chromeec/ec_message.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CROS_MESSAGE_H
diff --git a/src/ec/google/chromeec/ec_spi.c b/src/ec/google/chromeec/ec_spi.c
index cc7c48a..e39dba3 100644
--- a/src/ec/google/chromeec/ec_spi.c
+++ b/src/ec/google/chromeec/ec_spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/ec/kontron/it8516e/acpi/ec.asl b/src/ec/kontron/it8516e/acpi/ec.asl
index 6e29d77..afb9063 100644
--- a/src/ec/kontron/it8516e/acpi/ec.asl
+++ b/src/ec/kontron/it8516e/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/kontron/it8516e/acpi/pm_channels.asl b/src/ec/kontron/it8516e/acpi/pm_channels.asl
index 0eacad0..a4650b7 100644
--- a/src/ec/kontron/it8516e/acpi/pm_channels.asl
+++ b/src/ec/kontron/it8516e/acpi/pm_channels.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifdef IT8516E_FIRST_DATA
diff --git a/src/ec/kontron/it8516e/chip.h b/src/ec/kontron/it8516e/chip.h
index 7808185..fe4fe22 100644
--- a/src/ec/kontron/it8516e/chip.h
+++ b/src/ec/kontron/it8516e/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_KONTRON_IT8516E_CHIP_H
diff --git a/src/ec/kontron/it8516e/ec.c b/src/ec/kontron/it8516e/ec.c
index 99f581b..cac10b6 100644
--- a/src/ec/kontron/it8516e/ec.c
+++ b/src/ec/kontron/it8516e/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/ec/kontron/it8516e/ec.h b/src/ec/kontron/it8516e/ec.h
index b5953d3..3a09d92 100644
--- a/src/ec/kontron/it8516e/ec.h
+++ b/src/ec/kontron/it8516e/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_KONTRON_IT8516E_EC_H
diff --git a/src/ec/lenovo/h8/acpi/ac.asl b/src/ec/lenovo/h8/acpi/ac.asl
index aa81a89..848d2c8 100644
--- a/src/ec/lenovo/h8/acpi/ac.asl
+++ b/src/ec/lenovo/h8/acpi/ac.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Field(ERAM, ByteAcc, NoLock, Preserve)
diff --git a/src/ec/lenovo/h8/acpi/battery.asl b/src/ec/lenovo/h8/acpi/battery.asl
index 9ac49b7..f20e1a4 100644
--- a/src/ec/lenovo/h8/acpi/battery.asl
+++ b/src/ec/lenovo/h8/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Field(ERAM, ByteAcc, NoLock, Preserve)
diff --git a/src/ec/lenovo/h8/acpi/beep.asl b/src/ec/lenovo/h8/acpi/beep.asl
index 2a66684..6efa630 100644
--- a/src/ec/lenovo/h8/acpi/beep.asl
+++ b/src/ec/lenovo/h8/acpi/beep.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Field(ERAM, ByteAcc, NoLock, Preserve)
diff --git a/src/ec/lenovo/h8/acpi/ec.asl b/src/ec/lenovo/h8/acpi/ec.asl
index becce48..0436ff0 100644
--- a/src/ec/lenovo/h8/acpi/ec.asl
+++ b/src/ec/lenovo/h8/acpi/ec.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC)
diff --git a/src/ec/lenovo/h8/acpi/lid.asl b/src/ec/lenovo/h8/acpi/lid.asl
index 42ad5e2..56d4d92 100644
--- a/src/ec/lenovo/h8/acpi/lid.asl
+++ b/src/ec/lenovo/h8/acpi/lid.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Field(ERAM, ByteAcc, NoLock, Preserve)
diff --git a/src/ec/lenovo/h8/acpi/sleepbutton.asl b/src/ec/lenovo/h8/acpi/sleepbutton.asl
index 9ee693c..4bad888 100644
--- a/src/ec/lenovo/h8/acpi/sleepbutton.asl
+++ b/src/ec/lenovo/h8/acpi/sleepbutton.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Field(ERAM, ByteAcc, NoLock, Preserve)
diff --git a/src/ec/lenovo/h8/acpi/systemstatus.asl b/src/ec/lenovo/h8/acpi/systemstatus.asl
index aa7562b..787b9a2 100644
--- a/src/ec/lenovo/h8/acpi/systemstatus.asl
+++ b/src/ec/lenovo/h8/acpi/systemstatus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/ec/lenovo/h8/chip.h b/src/ec/lenovo/h8/chip.h
index bc321d2..fd42ab0 100644
--- a/src/ec/lenovo/h8/chip.h
+++ b/src/ec/lenovo/h8/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_LENOVO_H8EC_CHIP_H
diff --git a/src/ec/lenovo/h8/h8.c b/src/ec/lenovo/h8/h8.c
index 2cafc88..de2e7c7 100644
--- a/src/ec/lenovo/h8/h8.c
+++ b/src/ec/lenovo/h8/h8.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/lenovo/h8/h8.h b/src/ec/lenovo/h8/h8.h
index e726e27..0991e3c 100644
--- a/src/ec/lenovo/h8/h8.h
+++ b/src/ec/lenovo/h8/h8.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_LENOVO_H8_H
diff --git a/src/ec/lenovo/pmh7/chip.h b/src/ec/lenovo/pmh7/chip.h
index dc83da7..c6a1b22 100644
--- a/src/ec/lenovo/pmh7/chip.h
+++ b/src/ec/lenovo/pmh7/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_LENOVO_PMH7_CHIP_H
diff --git a/src/ec/lenovo/pmh7/pmh7.c b/src/ec/lenovo/pmh7/pmh7.c
index cc6e891..0cb6455 100644
--- a/src/ec/lenovo/pmh7/pmh7.c
+++ b/src/ec/lenovo/pmh7/pmh7.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/lenovo/pmh7/pmh7.h b/src/ec/lenovo/pmh7/pmh7.h
index 7dfc2c9..0bbcc49 100644
--- a/src/ec/lenovo/pmh7/pmh7.h
+++ b/src/ec/lenovo/pmh7/pmh7.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EC_LENOVO_PMH7_H
diff --git a/src/ec/quanta/ene_kb3940q/acpi/ac.asl b/src/ec/quanta/ene_kb3940q/acpi/ac.asl
index 2e49ac5..1999717 100644
--- a/src/ec/quanta/ene_kb3940q/acpi/ac.asl
+++ b/src/ec/quanta/ene_kb3940q/acpi/ac.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/quanta/ene_kb3940q/acpi/battery.asl b/src/ec/quanta/ene_kb3940q/acpi/battery.asl
index 7b00dfe..b32b8af 100644
--- a/src/ec/quanta/ene_kb3940q/acpi/battery.asl
+++ b/src/ec/quanta/ene_kb3940q/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/quanta/ene_kb3940q/acpi/ec.asl b/src/ec/quanta/ene_kb3940q/acpi/ec.asl
index 35fe791..7b12d57 100644
--- a/src/ec/quanta/ene_kb3940q/acpi/ec.asl
+++ b/src/ec/quanta/ene_kb3940q/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/quanta/ene_kb3940q/acpi/superio.asl b/src/ec/quanta/ene_kb3940q/acpi/superio.asl
index a64dbfc..1ff776d 100644
--- a/src/ec/quanta/ene_kb3940q/acpi/superio.asl
+++ b/src/ec/quanta/ene_kb3940q/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/ec/quanta/ene_kb3940q/chip.h b/src/ec/quanta/ene_kb3940q/chip.h
index f888eee..3d3185d 100644
--- a/src/ec/quanta/ene_kb3940q/chip.h
+++ b/src/ec/quanta/ene_kb3940q/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EC_QUANTA_ENE_KB3940Q_CHIP_H
diff --git a/src/ec/quanta/ene_kb3940q/ec.c b/src/ec/quanta/ene_kb3940q/ec.c
index 91f1916..d3fd72a 100644
--- a/src/ec/quanta/ene_kb3940q/ec.c
+++ b/src/ec/quanta/ene_kb3940q/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __PRE_RAM__
diff --git a/src/ec/quanta/ene_kb3940q/ec.h b/src/ec/quanta/ene_kb3940q/ec.h
index d669011..4c73f27 100644
--- a/src/ec/quanta/ene_kb3940q/ec.h
+++ b/src/ec/quanta/ene_kb3940q/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/quanta/it8518/acpi/ac.asl b/src/ec/quanta/it8518/acpi/ac.asl
index fd67144..1bd5c8b 100644
--- a/src/ec/quanta/it8518/acpi/ac.asl
+++ b/src/ec/quanta/it8518/acpi/ac.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/quanta/it8518/acpi/battery.asl b/src/ec/quanta/it8518/acpi/battery.asl
index 547e570..a1b2639 100644
--- a/src/ec/quanta/it8518/acpi/battery.asl
+++ b/src/ec/quanta/it8518/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/quanta/it8518/acpi/ec.asl b/src/ec/quanta/it8518/acpi/ec.asl
index d01a7d6..deac06a 100644
--- a/src/ec/quanta/it8518/acpi/ec.asl
+++ b/src/ec/quanta/it8518/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/quanta/it8518/acpi/superio.asl b/src/ec/quanta/it8518/acpi/superio.asl
index 0c2cf26..e325f21 100644
--- a/src/ec/quanta/it8518/acpi/superio.asl
+++ b/src/ec/quanta/it8518/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/ec/quanta/it8518/chip.h b/src/ec/quanta/it8518/chip.h
index b5c7701..7a06351 100644
--- a/src/ec/quanta/it8518/chip.h
+++ b/src/ec/quanta/it8518/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EC_QUANTA_IT8518_CHIP_H
diff --git a/src/ec/quanta/it8518/ec.c b/src/ec/quanta/it8518/ec.c
index 5798e27..3435cab 100644
--- a/src/ec/quanta/it8518/ec.c
+++ b/src/ec/quanta/it8518/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/quanta/it8518/ec.h b/src/ec/quanta/it8518/ec.h
index fd049ff..858bf04 100644
--- a/src/ec/quanta/it8518/ec.h
+++ b/src/ec/quanta/it8518/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/smsc/mec1308/acpi/ac.asl b/src/ec/smsc/mec1308/acpi/ac.asl
index ccc8854..5300663 100644
--- a/src/ec/smsc/mec1308/acpi/ac.asl
+++ b/src/ec/smsc/mec1308/acpi/ac.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope (EC0)
diff --git a/src/ec/smsc/mec1308/acpi/battery.asl b/src/ec/smsc/mec1308/acpi/battery.asl
index 199f4c0..c84816c 100644
--- a/src/ec/smsc/mec1308/acpi/battery.asl
+++ b/src/ec/smsc/mec1308/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/smsc/mec1308/acpi/ec.asl b/src/ec/smsc/mec1308/acpi/ec.asl
index 6d03242..22f2ba1 100644
--- a/src/ec/smsc/mec1308/acpi/ec.asl
+++ b/src/ec/smsc/mec1308/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/ec/smsc/mec1308/chip.h b/src/ec/smsc/mec1308/chip.h
index 768b1e9..ed92032 100644
--- a/src/ec/smsc/mec1308/chip.h
+++ b/src/ec/smsc/mec1308/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EC_SMSC_MEC1308_CHIP_H
diff --git a/src/ec/smsc/mec1308/ec.c b/src/ec/smsc/mec1308/ec.c
index af29daf..b660c3d 100644
--- a/src/ec/smsc/mec1308/ec.c
+++ b/src/ec/smsc/mec1308/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/ec/smsc/mec1308/ec.h b/src/ec/smsc/mec1308/ec.h
index 06f7332..edbb29a 100644
--- a/src/ec/smsc/mec1308/ec.h
+++ b/src/ec/smsc/mec1308/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * Mailbox EC communication interface for SMSC MEC1308 Embedded Controller.
  */
diff --git a/src/include/assert.h b/src/include/assert.h
index 085720b..5453e17 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __ASSERT_H__
diff --git a/src/include/assets.h b/src/include/assets.h
index 35d4662..4ff0482 100644
--- a/src/include/assets.h
+++ b/src/include/assets.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef ASSETS_H
 #define ASSETS_H
diff --git a/src/include/base3.h b/src/include/base3.h
index 7504ca6..d5ea462 100644
--- a/src/include/base3.h
+++ b/src/include/base3.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SRC_INCLUDE_BASE3_H__
diff --git a/src/include/bcd.h b/src/include/bcd.h
index d10e185..3004ab7 100644
--- a/src/include/bcd.h
+++ b/src/include/bcd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BCD_H_
diff --git a/src/include/boardid.h b/src/include/boardid.h
index 6023456..b99ab51 100644
--- a/src/include/boardid.h
+++ b/src/include/boardid.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __INCLUDE_BOARDID_H__
diff --git a/src/include/boot_device.h b/src/include/boot_device.h
index 9288066..71a2933 100644
--- a/src/include/boot_device.h
+++ b/src/include/boot_device.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BOOT_DEVICE_H_
diff --git a/src/include/bootmem.h b/src/include/bootmem.h
index c9ef2cb..cb573c6 100644
--- a/src/include/bootmem.h
+++ b/src/include/bootmem.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BOOTMEM_H
diff --git a/src/include/bootmode.h b/src/include/bootmode.h
index 730c0f3..bab2678 100644
--- a/src/include/bootmode.h
+++ b/src/include/bootmode.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __BOOTMODE_H__
diff --git a/src/include/bootstate.h b/src/include/bootstate.h
index 8dafa04..8d54faa 100644
--- a/src/include/bootstate.h
+++ b/src/include/bootstate.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef BOOTSTATE_H
 #define BOOTSTATE_H
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index 5d60716..91f6cf4 100644
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CBFS_H_
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 60de5a7..ac0a3e5 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CBMEM_H_
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h
index 35eae21..a9347f0 100644
--- a/src/include/console/cbmem_console.h
+++ b/src/include/console/cbmem_console.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _CONSOLE_CBMEM_CONSOLE_H_
 #define _CONSOLE_CBMEM_CONSOLE_H_
diff --git a/src/include/console/console.h b/src/include/console/console.h
index 4428bdb..7f73850 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CONSOLE_CONSOLE_H_
diff --git a/src/include/console/early_print.h b/src/include/console/early_print.h
index d852cbd..c185746 100644
--- a/src/include/console/early_print.h
+++ b/src/include/console/early_print.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CONSOLE_EARLY_PRINT_H_
diff --git a/src/include/console/ne2k.h b/src/include/console/ne2k.h
index d839a7c..b913204 100644
--- a/src/include/console/ne2k.h
+++ b/src/include/console/ne2k.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NE2K_H__
diff --git a/src/include/console/post_codes.h b/src/include/console/post_codes.h
index 5227e7a..932705c 100644
--- a/src/include/console/post_codes.h
+++ b/src/include/console/post_codes.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/include/console/spi.h b/src/include/console/spi.h
index c47fec5..a1bfb9b 100644
--- a/src/include/console/spi.h
+++ b/src/include/console/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CONSOLE_SPI_H
diff --git a/src/include/console/streams.h b/src/include/console/streams.h
index 1c6806da..e2bae5c 100644
--- a/src/include/console/streams.h
+++ b/src/include/console/streams.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CONSOLE_STREAMS_H_
diff --git a/src/include/console/uart.h b/src/include/console/uart.h
index d8fb095..c1efc5a 100644
--- a/src/include/console/uart.h
+++ b/src/include/console/uart.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CONSOLE_UART_H
diff --git a/src/include/console/usb.h b/src/include/console/usb.h
index 0ef1d05..8d93303 100644
--- a/src/include/console/usb.h
+++ b/src/include/console/usb.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CONSOLE_USB_H_
diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h
index 5543877..35040ff 100644
--- a/src/include/console/vtxprintf.h
+++ b/src/include/console/vtxprintf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CONSOLE_VTXPRINTF_H
diff --git a/src/include/cpu/amd/amdfam10_sysconf.h b/src/include/cpu/amd/amdfam10_sysconf.h
index 89fcd7c..92ba7bb 100644
--- a/src/include/cpu/amd/amdfam10_sysconf.h
+++ b/src/include/cpu/amd/amdfam10_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMDFAM10_SYSCONF_H
diff --git a/src/include/cpu/amd/amdfam12.h b/src/include/cpu/amd/amdfam12.h
index 3ffd452..e8233c1 100644
--- a/src/include/cpu/amd/amdfam12.h
+++ b/src/include/cpu/amd/amdfam12.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_FAM12_H
diff --git a/src/include/cpu/amd/amdfam14.h b/src/include/cpu/amd/amdfam14.h
index db57595..7e6e8ad 100644
--- a/src/include/cpu/amd/amdfam14.h
+++ b/src/include/cpu/amd/amdfam14.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_FAM14_H
diff --git a/src/include/cpu/amd/amdfam15.h b/src/include/cpu/amd/amdfam15.h
index a31b534..51a7bc6 100644
--- a/src/include/cpu/amd/amdfam15.h
+++ b/src/include/cpu/amd/amdfam15.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_FAM15_H
diff --git a/src/include/cpu/amd/amdfam16.h b/src/include/cpu/amd/amdfam16.h
index 0b325ad..cf6863e 100644
--- a/src/include/cpu/amd/amdfam16.h
+++ b/src/include/cpu/amd/amdfam16.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_FAM16_H
diff --git a/src/include/cpu/amd/common/cbtypes.h b/src/include/cpu/amd/common/cbtypes.h
index 346f1a3..c4e056b 100644
--- a/src/include/cpu/amd/common/cbtypes.h
+++ b/src/include/cpu/amd/common/cbtypes.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CBTYPES_H_
diff --git a/src/include/cpu/amd/lxdef.h b/src/include/cpu/amd/lxdef.h
index 3061339..5b53c5e 100644
--- a/src/include/cpu/amd/lxdef.h
+++ b/src/include/cpu/amd/lxdef.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_LXDEF_H
diff --git a/src/include/cpu/amd/model_10xxx_msr.h b/src/include/cpu/amd/model_10xxx_msr.h
index 6c7dece..6c63462 100644
--- a/src/include/cpu/amd/model_10xxx_msr.h
+++ b/src/include/cpu/amd/model_10xxx_msr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_MODEL_10XXX_MSR_H
diff --git a/src/include/cpu/amd/model_10xxx_rev.h b/src/include/cpu/amd/model_10xxx_rev.h
index b38f85c..190f795 100644
--- a/src/include/cpu/amd/model_10xxx_rev.h
+++ b/src/include/cpu/amd/model_10xxx_rev.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/include/cpu/amd/multicore.h b/src/include/cpu/amd/multicore.h
index 32f749f..ec8ce5e 100644
--- a/src/include/cpu/amd/multicore.h
+++ b/src/include/cpu/amd/multicore.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_AMD_QUADCORE_H
diff --git a/src/include/cpu/amd/powernow.h b/src/include/cpu/amd/powernow.h
index 85356bd..c2549ef 100644
--- a/src/include/cpu/amd/powernow.h
+++ b/src/include/cpu/amd/powernow.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef POWERNOW_H
diff --git a/src/include/cpu/intel/l2_cache.h b/src/include/cpu/intel/l2_cache.h
index 0b7d77d..7e46273 100644
--- a/src/include/cpu/intel/l2_cache.h
+++ b/src/include/cpu/intel/l2_cache.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The L2 cache definitions here only apply to SECC/SECC2 P6 family CPUs
diff --git a/src/include/cpu/intel/microcode.h b/src/include/cpu/intel/microcode.h
index 73b1c42..e668488 100644
--- a/src/include/cpu/intel/microcode.h
+++ b/src/include/cpu/intel/microcode.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef __CPU__INTEL__MICROCODE__
 #define __CPU__INTEL__MICROCODE__
diff --git a/src/include/cpu/intel/speedstep.h b/src/include/cpu/intel/speedstep.h
index ea7cb7d..e174182 100644
--- a/src/include/cpu/intel/speedstep.h
+++ b/src/include/cpu/intel/speedstep.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_INTEL_SPEEDSTEP_H
diff --git a/src/include/cpu/intel/turbo.h b/src/include/cpu/intel/turbo.h
index e6b27fe..6eebe21 100644
--- a/src/include/cpu/intel/turbo.h
+++ b/src/include/cpu/intel/turbo.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CPU_INTEL_TURBO_H
diff --git a/src/include/cpu/x86/cache.h b/src/include/cpu/x86/cache.h
index f0c8348..a32c4cc 100644
--- a/src/include/cpu/x86/cache.h
+++ b/src/include/cpu/x86/cache.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_X86_CACHE
diff --git a/src/include/cpu/x86/cr.h b/src/include/cpu/x86/cr.h
index 8f77aec..a60a7fe 100644
--- a/src/include/cpu/x86/cr.h
+++ b/src/include/cpu/x86/cr.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef CPU_X86_CR_H
 #define CPU_X86_CR_H
diff --git a/src/include/cpu/x86/gdt.h b/src/include/cpu/x86/gdt.h
index a96b0e4..0656f35 100644
--- a/src/include/cpu/x86/gdt.h
+++ b/src/include/cpu/x86/gdt.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_X86_GDT
diff --git a/src/include/cpu/x86/mp.h b/src/include/cpu/x86/mp.h
index c27eeba..fca40f1 100644
--- a/src/include/cpu/x86/mp.h
+++ b/src/include/cpu/x86/mp.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _X86_MP_H_
diff --git a/src/include/cpu/x86/name.h b/src/include/cpu/x86/name.h
index 80b8ea8..5cdca17 100644
--- a/src/include/cpu/x86/name.h
+++ b/src/include/cpu/x86/name.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_X86_NAME_H
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index f7aafa9..099596d 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* AMD64 SMM State-Save Area
diff --git a/src/include/device/azalia.h b/src/include/device/azalia.h
index feace4d..5343eeb 100644
--- a/src/include/device/azalia.h
+++ b/src/include/device/azalia.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef AZALIA_H_
 #define AZALIA_H_
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index cbd5a03..c809954 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DEVICE_AZALIA_H
diff --git a/src/include/device/i2c.h b/src/include/device/i2c.h
index 3dbc9ed..6982e78 100644
--- a/src/include/device/i2c.h
+++ b/src/include/device/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _DEVICE_I2C_H_
diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h
index 33f42b1..50ae700 100644
--- a/src/include/device/pci_ehci.h
+++ b/src/include/device/pci_ehci.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PCI_EHCI_H_
diff --git a/src/include/edid.h b/src/include/edid.h
index 6aed403..39a1a12 100644
--- a/src/include/edid.h
+++ b/src/include/edid.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EDID_H
diff --git a/src/include/elog.h b/src/include/elog.h
index ee7a0e2..3b5330c 100644
--- a/src/include/elog.h
+++ b/src/include/elog.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ELOG_H_
diff --git a/src/include/endian.h b/src/include/endian.h
index b9f1dee..3b8d564 100644
--- a/src/include/endian.h
+++ b/src/include/endian.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _ENDIAN_H_
diff --git a/src/include/fmap.h b/src/include/fmap.h
index 0f68bee..4692a3c 100644
--- a/src/include/fmap.h
+++ b/src/include/fmap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _FMAP_H_
diff --git a/src/include/gic.h b/src/include/gic.h
index d46922d..96fb4f2 100644
--- a/src/include/gic.h
+++ b/src/include/gic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef GIC_H
diff --git a/src/include/gpio.h b/src/include/gpio.h
index 8cbf6ad..88556b5 100644
--- a/src/include/gpio.h
+++ b/src/include/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SRC_INCLUDE_GPIO_H__
diff --git a/src/include/halt.h b/src/include/halt.h
index bd3511e..549045b 100644
--- a/src/include/halt.h
+++ b/src/include/halt.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __HALT_H__
diff --git a/src/include/imd.h b/src/include/imd.h
index a444b4f..9b574d0 100644
--- a/src/include/imd.h
+++ b/src/include/imd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _IMD_H_
diff --git a/src/include/lib.h b/src/include/lib.h
index d0cd66f..5d164ac 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is for "nuisance prototypes" that have no other home. */
diff --git a/src/include/memlayout.h b/src/include/memlayout.h
index 09be615..33de70b 100644
--- a/src/include/memlayout.h
+++ b/src/include/memlayout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains macro definitions for memlayout.ld linker scripts. */
diff --git a/src/include/memrange.h b/src/include/memrange.h
index 9016293..08a565c 100644
--- a/src/include/memrange.h
+++ b/src/include/memrange.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef MEMRANGE_H_
 #define MEMRANGE_H_
diff --git a/src/include/pc80/i8254.h b/src/include/pc80/i8254.h
index 92077d0..8015631 100644
--- a/src/include/pc80/i8254.h
+++ b/src/include/pc80/i8254.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PC80_I8254_H
diff --git a/src/include/pc80/i8259.h b/src/include/pc80/i8259.h
index 2ac3b9e..c000bb1 100644
--- a/src/include/pc80/i8259.h
+++ b/src/include/pc80/i8259.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PC80_I8259_H
diff --git a/src/include/pc80/vga.h b/src/include/pc80/vga.h
index 38efc3b..baa3f56 100644
--- a/src/include/pc80/vga.h
+++ b/src/include/pc80/vga.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef VGA_H
diff --git a/src/include/pc80/vga_io.h b/src/include/pc80/vga_io.h
index e3bc071..74db9c9 100644
--- a/src/include/pc80/vga_io.h
+++ b/src/include/pc80/vga_io.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef VGA_IO_H
diff --git a/src/include/program_loading.h b/src/include/program_loading.h
index d6da688..189703a 100644
--- a/src/include/program_loading.h
+++ b/src/include/program_loading.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef PROGRAM_LOADING_H
 #define PROGRAM_LOADING_H
diff --git a/src/include/reg_script.h b/src/include/reg_script.h
index 16cd8bb..014d13e 100644
--- a/src/include/reg_script.h
+++ b/src/include/reg_script.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef REG_SCRIPT_H
diff --git a/src/include/rmodule.h b/src/include/rmodule.h
index 742a671..c0db152 100644
--- a/src/include/rmodule.h
+++ b/src/include/rmodule.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef RMODULE_H
 #define RMODULE_H
diff --git a/src/include/romstage_handoff.h b/src/include/romstage_handoff.h
index 6ade04c..61599b6 100644
--- a/src/include/romstage_handoff.h
+++ b/src/include/romstage_handoff.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef ROMSTAGE_HANDOFF_H
 #define ROMSTAGE_HANDOFF_H
diff --git a/src/include/rtc.h b/src/include/rtc.h
index afe1bb5..3c95a0a 100644
--- a/src/include/rtc.h
+++ b/src/include/rtc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _RTC_H_
diff --git a/src/include/rules.h b/src/include/rules.h
index 7523347..26213e9 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _RULES_H
diff --git a/src/include/sdram_mode.h b/src/include/sdram_mode.h
index 34ae127..b110d32 100644
--- a/src/include/sdram_mode.h
+++ b/src/include/sdram_mode.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/include/smbios.h b/src/include/smbios.h
index b654c23..3aec196 100644
--- a/src/include/smbios.h
+++ b/src/include/smbios.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SMBIOS_H
diff --git a/src/include/spd.h b/src/include/spd.h
index a0e39ff..86f9a6e 100644
--- a/src/include/spd.h
+++ b/src/include/spd.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/include/spd_cache.h b/src/include/spd_cache.h
index e12ea6d..720956a 100644
--- a/src/include/spd_cache.h
+++ b/src/include/spd_cache.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SPD_CACHE_H_
diff --git a/src/include/spd_ddr2.h b/src/include/spd_ddr2.h
index 6d7b061..b4df598 100644
--- a/src/include/spd_ddr2.h
+++ b/src/include/spd_ddr2.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SPDs for DDR2 SDRAM */
diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h
index 7d8f971..52dcc40 100644
--- a/src/include/spi-generic.h
+++ b/src/include/spi-generic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SPI_GENERIC_H_
diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index 8b29df8..fc2c1cc 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _SPI_FLASH_H_
 #define _SPI_FLASH_H_
diff --git a/src/include/stage_cache.h b/src/include/stage_cache.h
index 68cfdb7..be5c732 100644
--- a/src/include/stage_cache.h
+++ b/src/include/stage_cache.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _STAGE_CACHE_H_
diff --git a/src/include/superio/conf_mode.h b/src/include/superio/conf_mode.h
index 4b8776c..6054908 100644
--- a/src/include/superio/conf_mode.h
+++ b/src/include/superio/conf_mode.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DEVICE_PNP_CONF_MODE_H
diff --git a/src/include/symbols.h b/src/include/symbols.h
index 22cd575..64014e2 100644
--- a/src/include/symbols.h
+++ b/src/include/symbols.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SYMBOLS_H
diff --git a/src/include/thread.h b/src/include/thread.h
index 834ac5c..32e3f57 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef THREAD_H_
 #define THREAD_H_
diff --git a/src/include/timer.h b/src/include/timer.h
index aa5746d..ee5e127 100644
--- a/src/include/timer.h
+++ b/src/include/timer.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef TIMER_H
 #define TIMER_H
diff --git a/src/include/timestamp.h b/src/include/timestamp.h
index 3c14bc9..185bdfe 100644
--- a/src/include/timestamp.h
+++ b/src/include/timestamp.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __TIMESTAMP_H__
diff --git a/src/include/tpm.h b/src/include/tpm.h
index 9b4db4a..6c4e869 100644
--- a/src/include/tpm.h
+++ b/src/include/tpm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef TPM_H_
diff --git a/src/include/trace.h b/src/include/trace.h
index 724efc0..514e13e 100644
--- a/src/include/trace.h
+++ b/src/include/trace.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __TRACE_H
diff --git a/src/include/types.h b/src/include/types.h
index 4fbde6e..d8c8874 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __TYPES_H
diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc
index b670782..99ab9fc 100644
--- a/src/lib/Makefile.inc
+++ b/src/lib/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 subdirs-y += loaders
 
diff --git a/src/lib/assets.c b/src/lib/assets.c
index 0115243..f4f42b3 100644
--- a/src/lib/assets.c
+++ b/src/lib/assets.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/lib/boot_device.c b/src/lib/boot_device.c
index e0353fc..048d0ff 100644
--- a/src/lib/boot_device.c
+++ b/src/lib/boot_device.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot_device.h>
diff --git a/src/lib/bootmem.c b/src/lib/bootmem.c
index 723c29b..a828a63 100644
--- a/src/lib/bootmem.c
+++ b/src/lib/bootmem.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/lib/bootmode.c b/src/lib/bootmode.c
index f2ff72a..b7bfc9c 100644
--- a/src/lib/bootmode.c
+++ b/src/lib/bootmode.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <rules.h>
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 9cdc365..bdcbc8d 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/lib/cbfs_boot_props.c b/src/lib/cbfs_boot_props.c
index 2906d84..38721ec 100644
--- a/src/lib/cbfs_boot_props.c
+++ b/src/lib/cbfs_boot_props.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot_device.h>
diff --git a/src/lib/cbfs_spi.c b/src/lib/cbfs_spi.c
index 5b5aaff..eea3b6c 100644
--- a/src/lib/cbfs_spi.c
+++ b/src/lib/cbfs_spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/lib/cbmem_common.c b/src/lib/cbmem_common.c
index d3019c5..2f0c4ba 100644
--- a/src/lib/cbmem_common.c
+++ b/src/lib/cbmem_common.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <cbmem.h>
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index d8fc7a9..3c76b64 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/lib/cbmem_stage_cache.c b/src/lib/cbmem_stage_cache.c
index eb5e2b3..dce4e97 100644
--- a/src/lib/cbmem_stage_cache.c
+++ b/src/lib/cbmem_stage_cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/early_variables.h>
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 6859bf2..4c5e37f 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/lib/debug.c b/src/lib/debug.c
index 8443afa..036bfff 100644
--- a/src/lib/debug.c
+++ b/src/lib/debug.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void print_debug_pci_dev(unsigned dev)
diff --git a/src/lib/ext_stage_cache.c b/src/lib/ext_stage_cache.c
index bbadb70..2f212fb 100644
--- a/src/lib/ext_stage_cache.c
+++ b/src/lib/ext_stage_cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/early_variables.h>
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
index d9c3048..dd7f308 100644
--- a/src/lib/fmap.c
+++ b/src/lib/fmap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot_device.h>
diff --git a/src/lib/gcc.c b/src/lib/gcc.c
index 22de328..f4ff348 100644
--- a/src/lib/gcc.c
+++ b/src/lib/gcc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/lib/gcov-glue.c b/src/lib/gcov-glue.c
index 3ec7d7a..121ccbc 100644
--- a/src/lib/gcov-glue.c
+++ b/src/lib/gcov-glue.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/lib/gpio.c b/src/lib/gpio.c
index 72bd7ec..52a3120 100644
--- a/src/lib/gpio.c
+++ b/src/lib/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/lib/halt.c b/src/lib/halt.c
index 145ef1a..0d0b2f7 100644
--- a/src/lib/halt.c
+++ b/src/lib/halt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/hlt.h>
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index b3c0c35..f07dd7e 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/lib/hexdump.c b/src/lib/hexdump.c
index 9807def..61e9c9d 100644
--- a/src/lib/hexdump.c
+++ b/src/lib/hexdump.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/lib/imd.c b/src/lib/imd.c
index 612e3f1..cffed99 100644
--- a/src/lib/imd.c
+++ b/src/lib/imd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c
index fa65334..eea61ce 100644
--- a/src/lib/imd_cbmem.c
+++ b/src/lib/imd_cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/lib/jpeg.c b/src/lib/jpeg.c
index a86ea06..4fda477 100644
--- a/src/lib/jpeg.c
+++ b/src/lib/jpeg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/lib/jpeg.h b/src/lib/jpeg.h
index a32e4af..7e227ca 100644
--- a/src/lib/jpeg.h
+++ b/src/lib/jpeg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/lib/libgcc.c b/src/lib/libgcc.c
index 14685be..8fae78b 100644
--- a/src/lib/libgcc.c
+++ b/src/lib/libgcc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/lib/memrange.c b/src/lib/memrange.c
index c8b0a07..89ad090 100644
--- a/src/lib/memrange.c
+++ b/src/lib/memrange.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stdlib.h>
 #include <console/console.h>
diff --git a/src/lib/mocked_tlcl.c b/src/lib/mocked_tlcl.c
index c5c12bf..ccc0078 100644
--- a/src/lib/mocked_tlcl.c
+++ b/src/lib/mocked_tlcl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <tpm_lite/tlcl.h>
diff --git a/src/lib/primitive_memtest.c b/src/lib/primitive_memtest.c
index c9a3519..625dc8d 100644
--- a/src/lib/primitive_memtest.c
+++ b/src/lib/primitive_memtest.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <inttypes.h>
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index e53fca5..d7d1b01 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/lib/prog_ops.c b/src/lib/prog_ops.c
index 80f4ff5..64021cf 100644
--- a/src/lib/prog_ops.c
+++ b/src/lib/prog_ops.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <program_loading.h>
diff --git a/src/lib/program.ld b/src/lib/program.ld
index 4c24231..3339987 100644
--- a/src/lib/program.ld
+++ b/src/lib/program.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/lib/reg_script.c b/src/lib/reg_script.c
index 4cc1ab0..346fa68 100644
--- a/src/lib/reg_script.c
+++ b/src/lib/reg_script.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index c17c7a5..afd13b9 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <assert.h>
 #include <cbmem.h>
diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c
index 94a75be..6bb7601 100644
--- a/src/lib/selfboot.c
+++ b/src/lib/selfboot.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/lib/thread.c b/src/lib/thread.c
index 036c5ec..6b537eb 100644
--- a/src/lib/thread.c
+++ b/src/lib/thread.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/lib/timer.c b/src/lib/timer.c
index df4af7d..70871ec 100644
--- a/src/lib/timer.c
+++ b/src/lib/timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/lib/timer_queue.c b/src/lib/timer_queue.c
index c141bf2..8befa2b 100644
--- a/src/lib/timer_queue.c
+++ b/src/lib/timer_queue.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stddef.h>
 #include <timer.h>
diff --git a/src/lib/timestamp.c b/src/lib/timestamp.c
index 21b3d29..8d54a56 100644
--- a/src/lib/timestamp.c
+++ b/src/lib/timestamp.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/lib/trace.c b/src/lib/trace.c
index 899842c..d2b60e1 100644
--- a/src/lib/trace.c
+++ b/src/lib/trace.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/a-trend/Kconfig b/src/mainboard/a-trend/Kconfig
index ed28db0..bb10086 100644
--- a/src/mainboard/a-trend/Kconfig
+++ b/src/mainboard/a-trend/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_A_TREND
 
diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig
index a0dbfec..a8d6f74 100644
--- a/src/mainboard/a-trend/atc-6220/Kconfig
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_A_TREND_ATC_6220
 
diff --git a/src/mainboard/a-trend/atc-6220/irq_tables.c b/src/mainboard/a-trend/atc-6220/irq_tables.c
index 35689b0..0390bc4 100644
--- a/src/mainboard/a-trend/atc-6220/irq_tables.c
+++ b/src/mainboard/a-trend/atc-6220/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/a-trend/atc-6220/romstage.c b/src/mainboard/a-trend/atc-6220/romstage.c
index 58cb40a..a4fcdfa 100644
--- a/src/mainboard/a-trend/atc-6220/romstage.c
+++ b/src/mainboard/a-trend/atc-6220/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig
index 2a734db..55f2693 100644
--- a/src/mainboard/a-trend/atc-6240/Kconfig
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_A_TREND_ATC_6240
 
diff --git a/src/mainboard/a-trend/atc-6240/irq_tables.c b/src/mainboard/a-trend/atc-6240/irq_tables.c
index 9457c02..7c2d40e 100644
--- a/src/mainboard/a-trend/atc-6240/irq_tables.c
+++ b/src/mainboard/a-trend/atc-6240/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/a-trend/atc-6240/romstage.c b/src/mainboard/a-trend/atc-6240/romstage.c
index 8d523b8..6ff0517 100644
--- a/src/mainboard/a-trend/atc-6240/romstage.c
+++ b/src/mainboard/a-trend/atc-6240/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c b/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c
index 4c81624..220a3b0 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c
+++ b/src/mainboard/aaeon/pfm-540i_revb/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on irq_tables.c from AMD's DB800 mainboard. */
diff --git a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
index 3df9cfa..c5bd2af 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
+++ b/src/mainboard/aaeon/pfm-540i_revb/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/aaeon/pfm-540i_revb/romstage.c b/src/mainboard/aaeon/pfm-540i_revb/romstage.c
index 47dcafb..0bb8ab8 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/romstage.c
+++ b/src/mainboard/aaeon/pfm-540i_revb/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on romstage.c from AMD's DB800 mainboard. */
diff --git a/src/mainboard/abit/Kconfig b/src/mainboard/abit/Kconfig
index c89c1cd..9aa9ea8 100644
--- a/src/mainboard/abit/Kconfig
+++ b/src/mainboard/abit/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_ABIT
 
diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig
index 051829c..0f7e3d7 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Kconfig
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ABIT_BE6_II_V2_0
 
diff --git a/src/mainboard/abit/be6-ii_v2_0/irq_tables.c b/src/mainboard/abit/be6-ii_v2_0/irq_tables.c
index e7fe10c..c2e85d6 100644
--- a/src/mainboard/abit/be6-ii_v2_0/irq_tables.c
+++ b/src/mainboard/abit/be6-ii_v2_0/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/abit/be6-ii_v2_0/romstage.c b/src/mainboard/abit/be6-ii_v2_0/romstage.c
index 913cb90..660d97c 100644
--- a/src/mainboard/abit/be6-ii_v2_0/romstage.c
+++ b/src/mainboard/abit/be6-ii_v2_0/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/advansus/Kconfig b/src/mainboard/advansus/Kconfig
index 6285c53..8e86497 100644
--- a/src/mainboard/advansus/Kconfig
+++ b/src/mainboard/advansus/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_ADVANSUS
 
diff --git a/src/mainboard/advansus/a785e-i/acpi/cpstate.asl b/src/mainboard/advansus/a785e-i/acpi/cpstate.asl
index 55825f9..9d28c91 100644
--- a/src/mainboard/advansus/a785e-i/acpi/cpstate.asl
+++ b/src/mainboard/advansus/a785e-i/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/advansus/a785e-i/acpi/routing.asl b/src/mainboard/advansus/a785e-i/acpi/routing.asl
index d9af686..8a389aa 100644
--- a/src/mainboard/advansus/a785e-i/acpi/routing.asl
+++ b/src/mainboard/advansus/a785e-i/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/advansus/a785e-i/acpi/sata.asl b/src/mainboard/advansus/a785e-i/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/advansus/a785e-i/acpi/sata.asl
+++ b/src/mainboard/advansus/a785e-i/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/advansus/a785e-i/acpi/usb.asl b/src/mainboard/advansus/a785e-i/acpi/usb.asl
index 2640397..bb37132 100644
--- a/src/mainboard/advansus/a785e-i/acpi/usb.asl
+++ b/src/mainboard/advansus/a785e-i/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/advansus/a785e-i/acpi_tables.c b/src/mainboard/advansus/a785e-i/acpi_tables.c
index 4176037..d84b862 100644
--- a/src/mainboard/advansus/a785e-i/acpi_tables.c
+++ b/src/mainboard/advansus/a785e-i/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/advansus/a785e-i/dsdt.asl b/src/mainboard/advansus/a785e-i/dsdt.asl
index 61a0754..d261b09 100644
--- a/src/mainboard/advansus/a785e-i/dsdt.asl
+++ b/src/mainboard/advansus/a785e-i/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/advansus/a785e-i/get_bus_conf.c b/src/mainboard/advansus/a785e-i/get_bus_conf.c
index ed33c22..8591255 100644
--- a/src/mainboard/advansus/a785e-i/get_bus_conf.c
+++ b/src/mainboard/advansus/a785e-i/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/advansus/a785e-i/irq_tables.c b/src/mainboard/advansus/a785e-i/irq_tables.c
index dfb69cd..05e6349 100644
--- a/src/mainboard/advansus/a785e-i/irq_tables.c
+++ b/src/mainboard/advansus/a785e-i/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/advansus/a785e-i/mainboard.c b/src/mainboard/advansus/a785e-i/mainboard.c
index 9acb874..437bcee 100644
--- a/src/mainboard/advansus/a785e-i/mainboard.c
+++ b/src/mainboard/advansus/a785e-i/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/advansus/a785e-i/mb_sysconf.h b/src/mainboard/advansus/a785e-i/mb_sysconf.h
index 784ed48..e25cc02 100644
--- a/src/mainboard/advansus/a785e-i/mb_sysconf.h
+++ b/src/mainboard/advansus/a785e-i/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/advansus/a785e-i/mptable.c b/src/mainboard/advansus/a785e-i/mptable.c
index dfb0205..1fe26ac 100644
--- a/src/mainboard/advansus/a785e-i/mptable.c
+++ b/src/mainboard/advansus/a785e-i/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/advansus/a785e-i/platform_cfg.h b/src/mainboard/advansus/a785e-i/platform_cfg.h
index 9343ecd..59d9944 100644
--- a/src/mainboard/advansus/a785e-i/platform_cfg.h
+++ b/src/mainboard/advansus/a785e-i/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/advansus/a785e-i/resourcemap.c b/src/mainboard/advansus/a785e-i/resourcemap.c
index c03324e..b9058b5 100644
--- a/src/mainboard/advansus/a785e-i/resourcemap.c
+++ b/src/mainboard/advansus/a785e-i/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/advansus/a785e-i/romstage.c b/src/mainboard/advansus/a785e-i/romstage.c
index dfda22e..3807b88 100644
--- a/src/mainboard/advansus/a785e-i/romstage.c
+++ b/src/mainboard/advansus/a785e-i/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/amd/bettong/BiosCallOuts.c b/src/mainboard/amd/bettong/BiosCallOuts.c
index ad8dc40..a8d870b 100644
--- a/src/mainboard/amd/bettong/BiosCallOuts.c
+++ b/src/mainboard/amd/bettong/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/bettong/BiosCallOuts.h b/src/mainboard/amd/bettong/BiosCallOuts.h
index 88cd045..be91eee 100644
--- a/src/mainboard/amd/bettong/BiosCallOuts.h
+++ b/src/mainboard/amd/bettong/BiosCallOuts.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAN_INPUT_INTERNAL_DIODE	0
diff --git a/src/mainboard/amd/bettong/Kconfig b/src/mainboard/amd/bettong/Kconfig
index 1f2d888..b46165b 100644
--- a/src/mainboard/amd/bettong/Kconfig
+++ b/src/mainboard/amd/bettong/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_BETTONG
diff --git a/src/mainboard/amd/bettong/Makefile.inc b/src/mainboard/amd/bettong/Makefile.inc
index 70722ee..7cd4850 100644
--- a/src/mainboard/amd/bettong/Makefile.inc
+++ b/src/mainboard/amd/bettong/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += BiosCallOuts.c
diff --git a/src/mainboard/amd/bettong/PlatformGnbPcie.c b/src/mainboard/amd/bettong/PlatformGnbPcie.c
index 16ac427..cf6bdb9 100644
--- a/src/mainboard/amd/bettong/PlatformGnbPcie.c
+++ b/src/mainboard/amd/bettong/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/pi/agesawrapper.h>
diff --git a/src/mainboard/amd/bettong/acpi/AmdImc.asl b/src/mainboard/amd/bettong/acpi/AmdImc.asl
index 044bbdd..60bd90c 100644
--- a/src/mainboard/amd/bettong/acpi/AmdImc.asl
+++ b/src/mainboard/amd/bettong/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/amd/bettong/acpi/gpe.asl b/src/mainboard/amd/bettong/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/amd/bettong/acpi/gpe.asl
+++ b/src/mainboard/amd/bettong/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/bettong/acpi/mainboard.asl b/src/mainboard/amd/bettong/acpi/mainboard.asl
index 8ff721b..060dbba 100644
--- a/src/mainboard/amd/bettong/acpi/mainboard.asl
+++ b/src/mainboard/amd/bettong/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/amd/bettong/acpi/routing.asl b/src/mainboard/amd/bettong/acpi/routing.asl
index 3cfdb79..4cb1de0 100644
--- a/src/mainboard/amd/bettong/acpi/routing.asl
+++ b/src/mainboard/amd/bettong/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/bettong/acpi/sleep.asl b/src/mainboard/amd/bettong/acpi/sleep.asl
index 3f658f6..d99826d 100644
--- a/src/mainboard/amd/bettong/acpi/sleep.asl
+++ b/src/mainboard/amd/bettong/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/bettong/acpi/usb_oc.asl b/src/mainboard/amd/bettong/acpi/usb_oc.asl
index 19d4163..0de0bef 100644
--- a/src/mainboard/amd/bettong/acpi/usb_oc.asl
+++ b/src/mainboard/amd/bettong/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/bettong/acpi_tables.c b/src/mainboard/amd/bettong/acpi_tables.c
index 1c7292a..01318f9 100644
--- a/src/mainboard/amd/bettong/acpi_tables.c
+++ b/src/mainboard/amd/bettong/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/pi/agesawrapper.h>
diff --git a/src/mainboard/amd/bettong/cmos.layout b/src/mainboard/amd/bettong/cmos.layout
index 615ab08..e9cdadb 100644
--- a/src/mainboard/amd/bettong/cmos.layout
+++ b/src/mainboard/amd/bettong/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/bettong/devicetree.cb b/src/mainboard/amd/bettong/devicetree.cb
index 41a5655..426a621 100644
--- a/src/mainboard/amd/bettong/devicetree.cb
+++ b/src/mainboard/amd/bettong/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/pi/00660F01/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/amd/bettong/dsdt.asl b/src/mainboard/amd/bettong/dsdt.asl
index 5e0febb..1c834c6 100644
--- a/src/mainboard/amd/bettong/dsdt.asl
+++ b/src/mainboard/amd/bettong/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/bettong/fchec.c b/src/mainboard/amd/bettong/fchec.c
index 3458f9b..69e4b62 100644
--- a/src/mainboard/amd/bettong/fchec.c
+++ b/src/mainboard/amd/bettong/fchec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "fchec.h"
diff --git a/src/mainboard/amd/bettong/fchec.h b/src/mainboard/amd/bettong/fchec.h
index 13305d8..95bf6a1 100644
--- a/src/mainboard/amd/bettong/fchec.h
+++ b/src/mainboard/amd/bettong/fchec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_BETTONG_FCHEC
diff --git a/src/mainboard/amd/bettong/irq_tables.c b/src/mainboard/amd/bettong/irq_tables.c
index f78042a..67cec80 100644
--- a/src/mainboard/amd/bettong/irq_tables.c
+++ b/src/mainboard/amd/bettong/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bettong/mainboard.c b/src/mainboard/amd/bettong/mainboard.c
index 6212665..d46fb51 100644
--- a/src/mainboard/amd/bettong/mainboard.c
+++ b/src/mainboard/amd/bettong/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bettong/mptable.c b/src/mainboard/amd/bettong/mptable.c
index ede8f7a..4e4ff7c 100644
--- a/src/mainboard/amd/bettong/mptable.c
+++ b/src/mainboard/amd/bettong/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bettong/romstage.c b/src/mainboard/amd/bettong/romstage.c
index a8a2777..b4acc6b 100644
--- a/src/mainboard/amd/bettong/romstage.c
+++ b/src/mainboard/amd/bettong/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl b/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl
+++ b/src/mainboard/amd/bimini_fam10/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/amd/bimini_fam10/acpi/ide.asl b/src/mainboard/amd/bimini_fam10/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/amd/bimini_fam10/acpi/ide.asl
+++ b/src/mainboard/amd/bimini_fam10/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/bimini_fam10/acpi/routing.asl b/src/mainboard/amd/bimini_fam10/acpi/routing.asl
index 65f5751..55cd59f 100644
--- a/src/mainboard/amd/bimini_fam10/acpi/routing.asl
+++ b/src/mainboard/amd/bimini_fam10/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/bimini_fam10/acpi/sata.asl b/src/mainboard/amd/bimini_fam10/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/amd/bimini_fam10/acpi/sata.asl
+++ b/src/mainboard/amd/bimini_fam10/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/bimini_fam10/acpi/usb.asl b/src/mainboard/amd/bimini_fam10/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/amd/bimini_fam10/acpi/usb.asl
+++ b/src/mainboard/amd/bimini_fam10/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/bimini_fam10/acpi_tables.c b/src/mainboard/amd/bimini_fam10/acpi_tables.c
index 39fc3a9..8c9db27 100644
--- a/src/mainboard/amd/bimini_fam10/acpi_tables.c
+++ b/src/mainboard/amd/bimini_fam10/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bimini_fam10/dsdt.asl b/src/mainboard/amd/bimini_fam10/dsdt.asl
index 6172a60..2f3bb79 100644
--- a/src/mainboard/amd/bimini_fam10/dsdt.asl
+++ b/src/mainboard/amd/bimini_fam10/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/bimini_fam10/get_bus_conf.c b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
index 4a4cbbd..54a7129 100644
--- a/src/mainboard/amd/bimini_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/bimini_fam10/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bimini_fam10/irq_tables.c b/src/mainboard/amd/bimini_fam10/irq_tables.c
index 0fc16b1..bdb8773 100644
--- a/src/mainboard/amd/bimini_fam10/irq_tables.c
+++ b/src/mainboard/amd/bimini_fam10/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bimini_fam10/mainboard.c b/src/mainboard/amd/bimini_fam10/mainboard.c
index 148480d..6413ce5 100644
--- a/src/mainboard/amd/bimini_fam10/mainboard.c
+++ b/src/mainboard/amd/bimini_fam10/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bimini_fam10/mb_sysconf.h b/src/mainboard/amd/bimini_fam10/mb_sysconf.h
index 950d5fe..41d3325 100644
--- a/src/mainboard/amd/bimini_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/bimini_fam10/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/amd/bimini_fam10/mptable.c b/src/mainboard/amd/bimini_fam10/mptable.c
index 6b7694f..48f83bc 100644
--- a/src/mainboard/amd/bimini_fam10/mptable.c
+++ b/src/mainboard/amd/bimini_fam10/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/bimini_fam10/resourcemap.c b/src/mainboard/amd/bimini_fam10/resourcemap.c
index 3476ee8..25bb529 100644
--- a/src/mainboard/amd/bimini_fam10/resourcemap.c
+++ b/src/mainboard/amd/bimini_fam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/amd/bimini_fam10/romstage.c b/src/mainboard/amd/bimini_fam10/romstage.c
index 9e2e904..5e829b4 100644
--- a/src/mainboard/amd/bimini_fam10/romstage.c
+++ b/src/mainboard/amd/bimini_fam10/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/amd/db800/irq_tables.c b/src/mainboard/amd/db800/irq_tables.c
index 24b809f..ecb5a6c 100644
--- a/src/mainboard/amd/db800/irq_tables.c
+++ b/src/mainboard/amd/db800/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/db800/mainboard.c b/src/mainboard/amd/db800/mainboard.c
index d353360..9a2154c 100644
--- a/src/mainboard/amd/db800/mainboard.c
+++ b/src/mainboard/amd/db800/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/db800/romstage.c b/src/mainboard/amd/db800/romstage.c
index 4f44415..bb5c4cf 100644
--- a/src/mainboard/amd/db800/romstage.c
+++ b/src/mainboard/amd/db800/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/dbm690t/acpi/ide.asl b/src/mainboard/amd/dbm690t/acpi/ide.asl
index d84fc2e..13aeede 100644
--- a/src/mainboard/amd/dbm690t/acpi/ide.asl
+++ b/src/mainboard/amd/dbm690t/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/dbm690t/acpi/routing.asl b/src/mainboard/amd/dbm690t/acpi/routing.asl
index 3e4c63a..7503c22 100644
--- a/src/mainboard/amd/dbm690t/acpi/routing.asl
+++ b/src/mainboard/amd/dbm690t/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/dbm690t/acpi/sata.asl b/src/mainboard/amd/dbm690t/acpi/sata.asl
index ea8e4f5..0235ef0 100644
--- a/src/mainboard/amd/dbm690t/acpi/sata.asl
+++ b/src/mainboard/amd/dbm690t/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/dbm690t/acpi/usb.asl b/src/mainboard/amd/dbm690t/acpi/usb.asl
index fd39183..707aa2e 100644
--- a/src/mainboard/amd/dbm690t/acpi/usb.asl
+++ b/src/mainboard/amd/dbm690t/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index 8c9b268..5395178 100644
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/dbm690t/cmos.layout b/src/mainboard/amd/dbm690t/cmos.layout
index 6da2266..d338a10 100644
--- a/src/mainboard/amd/dbm690t/cmos.layout
+++ b/src/mainboard/amd/dbm690t/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/amd/dbm690t/dsdt.asl b/src/mainboard/amd/dbm690t/dsdt.asl
index f873afb..e143e71 100644
--- a/src/mainboard/amd/dbm690t/dsdt.asl
+++ b/src/mainboard/amd/dbm690t/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/dbm690t/fadt.c b/src/mainboard/amd/dbm690t/fadt.c
index 2a2d710..d91f818 100644
--- a/src/mainboard/amd/dbm690t/fadt.c
+++ b/src/mainboard/amd/dbm690t/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/dbm690t/get_bus_conf.c b/src/mainboard/amd/dbm690t/get_bus_conf.c
index d35083c..6545b7d 100644
--- a/src/mainboard/amd/dbm690t/get_bus_conf.c
+++ b/src/mainboard/amd/dbm690t/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/dbm690t/irq_tables.c b/src/mainboard/amd/dbm690t/irq_tables.c
index f2c21fe..3d65966 100644
--- a/src/mainboard/amd/dbm690t/irq_tables.c
+++ b/src/mainboard/amd/dbm690t/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/amd/dbm690t/mainboard.c b/src/mainboard/amd/dbm690t/mainboard.c
index 5b65c2d..9d3656e 100644
--- a/src/mainboard/amd/dbm690t/mainboard.c
+++ b/src/mainboard/amd/dbm690t/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/dbm690t/mptable.c b/src/mainboard/amd/dbm690t/mptable.c
index b1f6df8..2f71ca2 100644
--- a/src/mainboard/amd/dbm690t/mptable.c
+++ b/src/mainboard/amd/dbm690t/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/dbm690t/resourcemap.c b/src/mainboard/amd/dbm690t/resourcemap.c
index b8df2ae..e5c6b695 100644
--- a/src/mainboard/amd/dbm690t/resourcemap.c
+++ b/src/mainboard/amd/dbm690t/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_dbm690t_resource_map(void)
diff --git a/src/mainboard/amd/dbm690t/romstage.c b/src/mainboard/amd/dbm690t/romstage.c
index 1f77afa..95dd298 100644
--- a/src/mainboard/amd/dbm690t/romstage.c
+++ b/src/mainboard/amd/dbm690t/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/dinar/BiosCallOuts.c b/src/mainboard/amd/dinar/BiosCallOuts.c
index 2f522e7..7c2718e 100644
--- a/src/mainboard/amd/dinar/BiosCallOuts.c
+++ b/src/mainboard/amd/dinar/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig
index 8bfe346..0a18e14 100644
--- a/src/mainboard/amd/dinar/Kconfig
+++ b/src/mainboard/amd/dinar/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_DINAR
diff --git a/src/mainboard/amd/dinar/Makefile.inc b/src/mainboard/amd/dinar/Makefile.inc
index 1f47830..2c7d43b 100644
--- a/src/mainboard/amd/dinar/Makefile.inc
+++ b/src/mainboard/amd/dinar/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/amd/dinar/OptionsIds.h b/src/mainboard/amd/dinar/OptionsIds.h
index e4d0bb9..d87fa6c 100644
--- a/src/mainboard/amd/dinar/OptionsIds.h
+++ b/src/mainboard/amd/dinar/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/dinar/acpi/ide.asl b/src/mainboard/amd/dinar/acpi/ide.asl
index 4715da7..953b11d 100644
--- a/src/mainboard/amd/dinar/acpi/ide.asl
+++ b/src/mainboard/amd/dinar/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/dinar/acpi/routing.asl b/src/mainboard/amd/dinar/acpi/routing.asl
index 5bb05c3..1a72c21 100644
--- a/src/mainboard/amd/dinar/acpi/routing.asl
+++ b/src/mainboard/amd/dinar/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/dinar/acpi/sata.asl b/src/mainboard/amd/dinar/acpi/sata.asl
index bc867a1..5687010 100644
--- a/src/mainboard/amd/dinar/acpi/sata.asl
+++ b/src/mainboard/amd/dinar/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c
index db54093..37d8f3c 100644
--- a/src/mainboard/amd/dinar/acpi_tables.c
+++ b/src/mainboard/amd/dinar/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/dinar/buildOpts.c b/src/mainboard/amd/dinar/buildOpts.c
index c55a8a0..05282ca 100644
--- a/src/mainboard/amd/dinar/buildOpts.c
+++ b/src/mainboard/amd/dinar/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/dinar/cmos.layout b/src/mainboard/amd/dinar/cmos.layout
index 30754e0..a71a23b 100644
--- a/src/mainboard/amd/dinar/cmos.layout
+++ b/src/mainboard/amd/dinar/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/dinar/devicetree.cb b/src/mainboard/amd/dinar/devicetree.cb
index f895d01..601e464 100644
--- a/src/mainboard/amd/dinar/devicetree.cb
+++ b/src/mainboard/amd/dinar/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 chip northbridge/amd/agesa/family15/root_complex
diff --git a/src/mainboard/amd/dinar/dsdt.asl b/src/mainboard/amd/dinar/dsdt.asl
index e7ca493..2603602 100644
--- a/src/mainboard/amd/dinar/dsdt.asl
+++ b/src/mainboard/amd/dinar/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/dinar/fadt.c b/src/mainboard/amd/dinar/fadt.c
index 5137964..8b602dd 100644
--- a/src/mainboard/amd/dinar/fadt.c
+++ b/src/mainboard/amd/dinar/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/dinar/gpio.c b/src/mainboard/amd/dinar/gpio.c
index 4320c4f..ff5a4e0 100644
--- a/src/mainboard/amd/dinar/gpio.c
+++ b/src/mainboard/amd/dinar/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "Filecode.h"
diff --git a/src/mainboard/amd/dinar/gpio.h b/src/mainboard/amd/dinar/gpio.h
index f0c87a3..5f82f96 100644
--- a/src/mainboard/amd/dinar/gpio.h
+++ b/src/mainboard/amd/dinar/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _GPIO_H_
diff --git a/src/mainboard/amd/dinar/irq_tables.c b/src/mainboard/amd/dinar/irq_tables.c
index 00a05e4..ee4f313 100644
--- a/src/mainboard/amd/dinar/irq_tables.c
+++ b/src/mainboard/amd/dinar/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/dinar/mainboard.c b/src/mainboard/amd/dinar/mainboard.c
index b8a8ccd..31f3f60 100644
--- a/src/mainboard/amd/dinar/mainboard.c
+++ b/src/mainboard/amd/dinar/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index 172c497..f4fe27e 100644
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/dinar/platform_cfg.h b/src/mainboard/amd/dinar/platform_cfg.h
index 14a50e8..38aa455 100644
--- a/src/mainboard/amd/dinar/platform_cfg.h
+++ b/src/mainboard/amd/dinar/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_CFG_H_
diff --git a/src/mainboard/amd/dinar/rd890_cfg.c b/src/mainboard/amd/dinar/rd890_cfg.c
index c90f9f0..4b5636d 100644
--- a/src/mainboard/amd/dinar/rd890_cfg.c
+++ b/src/mainboard/amd/dinar/rd890_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "NbPlatform.h"
diff --git a/src/mainboard/amd/dinar/rd890_cfg.h b/src/mainboard/amd/dinar/rd890_cfg.h
index 32a5c5f..1299041 100644
--- a/src/mainboard/amd/dinar/rd890_cfg.h
+++ b/src/mainboard/amd/dinar/rd890_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef  _RD890_CFG_H_
diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c
index 09ca682..5b8d632 100644
--- a/src/mainboard/amd/dinar/romstage.c
+++ b/src/mainboard/amd/dinar/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/dinar/sb700_cfg.c b/src/mainboard/amd/dinar/sb700_cfg.c
index 53e93ce..35c3dac 100644
--- a/src/mainboard/amd/dinar/sb700_cfg.c
+++ b/src/mainboard/amd/dinar/sb700_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/dinar/sb700_cfg.h b/src/mainboard/amd/dinar/sb700_cfg.h
index 5b0c6f9..b613c7f 100644
--- a/src/mainboard/amd/dinar/sb700_cfg.h
+++ b/src/mainboard/amd/dinar/sb700_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/inagua/BiosCallOuts.c b/src/mainboard/amd/inagua/BiosCallOuts.c
index 5367257..5394210 100644
--- a/src/mainboard/amd/inagua/BiosCallOuts.c
+++ b/src/mainboard/amd/inagua/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index d2bf5d0..67eef03 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_INAGUA
diff --git a/src/mainboard/amd/inagua/Makefile.inc b/src/mainboard/amd/inagua/Makefile.inc
index 6704f19..361d3d1 100644
--- a/src/mainboard/amd/inagua/Makefile.inc
+++ b/src/mainboard/amd/inagua/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/amd/inagua/OptionsIds.h b/src/mainboard/amd/inagua/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/amd/inagua/OptionsIds.h
+++ b/src/mainboard/amd/inagua/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/inagua/PlatformGnbPcie.c b/src/mainboard/amd/inagua/PlatformGnbPcie.c
index b84418d..4179a60 100644
--- a/src/mainboard/amd/inagua/PlatformGnbPcie.c
+++ b/src/mainboard/amd/inagua/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "PlatformGnbPcieComplex.h"
diff --git a/src/mainboard/amd/inagua/PlatformGnbPcieComplex.h b/src/mainboard/amd/inagua/PlatformGnbPcieComplex.h
index 183542c..6ebc7b8 100644
--- a/src/mainboard/amd/inagua/PlatformGnbPcieComplex.h
+++ b/src/mainboard/amd/inagua/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/amd/inagua/acpi/gpe.asl b/src/mainboard/amd/inagua/acpi/gpe.asl
index 998b9fa..f8cb779 100644
--- a/src/mainboard/amd/inagua/acpi/gpe.asl
+++ b/src/mainboard/amd/inagua/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/inagua/acpi/ide.asl b/src/mainboard/amd/inagua/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/amd/inagua/acpi/ide.asl
+++ b/src/mainboard/amd/inagua/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/inagua/acpi/mainboard.asl b/src/mainboard/amd/inagua/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/amd/inagua/acpi/mainboard.asl
+++ b/src/mainboard/amd/inagua/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/inagua/acpi/routing.asl b/src/mainboard/amd/inagua/acpi/routing.asl
index d608eac..660d97d 100644
--- a/src/mainboard/amd/inagua/acpi/routing.asl
+++ b/src/mainboard/amd/inagua/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/inagua/acpi/sata.asl b/src/mainboard/amd/inagua/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/amd/inagua/acpi/sata.asl
+++ b/src/mainboard/amd/inagua/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/inagua/acpi/sleep.asl b/src/mainboard/amd/inagua/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/amd/inagua/acpi/sleep.asl
+++ b/src/mainboard/amd/inagua/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/inagua/acpi/superio.asl b/src/mainboard/amd/inagua/acpi/superio.asl
index 3a0ab10..1384d2f 100644
--- a/src/mainboard/amd/inagua/acpi/superio.asl
+++ b/src/mainboard/amd/inagua/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SuperIO device or functionality yet */
diff --git a/src/mainboard/amd/inagua/acpi/usb_oc.asl b/src/mainboard/amd/inagua/acpi/usb_oc.asl
index e1d01de..e6f709b 100644
--- a/src/mainboard/amd/inagua/acpi/usb_oc.asl
+++ b/src/mainboard/amd/inagua/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/inagua/acpi_tables.c b/src/mainboard/amd/inagua/acpi_tables.c
index 73d9556..4d2e29a 100644
--- a/src/mainboard/amd/inagua/acpi_tables.c
+++ b/src/mainboard/amd/inagua/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/inagua/broadcom.c b/src/mainboard/amd/inagua/broadcom.c
index ae40d74..36b4b89 100644
--- a/src/mainboard/amd/inagua/broadcom.c
+++ b/src/mainboard/amd/inagua/broadcom.c
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/amd/inagua/buildOpts.c b/src/mainboard/amd/inagua/buildOpts.c
index 9dfc3c7..e6d514c 100644
--- a/src/mainboard/amd/inagua/buildOpts.c
+++ b/src/mainboard/amd/inagua/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/inagua/cmos.layout b/src/mainboard/amd/inagua/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/amd/inagua/cmos.layout
+++ b/src/mainboard/amd/inagua/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb
index 619d004..d652e62 100644
--- a/src/mainboard/amd/inagua/devicetree.cb
+++ b/src/mainboard/amd/inagua/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/amd/inagua/dsdt.asl b/src/mainboard/amd/inagua/dsdt.asl
index faaa288..40b8fe1 100644
--- a/src/mainboard/amd/inagua/dsdt.asl
+++ b/src/mainboard/amd/inagua/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/inagua/irq_tables.c b/src/mainboard/amd/inagua/irq_tables.c
index 8a4f4e0..9a2db9c 100644
--- a/src/mainboard/amd/inagua/irq_tables.c
+++ b/src/mainboard/amd/inagua/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/inagua/mainboard.c b/src/mainboard/amd/inagua/mainboard.c
index c6d9c32..f0a8c3b 100644
--- a/src/mainboard/amd/inagua/mainboard.c
+++ b/src/mainboard/amd/inagua/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c
index 8051fb2..dd0db2b 100644
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/inagua/platform_cfg.h b/src/mainboard/amd/inagua/platform_cfg.h
index 82c0afe..8b41886 100644
--- a/src/mainboard/amd/inagua/platform_cfg.h
+++ b/src/mainboard/amd/inagua/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/inagua/romstage.c b/src/mainboard/amd/inagua/romstage.c
index ceff8af..b9984c8 100644
--- a/src/mainboard/amd/inagua/romstage.c
+++ b/src/mainboard/amd/inagua/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/mainboard/amd/lamar/BiosCallOuts.c b/src/mainboard/amd/lamar/BiosCallOuts.c
index 24689d2..8f93474 100644
--- a/src/mainboard/amd/lamar/BiosCallOuts.c
+++ b/src/mainboard/amd/lamar/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/lamar/Kconfig b/src/mainboard/amd/lamar/Kconfig
index 406b78f..6b03bb4 100644
--- a/src/mainboard/amd/lamar/Kconfig
+++ b/src/mainboard/amd/lamar/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_LAMAR
diff --git a/src/mainboard/amd/lamar/Makefile.inc b/src/mainboard/amd/lamar/Makefile.inc
index 37ae8e3..9bc1ff9 100644
--- a/src/mainboard/amd/lamar/Makefile.inc
+++ b/src/mainboard/amd/lamar/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += BiosCallOuts.c
diff --git a/src/mainboard/amd/lamar/PlatformGnbPcie.c b/src/mainboard/amd/lamar/PlatformGnbPcie.c
index fd45908..88a5c43 100644
--- a/src/mainboard/amd/lamar/PlatformGnbPcie.c
+++ b/src/mainboard/amd/lamar/PlatformGnbPcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/pi/agesawrapper.h>
diff --git a/src/mainboard/amd/lamar/acpi/AmdImc.asl b/src/mainboard/amd/lamar/acpi/AmdImc.asl
index 927a7b0..e0ea30b 100644
--- a/src/mainboard/amd/lamar/acpi/AmdImc.asl
+++ b/src/mainboard/amd/lamar/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
diff --git a/src/mainboard/amd/lamar/acpi/gpe.asl b/src/mainboard/amd/lamar/acpi/gpe.asl
index 8c2ec6c..5d39490 100644
--- a/src/mainboard/amd/lamar/acpi/gpe.asl
+++ b/src/mainboard/amd/lamar/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/lamar/acpi/mainboard.asl b/src/mainboard/amd/lamar/acpi/mainboard.asl
index 3004d9f..d50e1ea 100644
--- a/src/mainboard/amd/lamar/acpi/mainboard.asl
+++ b/src/mainboard/amd/lamar/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/lamar/acpi/routing.asl b/src/mainboard/amd/lamar/acpi/routing.asl
index b6da1f5..794335a 100644
--- a/src/mainboard/amd/lamar/acpi/routing.asl
+++ b/src/mainboard/amd/lamar/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Routing is in System Bus scope */
diff --git a/src/mainboard/amd/lamar/acpi/si.asl b/src/mainboard/amd/lamar/acpi/si.asl
index de94071..6a70d5d 100644
--- a/src/mainboard/amd/lamar/acpi/si.asl
+++ b/src/mainboard/amd/lamar/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Scope(\_SI) {
 		Method(_SST, 1) {
diff --git a/src/mainboard/amd/lamar/acpi/sleep.asl b/src/mainboard/amd/lamar/acpi/sleep.asl
index c886463..fd489ba 100644
--- a/src/mainboard/amd/lamar/acpi/sleep.asl
+++ b/src/mainboard/amd/lamar/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/lamar/acpi/usb_oc.asl b/src/mainboard/amd/lamar/acpi/usb_oc.asl
index 34f9810..3083dc1 100644
--- a/src/mainboard/amd/lamar/acpi/usb_oc.asl
+++ b/src/mainboard/amd/lamar/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* USB overcurrent mapping pins.   */
diff --git a/src/mainboard/amd/lamar/acpi_tables.c b/src/mainboard/amd/lamar/acpi_tables.c
index c78eb89..f582028 100644
--- a/src/mainboard/amd/lamar/acpi_tables.c
+++ b/src/mainboard/amd/lamar/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/pi/agesawrapper.h>
diff --git a/src/mainboard/amd/lamar/cmos.layout b/src/mainboard/amd/lamar/cmos.layout
index 8058a1f..fa79e83 100644
--- a/src/mainboard/amd/lamar/cmos.layout
+++ b/src/mainboard/amd/lamar/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/lamar/devicetree.cb b/src/mainboard/amd/lamar/devicetree.cb
index 9e3564e..a4b9804 100644
--- a/src/mainboard/amd/lamar/devicetree.cb
+++ b/src/mainboard/amd/lamar/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/pi/00630F01/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/amd/lamar/dsdt.asl b/src/mainboard/amd/lamar/dsdt.asl
index 8443c1a..298fb3a 100644
--- a/src/mainboard/amd/lamar/dsdt.asl
+++ b/src/mainboard/amd/lamar/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/lamar/irq_tables.c b/src/mainboard/amd/lamar/irq_tables.c
index 8728dde..96f504e 100644
--- a/src/mainboard/amd/lamar/irq_tables.c
+++ b/src/mainboard/amd/lamar/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/lamar/mainboard.c b/src/mainboard/amd/lamar/mainboard.c
index 050ac64..6f8ca72 100644
--- a/src/mainboard/amd/lamar/mainboard.c
+++ b/src/mainboard/amd/lamar/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/lamar/mptable.c b/src/mainboard/amd/lamar/mptable.c
index fbd49ec..073a032 100644
--- a/src/mainboard/amd/lamar/mptable.c
+++ b/src/mainboard/amd/lamar/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/lamar/romstage.c b/src/mainboard/amd/lamar/romstage.c
index a32ec7d..8165e31 100644
--- a/src/mainboard/amd/lamar/romstage.c
+++ b/src/mainboard/amd/lamar/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/mahogany/acpi/ide.asl b/src/mainboard/amd/mahogany/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/amd/mahogany/acpi/ide.asl
+++ b/src/mainboard/amd/mahogany/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/mahogany/acpi/routing.asl b/src/mainboard/amd/mahogany/acpi/routing.asl
index 09c8fac..66d0057 100644
--- a/src/mainboard/amd/mahogany/acpi/routing.asl
+++ b/src/mainboard/amd/mahogany/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/mahogany/acpi/sata.asl b/src/mainboard/amd/mahogany/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/amd/mahogany/acpi/sata.asl
+++ b/src/mainboard/amd/mahogany/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/mahogany/acpi/usb.asl b/src/mainboard/amd/mahogany/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/amd/mahogany/acpi/usb.asl
+++ b/src/mainboard/amd/mahogany/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/mahogany/acpi_tables.c b/src/mainboard/amd/mahogany/acpi_tables.c
index 8a2c1d5..8fdfbe6 100644
--- a/src/mainboard/amd/mahogany/acpi_tables.c
+++ b/src/mainboard/amd/mahogany/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany/cmos.layout b/src/mainboard/amd/mahogany/cmos.layout
index 22d2679..125fc1f 100644
--- a/src/mainboard/amd/mahogany/cmos.layout
+++ b/src/mainboard/amd/mahogany/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl
index 2001560..13bbf54 100644
--- a/src/mainboard/amd/mahogany/dsdt.asl
+++ b/src/mainboard/amd/mahogany/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/mahogany/get_bus_conf.c b/src/mainboard/amd/mahogany/get_bus_conf.c
index ae96179..2413a8c 100644
--- a/src/mainboard/amd/mahogany/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany/irq_tables.c b/src/mainboard/amd/mahogany/irq_tables.c
index bed6170..e102081 100644
--- a/src/mainboard/amd/mahogany/irq_tables.c
+++ b/src/mainboard/amd/mahogany/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/amd/mahogany/mainboard.c b/src/mainboard/amd/mahogany/mainboard.c
index 56bf2c8..1787d34 100644
--- a/src/mainboard/amd/mahogany/mainboard.c
+++ b/src/mainboard/amd/mahogany/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany/mptable.c b/src/mainboard/amd/mahogany/mptable.c
index e6f47cb..73a3360 100644
--- a/src/mainboard/amd/mahogany/mptable.c
+++ b/src/mainboard/amd/mahogany/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/mahogany/resourcemap.c b/src/mainboard/amd/mahogany/resourcemap.c
index 37fe5ab..f5ca41b 100644
--- a/src/mainboard/amd/mahogany/resourcemap.c
+++ b/src/mainboard/amd/mahogany/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mahogany_resource_map(void)
diff --git a/src/mainboard/amd/mahogany/romstage.c b/src/mainboard/amd/mahogany/romstage.c
index 542ee60..cda78ce 100644
--- a/src/mainboard/amd/mahogany/romstage.c
+++ b/src/mainboard/amd/mahogany/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl b/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl
+++ b/src/mainboard/amd/mahogany_fam10/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/amd/mahogany_fam10/acpi/ide.asl b/src/mainboard/amd/mahogany_fam10/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi/ide.asl
+++ b/src/mainboard/amd/mahogany_fam10/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/mahogany_fam10/acpi/routing.asl b/src/mainboard/amd/mahogany_fam10/acpi/routing.asl
index be9ab74..e5a975e 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi/routing.asl
+++ b/src/mainboard/amd/mahogany_fam10/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/mahogany_fam10/acpi/sata.asl b/src/mainboard/amd/mahogany_fam10/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi/sata.asl
+++ b/src/mainboard/amd/mahogany_fam10/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/mahogany_fam10/acpi/usb.asl b/src/mainboard/amd/mahogany_fam10/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi/usb.asl
+++ b/src/mainboard/amd/mahogany_fam10/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/mahogany_fam10/acpi_tables.c b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
index e1f5590..da338b4 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl
index 330d3f8..9ee2ecf 100644
--- a/src/mainboard/amd/mahogany_fam10/dsdt.asl
+++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/mahogany_fam10/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany_fam10/irq_tables.c b/src/mainboard/amd/mahogany_fam10/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/amd/mahogany_fam10/irq_tables.c
+++ b/src/mainboard/amd/mahogany_fam10/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany_fam10/mainboard.c b/src/mainboard/amd/mahogany_fam10/mainboard.c
index ed164aa..fa91804 100644
--- a/src/mainboard/amd/mahogany_fam10/mainboard.c
+++ b/src/mainboard/amd/mahogany_fam10/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany_fam10/mb_sysconf.h b/src/mainboard/amd/mahogany_fam10/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/amd/mahogany_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/mahogany_fam10/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/mahogany_fam10/resourcemap.c b/src/mainboard/amd/mahogany_fam10/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/amd/mahogany_fam10/resourcemap.c
+++ b/src/mainboard/amd/mahogany_fam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index c01ccf0..a3056a0 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/amd/norwich/irq_tables.c b/src/mainboard/amd/norwich/irq_tables.c
index 11a8875..887cc2e 100644
--- a/src/mainboard/amd/norwich/irq_tables.c
+++ b/src/mainboard/amd/norwich/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/amd/norwich/mainboard.c b/src/mainboard/amd/norwich/mainboard.c
index 3e50375..b5c23e3 100644
--- a/src/mainboard/amd/norwich/mainboard.c
+++ b/src/mainboard/amd/norwich/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/norwich/romstage.c b/src/mainboard/amd/norwich/romstage.c
index ce34e8e..93632a1 100644
--- a/src/mainboard/amd/norwich/romstage.c
+++ b/src/mainboard/amd/norwich/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/olivehill/BiosCallOuts.c b/src/mainboard/amd/olivehill/BiosCallOuts.c
index ca0becc..edb43c1 100644
--- a/src/mainboard/amd/olivehill/BiosCallOuts.c
+++ b/src/mainboard/amd/olivehill/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index 50493e1..d0a3d77 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_OLIVEHILL
diff --git a/src/mainboard/amd/olivehill/Makefile.inc b/src/mainboard/amd/olivehill/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/amd/olivehill/Makefile.inc
+++ b/src/mainboard/amd/olivehill/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/amd/olivehill/OptionsIds.h b/src/mainboard/amd/olivehill/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/amd/olivehill/OptionsIds.h
+++ b/src/mainboard/amd/olivehill/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/olivehill/PlatformGnbPcie.c b/src/mainboard/amd/olivehill/PlatformGnbPcie.c
index 220528b..b44e9bc 100644
--- a/src/mainboard/amd/olivehill/PlatformGnbPcie.c
+++ b/src/mainboard/amd/olivehill/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/olivehill/acpi/AmdImc.asl b/src/mainboard/amd/olivehill/acpi/AmdImc.asl
index 88d3381..1996f04 100644
--- a/src/mainboard/amd/olivehill/acpi/AmdImc.asl
+++ b/src/mainboard/amd/olivehill/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/amd/olivehill/acpi/gpe.asl b/src/mainboard/amd/olivehill/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/amd/olivehill/acpi/gpe.asl
+++ b/src/mainboard/amd/olivehill/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/olivehill/acpi/ide.asl b/src/mainboard/amd/olivehill/acpi/ide.asl
index dfb4158..f8e323a 100644
--- a/src/mainboard/amd/olivehill/acpi/ide.asl
+++ b/src/mainboard/amd/olivehill/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No IDE functionality */
diff --git a/src/mainboard/amd/olivehill/acpi/mainboard.asl b/src/mainboard/amd/olivehill/acpi/mainboard.asl
index da4f11a..9e9ec0e 100644
--- a/src/mainboard/amd/olivehill/acpi/mainboard.asl
+++ b/src/mainboard/amd/olivehill/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/amd/olivehill/acpi/routing.asl b/src/mainboard/amd/olivehill/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/amd/olivehill/acpi/routing.asl
+++ b/src/mainboard/amd/olivehill/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/olivehill/acpi/sata.asl b/src/mainboard/amd/olivehill/acpi/sata.asl
index 9a96a9d..af1cff2 100644
--- a/src/mainboard/amd/olivehill/acpi/sata.asl
+++ b/src/mainboard/amd/olivehill/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/amd/olivehill/acpi/si.asl b/src/mainboard/amd/olivehill/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/amd/olivehill/acpi/si.asl
+++ b/src/mainboard/amd/olivehill/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/amd/olivehill/acpi/sleep.asl b/src/mainboard/amd/olivehill/acpi/sleep.asl
index 6a2cef9..f0986df 100644
--- a/src/mainboard/amd/olivehill/acpi/sleep.asl
+++ b/src/mainboard/amd/olivehill/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/olivehill/acpi/superio.asl b/src/mainboard/amd/olivehill/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/amd/olivehill/acpi/superio.asl
+++ b/src/mainboard/amd/olivehill/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/amd/olivehill/acpi/thermal.asl b/src/mainboard/amd/olivehill/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/amd/olivehill/acpi/thermal.asl
+++ b/src/mainboard/amd/olivehill/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/amd/olivehill/acpi/usb_oc.asl b/src/mainboard/amd/olivehill/acpi/usb_oc.asl
index 6ea7b17..7df6792 100644
--- a/src/mainboard/amd/olivehill/acpi/usb_oc.asl
+++ b/src/mainboard/amd/olivehill/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/olivehill/acpi_tables.c b/src/mainboard/amd/olivehill/acpi_tables.c
index 6c061e0..94e1df6 100644
--- a/src/mainboard/amd/olivehill/acpi_tables.c
+++ b/src/mainboard/amd/olivehill/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehill/buildOpts.c b/src/mainboard/amd/olivehill/buildOpts.c
index fefac7e..6b477f1 100644
--- a/src/mainboard/amd/olivehill/buildOpts.c
+++ b/src/mainboard/amd/olivehill/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/olivehill/cmos.layout b/src/mainboard/amd/olivehill/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/amd/olivehill/cmos.layout
+++ b/src/mainboard/amd/olivehill/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/olivehill/devicetree.cb b/src/mainboard/amd/olivehill/devicetree.cb
index 522efb8..1ce9009 100644
--- a/src/mainboard/amd/olivehill/devicetree.cb
+++ b/src/mainboard/amd/olivehill/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/amd/olivehill/dsdt.asl b/src/mainboard/amd/olivehill/dsdt.asl
index 3f1aa8b..6df107e 100644
--- a/src/mainboard/amd/olivehill/dsdt.asl
+++ b/src/mainboard/amd/olivehill/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/olivehill/irq_tables.c b/src/mainboard/amd/olivehill/irq_tables.c
index 33ce343..cb8248e 100644
--- a/src/mainboard/amd/olivehill/irq_tables.c
+++ b/src/mainboard/amd/olivehill/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehill/mainboard.c b/src/mainboard/amd/olivehill/mainboard.c
index fb33e0e..b12440d 100644
--- a/src/mainboard/amd/olivehill/mainboard.c
+++ b/src/mainboard/amd/olivehill/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index 974efba..47d2dbc 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c
index a2c7cc3..b6650c5 100644
--- a/src/mainboard/amd/olivehill/romstage.c
+++ b/src/mainboard/amd/olivehill/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/olivehillplus/BiosCallOuts.c b/src/mainboard/amd/olivehillplus/BiosCallOuts.c
index 62e2e09..8008f7b 100644
--- a/src/mainboard/amd/olivehillplus/BiosCallOuts.c
+++ b/src/mainboard/amd/olivehillplus/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/olivehillplus/Kconfig b/src/mainboard/amd/olivehillplus/Kconfig
index c9f73e9..15e397a 100644
--- a/src/mainboard/amd/olivehillplus/Kconfig
+++ b/src/mainboard/amd/olivehillplus/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_OLIVEHILLPLUS
diff --git a/src/mainboard/amd/olivehillplus/Makefile.inc b/src/mainboard/amd/olivehillplus/Makefile.inc
index 37ae8e3..9bc1ff9 100644
--- a/src/mainboard/amd/olivehillplus/Makefile.inc
+++ b/src/mainboard/amd/olivehillplus/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += BiosCallOuts.c
diff --git a/src/mainboard/amd/olivehillplus/PlatformGnbPcie.c b/src/mainboard/amd/olivehillplus/PlatformGnbPcie.c
index 46a20da..c2f37ff 100644
--- a/src/mainboard/amd/olivehillplus/PlatformGnbPcie.c
+++ b/src/mainboard/amd/olivehillplus/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/pi/agesawrapper.h>
diff --git a/src/mainboard/amd/olivehillplus/acpi/AmdImc.asl b/src/mainboard/amd/olivehillplus/acpi/AmdImc.asl
index 09e84f9..92d0437 100644
--- a/src/mainboard/amd/olivehillplus/acpi/AmdImc.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 OperationRegion(IMIO, SystemIO, 0x3E, 0x02)
diff --git a/src/mainboard/amd/olivehillplus/acpi/gpe.asl b/src/mainboard/amd/olivehillplus/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/amd/olivehillplus/acpi/gpe.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/olivehillplus/acpi/mainboard.asl b/src/mainboard/amd/olivehillplus/acpi/mainboard.asl
index da4f11a..9e9ec0e 100644
--- a/src/mainboard/amd/olivehillplus/acpi/mainboard.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/amd/olivehillplus/acpi/routing.asl b/src/mainboard/amd/olivehillplus/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/amd/olivehillplus/acpi/routing.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/olivehillplus/acpi/si.asl b/src/mainboard/amd/olivehillplus/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/amd/olivehillplus/acpi/si.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/amd/olivehillplus/acpi/sleep.asl b/src/mainboard/amd/olivehillplus/acpi/sleep.asl
index 7085e4b..7af335f 100644
--- a/src/mainboard/amd/olivehillplus/acpi/sleep.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl b/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl
index 3d90ba7..a755bcc 100644
--- a/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl
+++ b/src/mainboard/amd/olivehillplus/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/olivehillplus/acpi_tables.c b/src/mainboard/amd/olivehillplus/acpi_tables.c
index f5b27a2..cf30788 100644
--- a/src/mainboard/amd/olivehillplus/acpi_tables.c
+++ b/src/mainboard/amd/olivehillplus/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/pi/agesawrapper.h>
diff --git a/src/mainboard/amd/olivehillplus/cmos.layout b/src/mainboard/amd/olivehillplus/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/amd/olivehillplus/cmos.layout
+++ b/src/mainboard/amd/olivehillplus/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/olivehillplus/devicetree.cb b/src/mainboard/amd/olivehillplus/devicetree.cb
index 6ce5c59..a966a23 100644
--- a/src/mainboard/amd/olivehillplus/devicetree.cb
+++ b/src/mainboard/amd/olivehillplus/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/pi/00730F01/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/amd/olivehillplus/dsdt.asl b/src/mainboard/amd/olivehillplus/dsdt.asl
index 699dcb4..d526a3a 100644
--- a/src/mainboard/amd/olivehillplus/dsdt.asl
+++ b/src/mainboard/amd/olivehillplus/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/olivehillplus/irq_tables.c b/src/mainboard/amd/olivehillplus/irq_tables.c
index 33ce343..cb8248e 100644
--- a/src/mainboard/amd/olivehillplus/irq_tables.c
+++ b/src/mainboard/amd/olivehillplus/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehillplus/mainboard.c b/src/mainboard/amd/olivehillplus/mainboard.c
index eb8181f..bdf56cc 100644
--- a/src/mainboard/amd/olivehillplus/mainboard.c
+++ b/src/mainboard/amd/olivehillplus/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehillplus/mptable.c b/src/mainboard/amd/olivehillplus/mptable.c
index 81d302a..27c7bc6 100644
--- a/src/mainboard/amd/olivehillplus/mptable.c
+++ b/src/mainboard/amd/olivehillplus/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c
index 8cb362c..1281e63 100644
--- a/src/mainboard/amd/olivehillplus/romstage.c
+++ b/src/mainboard/amd/olivehillplus/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/parmer/BiosCallOuts.c b/src/mainboard/amd/parmer/BiosCallOuts.c
index 3b36d4e..e186622 100644
--- a/src/mainboard/amd/parmer/BiosCallOuts.c
+++ b/src/mainboard/amd/parmer/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index a7ad94c..e6e66d4 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_PARMER
diff --git a/src/mainboard/amd/parmer/Makefile.inc b/src/mainboard/amd/parmer/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/amd/parmer/Makefile.inc
+++ b/src/mainboard/amd/parmer/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/amd/parmer/OptionsIds.h b/src/mainboard/amd/parmer/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/amd/parmer/OptionsIds.h
+++ b/src/mainboard/amd/parmer/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/parmer/PlatformGnbPcie.c b/src/mainboard/amd/parmer/PlatformGnbPcie.c
index 003fc01..a6bc9aa 100644
--- a/src/mainboard/amd/parmer/PlatformGnbPcie.c
+++ b/src/mainboard/amd/parmer/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/parmer/acpi/gpe.asl b/src/mainboard/amd/parmer/acpi/gpe.asl
index b78947d..38722ca 100644
--- a/src/mainboard/amd/parmer/acpi/gpe.asl
+++ b/src/mainboard/amd/parmer/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/parmer/acpi/mainboard.asl b/src/mainboard/amd/parmer/acpi/mainboard.asl
index 2dd0d27..5cb97ca 100644
--- a/src/mainboard/amd/parmer/acpi/mainboard.asl
+++ b/src/mainboard/amd/parmer/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/parmer/acpi/routing.asl b/src/mainboard/amd/parmer/acpi/routing.asl
index 12c4666..744c6ff 100644
--- a/src/mainboard/amd/parmer/acpi/routing.asl
+++ b/src/mainboard/amd/parmer/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Routing is in System Bus scope */
diff --git a/src/mainboard/amd/parmer/acpi/sata.asl b/src/mainboard/amd/parmer/acpi/sata.asl
index bbd95d8..b09b369 100644
--- a/src/mainboard/amd/parmer/acpi/sata.asl
+++ b/src/mainboard/amd/parmer/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/amd/parmer/acpi/si.asl b/src/mainboard/amd/parmer/acpi/si.asl
index 28cf633..a12496a 100644
--- a/src/mainboard/amd/parmer/acpi/si.asl
+++ b/src/mainboard/amd/parmer/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Scope(\_SI) {
 		Method(_SST, 1) {
diff --git a/src/mainboard/amd/parmer/acpi/sleep.asl b/src/mainboard/amd/parmer/acpi/sleep.asl
index ef1dc5d..5d84bde 100644
--- a/src/mainboard/amd/parmer/acpi/sleep.asl
+++ b/src/mainboard/amd/parmer/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/parmer/acpi/superio.asl b/src/mainboard/amd/parmer/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/amd/parmer/acpi/superio.asl
+++ b/src/mainboard/amd/parmer/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/amd/parmer/acpi/thermal.asl b/src/mainboard/amd/parmer/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/amd/parmer/acpi/thermal.asl
+++ b/src/mainboard/amd/parmer/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/amd/parmer/acpi/usb_oc.asl b/src/mainboard/amd/parmer/acpi/usb_oc.asl
index 74691ad..6eee042 100644
--- a/src/mainboard/amd/parmer/acpi/usb_oc.asl
+++ b/src/mainboard/amd/parmer/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* USB overcurrent mapping pins.   */
diff --git a/src/mainboard/amd/parmer/acpi_tables.c b/src/mainboard/amd/parmer/acpi_tables.c
index 032342a..985ea16 100644
--- a/src/mainboard/amd/parmer/acpi_tables.c
+++ b/src/mainboard/amd/parmer/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/amd/parmer/buildOpts.c b/src/mainboard/amd/parmer/buildOpts.c
index 09629dd..4f22366 100644
--- a/src/mainboard/amd/parmer/buildOpts.c
+++ b/src/mainboard/amd/parmer/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/parmer/cmos.layout b/src/mainboard/amd/parmer/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/amd/parmer/cmos.layout
+++ b/src/mainboard/amd/parmer/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/parmer/devicetree.cb b/src/mainboard/amd/parmer/devicetree.cb
index d57611b..5f792a5 100644
--- a/src/mainboard/amd/parmer/devicetree.cb
+++ b/src/mainboard/amd/parmer/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15tn/root_complex
 
diff --git a/src/mainboard/amd/parmer/dsdt.asl b/src/mainboard/amd/parmer/dsdt.asl
index 449cc22..eccdae3 100644
--- a/src/mainboard/amd/parmer/dsdt.asl
+++ b/src/mainboard/amd/parmer/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/parmer/irq_tables.c b/src/mainboard/amd/parmer/irq_tables.c
index 8a18b3a..00c9bcc 100644
--- a/src/mainboard/amd/parmer/irq_tables.c
+++ b/src/mainboard/amd/parmer/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/parmer/mainboard.c b/src/mainboard/amd/parmer/mainboard.c
index 69366f9..1826f7d 100644
--- a/src/mainboard/amd/parmer/mainboard.c
+++ b/src/mainboard/amd/parmer/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index 529c7c1..0583270 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/parmer/romstage.c b/src/mainboard/amd/parmer/romstage.c
index 96c1df4..051869c 100644
--- a/src/mainboard/amd/parmer/romstage.c
+++ b/src/mainboard/amd/parmer/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/persimmon/BiosCallOuts.c b/src/mainboard/amd/persimmon/BiosCallOuts.c
index 11c67cd..0e6af3a 100644
--- a/src/mainboard/amd/persimmon/BiosCallOuts.c
+++ b/src/mainboard/amd/persimmon/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 1ed6d09..62a272d 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_PERSIMMON
diff --git a/src/mainboard/amd/persimmon/Makefile.inc b/src/mainboard/amd/persimmon/Makefile.inc
index e16e999..a1e39c5 100644
--- a/src/mainboard/amd/persimmon/Makefile.inc
+++ b/src/mainboard/amd/persimmon/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/amd/persimmon/OptionsIds.h b/src/mainboard/amd/persimmon/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/amd/persimmon/OptionsIds.h
+++ b/src/mainboard/amd/persimmon/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/persimmon/PlatformGnbPcie.c b/src/mainboard/amd/persimmon/PlatformGnbPcie.c
index 7c4288e..c3881c0 100644
--- a/src/mainboard/amd/persimmon/PlatformGnbPcie.c
+++ b/src/mainboard/amd/persimmon/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "PlatformGnbPcieComplex.h"
diff --git a/src/mainboard/amd/persimmon/PlatformGnbPcieComplex.h b/src/mainboard/amd/persimmon/PlatformGnbPcieComplex.h
index 4b5f43a..7fb4662 100644
--- a/src/mainboard/amd/persimmon/PlatformGnbPcieComplex.h
+++ b/src/mainboard/amd/persimmon/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/amd/persimmon/acpi/gpe.asl b/src/mainboard/amd/persimmon/acpi/gpe.asl
index 998b9fa..f8cb779 100644
--- a/src/mainboard/amd/persimmon/acpi/gpe.asl
+++ b/src/mainboard/amd/persimmon/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/persimmon/acpi/ide.asl b/src/mainboard/amd/persimmon/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/amd/persimmon/acpi/ide.asl
+++ b/src/mainboard/amd/persimmon/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/persimmon/acpi/mainboard.asl b/src/mainboard/amd/persimmon/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/amd/persimmon/acpi/mainboard.asl
+++ b/src/mainboard/amd/persimmon/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/persimmon/acpi/routing.asl b/src/mainboard/amd/persimmon/acpi/routing.asl
index 9a5a292..80bf788 100644
--- a/src/mainboard/amd/persimmon/acpi/routing.asl
+++ b/src/mainboard/amd/persimmon/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/persimmon/acpi/sata.asl b/src/mainboard/amd/persimmon/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/amd/persimmon/acpi/sata.asl
+++ b/src/mainboard/amd/persimmon/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/persimmon/acpi/sleep.asl b/src/mainboard/amd/persimmon/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/amd/persimmon/acpi/sleep.asl
+++ b/src/mainboard/amd/persimmon/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/persimmon/acpi/superio.asl b/src/mainboard/amd/persimmon/acpi/superio.asl
index dcfdc06..94c79b3 100644
--- a/src/mainboard/amd/persimmon/acpi/superio.asl
+++ b/src/mainboard/amd/persimmon/acpi/superio.asl
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/amd/persimmon/acpi/usb_oc.asl b/src/mainboard/amd/persimmon/acpi/usb_oc.asl
index dead4f2..d6b450c 100644
--- a/src/mainboard/amd/persimmon/acpi/usb_oc.asl
+++ b/src/mainboard/amd/persimmon/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/persimmon/acpi_tables.c b/src/mainboard/amd/persimmon/acpi_tables.c
index 0ccc311..e2c1ad0 100644
--- a/src/mainboard/amd/persimmon/acpi_tables.c
+++ b/src/mainboard/amd/persimmon/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/persimmon/buildOpts.c b/src/mainboard/amd/persimmon/buildOpts.c
index 244ab31..7a27fd1 100644
--- a/src/mainboard/amd/persimmon/buildOpts.c
+++ b/src/mainboard/amd/persimmon/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/persimmon/cmos.layout b/src/mainboard/amd/persimmon/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/amd/persimmon/cmos.layout
+++ b/src/mainboard/amd/persimmon/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/persimmon/devicetree.cb b/src/mainboard/amd/persimmon/devicetree.cb
index e9ac5a7..363637d 100644
--- a/src/mainboard/amd/persimmon/devicetree.cb
+++ b/src/mainboard/amd/persimmon/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/amd/persimmon/dsdt.asl b/src/mainboard/amd/persimmon/dsdt.asl
index faaa288..40b8fe1 100644
--- a/src/mainboard/amd/persimmon/dsdt.asl
+++ b/src/mainboard/amd/persimmon/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/persimmon/irq_tables.c b/src/mainboard/amd/persimmon/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/amd/persimmon/irq_tables.c
+++ b/src/mainboard/amd/persimmon/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/persimmon/mainboard.c b/src/mainboard/amd/persimmon/mainboard.c
index ae18a37..e5739c0 100644
--- a/src/mainboard/amd/persimmon/mainboard.c
+++ b/src/mainboard/amd/persimmon/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 1f9e4c6..9891b5b 100644
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/persimmon/platform_cfg.h b/src/mainboard/amd/persimmon/platform_cfg.h
index 21f612b..0e11c96 100644
--- a/src/mainboard/amd/persimmon/platform_cfg.h
+++ b/src/mainboard/amd/persimmon/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c
index 9855d3b..b1a31b6 100644
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/pistachio/acpi/ide.asl b/src/mainboard/amd/pistachio/acpi/ide.asl
index d84fc2e..13aeede 100644
--- a/src/mainboard/amd/pistachio/acpi/ide.asl
+++ b/src/mainboard/amd/pistachio/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/pistachio/acpi/routing.asl b/src/mainboard/amd/pistachio/acpi/routing.asl
index 3e4c63a..7503c22 100644
--- a/src/mainboard/amd/pistachio/acpi/routing.asl
+++ b/src/mainboard/amd/pistachio/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/pistachio/acpi/sata.asl b/src/mainboard/amd/pistachio/acpi/sata.asl
index ea8e4f5..0235ef0 100644
--- a/src/mainboard/amd/pistachio/acpi/sata.asl
+++ b/src/mainboard/amd/pistachio/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/pistachio/acpi/usb.asl b/src/mainboard/amd/pistachio/acpi/usb.asl
index 67d3a37..447b681 100644
--- a/src/mainboard/amd/pistachio/acpi/usb.asl
+++ b/src/mainboard/amd/pistachio/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/pistachio/acpi_tables.c b/src/mainboard/amd/pistachio/acpi_tables.c
index 628abfd..cf14699 100644
--- a/src/mainboard/amd/pistachio/acpi_tables.c
+++ b/src/mainboard/amd/pistachio/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/pistachio/cmos.layout b/src/mainboard/amd/pistachio/cmos.layout
index 6da2266..d338a10 100644
--- a/src/mainboard/amd/pistachio/cmos.layout
+++ b/src/mainboard/amd/pistachio/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/amd/pistachio/dsdt.asl b/src/mainboard/amd/pistachio/dsdt.asl
index f0cceae..76ec47f 100644
--- a/src/mainboard/amd/pistachio/dsdt.asl
+++ b/src/mainboard/amd/pistachio/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/pistachio/fadt.c b/src/mainboard/amd/pistachio/fadt.c
index 2a2d710..d91f818 100644
--- a/src/mainboard/amd/pistachio/fadt.c
+++ b/src/mainboard/amd/pistachio/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/pistachio/get_bus_conf.c b/src/mainboard/amd/pistachio/get_bus_conf.c
index d35083c..6545b7d 100644
--- a/src/mainboard/amd/pistachio/get_bus_conf.c
+++ b/src/mainboard/amd/pistachio/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/pistachio/irq_tables.c b/src/mainboard/amd/pistachio/irq_tables.c
index 6d0887b..32f7d60 100644
--- a/src/mainboard/amd/pistachio/irq_tables.c
+++ b/src/mainboard/amd/pistachio/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/amd/pistachio/mainboard.c b/src/mainboard/amd/pistachio/mainboard.c
index ce68f37..bd29bbd 100644
--- a/src/mainboard/amd/pistachio/mainboard.c
+++ b/src/mainboard/amd/pistachio/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/pistachio/mptable.c b/src/mainboard/amd/pistachio/mptable.c
index b1f6df8..2f71ca2 100644
--- a/src/mainboard/amd/pistachio/mptable.c
+++ b/src/mainboard/amd/pistachio/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/pistachio/resourcemap.c b/src/mainboard/amd/pistachio/resourcemap.c
index c2b29f3..15e2359 100644
--- a/src/mainboard/amd/pistachio/resourcemap.c
+++ b/src/mainboard/amd/pistachio/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_pistachio_resource_map(void)
diff --git a/src/mainboard/amd/pistachio/romstage.c b/src/mainboard/amd/pistachio/romstage.c
index ca2edae..73dac9d 100644
--- a/src/mainboard/amd/pistachio/romstage.c
+++ b/src/mainboard/amd/pistachio/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index f587a71..45a4ecf 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_AMD_RUMBA
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
index 2ebda00..5074d47 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 //AMD8111
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
index c8ffe39..bd35193 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 #include <arch/ioapic.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
index a104b9d..5b499cb 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_pic.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 //AMD8111 pic LNKA B C D
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
index 33ba522..3a99f0c 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8131_2.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 	Device (PG0A)
 	{
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
index 31c01ca..9a6c744 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	Device (PG0A)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
index 2079b3e..9dc35d3 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8132_2.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	Device (PG0A)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
index de302fb..ea1240b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8151.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 // AMD8151
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
index d06bb09..50c110b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/htx_no_ioapic.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	Device (HTXA)
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
index 1161bac..fc17d36 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci0_hc.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 	#include "amd8111.asl" //real SB at first
 	#include "amd8132.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
index d11af23..81bd735 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci2_hc.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	#include "amd8132_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
index acf19b2..ef8341b 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci3_hc.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	#include "amd8151.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
index cc46a81..de2f5be 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci4_hc.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	#include "amd8131_2.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
index 4ffce62..bdbfbd8 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/pci5_hc.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 	#include "htx_no_ioapic.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
index 4dd40c4..ad5255f 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/superio.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 //	#include "w83627hf.asl"
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
index 7b5be84..1392289 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
index 02e0382..ed5537c 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
index eb22075..e302ef9 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/dsdt.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c
index 9edb8c5..0bd11da 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
index 9b9c908..1d2cbff 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c b/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
index c33ca6a..ae9fc77 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mb_sysconf.h b/src/mainboard/amd/serengeti_cheetah_fam10/mb_sysconf.h
index c0b475b..9be2348 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index 84958db..2383cd0 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c b/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c
index f931967..155c084 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
index 3d7c168..6b1d106 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
index 338960f..51cdc5c 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt2.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 DefinitionBlock ("SSDT2.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
index 372236e..2a975ac 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt3.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 DefinitionBlock ("SSDT3.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
index 87f1ef1..a12d556 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt4.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 DefinitionBlock ("SSDT4.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
 {
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
index e3c60f4..dddd31a 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/ssdt5.asl
@@ -13,8 +13,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 DefinitionBlock ("SSDT5.aml", "SSDT", 1, "AMD-FAM10", "AMDACPI", 100925440)
diff --git a/src/mainboard/amd/south_station/BiosCallOuts.c b/src/mainboard/amd/south_station/BiosCallOuts.c
index cf2a506..1be4014 100644
--- a/src/mainboard/amd/south_station/BiosCallOuts.c
+++ b/src/mainboard/amd/south_station/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 1d3348d..6934d1f 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_SOUTHSTATION
diff --git a/src/mainboard/amd/south_station/Makefile.inc b/src/mainboard/amd/south_station/Makefile.inc
index 5df6442..de2b787 100644
--- a/src/mainboard/amd/south_station/Makefile.inc
+++ b/src/mainboard/amd/south_station/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/amd/south_station/OptionsIds.h b/src/mainboard/amd/south_station/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/amd/south_station/OptionsIds.h
+++ b/src/mainboard/amd/south_station/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/south_station/PlatformGnbPcie.c b/src/mainboard/amd/south_station/PlatformGnbPcie.c
index e94b49b..fd3cb13 100644
--- a/src/mainboard/amd/south_station/PlatformGnbPcie.c
+++ b/src/mainboard/amd/south_station/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "PlatformGnbPcieComplex.h"
diff --git a/src/mainboard/amd/south_station/PlatformGnbPcieComplex.h b/src/mainboard/amd/south_station/PlatformGnbPcieComplex.h
index 29d6681..d971764 100644
--- a/src/mainboard/amd/south_station/PlatformGnbPcieComplex.h
+++ b/src/mainboard/amd/south_station/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/amd/south_station/acpi/gpe.asl b/src/mainboard/amd/south_station/acpi/gpe.asl
index 998b9fa..f8cb779 100644
--- a/src/mainboard/amd/south_station/acpi/gpe.asl
+++ b/src/mainboard/amd/south_station/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/south_station/acpi/ide.asl b/src/mainboard/amd/south_station/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/amd/south_station/acpi/ide.asl
+++ b/src/mainboard/amd/south_station/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/south_station/acpi/mainboard.asl b/src/mainboard/amd/south_station/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/amd/south_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/south_station/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/south_station/acpi/routing.asl b/src/mainboard/amd/south_station/acpi/routing.asl
index d608eac..660d97d 100644
--- a/src/mainboard/amd/south_station/acpi/routing.asl
+++ b/src/mainboard/amd/south_station/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/south_station/acpi/sata.asl b/src/mainboard/amd/south_station/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/amd/south_station/acpi/sata.asl
+++ b/src/mainboard/amd/south_station/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/south_station/acpi/sleep.asl b/src/mainboard/amd/south_station/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/amd/south_station/acpi/sleep.asl
+++ b/src/mainboard/amd/south_station/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/south_station/acpi/superio.asl b/src/mainboard/amd/south_station/acpi/superio.asl
index 3a0ab10..1384d2f 100644
--- a/src/mainboard/amd/south_station/acpi/superio.asl
+++ b/src/mainboard/amd/south_station/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SuperIO device or functionality yet */
diff --git a/src/mainboard/amd/south_station/acpi/usb_oc.asl b/src/mainboard/amd/south_station/acpi/usb_oc.asl
index e1d01de..e6f709b 100644
--- a/src/mainboard/amd/south_station/acpi/usb_oc.asl
+++ b/src/mainboard/amd/south_station/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/south_station/acpi_tables.c b/src/mainboard/amd/south_station/acpi_tables.c
index 73d9556..4d2e29a 100644
--- a/src/mainboard/amd/south_station/acpi_tables.c
+++ b/src/mainboard/amd/south_station/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/south_station/buildOpts.c b/src/mainboard/amd/south_station/buildOpts.c
index d2882a7..45e43e8 100644
--- a/src/mainboard/amd/south_station/buildOpts.c
+++ b/src/mainboard/amd/south_station/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/south_station/cmos.layout b/src/mainboard/amd/south_station/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/amd/south_station/cmos.layout
+++ b/src/mainboard/amd/south_station/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/south_station/devicetree.cb b/src/mainboard/amd/south_station/devicetree.cb
index 76bedfb..80fe3e5 100644
--- a/src/mainboard/amd/south_station/devicetree.cb
+++ b/src/mainboard/amd/south_station/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
         device cpu_cluster 0 on
diff --git a/src/mainboard/amd/south_station/dsdt.asl b/src/mainboard/amd/south_station/dsdt.asl
index faaa288..40b8fe1 100644
--- a/src/mainboard/amd/south_station/dsdt.asl
+++ b/src/mainboard/amd/south_station/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/south_station/irq_tables.c b/src/mainboard/amd/south_station/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/amd/south_station/irq_tables.c
+++ b/src/mainboard/amd/south_station/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/south_station/mainboard.c b/src/mainboard/amd/south_station/mainboard.c
index 409cf10..80336d9 100644
--- a/src/mainboard/amd/south_station/mainboard.c
+++ b/src/mainboard/amd/south_station/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c
index a862386..e3485bb 100644
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/south_station/platform_cfg.h b/src/mainboard/amd/south_station/platform_cfg.h
index 82c0afe..8b41886 100644
--- a/src/mainboard/amd/south_station/platform_cfg.h
+++ b/src/mainboard/amd/south_station/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/south_station/romstage.c b/src/mainboard/amd/south_station/romstage.c
index ff446c5..605cc2c 100644
--- a/src/mainboard/amd/south_station/romstage.c
+++ b/src/mainboard/amd/south_station/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/mainboard/amd/thatcher/BiosCallOuts.c b/src/mainboard/amd/thatcher/BiosCallOuts.c
index 82452f5..55b7e08 100644
--- a/src/mainboard/amd/thatcher/BiosCallOuts.c
+++ b/src/mainboard/amd/thatcher/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index b33c33a..a841a7a 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_THATCHER
diff --git a/src/mainboard/amd/thatcher/Makefile.inc b/src/mainboard/amd/thatcher/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/amd/thatcher/Makefile.inc
+++ b/src/mainboard/amd/thatcher/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/amd/thatcher/OptionsIds.h b/src/mainboard/amd/thatcher/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/amd/thatcher/OptionsIds.h
+++ b/src/mainboard/amd/thatcher/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/thatcher/PlatformGnbPcie.c b/src/mainboard/amd/thatcher/PlatformGnbPcie.c
index dfa3057..383c90d 100644
--- a/src/mainboard/amd/thatcher/PlatformGnbPcie.c
+++ b/src/mainboard/amd/thatcher/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/thatcher/acpi/cpstate.asl b/src/mainboard/amd/thatcher/acpi/cpstate.asl
index dc543ee..c436b5c 100644
--- a/src/mainboard/amd/thatcher/acpi/cpstate.asl
+++ b/src/mainboard/amd/thatcher/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/amd/thatcher/acpi/gpe.asl b/src/mainboard/amd/thatcher/acpi/gpe.asl
index b78947d..38722ca 100644
--- a/src/mainboard/amd/thatcher/acpi/gpe.asl
+++ b/src/mainboard/amd/thatcher/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/thatcher/acpi/mainboard.asl b/src/mainboard/amd/thatcher/acpi/mainboard.asl
index 2dd0d27..5cb97ca 100644
--- a/src/mainboard/amd/thatcher/acpi/mainboard.asl
+++ b/src/mainboard/amd/thatcher/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/thatcher/acpi/routing.asl b/src/mainboard/amd/thatcher/acpi/routing.asl
index 12c4666..744c6ff 100644
--- a/src/mainboard/amd/thatcher/acpi/routing.asl
+++ b/src/mainboard/amd/thatcher/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Routing is in System Bus scope */
diff --git a/src/mainboard/amd/thatcher/acpi/sata.asl b/src/mainboard/amd/thatcher/acpi/sata.asl
index bbd95d8..b09b369 100644
--- a/src/mainboard/amd/thatcher/acpi/sata.asl
+++ b/src/mainboard/amd/thatcher/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/amd/thatcher/acpi/si.asl b/src/mainboard/amd/thatcher/acpi/si.asl
index 28cf633..a12496a 100644
--- a/src/mainboard/amd/thatcher/acpi/si.asl
+++ b/src/mainboard/amd/thatcher/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Scope(\_SI) {
 		Method(_SST, 1) {
diff --git a/src/mainboard/amd/thatcher/acpi/sleep.asl b/src/mainboard/amd/thatcher/acpi/sleep.asl
index 253cfd5..8c04c20 100644
--- a/src/mainboard/amd/thatcher/acpi/sleep.asl
+++ b/src/mainboard/amd/thatcher/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/thatcher/acpi/superio.asl b/src/mainboard/amd/thatcher/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/amd/thatcher/acpi/superio.asl
+++ b/src/mainboard/amd/thatcher/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/amd/thatcher/acpi/thermal.asl b/src/mainboard/amd/thatcher/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/amd/thatcher/acpi/thermal.asl
+++ b/src/mainboard/amd/thatcher/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/amd/thatcher/acpi/usb_oc.asl b/src/mainboard/amd/thatcher/acpi/usb_oc.asl
index 74691ad..6eee042 100644
--- a/src/mainboard/amd/thatcher/acpi/usb_oc.asl
+++ b/src/mainboard/amd/thatcher/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* USB overcurrent mapping pins.   */
diff --git a/src/mainboard/amd/thatcher/acpi_tables.c b/src/mainboard/amd/thatcher/acpi_tables.c
index 032342a..985ea16 100644
--- a/src/mainboard/amd/thatcher/acpi_tables.c
+++ b/src/mainboard/amd/thatcher/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/amd/thatcher/buildOpts.c b/src/mainboard/amd/thatcher/buildOpts.c
index af22e65..fd46482 100644
--- a/src/mainboard/amd/thatcher/buildOpts.c
+++ b/src/mainboard/amd/thatcher/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/thatcher/cmos.layout b/src/mainboard/amd/thatcher/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/amd/thatcher/cmos.layout
+++ b/src/mainboard/amd/thatcher/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/thatcher/devicetree.cb b/src/mainboard/amd/thatcher/devicetree.cb
index ae07794..f202969 100644
--- a/src/mainboard/amd/thatcher/devicetree.cb
+++ b/src/mainboard/amd/thatcher/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15tn/root_complex
 
diff --git a/src/mainboard/amd/thatcher/dsdt.asl b/src/mainboard/amd/thatcher/dsdt.asl
index 449cc22..eccdae3 100644
--- a/src/mainboard/amd/thatcher/dsdt.asl
+++ b/src/mainboard/amd/thatcher/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/thatcher/irq_tables.c b/src/mainboard/amd/thatcher/irq_tables.c
index 8a18b3a..00c9bcc 100644
--- a/src/mainboard/amd/thatcher/irq_tables.c
+++ b/src/mainboard/amd/thatcher/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/thatcher/mainboard.c b/src/mainboard/amd/thatcher/mainboard.c
index 0e6dfa0..4e36061 100644
--- a/src/mainboard/amd/thatcher/mainboard.c
+++ b/src/mainboard/amd/thatcher/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index e8b6215..5582b82 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index 1f222de..73de137 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl b/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl
+++ b/src/mainboard/amd/tilapia_fam10/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/amd/tilapia_fam10/acpi/ide.asl b/src/mainboard/amd/tilapia_fam10/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi/ide.asl
+++ b/src/mainboard/amd/tilapia_fam10/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/tilapia_fam10/acpi/routing.asl b/src/mainboard/amd/tilapia_fam10/acpi/routing.asl
index 3db15d5..576acc7 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi/routing.asl
+++ b/src/mainboard/amd/tilapia_fam10/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/tilapia_fam10/acpi/sata.asl b/src/mainboard/amd/tilapia_fam10/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi/sata.asl
+++ b/src/mainboard/amd/tilapia_fam10/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/tilapia_fam10/acpi/usb.asl b/src/mainboard/amd/tilapia_fam10/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi/usb.asl
+++ b/src/mainboard/amd/tilapia_fam10/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/tilapia_fam10/acpi_tables.c b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
index a548a10..0de9edc 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl
index e7b6022..3175042 100644
--- a/src/mainboard/amd/tilapia_fam10/dsdt.asl
+++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
+++ b/src/mainboard/amd/tilapia_fam10/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/tilapia_fam10/irq_tables.c b/src/mainboard/amd/tilapia_fam10/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/amd/tilapia_fam10/irq_tables.c
+++ b/src/mainboard/amd/tilapia_fam10/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/tilapia_fam10/mainboard.c b/src/mainboard/amd/tilapia_fam10/mainboard.c
index c6cb9f4..f3b6fe7 100644
--- a/src/mainboard/amd/tilapia_fam10/mainboard.c
+++ b/src/mainboard/amd/tilapia_fam10/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/tilapia_fam10/mb_sysconf.h b/src/mainboard/amd/tilapia_fam10/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/amd/tilapia_fam10/mb_sysconf.h
+++ b/src/mainboard/amd/tilapia_fam10/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/tilapia_fam10/resourcemap.c b/src/mainboard/amd/tilapia_fam10/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/amd/tilapia_fam10/resourcemap.c
+++ b/src/mainboard/amd/tilapia_fam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index 924345d..db1cc83 100644
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/amd/torpedo/BiosCallOuts.c b/src/mainboard/amd/torpedo/BiosCallOuts.c
index 0bda376..e16e5b1 100644
--- a/src/mainboard/amd/torpedo/BiosCallOuts.c
+++ b/src/mainboard/amd/torpedo/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index de781d8..c9923cb 100644
--- a/src/mainboard/amd/torpedo/Kconfig
+++ b/src/mainboard/amd/torpedo/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_TORPEDO
diff --git a/src/mainboard/amd/torpedo/Makefile.inc b/src/mainboard/amd/torpedo/Makefile.inc
index 35750ed..6497248 100644
--- a/src/mainboard/amd/torpedo/Makefile.inc
+++ b/src/mainboard/amd/torpedo/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/amd/torpedo/Oem.h b/src/mainboard/amd/torpedo/Oem.h
index 6176d25..979a444 100644
--- a/src/mainboard/amd/torpedo/Oem.h
+++ b/src/mainboard/amd/torpedo/Oem.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef BIOS_SIZE
 	#define BIOS_SIZE                      0x04   //04 - 1MB
diff --git a/src/mainboard/amd/torpedo/OptionsIds.h b/src/mainboard/amd/torpedo/OptionsIds.h
index 1eca73d..3cdea0f 100644
--- a/src/mainboard/amd/torpedo/OptionsIds.h
+++ b/src/mainboard/amd/torpedo/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/torpedo/PlatformGnbPcie.c b/src/mainboard/amd/torpedo/PlatformGnbPcie.c
index bda85d7..a679c1c 100644
--- a/src/mainboard/amd/torpedo/PlatformGnbPcie.c
+++ b/src/mainboard/amd/torpedo/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "PlatformGnbPcieComplex.h"
diff --git a/src/mainboard/amd/torpedo/PlatformGnbPcieComplex.h b/src/mainboard/amd/torpedo/PlatformGnbPcieComplex.h
index 29d6681..d971764 100644
--- a/src/mainboard/amd/torpedo/PlatformGnbPcieComplex.h
+++ b/src/mainboard/amd/torpedo/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/amd/torpedo/acpi/ide.asl b/src/mainboard/amd/torpedo/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/amd/torpedo/acpi/ide.asl
+++ b/src/mainboard/amd/torpedo/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/torpedo/acpi/routing.asl b/src/mainboard/amd/torpedo/acpi/routing.asl
index 2573b3a..86b89d2 100644
--- a/src/mainboard/amd/torpedo/acpi/routing.asl
+++ b/src/mainboard/amd/torpedo/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/torpedo/acpi/sata.asl b/src/mainboard/amd/torpedo/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/amd/torpedo/acpi/sata.asl
+++ b/src/mainboard/amd/torpedo/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/torpedo/acpi/usb.asl b/src/mainboard/amd/torpedo/acpi/usb.asl
index 5138175..5e0f8fa 100644
--- a/src/mainboard/amd/torpedo/acpi/usb.asl
+++ b/src/mainboard/amd/torpedo/acpi/usb.asl
@@ -13,6 +13,5 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
diff --git a/src/mainboard/amd/torpedo/acpi_tables.c b/src/mainboard/amd/torpedo/acpi_tables.c
index 39f904e..94c94df 100644
--- a/src/mainboard/amd/torpedo/acpi_tables.c
+++ b/src/mainboard/amd/torpedo/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/torpedo/buildOpts.c b/src/mainboard/amd/torpedo/buildOpts.c
index 0906786..dade90e 100644
--- a/src/mainboard/amd/torpedo/buildOpts.c
+++ b/src/mainboard/amd/torpedo/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/torpedo/cmos.layout b/src/mainboard/amd/torpedo/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/amd/torpedo/cmos.layout
+++ b/src/mainboard/amd/torpedo/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/torpedo/devicetree.cb b/src/mainboard/amd/torpedo/devicetree.cb
index c46d180..ee29c8d 100644
--- a/src/mainboard/amd/torpedo/devicetree.cb
+++ b/src/mainboard/amd/torpedo/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family12/root_complex
         device cpu_cluster 0 on
diff --git a/src/mainboard/amd/torpedo/dsdt.asl b/src/mainboard/amd/torpedo/dsdt.asl
index 67058bc..49baa00 100644
--- a/src/mainboard/amd/torpedo/dsdt.asl
+++ b/src/mainboard/amd/torpedo/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/torpedo/fadt.c b/src/mainboard/amd/torpedo/fadt.c
index 1bab638..39fd114 100644
--- a/src/mainboard/amd/torpedo/fadt.c
+++ b/src/mainboard/amd/torpedo/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/torpedo/gpio.c b/src/mainboard/amd/torpedo/gpio.c
index 8b297c9..a57e522 100644
--- a/src/mainboard/amd/torpedo/gpio.c
+++ b/src/mainboard/amd/torpedo/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "Filecode.h"
diff --git a/src/mainboard/amd/torpedo/gpio.h b/src/mainboard/amd/torpedo/gpio.h
index d3ef6cf..9fd575c 100644
--- a/src/mainboard/amd/torpedo/gpio.h
+++ b/src/mainboard/amd/torpedo/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _GPIO_H_
diff --git a/src/mainboard/amd/torpedo/irq_tables.c b/src/mainboard/amd/torpedo/irq_tables.c
index 6f823b9..604e6cd 100644
--- a/src/mainboard/amd/torpedo/irq_tables.c
+++ b/src/mainboard/amd/torpedo/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/torpedo/mainboard.c b/src/mainboard/amd/torpedo/mainboard.c
index 8946b9d..15859f6 100644
--- a/src/mainboard/amd/torpedo/mainboard.c
+++ b/src/mainboard/amd/torpedo/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index e5ec21f..8f755fc 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/torpedo/platform_cfg.h b/src/mainboard/amd/torpedo/platform_cfg.h
index f46d741..4a63796 100644
--- a/src/mainboard/amd/torpedo/platform_cfg.h
+++ b/src/mainboard/amd/torpedo/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/torpedo/pmio.h b/src/mainboard/amd/torpedo/pmio.h
index e99cd11..85b99ae 100644
--- a/src/mainboard/amd/torpedo/pmio.h
+++ b/src/mainboard/amd/torpedo/pmio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/torpedo/romstage.c b/src/mainboard/amd/torpedo/romstage.c
index 96f3e69..1c1c618 100644
--- a/src/mainboard/amd/torpedo/romstage.c
+++ b/src/mainboard/amd/torpedo/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/amd/union_station/BiosCallOuts.c b/src/mainboard/amd/union_station/BiosCallOuts.c
index cf2a506..1be4014 100644
--- a/src/mainboard/amd/union_station/BiosCallOuts.c
+++ b/src/mainboard/amd/union_station/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 4a4a632..ec82d45 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_AMD_UNIONSTATION
diff --git a/src/mainboard/amd/union_station/Makefile.inc b/src/mainboard/amd/union_station/Makefile.inc
index 5df6442..de2b787 100644
--- a/src/mainboard/amd/union_station/Makefile.inc
+++ b/src/mainboard/amd/union_station/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/amd/union_station/OptionsIds.h b/src/mainboard/amd/union_station/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/amd/union_station/OptionsIds.h
+++ b/src/mainboard/amd/union_station/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/union_station/PlatformGnbPcie.c b/src/mainboard/amd/union_station/PlatformGnbPcie.c
index 6a7f6f5..a46755d 100644
--- a/src/mainboard/amd/union_station/PlatformGnbPcie.c
+++ b/src/mainboard/amd/union_station/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/amd/union_station/PlatformGnbPcieComplex.h b/src/mainboard/amd/union_station/PlatformGnbPcieComplex.h
index 29d6681..d971764 100644
--- a/src/mainboard/amd/union_station/PlatformGnbPcieComplex.h
+++ b/src/mainboard/amd/union_station/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/amd/union_station/acpi/gpe.asl b/src/mainboard/amd/union_station/acpi/gpe.asl
index 998b9fa..f8cb779 100644
--- a/src/mainboard/amd/union_station/acpi/gpe.asl
+++ b/src/mainboard/amd/union_station/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/amd/union_station/acpi/ide.asl b/src/mainboard/amd/union_station/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/amd/union_station/acpi/ide.asl
+++ b/src/mainboard/amd/union_station/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/union_station/acpi/mainboard.asl b/src/mainboard/amd/union_station/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/amd/union_station/acpi/mainboard.asl
+++ b/src/mainboard/amd/union_station/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/amd/union_station/acpi/routing.asl b/src/mainboard/amd/union_station/acpi/routing.asl
index d608eac..660d97d 100644
--- a/src/mainboard/amd/union_station/acpi/routing.asl
+++ b/src/mainboard/amd/union_station/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/amd/union_station/acpi/sata.asl b/src/mainboard/amd/union_station/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/amd/union_station/acpi/sata.asl
+++ b/src/mainboard/amd/union_station/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/union_station/acpi/sleep.asl b/src/mainboard/amd/union_station/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/amd/union_station/acpi/sleep.asl
+++ b/src/mainboard/amd/union_station/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/amd/union_station/acpi/superio.asl b/src/mainboard/amd/union_station/acpi/superio.asl
index 3a0ab10..1384d2f 100644
--- a/src/mainboard/amd/union_station/acpi/superio.asl
+++ b/src/mainboard/amd/union_station/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SuperIO device or functionality yet */
diff --git a/src/mainboard/amd/union_station/acpi/usb_oc.asl b/src/mainboard/amd/union_station/acpi/usb_oc.asl
index e1d01de..e6f709b 100644
--- a/src/mainboard/amd/union_station/acpi/usb_oc.asl
+++ b/src/mainboard/amd/union_station/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/amd/union_station/acpi_tables.c b/src/mainboard/amd/union_station/acpi_tables.c
index 73d9556..4d2e29a 100644
--- a/src/mainboard/amd/union_station/acpi_tables.c
+++ b/src/mainboard/amd/union_station/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/union_station/buildOpts.c b/src/mainboard/amd/union_station/buildOpts.c
index d2882a7..45e43e8 100644
--- a/src/mainboard/amd/union_station/buildOpts.c
+++ b/src/mainboard/amd/union_station/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/amd/union_station/cmos.layout b/src/mainboard/amd/union_station/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/amd/union_station/cmos.layout
+++ b/src/mainboard/amd/union_station/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/amd/union_station/devicetree.cb b/src/mainboard/amd/union_station/devicetree.cb
index bf98359..1570462 100644
--- a/src/mainboard/amd/union_station/devicetree.cb
+++ b/src/mainboard/amd/union_station/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
         device cpu_cluster 0 on
diff --git a/src/mainboard/amd/union_station/dsdt.asl b/src/mainboard/amd/union_station/dsdt.asl
index faaa288..40b8fe1 100644
--- a/src/mainboard/amd/union_station/dsdt.asl
+++ b/src/mainboard/amd/union_station/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/amd/union_station/irq_tables.c b/src/mainboard/amd/union_station/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/amd/union_station/irq_tables.c
+++ b/src/mainboard/amd/union_station/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/union_station/mainboard.c b/src/mainboard/amd/union_station/mainboard.c
index 8bf7267..bbb1c53 100644
--- a/src/mainboard/amd/union_station/mainboard.c
+++ b/src/mainboard/amd/union_station/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c
index 35acb8d..40411e9 100644
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/union_station/platform_cfg.h b/src/mainboard/amd/union_station/platform_cfg.h
index 82c0afe..8b41886 100644
--- a/src/mainboard/amd/union_station/platform_cfg.h
+++ b/src/mainboard/amd/union_station/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/amd/union_station/romstage.c b/src/mainboard/amd/union_station/romstage.c
index 328e608..f6ca590 100644
--- a/src/mainboard/amd/union_station/romstage.c
+++ b/src/mainboard/amd/union_station/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
index 80ae773..4fe8ff9 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_pri.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (MBRS)
diff --git a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
index 8fd3bf5..06353f1 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/e7505_sec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (PBRS, ResourceTemplate ()
diff --git a/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl b/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl
index 837f1bd..38bb720 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/i82801db.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (USB0)
diff --git a/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl b/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
index 3264ec0..73a4a65 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/p64h2.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Interrupt routing for PCI 03:xx.x */
diff --git a/src/mainboard/aopen/dxplplusu/acpi/power.asl b/src/mainboard/aopen/dxplplusu/acpi/power.asl
index 908a2cc..7dcf1f6 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/power.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/power.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/aopen/dxplplusu/acpi/scsi.asl b/src/mainboard/aopen/dxplplusu/acpi/scsi.asl
index ad726e7..7406db1 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/scsi.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/scsi.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PCI-X devices 04:04.0 and 04:04.1 : AIC-7902W
diff --git a/src/mainboard/aopen/dxplplusu/acpi/superio.asl b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
index 4c26a73..cdd2ff5 100644
--- a/src/mainboard/aopen/dxplplusu/acpi/superio.asl
+++ b/src/mainboard/aopen/dxplplusu/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/aopen/dxplplusu/acpi_tables.c b/src/mainboard/aopen/dxplplusu/acpi_tables.c
index ac6a10b..5492c4f 100644
--- a/src/mainboard/aopen/dxplplusu/acpi_tables.c
+++ b/src/mainboard/aopen/dxplplusu/acpi_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/aopen/dxplplusu/bus.h b/src/mainboard/aopen/dxplplusu/bus.h
index 2750454..e2b95b7 100644
--- a/src/mainboard/aopen/dxplplusu/bus.h
+++ b/src/mainboard/aopen/dxplplusu/bus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DXPLPLUSU_BUS_H_INCLUDED
diff --git a/src/mainboard/aopen/dxplplusu/devicetree.cb b/src/mainboard/aopen/dxplplusu/devicetree.cb
index 8eb0322..66e1cfd 100644
--- a/src/mainboard/aopen/dxplplusu/devicetree.cb
+++ b/src/mainboard/aopen/dxplplusu/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/e7505
diff --git a/src/mainboard/aopen/dxplplusu/dsdt.asl b/src/mainboard/aopen/dxplplusu/dsdt.asl
index 816f892..8822d8b 100644
--- a/src/mainboard/aopen/dxplplusu/dsdt.asl
+++ b/src/mainboard/aopen/dxplplusu/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/ioapic.h>
diff --git a/src/mainboard/aopen/dxplplusu/fadt.c b/src/mainboard/aopen/dxplplusu/fadt.c
index 7ae7a92..3df6e9e 100644
--- a/src/mainboard/aopen/dxplplusu/fadt.c
+++ b/src/mainboard/aopen/dxplplusu/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/aopen/dxplplusu/irq_tables.c b/src/mainboard/aopen/dxplplusu/irq_tables.c
index 436f3d8..4d86835 100644
--- a/src/mainboard/aopen/dxplplusu/irq_tables.c
+++ b/src/mainboard/aopen/dxplplusu/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/aopen/dxplplusu/romstage.c b/src/mainboard/aopen/dxplplusu/romstage.c
index bd2cc72..dd017e3 100644
--- a/src/mainboard/aopen/dxplplusu/romstage.c
+++ b/src/mainboard/aopen/dxplplusu/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/apple/macbook21/acpi/i945_pci_irqs.asl b/src/mainboard/apple/macbook21/acpi/i945_pci_irqs.asl
index fb5838e..cf12727 100644
--- a/src/mainboard/apple/macbook21/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/apple/macbook21/acpi/i945_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/apple/macbook21/acpi/ich7_pci_irqs.asl b/src/mainboard/apple/macbook21/acpi/ich7_pci_irqs.asl
index 6ca7347..460e9dd 100644
--- a/src/mainboard/apple/macbook21/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/apple/macbook21/acpi/ich7_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/apple/macbook21/acpi/platform.asl b/src/mainboard/apple/macbook21/acpi/platform.asl
index e38dff2..ac0be87 100644
--- a/src/mainboard/apple/macbook21/acpi/platform.asl
+++ b/src/mainboard/apple/macbook21/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _WAK method is called on system wakeup */
diff --git a/src/mainboard/apple/macbook21/acpi_tables.c b/src/mainboard/apple/macbook21/acpi_tables.c
index 4e4cf1e..7949b4d 100644
--- a/src/mainboard/apple/macbook21/acpi_tables.c
+++ b/src/mainboard/apple/macbook21/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/apple/macbook21/cmos.layout b/src/mainboard/apple/macbook21/cmos.layout
index 1dd42c1..985fc60 100644
--- a/src/mainboard/apple/macbook21/cmos.layout
+++ b/src/mainboard/apple/macbook21/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/apple/macbook21/devicetree.cb b/src/mainboard/apple/macbook21/devicetree.cb
index 422ec5a..e2b68ac 100644
--- a/src/mainboard/apple/macbook21/devicetree.cb
+++ b/src/mainboard/apple/macbook21/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i945
diff --git a/src/mainboard/apple/macbook21/dsdt.asl b/src/mainboard/apple/macbook21/dsdt.asl
index 078f1d1..7c686c4 100644
--- a/src/mainboard/apple/macbook21/dsdt.asl
+++ b/src/mainboard/apple/macbook21/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define BRIGHTNESS_UP \DSPC.BRTU
diff --git a/src/mainboard/apple/macbook21/hda_verb.c b/src/mainboard/apple/macbook21/hda_verb.c
index 117838f..a7f3544 100644
--- a/src/mainboard/apple/macbook21/hda_verb.c
+++ b/src/mainboard/apple/macbook21/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/apple/macbook21/mainboard.c b/src/mainboard/apple/macbook21/mainboard.c
index 3829b1d..f094f9d 100644
--- a/src/mainboard/apple/macbook21/mainboard.c
+++ b/src/mainboard/apple/macbook21/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/apple/macbook21/mptable.c b/src/mainboard/apple/macbook21/mptable.c
index 1211132..75ec959 100644
--- a/src/mainboard/apple/macbook21/mptable.c
+++ b/src/mainboard/apple/macbook21/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/apple/macbook21/romstage.c b/src/mainboard/apple/macbook21/romstage.c
index 3f252ab..880683b 100644
--- a/src/mainboard/apple/macbook21/romstage.c
+++ b/src/mainboard/apple/macbook21/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/apple/macbook21/smihandler.c b/src/mainboard/apple/macbook21/smihandler.c
index 0b8970a..fd1a90b 100644
--- a/src/mainboard/apple/macbook21/smihandler.c
+++ b/src/mainboard/apple/macbook21/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/artecgroup/dbe61/irq_tables.c b/src/mainboard/artecgroup/dbe61/irq_tables.c
index 29ca961..28b8080 100644
--- a/src/mainboard/artecgroup/dbe61/irq_tables.c
+++ b/src/mainboard/artecgroup/dbe61/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/artecgroup/dbe61/mainboard.c b/src/mainboard/artecgroup/dbe61/mainboard.c
index ba47806..a31a229 100644
--- a/src/mainboard/artecgroup/dbe61/mainboard.c
+++ b/src/mainboard/artecgroup/dbe61/mainboard.c
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #include <console/console.h>
diff --git a/src/mainboard/artecgroup/dbe61/romstage.c b/src/mainboard/artecgroup/dbe61/romstage.c
index c5ec5e8..0c1664e 100644
--- a/src/mainboard/artecgroup/dbe61/romstage.c
+++ b/src/mainboard/artecgroup/dbe61/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/artecgroup/dbe61/spd_table.h b/src/mainboard/artecgroup/dbe61/spd_table.h
index 4a1464e..394466c 100644
--- a/src/mainboard/artecgroup/dbe61/spd_table.h
+++ b/src/mainboard/artecgroup/dbe61/spd_table.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/mainboard/asrock/939a785gmh/acpi/routing.asl b/src/mainboard/asrock/939a785gmh/acpi/routing.asl
index da96d1b..742fd72 100644
--- a/src/mainboard/asrock/939a785gmh/acpi/routing.asl
+++ b/src/mainboard/asrock/939a785gmh/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asrock/939a785gmh/acpi_tables.c b/src/mainboard/asrock/939a785gmh/acpi_tables.c
index 0a2637e..ecc2f18 100644
--- a/src/mainboard/asrock/939a785gmh/acpi_tables.c
+++ b/src/mainboard/asrock/939a785gmh/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/939a785gmh/cmos.layout b/src/mainboard/asrock/939a785gmh/cmos.layout
index 22d2679..125fc1f 100644
--- a/src/mainboard/asrock/939a785gmh/cmos.layout
+++ b/src/mainboard/asrock/939a785gmh/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/asrock/939a785gmh/dsdt.asl b/src/mainboard/asrock/939a785gmh/dsdt.asl
index c8406ce..78cc8fb 100644
--- a/src/mainboard/asrock/939a785gmh/dsdt.asl
+++ b/src/mainboard/asrock/939a785gmh/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asrock/939a785gmh/get_bus_conf.c b/src/mainboard/asrock/939a785gmh/get_bus_conf.c
index ae96179..2413a8c 100644
--- a/src/mainboard/asrock/939a785gmh/get_bus_conf.c
+++ b/src/mainboard/asrock/939a785gmh/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/939a785gmh/irq_tables.c b/src/mainboard/asrock/939a785gmh/irq_tables.c
index bed6170..e102081 100644
--- a/src/mainboard/asrock/939a785gmh/irq_tables.c
+++ b/src/mainboard/asrock/939a785gmh/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/asrock/939a785gmh/mainboard.c b/src/mainboard/asrock/939a785gmh/mainboard.c
index 74f5d3b..d0f8731 100644
--- a/src/mainboard/asrock/939a785gmh/mainboard.c
+++ b/src/mainboard/asrock/939a785gmh/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/939a785gmh/mptable.c b/src/mainboard/asrock/939a785gmh/mptable.c
index c8a909b..75a5817 100644
--- a/src/mainboard/asrock/939a785gmh/mptable.c
+++ b/src/mainboard/asrock/939a785gmh/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/939a785gmh/resourcemap.c b/src/mainboard/asrock/939a785gmh/resourcemap.c
index 5d45fb9..ce26467 100644
--- a/src/mainboard/asrock/939a785gmh/resourcemap.c
+++ b/src/mainboard/asrock/939a785gmh/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_939a785gmh_resource_map(void)
diff --git a/src/mainboard/asrock/939a785gmh/romstage.c b/src/mainboard/asrock/939a785gmh/romstage.c
index 09c5b18..9262bb6 100644
--- a/src/mainboard/asrock/939a785gmh/romstage.c
+++ b/src/mainboard/asrock/939a785gmh/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asrock/Kconfig b/src/mainboard/asrock/Kconfig
index e76ecf0..685f188 100644
--- a/src/mainboard/asrock/Kconfig
+++ b/src/mainboard/asrock/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_ASROCK
 
diff --git a/src/mainboard/asrock/e350m1/BiosCallOuts.c b/src/mainboard/asrock/e350m1/BiosCallOuts.c
index 92ba7be..d58950a 100644
--- a/src/mainboard/asrock/e350m1/BiosCallOuts.c
+++ b/src/mainboard/asrock/e350m1/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index ff3e8f4..feb9200 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_ASROCK_E350M1
diff --git a/src/mainboard/asrock/e350m1/Makefile.inc b/src/mainboard/asrock/e350m1/Makefile.inc
index 5df6442..de2b787 100644
--- a/src/mainboard/asrock/e350m1/Makefile.inc
+++ b/src/mainboard/asrock/e350m1/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/asrock/e350m1/OptionsIds.h b/src/mainboard/asrock/e350m1/OptionsIds.h
index e4364eb..55569d3 100644
--- a/src/mainboard/asrock/e350m1/OptionsIds.h
+++ b/src/mainboard/asrock/e350m1/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asrock/e350m1/PlatformGnbPcie.c b/src/mainboard/asrock/e350m1/PlatformGnbPcie.c
index 140af92..1110778 100644
--- a/src/mainboard/asrock/e350m1/PlatformGnbPcie.c
+++ b/src/mainboard/asrock/e350m1/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/asrock/e350m1/PlatformGnbPcieComplex.h b/src/mainboard/asrock/e350m1/PlatformGnbPcieComplex.h
index 29d6681..d971764 100644
--- a/src/mainboard/asrock/e350m1/PlatformGnbPcieComplex.h
+++ b/src/mainboard/asrock/e350m1/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/asrock/e350m1/acpi/gpe.asl b/src/mainboard/asrock/e350m1/acpi/gpe.asl
index 77d132a..cf557ef 100644
--- a/src/mainboard/asrock/e350m1/acpi/gpe.asl
+++ b/src/mainboard/asrock/e350m1/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/asrock/e350m1/acpi/mainboard.asl b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/asrock/e350m1/acpi/mainboard.asl
+++ b/src/mainboard/asrock/e350m1/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/asrock/e350m1/acpi/routing.asl b/src/mainboard/asrock/e350m1/acpi/routing.asl
index d608eac..660d97d 100644
--- a/src/mainboard/asrock/e350m1/acpi/routing.asl
+++ b/src/mainboard/asrock/e350m1/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asrock/e350m1/acpi/sata.asl b/src/mainboard/asrock/e350m1/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/asrock/e350m1/acpi/sata.asl
+++ b/src/mainboard/asrock/e350m1/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asrock/e350m1/acpi/sleep.asl b/src/mainboard/asrock/e350m1/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/asrock/e350m1/acpi/sleep.asl
+++ b/src/mainboard/asrock/e350m1/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/asrock/e350m1/acpi/superio.asl b/src/mainboard/asrock/e350m1/acpi/superio.asl
index 3a0ab10..1384d2f 100644
--- a/src/mainboard/asrock/e350m1/acpi/superio.asl
+++ b/src/mainboard/asrock/e350m1/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SuperIO device or functionality yet */
diff --git a/src/mainboard/asrock/e350m1/acpi/usb_oc.asl b/src/mainboard/asrock/e350m1/acpi/usb_oc.asl
index 605d505..53a0df1 100644
--- a/src/mainboard/asrock/e350m1/acpi/usb_oc.asl
+++ b/src/mainboard/asrock/e350m1/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asrock/e350m1/acpi_tables.c b/src/mainboard/asrock/e350m1/acpi_tables.c
index 666d826..b0e3d4e 100644
--- a/src/mainboard/asrock/e350m1/acpi_tables.c
+++ b/src/mainboard/asrock/e350m1/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/asrock/e350m1/buildOpts.c b/src/mainboard/asrock/e350m1/buildOpts.c
index 2c6eb3b..aa6c8c6 100644
--- a/src/mainboard/asrock/e350m1/buildOpts.c
+++ b/src/mainboard/asrock/e350m1/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asrock/e350m1/cmos.layout b/src/mainboard/asrock/e350m1/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/asrock/e350m1/cmos.layout
+++ b/src/mainboard/asrock/e350m1/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/asrock/e350m1/devicetree.cb b/src/mainboard/asrock/e350m1/devicetree.cb
index 9c11b60..973ef06 100644
--- a/src/mainboard/asrock/e350m1/devicetree.cb
+++ b/src/mainboard/asrock/e350m1/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/asrock/e350m1/dsdt.asl b/src/mainboard/asrock/e350m1/dsdt.asl
index 71ea450..2fd7598 100644
--- a/src/mainboard/asrock/e350m1/dsdt.asl
+++ b/src/mainboard/asrock/e350m1/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asrock/e350m1/irq_tables.c b/src/mainboard/asrock/e350m1/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/asrock/e350m1/irq_tables.c
+++ b/src/mainboard/asrock/e350m1/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/asrock/e350m1/mainboard.c b/src/mainboard/asrock/e350m1/mainboard.c
index ef9b5e9..b88d9e1 100644
--- a/src/mainboard/asrock/e350m1/mainboard.c
+++ b/src/mainboard/asrock/e350m1/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c
index a2deb8f..35b50fe 100644
--- a/src/mainboard/asrock/e350m1/mptable.c
+++ b/src/mainboard/asrock/e350m1/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/asrock/e350m1/platform_cfg.h b/src/mainboard/asrock/e350m1/platform_cfg.h
index 9343ecd..59d9944 100644
--- a/src/mainboard/asrock/e350m1/platform_cfg.h
+++ b/src/mainboard/asrock/e350m1/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/asrock/e350m1/romstage.c b/src/mainboard/asrock/e350m1/romstage.c
index ddb3d76..72dcd6b 100644
--- a/src/mainboard/asrock/e350m1/romstage.c
+++ b/src/mainboard/asrock/e350m1/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asrock/imb-a180/BiosCallOuts.c b/src/mainboard/asrock/imb-a180/BiosCallOuts.c
index f409097..f5d1c2a 100644
--- a/src/mainboard/asrock/imb-a180/BiosCallOuts.c
+++ b/src/mainboard/asrock/imb-a180/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia.h>
diff --git a/src/mainboard/asrock/imb-a180/Kconfig b/src/mainboard/asrock/imb-a180/Kconfig
index 411e4f9..b36724d 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_ASROCK_IMB_A180
diff --git a/src/mainboard/asrock/imb-a180/Makefile.inc b/src/mainboard/asrock/imb-a180/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/asrock/imb-a180/Makefile.inc
+++ b/src/mainboard/asrock/imb-a180/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/asrock/imb-a180/OptionsIds.h b/src/mainboard/asrock/imb-a180/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/asrock/imb-a180/OptionsIds.h
+++ b/src/mainboard/asrock/imb-a180/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asrock/imb-a180/PlatformGnbPcie.c b/src/mainboard/asrock/imb-a180/PlatformGnbPcie.c
index fa1cc65..7ddfc63 100644
--- a/src/mainboard/asrock/imb-a180/PlatformGnbPcie.c
+++ b/src/mainboard/asrock/imb-a180/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl b/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl
index 88d3381..1996f04 100644
--- a/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/asrock/imb-a180/acpi/gpe.asl b/src/mainboard/asrock/imb-a180/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/asrock/imb-a180/acpi/gpe.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/asrock/imb-a180/acpi/ide.asl b/src/mainboard/asrock/imb-a180/acpi/ide.asl
index dfb4158..f8e323a 100644
--- a/src/mainboard/asrock/imb-a180/acpi/ide.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No IDE functionality */
diff --git a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
index da4f11a..9e9ec0e 100644
--- a/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/asrock/imb-a180/acpi/routing.asl b/src/mainboard/asrock/imb-a180/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/asrock/imb-a180/acpi/routing.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asrock/imb-a180/acpi/sata.asl b/src/mainboard/asrock/imb-a180/acpi/sata.asl
index 9a96a9d..af1cff2 100644
--- a/src/mainboard/asrock/imb-a180/acpi/sata.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/asrock/imb-a180/acpi/si.asl b/src/mainboard/asrock/imb-a180/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/asrock/imb-a180/acpi/si.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/asrock/imb-a180/acpi/sleep.asl b/src/mainboard/asrock/imb-a180/acpi/sleep.asl
index 6a2cef9..f0986df 100644
--- a/src/mainboard/asrock/imb-a180/acpi/sleep.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/asrock/imb-a180/acpi/superio.asl b/src/mainboard/asrock/imb-a180/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/asrock/imb-a180/acpi/superio.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/asrock/imb-a180/acpi/thermal.asl b/src/mainboard/asrock/imb-a180/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/asrock/imb-a180/acpi/thermal.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl b/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl
index 608f557..259d28a 100644
--- a/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl
+++ b/src/mainboard/asrock/imb-a180/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asrock/imb-a180/acpi_tables.c b/src/mainboard/asrock/imb-a180/acpi_tables.c
index 6c061e0..94e1df6 100644
--- a/src/mainboard/asrock/imb-a180/acpi_tables.c
+++ b/src/mainboard/asrock/imb-a180/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/imb-a180/buildOpts.c b/src/mainboard/asrock/imb-a180/buildOpts.c
index 219b524..1ec5fe3 100644
--- a/src/mainboard/asrock/imb-a180/buildOpts.c
+++ b/src/mainboard/asrock/imb-a180/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asrock/imb-a180/cmos.layout b/src/mainboard/asrock/imb-a180/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/asrock/imb-a180/cmos.layout
+++ b/src/mainboard/asrock/imb-a180/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/asrock/imb-a180/devicetree.cb b/src/mainboard/asrock/imb-a180/devicetree.cb
index fc941fc..33032f9 100644
--- a/src/mainboard/asrock/imb-a180/devicetree.cb
+++ b/src/mainboard/asrock/imb-a180/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/asrock/imb-a180/dsdt.asl b/src/mainboard/asrock/imb-a180/dsdt.asl
index 3f1aa8b..6df107e 100644
--- a/src/mainboard/asrock/imb-a180/dsdt.asl
+++ b/src/mainboard/asrock/imb-a180/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asrock/imb-a180/irq_tables.c b/src/mainboard/asrock/imb-a180/irq_tables.c
index 33ce343..cb8248e 100644
--- a/src/mainboard/asrock/imb-a180/irq_tables.c
+++ b/src/mainboard/asrock/imb-a180/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/imb-a180/mainboard.c b/src/mainboard/asrock/imb-a180/mainboard.c
index fb33e0e..b12440d 100644
--- a/src/mainboard/asrock/imb-a180/mainboard.c
+++ b/src/mainboard/asrock/imb-a180/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c
index 45d3735..d2842f7 100644
--- a/src/mainboard/asrock/imb-a180/mptable.c
+++ b/src/mainboard/asrock/imb-a180/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index 4d9ca3e..3ff7f03 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig
index 747a047..c492600 100644
--- a/src/mainboard/asus/Kconfig
+++ b/src/mainboard/asus/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_ASUS
 
diff --git a/src/mainboard/asus/a8n_e/dsdt.asl b/src/mainboard/asus/a8n_e/dsdt.asl
index 64298aa..36c1526 100644
--- a/src/mainboard/asus/a8n_e/dsdt.asl
+++ b/src/mainboard/asus/a8n_e/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/a8n_e/get_bus_conf.c b/src/mainboard/asus/a8n_e/get_bus_conf.c
index aff5edd..087698d 100644
--- a/src/mainboard/asus/a8n_e/get_bus_conf.c
+++ b/src/mainboard/asus/a8n_e/get_bus_conf.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/a8n_e/irq_tables.c b/src/mainboard/asus/a8n_e/irq_tables.c
index 07856e1..75858dc 100644
--- a/src/mainboard/asus/a8n_e/irq_tables.c
+++ b/src/mainboard/asus/a8n_e/irq_tables.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/a8n_e/mptable.c b/src/mainboard/asus/a8n_e/mptable.c
index 8f3cd80..5c91886 100644
--- a/src/mainboard/asus/a8n_e/mptable.c
+++ b/src/mainboard/asus/a8n_e/mptable.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/a8n_e/romstage.c b/src/mainboard/asus/a8n_e/romstage.c
index d1485bf..21e44ba 100644
--- a/src/mainboard/asus/a8n_e/romstage.c
+++ b/src/mainboard/asus/a8n_e/romstage.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Used by ite_enable_serial(). */
diff --git a/src/mainboard/asus/a8v-e_deluxe/acpi_tables.c b/src/mainboard/asus/a8v-e_deluxe/acpi_tables.c
index 4a1fb5d..7630d57 100644
--- a/src/mainboard/asus/a8v-e_deluxe/acpi_tables.c
+++ b/src/mainboard/asus/a8v-e_deluxe/acpi_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/a8v-e_deluxe/dsdt.asl b/src/mainboard/asus/a8v-e_deluxe/dsdt.asl
index 624603e..8da350b 100644
--- a/src/mainboard/asus/a8v-e_deluxe/dsdt.asl
+++ b/src/mainboard/asus/a8v-e_deluxe/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/a8v-e_deluxe/mptable.c b/src/mainboard/asus/a8v-e_deluxe/mptable.c
index 29e9745..588f8f7 100644
--- a/src/mainboard/asus/a8v-e_deluxe/mptable.c
+++ b/src/mainboard/asus/a8v-e_deluxe/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/asus/a8v-e_deluxe/romstage.c b/src/mainboard/asus/a8v-e_deluxe/romstage.c
index dc1d6ff..286ef29 100644
--- a/src/mainboard/asus/a8v-e_deluxe/romstage.c
+++ b/src/mainboard/asus/a8v-e_deluxe/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 unsigned int get_sbdn(unsigned bus);
diff --git a/src/mainboard/asus/a8v-e_se/acpi_tables.c b/src/mainboard/asus/a8v-e_se/acpi_tables.c
index 776f76a..3cb0e98 100644
--- a/src/mainboard/asus/a8v-e_se/acpi_tables.c
+++ b/src/mainboard/asus/a8v-e_se/acpi_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/a8v-e_se/dsdt.asl b/src/mainboard/asus/a8v-e_se/dsdt.asl
index a309fba..40521a4 100644
--- a/src/mainboard/asus/a8v-e_se/dsdt.asl
+++ b/src/mainboard/asus/a8v-e_se/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/a8v-e_se/mptable.c b/src/mainboard/asus/a8v-e_se/mptable.c
index 29e9745..588f8f7 100644
--- a/src/mainboard/asus/a8v-e_se/mptable.c
+++ b/src/mainboard/asus/a8v-e_se/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/asus/a8v-e_se/romstage.c b/src/mainboard/asus/a8v-e_se/romstage.c
index 0531cd3..a68ecf8 100644
--- a/src/mainboard/asus/a8v-e_se/romstage.c
+++ b/src/mainboard/asus/a8v-e_se/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 unsigned int get_sbdn(unsigned bus);
diff --git a/src/mainboard/asus/dsbf/cmos.layout b/src/mainboard/asus/dsbf/cmos.layout
index 0f67e68..e7e1731 100644
--- a/src/mainboard/asus/dsbf/cmos.layout
+++ b/src/mainboard/asus/dsbf/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/asus/dsbf/devicetree.cb b/src/mainboard/asus/dsbf/devicetree.cb
index 9eacf64..1cc7c71 100644
--- a/src/mainboard/asus/dsbf/devicetree.cb
+++ b/src/mainboard/asus/dsbf/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i5000
diff --git a/src/mainboard/asus/dsbf/irq_tables.c b/src/mainboard/asus/dsbf/irq_tables.c
index 350650e..06326ea 100644
--- a/src/mainboard/asus/dsbf/irq_tables.c
+++ b/src/mainboard/asus/dsbf/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/dsbf/mainboard.c b/src/mainboard/asus/dsbf/mainboard.c
index db4ace2..785be30 100644
--- a/src/mainboard/asus/dsbf/mainboard.c
+++ b/src/mainboard/asus/dsbf/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/dsbf/romstage.c b/src/mainboard/asus/dsbf/romstage.c
index 730de12..e1dc098 100644
--- a/src/mainboard/asus/dsbf/romstage.c
+++ b/src/mainboard/asus/dsbf/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/f2a85-m/BiosCallOuts.c b/src/mainboard/asus/f2a85-m/BiosCallOuts.c
index 3c87658..5faee0c 100644
--- a/src/mainboard/asus/f2a85-m/BiosCallOuts.c
+++ b/src/mainboard/asus/f2a85-m/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index d48965c..7cf552c 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_ASUS_F2A85_M
diff --git a/src/mainboard/asus/f2a85-m/Makefile.inc b/src/mainboard/asus/f2a85-m/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/asus/f2a85-m/Makefile.inc
+++ b/src/mainboard/asus/f2a85-m/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/asus/f2a85-m/OptionsIds.h b/src/mainboard/asus/f2a85-m/OptionsIds.h
index 6354a62..5485563 100644
--- a/src/mainboard/asus/f2a85-m/OptionsIds.h
+++ b/src/mainboard/asus/f2a85-m/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asus/f2a85-m/PlatformGnbPcie.c b/src/mainboard/asus/f2a85-m/PlatformGnbPcie.c
index cbb5c9a..bb1cb7f 100644
--- a/src/mainboard/asus/f2a85-m/PlatformGnbPcie.c
+++ b/src/mainboard/asus/f2a85-m/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "Porting.h"
diff --git a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl
index dc543ee..c436b5c 100644
--- a/src/mainboard/asus/f2a85-m/acpi/cpstate.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/asus/f2a85-m/acpi/gpe.asl b/src/mainboard/asus/f2a85-m/acpi/gpe.asl
index c755521..a0ac952 100644
--- a/src/mainboard/asus/f2a85-m/acpi/gpe.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
index 64b83b7..7b2c89a 100644
--- a/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/asus/f2a85-m/acpi/routing.asl b/src/mainboard/asus/f2a85-m/acpi/routing.asl
index b6892b1..2a9267b 100644
--- a/src/mainboard/asus/f2a85-m/acpi/routing.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Routing is in System Bus scope */
diff --git a/src/mainboard/asus/f2a85-m/acpi/sata.asl b/src/mainboard/asus/f2a85-m/acpi/sata.asl
index bbd95d8..b09b369 100644
--- a/src/mainboard/asus/f2a85-m/acpi/sata.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/asus/f2a85-m/acpi/si.asl b/src/mainboard/asus/f2a85-m/acpi/si.asl
index 28cf633..a12496a 100644
--- a/src/mainboard/asus/f2a85-m/acpi/si.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Scope(\_SI) {
 		Method(_SST, 1) {
diff --git a/src/mainboard/asus/f2a85-m/acpi/sleep.asl b/src/mainboard/asus/f2a85-m/acpi/sleep.asl
index 0c2fcb8..5c1a04c 100644
--- a/src/mainboard/asus/f2a85-m/acpi/sleep.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/asus/f2a85-m/acpi/superio.asl b/src/mainboard/asus/f2a85-m/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/asus/f2a85-m/acpi/superio.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/asus/f2a85-m/acpi/thermal.asl b/src/mainboard/asus/f2a85-m/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/asus/f2a85-m/acpi/thermal.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/asus/f2a85-m/acpi/usb_oc.asl b/src/mainboard/asus/f2a85-m/acpi/usb_oc.asl
index 74691ad..6eee042 100644
--- a/src/mainboard/asus/f2a85-m/acpi/usb_oc.asl
+++ b/src/mainboard/asus/f2a85-m/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* USB overcurrent mapping pins.   */
diff --git a/src/mainboard/asus/f2a85-m/acpi_tables.c b/src/mainboard/asus/f2a85-m/acpi_tables.c
index 50e3be3..1b5b282 100644
--- a/src/mainboard/asus/f2a85-m/acpi_tables.c
+++ b/src/mainboard/asus/f2a85-m/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/asus/f2a85-m/buildOpts.c b/src/mainboard/asus/f2a85-m/buildOpts.c
index b812cd5..2a4a3d2 100644
--- a/src/mainboard/asus/f2a85-m/buildOpts.c
+++ b/src/mainboard/asus/f2a85-m/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asus/f2a85-m/cmos.layout b/src/mainboard/asus/f2a85-m/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/asus/f2a85-m/cmos.layout
+++ b/src/mainboard/asus/f2a85-m/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/asus/f2a85-m/devicetree.cb b/src/mainboard/asus/f2a85-m/devicetree.cb
index 4562557..f71bb50 100644
--- a/src/mainboard/asus/f2a85-m/devicetree.cb
+++ b/src/mainboard/asus/f2a85-m/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15tn/root_complex
 
diff --git a/src/mainboard/asus/f2a85-m/dsdt.asl b/src/mainboard/asus/f2a85-m/dsdt.asl
index a3a5917..28e320e 100644
--- a/src/mainboard/asus/f2a85-m/dsdt.asl
+++ b/src/mainboard/asus/f2a85-m/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asus/f2a85-m/irq_tables.c b/src/mainboard/asus/f2a85-m/irq_tables.c
index 16a3667..daff67c 100644
--- a/src/mainboard/asus/f2a85-m/irq_tables.c
+++ b/src/mainboard/asus/f2a85-m/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/f2a85-m/mainboard.c b/src/mainboard/asus/f2a85-m/mainboard.c
index 7bb008b..8f705bf 100644
--- a/src/mainboard/asus/f2a85-m/mainboard.c
+++ b/src/mainboard/asus/f2a85-m/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 6bb7d86..f83c94b 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/mainboard/asus/f2a85-m/romstage.c b/src/mainboard/asus/f2a85-m/romstage.c
index 674fc1d..0329b03 100644
--- a/src/mainboard/asus/f2a85-m/romstage.c
+++ b/src/mainboard/asus/f2a85-m/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/asus/f2a85-m_le/BiosCallOuts.c b/src/mainboard/asus/f2a85-m_le/BiosCallOuts.c
index f69002b..4453bab 100644
--- a/src/mainboard/asus/f2a85-m_le/BiosCallOuts.c
+++ b/src/mainboard/asus/f2a85-m_le/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/asus/f2a85-m_le/Kconfig b/src/mainboard/asus/f2a85-m_le/Kconfig
index 9476b0c..683c3d8 100644
--- a/src/mainboard/asus/f2a85-m_le/Kconfig
+++ b/src/mainboard/asus/f2a85-m_le/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_ASUS_F2A85_M_LE
diff --git a/src/mainboard/asus/f2a85-m_le/Makefile.inc b/src/mainboard/asus/f2a85-m_le/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/asus/f2a85-m_le/Makefile.inc
+++ b/src/mainboard/asus/f2a85-m_le/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/asus/f2a85-m_le/buildOpts.c b/src/mainboard/asus/f2a85-m_le/buildOpts.c
index 145fb67..93588a8 100644
--- a/src/mainboard/asus/f2a85-m_le/buildOpts.c
+++ b/src/mainboard/asus/f2a85-m_le/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/asus/f2a85-m_le/cmos.layout b/src/mainboard/asus/f2a85-m_le/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/asus/f2a85-m_le/cmos.layout
+++ b/src/mainboard/asus/f2a85-m_le/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/asus/f2a85-m_le/devicetree.cb b/src/mainboard/asus/f2a85-m_le/devicetree.cb
index cfbc6c5..5a71d8b 100644
--- a/src/mainboard/asus/f2a85-m_le/devicetree.cb
+++ b/src/mainboard/asus/f2a85-m_le/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15tn/root_complex
 
diff --git a/src/mainboard/asus/k8v-x/acpi_tables.c b/src/mainboard/asus/k8v-x/acpi_tables.c
index dbc67f4..9f15e8f 100644
--- a/src/mainboard/asus/k8v-x/acpi_tables.c
+++ b/src/mainboard/asus/k8v-x/acpi_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/k8v-x/dsdt.asl b/src/mainboard/asus/k8v-x/dsdt.asl
index 51c8f5a..f94334c 100644
--- a/src/mainboard/asus/k8v-x/dsdt.asl
+++ b/src/mainboard/asus/k8v-x/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/k8v-x/mainboard.c b/src/mainboard/asus/k8v-x/mainboard.c
index 5daf33e..c40f239 100644
--- a/src/mainboard/asus/k8v-x/mainboard.c
+++ b/src/mainboard/asus/k8v-x/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/k8v-x/mptable.c b/src/mainboard/asus/k8v-x/mptable.c
index d273b94..f55fe75 100644
--- a/src/mainboard/asus/k8v-x/mptable.c
+++ b/src/mainboard/asus/k8v-x/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/asus/k8v-x/romstage.c b/src/mainboard/asus/k8v-x/romstage.c
index 45103fd..dda28a2 100644
--- a/src/mainboard/asus/k8v-x/romstage.c
+++ b/src/mainboard/asus/k8v-x/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 unsigned int get_sbdn(unsigned bus);
diff --git a/src/mainboard/asus/kfsn4-dre/acpi/pm_ctrl.asl b/src/mainboard/asus/kfsn4-dre/acpi/pm_ctrl.asl
index 676caf5..0a07720 100644
--- a/src/mainboard/asus/kfsn4-dre/acpi/pm_ctrl.asl
+++ b/src/mainboard/asus/kfsn4-dre/acpi/pm_ctrl.asl
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/kfsn4-dre/bootblock.c b/src/mainboard/asus/kfsn4-dre/bootblock.c
index 885cd59..3eeb47a 100644
--- a/src/mainboard/asus/kfsn4-dre/bootblock.c
+++ b/src/mainboard/asus/kfsn4-dre/bootblock.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <pc80/mc146818rtc.h>
diff --git a/src/mainboard/asus/kfsn4-dre/cmos.layout b/src/mainboard/asus/kfsn4-dre/cmos.layout
index 27a3489..7251dca 100644
--- a/src/mainboard/asus/kfsn4-dre/cmos.layout
+++ b/src/mainboard/asus/kfsn4-dre/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/asus/kfsn4-dre/dsdt.asl b/src/mainboard/asus/kfsn4-dre/dsdt.asl
index 3e3f3c3..22b125f 100644
--- a/src/mainboard/asus/kfsn4-dre/dsdt.asl
+++ b/src/mainboard/asus/kfsn4-dre/dsdt.asl
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index 3003bb6..020eebf 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/kfsn4-dre/irq_tables.c b/src/mainboard/asus/kfsn4-dre/irq_tables.c
index d107598..df09b10 100644
--- a/src/mainboard/asus/kfsn4-dre/irq_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/irq_tables.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // WARNING
diff --git a/src/mainboard/asus/kfsn4-dre/mptable.c b/src/mainboard/asus/kfsn4-dre/mptable.c
index 57a5904..5b945ad 100644
--- a/src/mainboard/asus/kfsn4-dre/mptable.c
+++ b/src/mainboard/asus/kfsn4-dre/mptable.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // WARNING
diff --git a/src/mainboard/asus/kfsn4-dre/resourcemap.c b/src/mainboard/asus/kfsn4-dre/resourcemap.c
index 5c0c535..884acff 100644
--- a/src/mainboard/asus/kfsn4-dre/resourcemap.c
+++ b/src/mainboard/asus/kfsn4-dre/resourcemap.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index b35473c..d6ad668 100644
--- a/src/mainboard/asus/kfsn4-dre/romstage.c
+++ b/src/mainboard/asus/kfsn4-dre/romstage.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAM10_SCAN_PCI_BUS 0
diff --git a/src/mainboard/asus/m2n-e/Kconfig b/src/mainboard/asus/m2n-e/Kconfig
index f4e95e7..d3a6099 100644
--- a/src/mainboard/asus/m2n-e/Kconfig
+++ b/src/mainboard/asus/m2n-e/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_ASUS_M2N_E
diff --git a/src/mainboard/asus/m2n-e/Makefile.inc b/src/mainboard/asus/m2n-e/Makefile.inc
index f54d350..d22da5e 100644
--- a/src/mainboard/asus/m2n-e/Makefile.inc
+++ b/src/mainboard/asus/m2n-e/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.c
diff --git a/src/mainboard/asus/m2n-e/cmos.layout b/src/mainboard/asus/m2n-e/cmos.layout
index 37f6074..abad433 100644
--- a/src/mainboard/asus/m2n-e/cmos.layout
+++ b/src/mainboard/asus/m2n-e/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/asus/m2n-e/devicetree.cb b/src/mainboard/asus/m2n-e/devicetree.cb
index efd0764..c59eef8 100644
--- a/src/mainboard/asus/m2n-e/devicetree.cb
+++ b/src/mainboard/asus/m2n-e/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/amd/amdk8/root_complex		# Root complex
diff --git a/src/mainboard/asus/m2n-e/fanctl.c b/src/mainboard/asus/m2n-e/fanctl.c
index 0801c4e..c2bc7a0 100644
--- a/src/mainboard/asus/m2n-e/fanctl.c
+++ b/src/mainboard/asus/m2n-e/fanctl.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m2n-e/get_bus_conf.c b/src/mainboard/asus/m2n-e/get_bus_conf.c
index a1661c0..fd04546 100644
--- a/src/mainboard/asus/m2n-e/get_bus_conf.c
+++ b/src/mainboard/asus/m2n-e/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m2n-e/hda_verb.c b/src/mainboard/asus/m2n-e/hda_verb.c
index 7e9a53c..f6f82d7 100644
--- a/src/mainboard/asus/m2n-e/hda_verb.c
+++ b/src/mainboard/asus/m2n-e/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m2n-e/mainboard.c b/src/mainboard/asus/m2n-e/mainboard.c
index b4ce9e5..dec1f36 100644
--- a/src/mainboard/asus/m2n-e/mainboard.c
+++ b/src/mainboard/asus/m2n-e/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/asus/m2n-e/mptable.c b/src/mainboard/asus/m2n-e/mptable.c
index 79ffcaa..12b8b08 100644
--- a/src/mainboard/asus/m2n-e/mptable.c
+++ b/src/mainboard/asus/m2n-e/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m2n-e/resourcemap.c b/src/mainboard/asus/m2n-e/resourcemap.c
index 957233c..b8433eb 100644
--- a/src/mainboard/asus/m2n-e/resourcemap.c
+++ b/src/mainboard/asus/m2n-e/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/asus/m2n-e/romstage.c b/src/mainboard/asus/m2n-e/romstage.c
index 306c124..3448a4c 100644
--- a/src/mainboard/asus/m2n-e/romstage.c
+++ b/src/mainboard/asus/m2n-e/romstage.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index efcfc81..4738dcc 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_M2V_MX_SE
 
diff --git a/src/mainboard/asus/m2v-mx_se/acpi_tables.c b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
index c2750e6..efb9e41 100644
--- a/src/mainboard/asus/m2v-mx_se/acpi_tables.c
+++ b/src/mainboard/asus/m2v-mx_se/acpi_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m2v-mx_se/dsdt.asl b/src/mainboard/asus/m2v-mx_se/dsdt.asl
index 0922e40..e630124 100644
--- a/src/mainboard/asus/m2v-mx_se/dsdt.asl
+++ b/src/mainboard/asus/m2v-mx_se/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m2v-mx_se/romstage.c b/src/mainboard/asus/m2v-mx_se/romstage.c
index 89e24a4..4709ae1 100644
--- a/src/mainboard/asus/m2v-mx_se/romstage.c
+++ b/src/mainboard/asus/m2v-mx_se/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 unsigned int get_sbdn(unsigned bus);
diff --git a/src/mainboard/asus/m2v/acpi_tables.c b/src/mainboard/asus/m2v/acpi_tables.c
index f135aab..b7eeae0 100644
--- a/src/mainboard/asus/m2v/acpi_tables.c
+++ b/src/mainboard/asus/m2v/acpi_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m2v/dsdt.asl b/src/mainboard/asus/m2v/dsdt.asl
index 8ec24b1..dddc3f3 100644
--- a/src/mainboard/asus/m2v/dsdt.asl
+++ b/src/mainboard/asus/m2v/dsdt.asl
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m2v/irq_tables.c b/src/mainboard/asus/m2v/irq_tables.c
index c2e38ac..c216f3c 100644
--- a/src/mainboard/asus/m2v/irq_tables.c
+++ b/src/mainboard/asus/m2v/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * IRQ Routing Table
  *
diff --git a/src/mainboard/asus/m2v/mainboard.c b/src/mainboard/asus/m2v/mainboard.c
index c5837b2..f32a0c4 100644
--- a/src/mainboard/asus/m2v/mainboard.c
+++ b/src/mainboard/asus/m2v/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/asus/m2v/mptable.c b/src/mainboard/asus/m2v/mptable.c
index 5579f00..abc3a71 100644
--- a/src/mainboard/asus/m2v/mptable.c
+++ b/src/mainboard/asus/m2v/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/asus/m2v/romstage.c b/src/mainboard/asus/m2v/romstage.c
index 8c99080..40ea0b1 100644
--- a/src/mainboard/asus/m2v/romstage.c
+++ b/src/mainboard/asus/m2v/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 unsigned int get_sbdn(unsigned bus);
diff --git a/src/mainboard/asus/m4a78-em/acpi/cpstate.asl b/src/mainboard/asus/m4a78-em/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/asus/m4a78-em/acpi/cpstate.asl
+++ b/src/mainboard/asus/m4a78-em/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/asus/m4a78-em/acpi/ide.asl b/src/mainboard/asus/m4a78-em/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/asus/m4a78-em/acpi/ide.asl
+++ b/src/mainboard/asus/m4a78-em/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m4a78-em/acpi/routing.asl b/src/mainboard/asus/m4a78-em/acpi/routing.asl
index 3db15d5..576acc7 100644
--- a/src/mainboard/asus/m4a78-em/acpi/routing.asl
+++ b/src/mainboard/asus/m4a78-em/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m4a78-em/acpi/sata.asl b/src/mainboard/asus/m4a78-em/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/asus/m4a78-em/acpi/sata.asl
+++ b/src/mainboard/asus/m4a78-em/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m4a78-em/acpi/usb.asl b/src/mainboard/asus/m4a78-em/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/asus/m4a78-em/acpi/usb.asl
+++ b/src/mainboard/asus/m4a78-em/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m4a78-em/acpi_tables.c b/src/mainboard/asus/m4a78-em/acpi_tables.c
index 26e16a7..16c2329 100644
--- a/src/mainboard/asus/m4a78-em/acpi_tables.c
+++ b/src/mainboard/asus/m4a78-em/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a78-em/dsdt.asl b/src/mainboard/asus/m4a78-em/dsdt.asl
index 0a20cee..181042b 100644
--- a/src/mainboard/asus/m4a78-em/dsdt.asl
+++ b/src/mainboard/asus/m4a78-em/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asus/m4a78-em/get_bus_conf.c b/src/mainboard/asus/m4a78-em/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/asus/m4a78-em/get_bus_conf.c
+++ b/src/mainboard/asus/m4a78-em/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a78-em/irq_tables.c b/src/mainboard/asus/m4a78-em/irq_tables.c
index dcda2d6..f4d0b7c 100644
--- a/src/mainboard/asus/m4a78-em/irq_tables.c
+++ b/src/mainboard/asus/m4a78-em/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/m4a78-em/mainboard.c b/src/mainboard/asus/m4a78-em/mainboard.c
index 8759078..a6a5bfa 100644
--- a/src/mainboard/asus/m4a78-em/mainboard.c
+++ b/src/mainboard/asus/m4a78-em/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a78-em/mb_sysconf.h b/src/mainboard/asus/m4a78-em/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/asus/m4a78-em/mb_sysconf.h
+++ b/src/mainboard/asus/m4a78-em/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a78-em/resourcemap.c b/src/mainboard/asus/m4a78-em/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/asus/m4a78-em/resourcemap.c
+++ b/src/mainboard/asus/m4a78-em/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/asus/m4a78-em/romstage.c b/src/mainboard/asus/m4a78-em/romstage.c
index bcff9e4..c6adf56 100644
--- a/src/mainboard/asus/m4a78-em/romstage.c
+++ b/src/mainboard/asus/m4a78-em/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/asus/m4a785-m/acpi/cpstate.asl b/src/mainboard/asus/m4a785-m/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/asus/m4a785-m/acpi/cpstate.asl
+++ b/src/mainboard/asus/m4a785-m/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/asus/m4a785-m/acpi/ide.asl b/src/mainboard/asus/m4a785-m/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/asus/m4a785-m/acpi/ide.asl
+++ b/src/mainboard/asus/m4a785-m/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m4a785-m/acpi/routing.asl b/src/mainboard/asus/m4a785-m/acpi/routing.asl
index 3db15d5..576acc7 100644
--- a/src/mainboard/asus/m4a785-m/acpi/routing.asl
+++ b/src/mainboard/asus/m4a785-m/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m4a785-m/acpi/sata.asl b/src/mainboard/asus/m4a785-m/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/asus/m4a785-m/acpi/sata.asl
+++ b/src/mainboard/asus/m4a785-m/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m4a785-m/acpi/usb.asl b/src/mainboard/asus/m4a785-m/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/asus/m4a785-m/acpi/usb.asl
+++ b/src/mainboard/asus/m4a785-m/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m4a785-m/acpi_tables.c b/src/mainboard/asus/m4a785-m/acpi_tables.c
index f801ef1..4612528 100644
--- a/src/mainboard/asus/m4a785-m/acpi_tables.c
+++ b/src/mainboard/asus/m4a785-m/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a785-m/dsdt.asl b/src/mainboard/asus/m4a785-m/dsdt.asl
index 0a20cee..181042b 100644
--- a/src/mainboard/asus/m4a785-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785-m/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asus/m4a785-m/get_bus_conf.c b/src/mainboard/asus/m4a785-m/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/asus/m4a785-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785-m/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a785-m/irq_tables.c b/src/mainboard/asus/m4a785-m/irq_tables.c
index 159d390..7896a8f 100644
--- a/src/mainboard/asus/m4a785-m/irq_tables.c
+++ b/src/mainboard/asus/m4a785-m/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/m4a785-m/mainboard.c b/src/mainboard/asus/m4a785-m/mainboard.c
index f8e5d17..3b8a91c 100644
--- a/src/mainboard/asus/m4a785-m/mainboard.c
+++ b/src/mainboard/asus/m4a785-m/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a785-m/mb_sysconf.h b/src/mainboard/asus/m4a785-m/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/asus/m4a785-m/mb_sysconf.h
+++ b/src/mainboard/asus/m4a785-m/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m4a785-m/resourcemap.c b/src/mainboard/asus/m4a785-m/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/asus/m4a785-m/resourcemap.c
+++ b/src/mainboard/asus/m4a785-m/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/asus/m4a785-m/romstage.c b/src/mainboard/asus/m4a785-m/romstage.c
index e49c9b9..92a4490 100644
--- a/src/mainboard/asus/m4a785-m/romstage.c
+++ b/src/mainboard/asus/m4a785-m/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl b/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl
index e406a44..3152d81 100644
--- a/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl
+++ b/src/mainboard/asus/m4a785t-m/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/asus/m4a785t-m/acpi/ide.asl b/src/mainboard/asus/m4a785t-m/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/asus/m4a785t-m/acpi/ide.asl
+++ b/src/mainboard/asus/m4a785t-m/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m4a785t-m/acpi/routing.asl b/src/mainboard/asus/m4a785t-m/acpi/routing.asl
index 3db15d5..576acc7 100644
--- a/src/mainboard/asus/m4a785t-m/acpi/routing.asl
+++ b/src/mainboard/asus/m4a785t-m/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m4a785t-m/acpi/sata.asl b/src/mainboard/asus/m4a785t-m/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/asus/m4a785t-m/acpi/sata.asl
+++ b/src/mainboard/asus/m4a785t-m/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m4a785t-m/acpi/usb.asl b/src/mainboard/asus/m4a785t-m/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/asus/m4a785t-m/acpi/usb.asl
+++ b/src/mainboard/asus/m4a785t-m/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m4a785t-m/acpi_tables.c b/src/mainboard/asus/m4a785t-m/acpi_tables.c
index fd9ed33..5220d97 100644
--- a/src/mainboard/asus/m4a785t-m/acpi_tables.c
+++ b/src/mainboard/asus/m4a785t-m/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../m4a785-m/acpi_tables.c"
diff --git a/src/mainboard/asus/m4a785t-m/dsdt.asl b/src/mainboard/asus/m4a785t-m/dsdt.asl
index 7fc078a..ae67a2e 100644
--- a/src/mainboard/asus/m4a785t-m/dsdt.asl
+++ b/src/mainboard/asus/m4a785t-m/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asus/m4a785t-m/get_bus_conf.c b/src/mainboard/asus/m4a785t-m/get_bus_conf.c
index dfa93bc..0f6e9f0 100644
--- a/src/mainboard/asus/m4a785t-m/get_bus_conf.c
+++ b/src/mainboard/asus/m4a785t-m/get_bus_conf.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../m4a785-m/get_bus_conf.c"
diff --git a/src/mainboard/asus/m4a785t-m/irq_tables.c b/src/mainboard/asus/m4a785t-m/irq_tables.c
index 21ba2dc..2182f48 100644
--- a/src/mainboard/asus/m4a785t-m/irq_tables.c
+++ b/src/mainboard/asus/m4a785t-m/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../m4a785-m/irq_tables.c"
diff --git a/src/mainboard/asus/m4a785t-m/mainboard.c b/src/mainboard/asus/m4a785t-m/mainboard.c
index 9cbd2cf..07fdd45 100644
--- a/src/mainboard/asus/m4a785t-m/mainboard.c
+++ b/src/mainboard/asus/m4a785t-m/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../m4a785-m/mainboard.c"
diff --git a/src/mainboard/asus/m4a785t-m/mptable.c b/src/mainboard/asus/m4a785t-m/mptable.c
index e25b8ff..48d42f3 100644
--- a/src/mainboard/asus/m4a785t-m/mptable.c
+++ b/src/mainboard/asus/m4a785t-m/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../m4a785-m/mptable.c"
diff --git a/src/mainboard/asus/m4a785t-m/romstage.c b/src/mainboard/asus/m4a785t-m/romstage.c
index 7e27df6..ea1d715 100644
--- a/src/mainboard/asus/m4a785t-m/romstage.c
+++ b/src/mainboard/asus/m4a785t-m/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../m4a785-m/romstage.c"
diff --git a/src/mainboard/asus/m5a88-v/acpi/cpstate.asl b/src/mainboard/asus/m5a88-v/acpi/cpstate.asl
index 55825f9..9d28c91 100644
--- a/src/mainboard/asus/m5a88-v/acpi/cpstate.asl
+++ b/src/mainboard/asus/m5a88-v/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/asus/m5a88-v/acpi/ide.asl b/src/mainboard/asus/m5a88-v/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/asus/m5a88-v/acpi/ide.asl
+++ b/src/mainboard/asus/m5a88-v/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m5a88-v/acpi/routing.asl b/src/mainboard/asus/m5a88-v/acpi/routing.asl
index d9af686..8a389aa 100644
--- a/src/mainboard/asus/m5a88-v/acpi/routing.asl
+++ b/src/mainboard/asus/m5a88-v/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/asus/m5a88-v/acpi/sata.asl b/src/mainboard/asus/m5a88-v/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/asus/m5a88-v/acpi/sata.asl
+++ b/src/mainboard/asus/m5a88-v/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m5a88-v/acpi/usb.asl b/src/mainboard/asus/m5a88-v/acpi/usb.asl
index 0b647ed..36bb3df 100644
--- a/src/mainboard/asus/m5a88-v/acpi/usb.asl
+++ b/src/mainboard/asus/m5a88-v/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/asus/m5a88-v/acpi_tables.c b/src/mainboard/asus/m5a88-v/acpi_tables.c
index 4176037..d84b862 100644
--- a/src/mainboard/asus/m5a88-v/acpi_tables.c
+++ b/src/mainboard/asus/m5a88-v/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m5a88-v/dsdt.asl b/src/mainboard/asus/m5a88-v/dsdt.asl
index 561a453..a358e6f 100644
--- a/src/mainboard/asus/m5a88-v/dsdt.asl
+++ b/src/mainboard/asus/m5a88-v/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/asus/m5a88-v/get_bus_conf.c b/src/mainboard/asus/m5a88-v/get_bus_conf.c
index 830905e..23f45ac 100644
--- a/src/mainboard/asus/m5a88-v/get_bus_conf.c
+++ b/src/mainboard/asus/m5a88-v/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m5a88-v/irq_tables.c b/src/mainboard/asus/m5a88-v/irq_tables.c
index dfb69cd..05e6349 100644
--- a/src/mainboard/asus/m5a88-v/irq_tables.c
+++ b/src/mainboard/asus/m5a88-v/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m5a88-v/mainboard.c b/src/mainboard/asus/m5a88-v/mainboard.c
index 47a5505..bc0f997 100644
--- a/src/mainboard/asus/m5a88-v/mainboard.c
+++ b/src/mainboard/asus/m5a88-v/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m5a88-v/mb_sysconf.h b/src/mainboard/asus/m5a88-v/mb_sysconf.h
index 784ed48..e25cc02 100644
--- a/src/mainboard/asus/m5a88-v/mb_sysconf.h
+++ b/src/mainboard/asus/m5a88-v/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c
index 9a2f5a3..2e1a4e1 100644
--- a/src/mainboard/asus/m5a88-v/mptable.c
+++ b/src/mainboard/asus/m5a88-v/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/m5a88-v/platform_cfg.h b/src/mainboard/asus/m5a88-v/platform_cfg.h
index 1ba456e..ae69ab0 100644
--- a/src/mainboard/asus/m5a88-v/platform_cfg.h
+++ b/src/mainboard/asus/m5a88-v/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/asus/m5a88-v/resourcemap.c b/src/mainboard/asus/m5a88-v/resourcemap.c
index c03324e..b9058b5 100644
--- a/src/mainboard/asus/m5a88-v/resourcemap.c
+++ b/src/mainboard/asus/m5a88-v/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/asus/m5a88-v/romstage.c b/src/mainboard/asus/m5a88-v/romstage.c
index 35e9e94..635b67d 100644
--- a/src/mainboard/asus/m5a88-v/romstage.c
+++ b/src/mainboard/asus/m5a88-v/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index cd91b9e..5b6f3c7 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_MEW_AM
 
diff --git a/src/mainboard/asus/mew-am/irq_tables.c b/src/mainboard/asus/mew-am/irq_tables.c
index 8a349d3..be2e91c 100644
--- a/src/mainboard/asus/mew-am/irq_tables.c
+++ b/src/mainboard/asus/mew-am/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/mew-am/romstage.c b/src/mainboard/asus/mew-am/romstage.c
index 7fdbe40..94cfadd 100644
--- a/src/mainboard/asus/mew-am/romstage.c
+++ b/src/mainboard/asus/mew-am/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index eb40a7e..d0d279f 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_MEW_VM
 
diff --git a/src/mainboard/asus/mew-vm/romstage.c b/src/mainboard/asus/mew-vm/romstage.c
index ccae7c3..314fbc8 100644
--- a/src/mainboard/asus/mew-vm/romstage.c
+++ b/src/mainboard/asus/mew-vm/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index d9e6113..45bdbce 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_P2B_D
 
diff --git a/src/mainboard/asus/p2b-d/irq_tables.c b/src/mainboard/asus/p2b-d/irq_tables.c
index e29e509..a9e6b0d 100644
--- a/src/mainboard/asus/p2b-d/irq_tables.c
+++ b/src/mainboard/asus/p2b-d/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/p2b-d/mptable.c b/src/mainboard/asus/p2b-d/mptable.c
index 4b0b72e..bad7997 100644
--- a/src/mainboard/asus/p2b-d/mptable.c
+++ b/src/mainboard/asus/p2b-d/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/p2b-d/romstage.c b/src/mainboard/asus/p2b-d/romstage.c
index 00605e6..d92c356 100644
--- a/src/mainboard/asus/p2b-d/romstage.c
+++ b/src/mainboard/asus/p2b-d/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 29b39de..1d8a21e 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_P2B_DS
 
diff --git a/src/mainboard/asus/p2b-ds/irq_tables.c b/src/mainboard/asus/p2b-ds/irq_tables.c
index 0685c91..e02378c 100644
--- a/src/mainboard/asus/p2b-ds/irq_tables.c
+++ b/src/mainboard/asus/p2b-ds/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b-ds/mptable.c
index 3e6b9d3..b26d99d 100644
--- a/src/mainboard/asus/p2b-ds/mptable.c
+++ b/src/mainboard/asus/p2b-ds/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/asus/p2b-ds/romstage.c b/src/mainboard/asus/p2b-ds/romstage.c
index 3493fb2..a0d172e 100644
--- a/src/mainboard/asus/p2b-ds/romstage.c
+++ b/src/mainboard/asus/p2b-ds/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index 6b9c963..d811ca7 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_P2B_F
 
diff --git a/src/mainboard/asus/p2b-f/irq_tables.c b/src/mainboard/asus/p2b-f/irq_tables.c
index 1250eb1..1f99fd2 100644
--- a/src/mainboard/asus/p2b-f/irq_tables.c
+++ b/src/mainboard/asus/p2b-f/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/p2b-f/romstage.c b/src/mainboard/asus/p2b-f/romstage.c
index 940ed73..c686356 100644
--- a/src/mainboard/asus/p2b-f/romstage.c
+++ b/src/mainboard/asus/p2b-f/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index 77cb651..d9d53d9 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_P2B_LS
 
diff --git a/src/mainboard/asus/p2b-ls/irq_tables.c b/src/mainboard/asus/p2b-ls/irq_tables.c
index efb546f..4428573 100644
--- a/src/mainboard/asus/p2b-ls/irq_tables.c
+++ b/src/mainboard/asus/p2b-ls/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/p2b-ls/romstage.c b/src/mainboard/asus/p2b-ls/romstage.c
index b934a24..69eb2b6 100644
--- a/src/mainboard/asus/p2b-ls/romstage.c
+++ b/src/mainboard/asus/p2b-ls/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index cf3edee..7c763ea 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_P2B
 
diff --git a/src/mainboard/asus/p2b/acpi_tables.c b/src/mainboard/asus/p2b/acpi_tables.c
index 10fa8b6..d8643f8 100644
--- a/src/mainboard/asus/p2b/acpi_tables.c
+++ b/src/mainboard/asus/p2b/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/asus/p2b/dsdt.asl b/src/mainboard/asus/p2b/dsdt.asl
index 29a4505..d1a15aa 100644
--- a/src/mainboard/asus/p2b/dsdt.asl
+++ b/src/mainboard/asus/p2b/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "southbridge/intel/i82371eb/i82371eb.h"
diff --git a/src/mainboard/asus/p2b/irq_tables.c b/src/mainboard/asus/p2b/irq_tables.c
index 7b7b30d..183d3cb 100644
--- a/src/mainboard/asus/p2b/irq_tables.c
+++ b/src/mainboard/asus/p2b/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/p2b/romstage.c b/src/mainboard/asus/p2b/romstage.c
index 58cb40a..a4fcdfa 100644
--- a/src/mainboard/asus/p2b/romstage.c
+++ b/src/mainboard/asus/p2b/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index 68a2d3b..9bd8d05 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ASUS_P3B_F
 
diff --git a/src/mainboard/asus/p3b-f/irq_tables.c b/src/mainboard/asus/p3b-f/irq_tables.c
index 3041a14..1da333a 100644
--- a/src/mainboard/asus/p3b-f/irq_tables.c
+++ b/src/mainboard/asus/p3b-f/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/asus/p3b-f/romstage.c b/src/mainboard/asus/p3b-f/romstage.c
index 4ca6905..86ae01f 100644
--- a/src/mainboard/asus/p3b-f/romstage.c
+++ b/src/mainboard/asus/p3b-f/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/avalue/Kconfig b/src/mainboard/avalue/Kconfig
index c6fa57d..434892d 100644
--- a/src/mainboard/avalue/Kconfig
+++ b/src/mainboard/avalue/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_AVALUE
 
diff --git a/src/mainboard/avalue/eax-785e/acpi/cpstate.asl b/src/mainboard/avalue/eax-785e/acpi/cpstate.asl
index 55825f9..9d28c91 100644
--- a/src/mainboard/avalue/eax-785e/acpi/cpstate.asl
+++ b/src/mainboard/avalue/eax-785e/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/avalue/eax-785e/acpi/routing.asl b/src/mainboard/avalue/eax-785e/acpi/routing.asl
index d9af686..8a389aa 100644
--- a/src/mainboard/avalue/eax-785e/acpi/routing.asl
+++ b/src/mainboard/avalue/eax-785e/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/avalue/eax-785e/acpi/sata.asl b/src/mainboard/avalue/eax-785e/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/avalue/eax-785e/acpi/sata.asl
+++ b/src/mainboard/avalue/eax-785e/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/avalue/eax-785e/acpi/usb.asl b/src/mainboard/avalue/eax-785e/acpi/usb.asl
index 0b647ed..36bb3df 100644
--- a/src/mainboard/avalue/eax-785e/acpi/usb.asl
+++ b/src/mainboard/avalue/eax-785e/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/avalue/eax-785e/acpi_tables.c b/src/mainboard/avalue/eax-785e/acpi_tables.c
index 4176037..d84b862 100644
--- a/src/mainboard/avalue/eax-785e/acpi_tables.c
+++ b/src/mainboard/avalue/eax-785e/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/avalue/eax-785e/dsdt.asl b/src/mainboard/avalue/eax-785e/dsdt.asl
index 45d8be2..ec08e02 100644
--- a/src/mainboard/avalue/eax-785e/dsdt.asl
+++ b/src/mainboard/avalue/eax-785e/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/avalue/eax-785e/get_bus_conf.c b/src/mainboard/avalue/eax-785e/get_bus_conf.c
index 830905e..23f45ac 100644
--- a/src/mainboard/avalue/eax-785e/get_bus_conf.c
+++ b/src/mainboard/avalue/eax-785e/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/avalue/eax-785e/irq_tables.c b/src/mainboard/avalue/eax-785e/irq_tables.c
index dfb69cd..05e6349 100644
--- a/src/mainboard/avalue/eax-785e/irq_tables.c
+++ b/src/mainboard/avalue/eax-785e/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/avalue/eax-785e/mainboard.c b/src/mainboard/avalue/eax-785e/mainboard.c
index 591ae1e..03e8ff9 100644
--- a/src/mainboard/avalue/eax-785e/mainboard.c
+++ b/src/mainboard/avalue/eax-785e/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/avalue/eax-785e/mb_sysconf.h b/src/mainboard/avalue/eax-785e/mb_sysconf.h
index 784ed48..e25cc02 100644
--- a/src/mainboard/avalue/eax-785e/mb_sysconf.h
+++ b/src/mainboard/avalue/eax-785e/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/avalue/eax-785e/mptable.c b/src/mainboard/avalue/eax-785e/mptable.c
index ce251a3..b6e3cae 100644
--- a/src/mainboard/avalue/eax-785e/mptable.c
+++ b/src/mainboard/avalue/eax-785e/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/avalue/eax-785e/platform_cfg.h b/src/mainboard/avalue/eax-785e/platform_cfg.h
index 1ba456e..ae69ab0 100644
--- a/src/mainboard/avalue/eax-785e/platform_cfg.h
+++ b/src/mainboard/avalue/eax-785e/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/avalue/eax-785e/resourcemap.c b/src/mainboard/avalue/eax-785e/resourcemap.c
index c03324e..b9058b5 100644
--- a/src/mainboard/avalue/eax-785e/resourcemap.c
+++ b/src/mainboard/avalue/eax-785e/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/avalue/eax-785e/romstage.c b/src/mainboard/avalue/eax-785e/romstage.c
index bace1d0..103af19 100644
--- a/src/mainboard/avalue/eax-785e/romstage.c
+++ b/src/mainboard/avalue/eax-785e/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/azza/Kconfig b/src/mainboard/azza/Kconfig
index 82517ba..6de039d 100644
--- a/src/mainboard/azza/Kconfig
+++ b/src/mainboard/azza/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_AZZA
 
diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig
index 4569ed0..397aa5f 100644
--- a/src/mainboard/azza/pt-6ibd/Kconfig
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_AZZA_PT_6IBD
 
diff --git a/src/mainboard/azza/pt-6ibd/irq_tables.c b/src/mainboard/azza/pt-6ibd/irq_tables.c
index 9c5501a..25523e1 100644
--- a/src/mainboard/azza/pt-6ibd/irq_tables.c
+++ b/src/mainboard/azza/pt-6ibd/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/azza/pt-6ibd/romstage.c b/src/mainboard/azza/pt-6ibd/romstage.c
index 44fd018..2b4bf76 100644
--- a/src/mainboard/azza/pt-6ibd/romstage.c
+++ b/src/mainboard/azza/pt-6ibd/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/bachmann/ot200/cmos.layout b/src/mainboard/bachmann/ot200/cmos.layout
index 63e16cd..e395dde 100644
--- a/src/mainboard/bachmann/ot200/cmos.layout
+++ b/src/mainboard/bachmann/ot200/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/bachmann/ot200/irq_tables.c b/src/mainboard/bachmann/ot200/irq_tables.c
index 4c33883..b12f14b 100644
--- a/src/mainboard/bachmann/ot200/irq_tables.c
+++ b/src/mainboard/bachmann/ot200/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/bachmann/ot200/mainboard.c b/src/mainboard/bachmann/ot200/mainboard.c
index fdcd7a6..49ed801 100644
--- a/src/mainboard/bachmann/ot200/mainboard.c
+++ b/src/mainboard/bachmann/ot200/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/bachmann/ot200/romstage.c b/src/mainboard/bachmann/ot200/romstage.c
index 01d9504..30a571d 100644
--- a/src/mainboard/bachmann/ot200/romstage.c
+++ b/src/mainboard/bachmann/ot200/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/bap/Kconfig b/src/mainboard/bap/Kconfig
index b5f56e9..92ef902 100644
--- a/src/mainboard/bap/Kconfig
+++ b/src/mainboard/bap/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_BAP
 
diff --git a/src/mainboard/bap/ode_e20XX/BAP_Q7.spd.hex b/src/mainboard/bap/ode_e20XX/BAP_Q7.spd.hex
index fff7cc1..64c7136 100644
--- a/src/mainboard/bap/ode_e20XX/BAP_Q7.spd.hex
+++ b/src/mainboard/bap/ode_e20XX/BAP_Q7.spd.hex
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc. 
+# along with this program. 
 
 # BAP ODE E20XX has 2GB ram soldered down on the Q7
 
diff --git a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
index 953eb40..92df98c 100644
--- a/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
+++ b/src/mainboard/bap/ode_e20XX/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/bap/ode_e20XX/Kconfig b/src/mainboard/bap/ode_e20XX/Kconfig
index 15face5..a78df87 100644
--- a/src/mainboard/bap/ode_e20XX/Kconfig
+++ b/src/mainboard/bap/ode_e20XX/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_ODE_E20XX
diff --git a/src/mainboard/bap/ode_e20XX/Makefile.inc b/src/mainboard/bap/ode_e20XX/Makefile.inc
index 13523dd..503b251 100644
--- a/src/mainboard/bap/ode_e20XX/Makefile.inc
+++ b/src/mainboard/bap/ode_e20XX/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/bap/ode_e20XX/OptionsIds.h b/src/mainboard/bap/ode_e20XX/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/bap/ode_e20XX/OptionsIds.h
+++ b/src/mainboard/bap/ode_e20XX/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/bap/ode_e20XX/PlatformGnbPcie.c b/src/mainboard/bap/ode_e20XX/PlatformGnbPcie.c
index a282699..4a3b92d 100644
--- a/src/mainboard/bap/ode_e20XX/PlatformGnbPcie.c
+++ b/src/mainboard/bap/ode_e20XX/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl b/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl
index 88d3381..1996f04 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/bap/ode_e20XX/acpi/gpe.asl b/src/mainboard/bap/ode_e20XX/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/gpe.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/ide.asl b/src/mainboard/bap/ode_e20XX/acpi/ide.asl
index dfb4158..f8e323a 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/ide.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No IDE functionality */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
index da4f11a..9e9ec0e 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/routing.asl b/src/mainboard/bap/ode_e20XX/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/routing.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/bap/ode_e20XX/acpi/sata.asl b/src/mainboard/bap/ode_e20XX/acpi/sata.asl
index 9a96a9d..af1cff2 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/sata.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/si.asl b/src/mainboard/bap/ode_e20XX/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/si.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/bap/ode_e20XX/acpi/sleep.asl b/src/mainboard/bap/ode_e20XX/acpi/sleep.asl
index 6a2cef9..f0986df 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/sleep.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/superio.asl b/src/mainboard/bap/ode_e20XX/acpi/superio.asl
index 1c5b3cd..d5208cb 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/superio.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/superio.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SuperIO support for Windows */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/thermal.asl b/src/mainboard/bap/ode_e20XX/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/thermal.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl b/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl
index 07ca7b4..44087cc 100644
--- a/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl
+++ b/src/mainboard/bap/ode_e20XX/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/bap/ode_e20XX/acpi_tables.c b/src/mainboard/bap/ode_e20XX/acpi_tables.c
index 6c061e0..94e1df6 100644
--- a/src/mainboard/bap/ode_e20XX/acpi_tables.c
+++ b/src/mainboard/bap/ode_e20XX/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/bap/ode_e20XX/buildOpts.c b/src/mainboard/bap/ode_e20XX/buildOpts.c
index c7bdab8..2556187 100644
--- a/src/mainboard/bap/ode_e20XX/buildOpts.c
+++ b/src/mainboard/bap/ode_e20XX/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/bap/ode_e20XX/cmos.layout b/src/mainboard/bap/ode_e20XX/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/bap/ode_e20XX/cmos.layout
+++ b/src/mainboard/bap/ode_e20XX/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/bap/ode_e20XX/devicetree.cb b/src/mainboard/bap/ode_e20XX/devicetree.cb
index 93f5e73..25b592b 100644
--- a/src/mainboard/bap/ode_e20XX/devicetree.cb
+++ b/src/mainboard/bap/ode_e20XX/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/bap/ode_e20XX/dsdt.asl b/src/mainboard/bap/ode_e20XX/dsdt.asl
index 3f1aa8b..6df107e 100644
--- a/src/mainboard/bap/ode_e20XX/dsdt.asl
+++ b/src/mainboard/bap/ode_e20XX/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/bap/ode_e20XX/irq_tables.c b/src/mainboard/bap/ode_e20XX/irq_tables.c
index 33ce343..cb8248e 100644
--- a/src/mainboard/bap/ode_e20XX/irq_tables.c
+++ b/src/mainboard/bap/ode_e20XX/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/bap/ode_e20XX/mainboard.c b/src/mainboard/bap/ode_e20XX/mainboard.c
index ab1bb8b..7ee0f48 100644
--- a/src/mainboard/bap/ode_e20XX/mainboard.c
+++ b/src/mainboard/bap/ode_e20XX/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/bap/ode_e20XX/mptable.c b/src/mainboard/bap/ode_e20XX/mptable.c
index 5ead389..aa505a4 100644
--- a/src/mainboard/bap/ode_e20XX/mptable.c
+++ b/src/mainboard/bap/ode_e20XX/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/bap/ode_e20XX/romstage.c b/src/mainboard/bap/ode_e20XX/romstage.c
index 5b64152..7d54eff 100644
--- a/src/mainboard/bap/ode_e20XX/romstage.c
+++ b/src/mainboard/bap/ode_e20XX/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/bcom/Kconfig b/src/mainboard/bcom/Kconfig
index 0169dc0..5cf70b2 100644
--- a/src/mainboard/bcom/Kconfig
+++ b/src/mainboard/bcom/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_BCOM
 
diff --git a/src/mainboard/bcom/winnetp680/irq_tables.c b/src/mainboard/bcom/winnetp680/irq_tables.c
index 6a3a8be..42fb4bc 100644
--- a/src/mainboard/bcom/winnetp680/irq_tables.c
+++ b/src/mainboard/bcom/winnetp680/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/bcom/winnetp680/romstage.c b/src/mainboard/bcom/winnetp680/romstage.c
index f86b3cb..1121f19 100644
--- a/src/mainboard/bcom/winnetp680/romstage.c
+++ b/src/mainboard/bcom/winnetp680/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/bifferos/Kconfig b/src/mainboard/bifferos/Kconfig
index 584a8ce..29829ce 100644
--- a/src/mainboard/bifferos/Kconfig
+++ b/src/mainboard/bifferos/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if VENDOR_BIFFEROS
diff --git a/src/mainboard/bifferos/bifferboard/romstage.c b/src/mainboard/bifferos/bifferboard/romstage.c
index dc616ed..fe8fe32 100644
--- a/src/mainboard/bifferos/bifferboard/romstage.c
+++ b/src/mainboard/bifferos/bifferboard/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/biostar/Kconfig b/src/mainboard/biostar/Kconfig
index 616720c..a9b40bc 100644
--- a/src/mainboard/biostar/Kconfig
+++ b/src/mainboard/biostar/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_BIOSTAR
 
diff --git a/src/mainboard/biostar/am1ml/BiosCallOuts.c b/src/mainboard/biostar/am1ml/BiosCallOuts.c
index 5f644e7..dc54463 100644
--- a/src/mainboard/biostar/am1ml/BiosCallOuts.c
+++ b/src/mainboard/biostar/am1ml/BiosCallOuts.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia.h>
diff --git a/src/mainboard/biostar/am1ml/Kconfig b/src/mainboard/biostar/am1ml/Kconfig
index 8f25562..53905ef 100644
--- a/src/mainboard/biostar/am1ml/Kconfig
+++ b/src/mainboard/biostar/am1ml/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_BIOSTAR_AM1ML
diff --git a/src/mainboard/biostar/am1ml/Makefile.inc b/src/mainboard/biostar/am1ml/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/biostar/am1ml/Makefile.inc
+++ b/src/mainboard/biostar/am1ml/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/biostar/am1ml/OptionsIds.h b/src/mainboard/biostar/am1ml/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/biostar/am1ml/OptionsIds.h
+++ b/src/mainboard/biostar/am1ml/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/biostar/am1ml/PlatformGnbPcie.c b/src/mainboard/biostar/am1ml/PlatformGnbPcie.c
index fa1cc65..7ddfc63 100644
--- a/src/mainboard/biostar/am1ml/PlatformGnbPcie.c
+++ b/src/mainboard/biostar/am1ml/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/biostar/am1ml/acpi/AmdImc.asl b/src/mainboard/biostar/am1ml/acpi/AmdImc.asl
index 88d3381..1996f04 100644
--- a/src/mainboard/biostar/am1ml/acpi/AmdImc.asl
+++ b/src/mainboard/biostar/am1ml/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/biostar/am1ml/acpi/flag0.asl b/src/mainboard/biostar/am1ml/acpi/flag0.asl
index 14bd712..0465e74 100644
--- a/src/mainboard/biostar/am1ml/acpi/flag0.asl
+++ b/src/mainboard/biostar/am1ml/acpi/flag0.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 OperationRegion (GRAM, SystemMemory, 0x0400, 0x0100)
diff --git a/src/mainboard/biostar/am1ml/acpi/gpe.asl b/src/mainboard/biostar/am1ml/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/biostar/am1ml/acpi/gpe.asl
+++ b/src/mainboard/biostar/am1ml/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/biostar/am1ml/acpi/ide.asl b/src/mainboard/biostar/am1ml/acpi/ide.asl
index 15cfeb6..96a788c 100644
--- a/src/mainboard/biostar/am1ml/acpi/ide.asl
+++ b/src/mainboard/biostar/am1ml/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No IDE functionality */
diff --git a/src/mainboard/biostar/am1ml/acpi/mainboard.asl b/src/mainboard/biostar/am1ml/acpi/mainboard.asl
index da4f11a..9e9ec0e 100644
--- a/src/mainboard/biostar/am1ml/acpi/mainboard.asl
+++ b/src/mainboard/biostar/am1ml/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/biostar/am1ml/acpi/routing.asl b/src/mainboard/biostar/am1ml/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/biostar/am1ml/acpi/routing.asl
+++ b/src/mainboard/biostar/am1ml/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/biostar/am1ml/acpi/sata.asl b/src/mainboard/biostar/am1ml/acpi/sata.asl
index 30733c8..f234b21 100644
--- a/src/mainboard/biostar/am1ml/acpi/sata.asl
+++ b/src/mainboard/biostar/am1ml/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/biostar/am1ml/acpi/si.asl b/src/mainboard/biostar/am1ml/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/biostar/am1ml/acpi/si.asl
+++ b/src/mainboard/biostar/am1ml/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/biostar/am1ml/acpi/sio.asl b/src/mainboard/biostar/am1ml/acpi/sio.asl
index de7e2a7..6a9657d 100644
--- a/src/mainboard/biostar/am1ml/acpi/sio.asl
+++ b/src/mainboard/biostar/am1ml/acpi/sio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 OperationRegion (IOID, SystemIO, 0x2E, 0x02)
diff --git a/src/mainboard/biostar/am1ml/acpi/sleep.asl b/src/mainboard/biostar/am1ml/acpi/sleep.asl
index 6a2cef9..f0986df 100644
--- a/src/mainboard/biostar/am1ml/acpi/sleep.asl
+++ b/src/mainboard/biostar/am1ml/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/biostar/am1ml/acpi/superio.asl b/src/mainboard/biostar/am1ml/acpi/superio.asl
index 28ea216..4a962ed 100644
--- a/src/mainboard/biostar/am1ml/acpi/superio.asl
+++ b/src/mainboard/biostar/am1ml/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/mainboard/biostar/am1ml/acpi/thermal.asl b/src/mainboard/biostar/am1ml/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/biostar/am1ml/acpi/thermal.asl
+++ b/src/mainboard/biostar/am1ml/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/biostar/am1ml/acpi/usb_oc.asl b/src/mainboard/biostar/am1ml/acpi/usb_oc.asl
index 4a621c9..4c060cd 100644
--- a/src/mainboard/biostar/am1ml/acpi/usb_oc.asl
+++ b/src/mainboard/biostar/am1ml/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/biostar/am1ml/acpi_tables.c b/src/mainboard/biostar/am1ml/acpi_tables.c
index 9d97943..2fa44f7 100644
--- a/src/mainboard/biostar/am1ml/acpi_tables.c
+++ b/src/mainboard/biostar/am1ml/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/biostar/am1ml/buildOpts.c b/src/mainboard/biostar/am1ml/buildOpts.c
index 822eeb2..691917f 100644
--- a/src/mainboard/biostar/am1ml/buildOpts.c
+++ b/src/mainboard/biostar/am1ml/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/biostar/am1ml/cmos.layout b/src/mainboard/biostar/am1ml/cmos.layout
index aa133e2..6e1704f 100644
--- a/src/mainboard/biostar/am1ml/cmos.layout
+++ b/src/mainboard/biostar/am1ml/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/biostar/am1ml/devicetree.cb b/src/mainboard/biostar/am1ml/devicetree.cb
index c9cf45e..290551c 100644
--- a/src/mainboard/biostar/am1ml/devicetree.cb
+++ b/src/mainboard/biostar/am1ml/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/biostar/am1ml/dsdt.asl b/src/mainboard/biostar/am1ml/dsdt.asl
index 301100f..f511797 100644
--- a/src/mainboard/biostar/am1ml/dsdt.asl
+++ b/src/mainboard/biostar/am1ml/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/biostar/am1ml/irq_tables.c b/src/mainboard/biostar/am1ml/irq_tables.c
index 79958ff..825e21a 100644
--- a/src/mainboard/biostar/am1ml/irq_tables.c
+++ b/src/mainboard/biostar/am1ml/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/biostar/am1ml/mainboard.c b/src/mainboard/biostar/am1ml/mainboard.c
index 01083de..6f4576e 100644
--- a/src/mainboard/biostar/am1ml/mainboard.c
+++ b/src/mainboard/biostar/am1ml/mainboard.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/biostar/am1ml/mptable.c b/src/mainboard/biostar/am1ml/mptable.c
index f182709..92eee12 100644
--- a/src/mainboard/biostar/am1ml/mptable.c
+++ b/src/mainboard/biostar/am1ml/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/biostar/am1ml/romstage.c b/src/mainboard/biostar/am1ml/romstage.c
index be5deda..eac79cf 100644
--- a/src/mainboard/biostar/am1ml/romstage.c
+++ b/src/mainboard/biostar/am1ml/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig
index 3fe7fd6..b979f40 100644
--- a/src/mainboard/biostar/m6tba/Kconfig
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_BIOSTAR_M6TBA
 
diff --git a/src/mainboard/biostar/m6tba/irq_tables.c b/src/mainboard/biostar/m6tba/irq_tables.c
index d848b3c..2cfecb7 100644
--- a/src/mainboard/biostar/m6tba/irq_tables.c
+++ b/src/mainboard/biostar/m6tba/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/biostar/m6tba/romstage.c b/src/mainboard/biostar/m6tba/romstage.c
index 73f08f2..5663ad8 100644
--- a/src/mainboard/biostar/m6tba/romstage.c
+++ b/src/mainboard/biostar/m6tba/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/compaq/Kconfig b/src/mainboard/compaq/Kconfig
index 5e351e1..3d31126 100644
--- a/src/mainboard/compaq/Kconfig
+++ b/src/mainboard/compaq/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_COMPAQ
 
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
index 9cfb28c..fa22272 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_COMPAQ_DESKPRO_EN_SFF_P600
 
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/irq_tables.c b/src/mainboard/compaq/deskpro_en_sff_p600/irq_tables.c
index 13b6402..c53f374 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/irq_tables.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
index 3703104..f17c17e 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/cubietech/cubieboard/memlayout.ld b/src/mainboard/cubietech/cubieboard/memlayout.ld
index 6fc798a..e8b3435 100644
--- a/src/mainboard/cubietech/cubieboard/memlayout.ld
+++ b/src/mainboard/cubietech/cubieboard/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/mainboard/digitallogic/msm800sev/irq_tables.c b/src/mainboard/digitallogic/msm800sev/irq_tables.c
index 401a140..ecb7084 100644
--- a/src/mainboard/digitallogic/msm800sev/irq_tables.c
+++ b/src/mainboard/digitallogic/msm800sev/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/digitallogic/msm800sev/mainboard.c b/src/mainboard/digitallogic/msm800sev/mainboard.c
index aec53cf..0a10e3d 100644
--- a/src/mainboard/digitallogic/msm800sev/mainboard.c
+++ b/src/mainboard/digitallogic/msm800sev/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/dmp/Kconfig b/src/mainboard/dmp/Kconfig
index 44004b0..c0c7c4e 100644
--- a/src/mainboard/dmp/Kconfig
+++ b/src/mainboard/dmp/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if VENDOR_DMP
diff --git a/src/mainboard/dmp/vortex86ex/Kconfig b/src/mainboard/dmp/vortex86ex/Kconfig
index ab2330b..c607c37 100644
--- a/src/mainboard/dmp/vortex86ex/Kconfig
+++ b/src/mainboard/dmp/vortex86ex/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_DMP_EX
diff --git a/src/mainboard/dmp/vortex86ex/devicetree.cb b/src/mainboard/dmp/vortex86ex/devicetree.cb
index 2ea6cb1..6cb9933 100644
--- a/src/mainboard/dmp/vortex86ex/devicetree.cb
+++ b/src/mainboard/dmp/vortex86ex/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/dmp/vortex86ex			# North Bridge
diff --git a/src/mainboard/dmp/vortex86ex/hda_verb.c b/src/mainboard/dmp/vortex86ex/hda_verb.c
index 570679f..28ff12e 100644
--- a/src/mainboard/dmp/vortex86ex/hda_verb.c
+++ b/src/mainboard/dmp/vortex86ex/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/dmp/vortex86ex/irq_tables.c b/src/mainboard/dmp/vortex86ex/irq_tables.c
index 71e1f6b..bd892ea 100644
--- a/src/mainboard/dmp/vortex86ex/irq_tables.c
+++ b/src/mainboard/dmp/vortex86ex/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/dmp/vortex86ex/mainboard.c b/src/mainboard/dmp/vortex86ex/mainboard.c
index 556e4ed..180c418 100644
--- a/src/mainboard/dmp/vortex86ex/mainboard.c
+++ b/src/mainboard/dmp/vortex86ex/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/dmp/vortex86ex/romstage.c b/src/mainboard/dmp/vortex86ex/romstage.c
index 36925db..dd42ca5 100644
--- a/src/mainboard/dmp/vortex86ex/romstage.c
+++ b/src/mainboard/dmp/vortex86ex/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/ecs/Kconfig b/src/mainboard/ecs/Kconfig
index be385db..acb4886 100644
--- a/src/mainboard/ecs/Kconfig
+++ b/src/mainboard/ecs/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_ECS
 
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig
index c0e34f1..691da5c 100644
--- a/src/mainboard/ecs/p6iwp-fe/Kconfig
+++ b/src/mainboard/ecs/p6iwp-fe/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_ECS_P6IWP_FE
 
diff --git a/src/mainboard/ecs/p6iwp-fe/devicetree.cb b/src/mainboard/ecs/p6iwp-fe/devicetree.cb
index 4739a7c..17a7131 100644
--- a/src/mainboard/ecs/p6iwp-fe/devicetree.cb
+++ b/src/mainboard/ecs/p6iwp-fe/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i82810		# Northbridge
diff --git a/src/mainboard/ecs/p6iwp-fe/irq_tables.c b/src/mainboard/ecs/p6iwp-fe/irq_tables.c
index 4be19f3..b876e17 100644
--- a/src/mainboard/ecs/p6iwp-fe/irq_tables.c
+++ b/src/mainboard/ecs/p6iwp-fe/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/ecs/p6iwp-fe/romstage.c b/src/mainboard/ecs/p6iwp-fe/romstage.c
index bb79fd9..4fe7052 100644
--- a/src/mainboard/ecs/p6iwp-fe/romstage.c
+++ b/src/mainboard/ecs/p6iwp-fe/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/emulation/qemu-armv7/cbmem.c b/src/mainboard/emulation/qemu-armv7/cbmem.c
index d3a2d6f..b1773a4 100644
--- a/src/mainboard/emulation/qemu-armv7/cbmem.c
+++ b/src/mainboard/emulation/qemu-armv7/cbmem.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/mainboard/emulation/qemu-armv7/memlayout.ld b/src/mainboard/emulation/qemu-armv7/memlayout.ld
index 5ce06cd..a004ef1 100644
--- a/src/mainboard/emulation/qemu-armv7/memlayout.ld
+++ b/src/mainboard/emulation/qemu-armv7/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
index c2055f5..9f528cf 100644
--- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
index 86c10ce..5a48046 100644
--- a/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
+++ b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/dsdt.asl b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
index 8594f38..a91cc02 100644
--- a/src/mainboard/emulation/qemu-i440fx/dsdt.asl
+++ b/src/mainboard/emulation/qemu-i440fx/dsdt.asl
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc.
+ * License along with this library.
  */
 
 DefinitionBlock (
diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
index f674972..8bcf2d9 100644
--- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.h b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h
index 8763360..f2d1010 100644
--- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.h
+++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void fw_cfg_get(int entry, void *dst, int dstlen);
diff --git a/src/mainboard/emulation/qemu-i440fx/mainboard.c b/src/mainboard/emulation/qemu-i440fx/mainboard.c
index 3aaa908..bd05a07 100644
--- a/src/mainboard/emulation/qemu-i440fx/mainboard.c
+++ b/src/mainboard/emulation/qemu-i440fx/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/memory.c b/src/mainboard/emulation/qemu-i440fx/memory.c
index fd6c6ad..0478c42 100644
--- a/src/mainboard/emulation/qemu-i440fx/memory.c
+++ b/src/mainboard/emulation/qemu-i440fx/memory.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c
index 359bb25..ae1482f 100644
--- a/src/mainboard/emulation/qemu-i440fx/romstage.c
+++ b/src/mainboard/emulation/qemu-i440fx/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c
index 2fd4673..f118bcb 100644
--- a/src/mainboard/emulation/qemu-q35/acpi_tables.c
+++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/emulation/qemu-q35/dsdt.asl b/src/mainboard/emulation/qemu-q35/dsdt.asl
index 9cee022..62edd05 100644
--- a/src/mainboard/emulation/qemu-q35/dsdt.asl
+++ b/src/mainboard/emulation/qemu-q35/dsdt.asl
@@ -13,8 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc.
+ * License along with this library.
  */
 /*
  * Copyright (c) 2010 Isaku Yamahata
diff --git a/src/mainboard/emulation/qemu-q35/mainboard.c b/src/mainboard/emulation/qemu-q35/mainboard.c
index 64407dc..e351f7c 100644
--- a/src/mainboard/emulation/qemu-q35/mainboard.c
+++ b/src/mainboard/emulation/qemu-q35/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c
index 8114739..295b763 100644
--- a/src/mainboard/emulation/qemu-q35/romstage.c
+++ b/src/mainboard/emulation/qemu-q35/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/emulation/qemu-riscv/bootblock.c b/src/mainboard/emulation/qemu-riscv/bootblock.c
index c771862..ffa188e 100644
--- a/src/mainboard/emulation/qemu-riscv/bootblock.c
+++ b/src/mainboard/emulation/qemu-riscv/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/mainboard/emulation/qemu-riscv/memlayout.ld b/src/mainboard/emulation/qemu-riscv/memlayout.ld
index 8801f35..55f4402 100644
--- a/src/mainboard/emulation/qemu-riscv/memlayout.ld
+++ b/src/mainboard/emulation/qemu-riscv/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/mainboard/emulation/qemu-riscv/uart.c b/src/mainboard/emulation/qemu-riscv/uart.c
index 9b8c51f..397d290 100644
--- a/src/mainboard/emulation/qemu-riscv/uart.c
+++ b/src/mainboard/emulation/qemu-riscv/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/emulation/spike-riscv/bootblock.c b/src/mainboard/emulation/spike-riscv/bootblock.c
index 56f2eca..3accd86 100644
--- a/src/mainboard/emulation/spike-riscv/bootblock.c
+++ b/src/mainboard/emulation/spike-riscv/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/mainboard/emulation/spike-riscv/memlayout.ld b/src/mainboard/emulation/spike-riscv/memlayout.ld
index 8e2e7ee..3ba3c59 100644
--- a/src/mainboard/emulation/spike-riscv/memlayout.ld
+++ b/src/mainboard/emulation/spike-riscv/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/mainboard/emulation/spike-riscv/uart.c b/src/mainboard/emulation/spike-riscv/uart.c
index 961ddc5..42a5381 100644
--- a/src/mainboard/emulation/spike-riscv/uart.c
+++ b/src/mainboard/emulation/spike-riscv/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/getac/Kconfig b/src/mainboard/getac/Kconfig
index d3762cc..d0b9245 100644
--- a/src/mainboard/getac/Kconfig
+++ b/src/mainboard/getac/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_GETAC
 
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index 5e6e3c1..f3937d7 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_GETAC_P470
 
diff --git a/src/mainboard/getac/p470/Makefile.inc b/src/mainboard/getac/p470/Makefile.inc
index b5fbe90..576cc25 100644
--- a/src/mainboard/getac/p470/Makefile.inc
+++ b/src/mainboard/getac/p470/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += cstates.c
diff --git a/src/mainboard/getac/p470/acpi/battery.asl b/src/mainboard/getac/p470/acpi/battery.asl
index 4f15bac..fe23cec 100644
--- a/src/mainboard/getac/p470/acpi/battery.asl
+++ b/src/mainboard/getac/p470/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SB) {
diff --git a/src/mainboard/getac/p470/acpi/ec.asl b/src/mainboard/getac/p470/acpi/ec.asl
index e9d46e4..4e56f21 100644
--- a/src/mainboard/getac/p470/acpi/ec.asl
+++ b/src/mainboard/getac/p470/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/getac/p470/acpi/gpe.asl b/src/mainboard/getac/p470/acpi/gpe.asl
index 2cabd0f..69fb828 100644
--- a/src/mainboard/getac/p470/acpi/gpe.asl
+++ b/src/mainboard/getac/p470/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (_GPE)
diff --git a/src/mainboard/getac/p470/acpi/i945_pci_irqs.asl b/src/mainboard/getac/p470/acpi/i945_pci_irqs.asl
index 2d50aa6..7f83f45 100644
--- a/src/mainboard/getac/p470/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/getac/p470/acpi/i945_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/getac/p470/acpi/ich7_pci_irqs.asl b/src/mainboard/getac/p470/acpi/ich7_pci_irqs.asl
index 560df4d..081a6dd 100644
--- a/src/mainboard/getac/p470/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/getac/p470/acpi/ich7_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/getac/p470/acpi/mainboard.asl b/src/mainboard/getac/p470/acpi/mainboard.asl
index 847c7ec..a48a769 100644
--- a/src/mainboard/getac/p470/acpi/mainboard.asl
+++ b/src/mainboard/getac/p470/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LID0)
diff --git a/src/mainboard/getac/p470/acpi/platform.asl b/src/mainboard/getac/p470/acpi/platform.asl
index ba942e7..939c37b 100644
--- a/src/mainboard/getac/p470/acpi/platform.asl
+++ b/src/mainboard/getac/p470/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/getac/p470/acpi/superio.asl b/src/mainboard/getac/p470/acpi/superio.asl
index 5ffba15..ace4329 100644
--- a/src/mainboard/getac/p470/acpi/superio.asl
+++ b/src/mainboard/getac/p470/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMSC SIO10N268 */
diff --git a/src/mainboard/getac/p470/acpi/thermal.asl b/src/mainboard/getac/p470/acpi/thermal.asl
index f80491b..4f23637 100644
--- a/src/mainboard/getac/p470/acpi/thermal.asl
+++ b/src/mainboard/getac/p470/acpi/thermal.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/getac/p470/acpi_tables.c b/src/mainboard/getac/p470/acpi_tables.c
index 18b7151..90e6210 100644
--- a/src/mainboard/getac/p470/acpi_tables.c
+++ b/src/mainboard/getac/p470/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/getac/p470/cmos.layout b/src/mainboard/getac/p470/cmos.layout
index 376f171..82e1dc3 100644
--- a/src/mainboard/getac/p470/cmos.layout
+++ b/src/mainboard/getac/p470/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb
index edf165e..4f866c5 100644
--- a/src/mainboard/getac/p470/devicetree.cb
+++ b/src/mainboard/getac/p470/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i945
diff --git a/src/mainboard/getac/p470/dsdt.asl b/src/mainboard/getac/p470/dsdt.asl
index 27c4fe3..b6d2c98 100644
--- a/src/mainboard/getac/p470/dsdt.asl
+++ b/src/mainboard/getac/p470/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/getac/p470/ec_oem.c b/src/mainboard/getac/p470/ec_oem.c
index b7b8b3a..43c59ab 100644
--- a/src/mainboard/getac/p470/ec_oem.c
+++ b/src/mainboard/getac/p470/ec_oem.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/getac/p470/ec_oem.h b/src/mainboard/getac/p470/ec_oem.h
index f809646..7700ff2 100644
--- a/src/mainboard/getac/p470/ec_oem.h
+++ b/src/mainboard/getac/p470/ec_oem.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _MAINBOARD_EC_OEM_H
diff --git a/src/mainboard/getac/p470/hda_verb.c b/src/mainboard/getac/p470/hda_verb.c
index c5a2580..5aaab97 100644
--- a/src/mainboard/getac/p470/hda_verb.c
+++ b/src/mainboard/getac/p470/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/getac/p470/irq_tables.c b/src/mainboard/getac/p470/irq_tables.c
index 42a6781..9dd9662 100644
--- a/src/mainboard/getac/p470/irq_tables.c
+++ b/src/mainboard/getac/p470/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/getac/p470/mainboard.c b/src/mainboard/getac/p470/mainboard.c
index 226b9c0..0f5e220 100644
--- a/src/mainboard/getac/p470/mainboard.c
+++ b/src/mainboard/getac/p470/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/getac/p470/mptable.c b/src/mainboard/getac/p470/mptable.c
index 80549a1..b46bb38 100644
--- a/src/mainboard/getac/p470/mptable.c
+++ b/src/mainboard/getac/p470/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/getac/p470/romstage.c b/src/mainboard/getac/p470/romstage.c
index 22a14c2..31382dd 100644
--- a/src/mainboard/getac/p470/romstage.c
+++ b/src/mainboard/getac/p470/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/getac/p470/smihandler.c b/src/mainboard/getac/p470/smihandler.c
index f37342e..f6ff685 100644
--- a/src/mainboard/getac/p470/smihandler.c
+++ b/src/mainboard/getac/p470/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/gigabyte/Kconfig b/src/mainboard/gigabyte/Kconfig
index b7721e9..53a2bd6 100644
--- a/src/mainboard/gigabyte/Kconfig
+++ b/src/mainboard/gigabyte/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_GIGABYTE
 
diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
index 24ff4fe..7730494 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_GIGABYTE_GA_6BXC
 
diff --git a/src/mainboard/gigabyte/ga-6bxc/irq_tables.c b/src/mainboard/gigabyte/ga-6bxc/irq_tables.c
index 460a762..da4c1c4 100644
--- a/src/mainboard/gigabyte/ga-6bxc/irq_tables.c
+++ b/src/mainboard/gigabyte/ga-6bxc/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/gigabyte/ga-6bxc/romstage.c b/src/mainboard/gigabyte/ga-6bxc/romstage.c
index 670fb82..39e8ef4 100644
--- a/src/mainboard/gigabyte/ga-6bxc/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxc/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/gigabyte/ga-6bxe/Kconfig b/src/mainboard/gigabyte/ga-6bxe/Kconfig
index 5884ae9..3987fc5 100644
--- a/src/mainboard/gigabyte/ga-6bxe/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxe/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_GIGABYTE_GA_6BXE
 
diff --git a/src/mainboard/gigabyte/ga-6bxe/irq_tables.c b/src/mainboard/gigabyte/ga-6bxe/irq_tables.c
index 0ea5722..28e5d25 100644
--- a/src/mainboard/gigabyte/ga-6bxe/irq_tables.c
+++ b/src/mainboard/gigabyte/ga-6bxe/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/gigabyte/ga-6bxe/romstage.c b/src/mainboard/gigabyte/ga-6bxe/romstage.c
index 63781e5..fc93722 100644
--- a/src/mainboard/gigabyte/ga-6bxe/romstage.c
+++ b/src/mainboard/gigabyte/ga-6bxe/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
index 1b69e9c..07c2222 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += gpio.c
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl
index b0fb277..13cc8cd 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl
index 1f661ce..8784932 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl
index 0706429..1e78bac 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl
index 171365a..e4d612d 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
index 70eeeb2..047a235 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
index b9732bc..c8b8215 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c
index 6828330..1977e67 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c
index 14fd79d..acc64d8 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define SUPERIO_BASE 0x2e
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/thermal.h b/src/mainboard/gigabyte/ga-b75m-d3h/thermal.h
index c0360f0..5453952 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/thermal.h
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef GAB75MD3H_THERMAL_H
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc b/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc
index 1b69e9c..07c2222 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += gpio.c
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl
index 5ec810d..31f996f 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl
index 171365a..e4d612d 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c
index 70eeeb2..047a235 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
index b9732bc..c8b8215 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c
index 6828330..1977e67 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c b/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c
index 99b99c3..83be11b 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define SUPERIO_BASE 0x2e
diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h b/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h
index c0360f0..5453952 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h
+++ b/src/mainboard/gigabyte/ga-b75m-d3v/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef GAB75MD3H_THERMAL_H
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
index aa4ee3e..b63a627 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
index 19caa53..166ead1 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/get_bus_conf.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
index 001cf59..d53390a 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/irq_tables.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
index a464605..383a5ab 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c b/src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c
index dce6bda..877cf30 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
index 008a23f..758f5a1 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/romstage.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/gigabyte/m57sli/Makefile.inc b/src/mainboard/gigabyte/m57sli/Makefile.inc
index 7b94129..8667e47 100644
--- a/src/mainboard/gigabyte/m57sli/Makefile.inc
+++ b/src/mainboard/gigabyte/m57sli/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_ITE_IT8716F_OVERRIDE_FANCTL) += fanctl.c
diff --git a/src/mainboard/gigabyte/m57sli/acpi_tables.c b/src/mainboard/gigabyte/m57sli/acpi_tables.c
index 334c1cf..27a0700 100644
--- a/src/mainboard/gigabyte/m57sli/acpi_tables.c
+++ b/src/mainboard/gigabyte/m57sli/acpi_tables.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/m57sli/cmos.layout b/src/mainboard/gigabyte/m57sli/cmos.layout
index aa4ee3e..b63a627 100644
--- a/src/mainboard/gigabyte/m57sli/cmos.layout
+++ b/src/mainboard/gigabyte/m57sli/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/gigabyte/m57sli/dsdt.asl b/src/mainboard/gigabyte/m57sli/dsdt.asl
index 163b228..a81ae42 100644
--- a/src/mainboard/gigabyte/m57sli/dsdt.asl
+++ b/src/mainboard/gigabyte/m57sli/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/m57sli/get_bus_conf.c b/src/mainboard/gigabyte/m57sli/get_bus_conf.c
index 15cc8ac..9c02c47 100644
--- a/src/mainboard/gigabyte/m57sli/get_bus_conf.c
+++ b/src/mainboard/gigabyte/m57sli/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/m57sli/irq_tables.c b/src/mainboard/gigabyte/m57sli/irq_tables.c
index 0bce0b5..eea14ca 100644
--- a/src/mainboard/gigabyte/m57sli/irq_tables.c
+++ b/src/mainboard/gigabyte/m57sli/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/gigabyte/m57sli/mainboard.c b/src/mainboard/gigabyte/m57sli/mainboard.c
index e09f86e..7747762 100644
--- a/src/mainboard/gigabyte/m57sli/mainboard.c
+++ b/src/mainboard/gigabyte/m57sli/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/m57sli/mptable.c b/src/mainboard/gigabyte/m57sli/mptable.c
index 726de01..0bfa0ab 100644
--- a/src/mainboard/gigabyte/m57sli/mptable.c
+++ b/src/mainboard/gigabyte/m57sli/mptable.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/m57sli/resourcemap.c b/src/mainboard/gigabyte/m57sli/resourcemap.c
index dce6bda..877cf30 100644
--- a/src/mainboard/gigabyte/m57sli/resourcemap.c
+++ b/src/mainboard/gigabyte/m57sli/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/gigabyte/m57sli/romstage.c b/src/mainboard/gigabyte/m57sli/romstage.c
index fe97e68..7edb558 100644
--- a/src/mainboard/gigabyte/m57sli/romstage.c
+++ b/src/mainboard/gigabyte/m57sli/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl b/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl
+++ b/src/mainboard/gigabyte/ma785gm/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/gigabyte/ma785gm/acpi/ide.asl b/src/mainboard/gigabyte/ma785gm/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi/ide.asl
+++ b/src/mainboard/gigabyte/ma785gm/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/ma785gm/acpi/routing.asl b/src/mainboard/gigabyte/ma785gm/acpi/routing.asl
index 3db15d5..576acc7 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi/routing.asl
+++ b/src/mainboard/gigabyte/ma785gm/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/ma785gm/acpi/sata.asl b/src/mainboard/gigabyte/ma785gm/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi/sata.asl
+++ b/src/mainboard/gigabyte/ma785gm/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gigabyte/ma785gm/acpi/usb.asl b/src/mainboard/gigabyte/ma785gm/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi/usb.asl
+++ b/src/mainboard/gigabyte/ma785gm/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gigabyte/ma785gm/acpi_tables.c b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
index a548a10..0de9edc 100644
--- a/src/mainboard/gigabyte/ma785gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gm/dsdt.asl b/src/mainboard/gigabyte/ma785gm/dsdt.asl
index b2eb7c2..4345b57 100644
--- a/src/mainboard/gigabyte/ma785gm/dsdt.asl
+++ b/src/mainboard/gigabyte/ma785gm/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gm/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gm/irq_tables.c b/src/mainboard/gigabyte/ma785gm/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/gigabyte/ma785gm/irq_tables.c
+++ b/src/mainboard/gigabyte/ma785gm/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gm/mainboard.c b/src/mainboard/gigabyte/ma785gm/mainboard.c
index 0895f62..e71d97a 100644
--- a/src/mainboard/gigabyte/ma785gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gm/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gm/mb_sysconf.h b/src/mainboard/gigabyte/ma785gm/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/gigabyte/ma785gm/mb_sysconf.h
+++ b/src/mainboard/gigabyte/ma785gm/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/gigabyte/ma785gm/mptable.c b/src/mainboard/gigabyte/ma785gm/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/gigabyte/ma785gm/mptable.c
+++ b/src/mainboard/gigabyte/ma785gm/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gm/resourcemap.c b/src/mainboard/gigabyte/ma785gm/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/gigabyte/ma785gm/resourcemap.c
+++ b/src/mainboard/gigabyte/ma785gm/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/gigabyte/ma785gm/romstage.c b/src/mainboard/gigabyte/ma785gm/romstage.c
index 8ac24f9..7d861d3 100644
--- a/src/mainboard/gigabyte/ma785gm/romstage.c
+++ b/src/mainboard/gigabyte/ma785gm/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl b/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl
+++ b/src/mainboard/gigabyte/ma785gmt/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/ide.asl b/src/mainboard/gigabyte/ma785gmt/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi/ide.asl
+++ b/src/mainboard/gigabyte/ma785gmt/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl b/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl
index 3db15d5..576acc7 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl
+++ b/src/mainboard/gigabyte/ma785gmt/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/sata.asl b/src/mainboard/gigabyte/ma785gmt/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi/sata.asl
+++ b/src/mainboard/gigabyte/ma785gmt/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl b/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl
+++ b/src/mainboard/gigabyte/ma785gmt/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
index d02e6d1..a13a424 100644
--- a/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/dsdt.asl b/src/mainboard/gigabyte/ma785gmt/dsdt.asl
index b2eb7c2..4345b57 100644
--- a/src/mainboard/gigabyte/ma785gmt/dsdt.asl
+++ b/src/mainboard/gigabyte/ma785gmt/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma785gmt/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/irq_tables.c b/src/mainboard/gigabyte/ma785gmt/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/gigabyte/ma785gmt/irq_tables.c
+++ b/src/mainboard/gigabyte/ma785gmt/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/mainboard.c b/src/mainboard/gigabyte/ma785gmt/mainboard.c
index 41fc109..30fa389 100644
--- a/src/mainboard/gigabyte/ma785gmt/mainboard.c
+++ b/src/mainboard/gigabyte/ma785gmt/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma785gmt/resourcemap.c b/src/mainboard/gigabyte/ma785gmt/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/gigabyte/ma785gmt/resourcemap.c
+++ b/src/mainboard/gigabyte/ma785gmt/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/gigabyte/ma785gmt/romstage.c b/src/mainboard/gigabyte/ma785gmt/romstage.c
index cd9b790..65d4030 100644
--- a/src/mainboard/gigabyte/ma785gmt/romstage.c
+++ b/src/mainboard/gigabyte/ma785gmt/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl b/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl
+++ b/src/mainboard/gigabyte/ma78gm/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/gigabyte/ma78gm/acpi/ide.asl b/src/mainboard/gigabyte/ma78gm/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi/ide.asl
+++ b/src/mainboard/gigabyte/ma78gm/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/ma78gm/acpi/routing.asl b/src/mainboard/gigabyte/ma78gm/acpi/routing.asl
index 09c8fac..66d0057 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi/routing.asl
+++ b/src/mainboard/gigabyte/ma78gm/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gigabyte/ma78gm/acpi/sata.asl b/src/mainboard/gigabyte/ma78gm/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi/sata.asl
+++ b/src/mainboard/gigabyte/ma78gm/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gigabyte/ma78gm/acpi/usb.asl b/src/mainboard/gigabyte/ma78gm/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi/usb.asl
+++ b/src/mainboard/gigabyte/ma78gm/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gigabyte/ma78gm/acpi_tables.c b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
index d02e6d1..a13a424 100644
--- a/src/mainboard/gigabyte/ma78gm/acpi_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma78gm/dsdt.asl b/src/mainboard/gigabyte/ma78gm/dsdt.asl
index b2eb7c2..4345b57 100644
--- a/src/mainboard/gigabyte/ma78gm/dsdt.asl
+++ b/src/mainboard/gigabyte/ma78gm/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
+++ b/src/mainboard/gigabyte/ma78gm/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma78gm/irq_tables.c b/src/mainboard/gigabyte/ma78gm/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/gigabyte/ma78gm/irq_tables.c
+++ b/src/mainboard/gigabyte/ma78gm/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma78gm/mainboard.c b/src/mainboard/gigabyte/ma78gm/mainboard.c
index 8aacb58..29ceea6 100644
--- a/src/mainboard/gigabyte/ma78gm/mainboard.c
+++ b/src/mainboard/gigabyte/ma78gm/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gigabyte/ma78gm/resourcemap.c b/src/mainboard/gigabyte/ma78gm/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/gigabyte/ma78gm/resourcemap.c
+++ b/src/mainboard/gigabyte/ma78gm/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/gigabyte/ma78gm/romstage.c b/src/mainboard/gigabyte/ma78gm/romstage.c
index 6cb4227..3e5e22f 100644
--- a/src/mainboard/gigabyte/ma78gm/romstage.c
+++ b/src/mainboard/gigabyte/ma78gm/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/gizmosphere/Kconfig b/src/mainboard/gizmosphere/Kconfig
index a61c3e8..51c774b 100644
--- a/src/mainboard/gizmosphere/Kconfig
+++ b/src/mainboard/gizmosphere/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if VENDOR_GIZMOSPHERE
diff --git a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
index 99c819a..34756ce 100644
--- a/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
+++ b/src/mainboard/gizmosphere/gizmo/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index 7a752f9..682daa9 100644
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_GIZMOSPHERE_GIZMO
diff --git a/src/mainboard/gizmosphere/gizmo/Makefile.inc b/src/mainboard/gizmosphere/gizmo/Makefile.inc
index a86cfc6..a8d2e10 100644
--- a/src/mainboard/gizmosphere/gizmo/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/gizmosphere/gizmo/OptionsIds.h b/src/mainboard/gizmosphere/gizmo/OptionsIds.h
index ae1d66a..c74f85a 100644
--- a/src/mainboard/gizmosphere/gizmo/OptionsIds.h
+++ b/src/mainboard/gizmosphere/gizmo/OptionsIds.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/gizmosphere/gizmo/PlatformGnbPcie.c b/src/mainboard/gizmosphere/gizmo/PlatformGnbPcie.c
index 637e8fa..c01ddcc 100644
--- a/src/mainboard/gizmosphere/gizmo/PlatformGnbPcie.c
+++ b/src/mainboard/gizmosphere/gizmo/PlatformGnbPcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/gizmosphere/gizmo/PlatformGnbPcieComplex.h b/src/mainboard/gizmosphere/gizmo/PlatformGnbPcieComplex.h
index 5a44ca7..4e986ef 100644
--- a/src/mainboard/gizmosphere/gizmo/PlatformGnbPcieComplex.h
+++ b/src/mainboard/gizmosphere/gizmo/PlatformGnbPcieComplex.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl b/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl
index ca3174d..e10660c 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/ide.asl b/src/mainboard/gizmosphere/gizmo/acpi/ide.asl
index 3a2c8f2..94bf9f4 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/ide.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/ide.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
index 3c67479..cb6d04f 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/routing.asl b/src/mainboard/gizmosphere/gizmo/acpi/routing.asl
index 9516c74..ca7ed42 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/routing.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/sata.asl b/src/mainboard/gizmosphere/gizmo/acpi/sata.asl
index 0175998..d6fe103 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/sata.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/sata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/sleep.asl b/src/mainboard/gizmosphere/gizmo/acpi/sleep.asl
index 9523c71..d5fe4db 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/sleep.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/sleep.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/superio.asl b/src/mainboard/gizmosphere/gizmo/acpi/superio.asl
index dcfdc06..94c79b3 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/superio.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/superio.asl
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl b/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl
index 24ab07e..bcd75fc 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl
+++ b/src/mainboard/gizmosphere/gizmo/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gizmosphere/gizmo/acpi_tables.c b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
index b8d108d..9239bfb 100644
--- a/src/mainboard/gizmosphere/gizmo/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo/buildOpts.c b/src/mainboard/gizmosphere/gizmo/buildOpts.c
index bcd8870..abd28fc 100644
--- a/src/mainboard/gizmosphere/gizmo/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo/buildOpts.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/gizmosphere/gizmo/cmos.layout b/src/mainboard/gizmosphere/gizmo/cmos.layout
index 7ba5a49..3bc2543 100644
--- a/src/mainboard/gizmosphere/gizmo/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo/cmos.layout
@@ -15,8 +15,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/gizmosphere/gizmo/devicetree.cb b/src/mainboard/gizmosphere/gizmo/devicetree.cb
index 11c6d94..63db9bd 100644
--- a/src/mainboard/gizmosphere/gizmo/devicetree.cb
+++ b/src/mainboard/gizmosphere/gizmo/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/gizmosphere/gizmo/dsdt.asl b/src/mainboard/gizmosphere/gizmo/dsdt.asl
index a4d3034..f5c8db4 100644
--- a/src/mainboard/gizmosphere/gizmo/dsdt.asl
+++ b/src/mainboard/gizmosphere/gizmo/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/gizmosphere/gizmo/irq_tables.c b/src/mainboard/gizmosphere/gizmo/irq_tables.c
index 3d4c563..7d1e0cd 100644
--- a/src/mainboard/gizmosphere/gizmo/irq_tables.c
+++ b/src/mainboard/gizmosphere/gizmo/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/gizmosphere/gizmo/mainboard.c b/src/mainboard/gizmosphere/gizmo/mainboard.c
index 82de752..d269789 100644
--- a/src/mainboard/gizmosphere/gizmo/mainboard.c
+++ b/src/mainboard/gizmosphere/gizmo/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo/mptable.c b/src/mainboard/gizmosphere/gizmo/mptable.c
index 1b76389..a58fd5a 100644
--- a/src/mainboard/gizmosphere/gizmo/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/gizmosphere/gizmo/platform_cfg.h b/src/mainboard/gizmosphere/gizmo/platform_cfg.h
index 8889927..52fb028 100644
--- a/src/mainboard/gizmosphere/gizmo/platform_cfg.h
+++ b/src/mainboard/gizmosphere/gizmo/platform_cfg.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/gizmosphere/gizmo/romstage.c b/src/mainboard/gizmosphere/gizmo/romstage.c
index e267342..10a1f24 100644
--- a/src/mainboard/gizmosphere/gizmo/romstage.c
+++ b/src/mainboard/gizmosphere/gizmo/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c b/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
index 953eb40..92df98c 100644
--- a/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
+++ b/src/mainboard/gizmosphere/gizmo2/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/gizmosphere/gizmo2/Kconfig b/src/mainboard/gizmosphere/gizmo2/Kconfig
index 445277e..d431b79 100644
--- a/src/mainboard/gizmosphere/gizmo2/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo2/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_GIZMOSPHERE_GIZMO2
diff --git a/src/mainboard/gizmosphere/gizmo2/Makefile.inc b/src/mainboard/gizmosphere/gizmo2/Makefile.inc
index 6bbb85a..062bf0c 100644
--- a/src/mainboard/gizmosphere/gizmo2/Makefile.inc
+++ b/src/mainboard/gizmosphere/gizmo2/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/gizmosphere/gizmo2/Micron_MT41J128M16JT.spd.hex b/src/mainboard/gizmosphere/gizmo2/Micron_MT41J128M16JT.spd.hex
index 08736f6..17775d9 100644
--- a/src/mainboard/gizmosphere/gizmo2/Micron_MT41J128M16JT.spd.hex
+++ b/src/mainboard/gizmosphere/gizmo2/Micron_MT41J128M16JT.spd.hex
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc. 
+# along with this program. 
 
 # Gizmo2 has 1GB using 4 Micron_MT41J128M16JT-125 chips
 # The datasheet is available at:
diff --git a/src/mainboard/gizmosphere/gizmo2/OptionsIds.h b/src/mainboard/gizmosphere/gizmo2/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/gizmosphere/gizmo2/OptionsIds.h
+++ b/src/mainboard/gizmosphere/gizmo2/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/gizmosphere/gizmo2/PlatformGnbPcie.c b/src/mainboard/gizmosphere/gizmo2/PlatformGnbPcie.c
index 66bebc2..a3bdd26 100644
--- a/src/mainboard/gizmosphere/gizmo2/PlatformGnbPcie.c
+++ b/src/mainboard/gizmosphere/gizmo2/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl b/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl
index 88d3381..1996f04 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/gpe.asl b/src/mainboard/gizmosphere/gizmo2/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/gpe.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/ide.asl b/src/mainboard/gizmosphere/gizmo2/acpi/ide.asl
index dfb4158..f8e323a 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/ide.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No IDE functionality */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
index da4f11a..9e9ec0e 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl b/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/sata.asl b/src/mainboard/gizmosphere/gizmo2/acpi/sata.asl
index 9a96a9d..af1cff2 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/sata.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/si.asl b/src/mainboard/gizmosphere/gizmo2/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/si.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/sleep.asl b/src/mainboard/gizmosphere/gizmo2/acpi/sleep.asl
index 6a2cef9..f0986df 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/sleep.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/superio.asl b/src/mainboard/gizmosphere/gizmo2/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/superio.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/thermal.asl b/src/mainboard/gizmosphere/gizmo2/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/thermal.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl b/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl
index 07ca7b4..44087cc 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl
+++ b/src/mainboard/gizmosphere/gizmo2/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
index 6c061e0..94e1df6 100644
--- a/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/buildOpts.c b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
index c7bdab8..2556187 100644
--- a/src/mainboard/gizmosphere/gizmo2/buildOpts.c
+++ b/src/mainboard/gizmosphere/gizmo2/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/gizmosphere/gizmo2/cmos.layout b/src/mainboard/gizmosphere/gizmo2/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/gizmosphere/gizmo2/cmos.layout
+++ b/src/mainboard/gizmosphere/gizmo2/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/gizmosphere/gizmo2/devicetree.cb b/src/mainboard/gizmosphere/gizmo2/devicetree.cb
index 34c2fd4..e5b7aa1 100644
--- a/src/mainboard/gizmosphere/gizmo2/devicetree.cb
+++ b/src/mainboard/gizmosphere/gizmo2/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/gizmosphere/gizmo2/dsdt.asl b/src/mainboard/gizmosphere/gizmo2/dsdt.asl
index 3f1aa8b..6df107e 100644
--- a/src/mainboard/gizmosphere/gizmo2/dsdt.asl
+++ b/src/mainboard/gizmosphere/gizmo2/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/gizmosphere/gizmo2/irq_tables.c b/src/mainboard/gizmosphere/gizmo2/irq_tables.c
index 33ce343..cb8248e 100644
--- a/src/mainboard/gizmosphere/gizmo2/irq_tables.c
+++ b/src/mainboard/gizmosphere/gizmo2/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/mainboard.c b/src/mainboard/gizmosphere/gizmo2/mainboard.c
index ab1bb8b..7ee0f48 100644
--- a/src/mainboard/gizmosphere/gizmo2/mainboard.c
+++ b/src/mainboard/gizmosphere/gizmo2/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/mptable.c b/src/mainboard/gizmosphere/gizmo2/mptable.c
index 5ead389..aa505a4 100644
--- a/src/mainboard/gizmosphere/gizmo2/mptable.c
+++ b/src/mainboard/gizmosphere/gizmo2/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/gizmosphere/gizmo2/romstage.c b/src/mainboard/gizmosphere/gizmo2/romstage.c
index a2c7cc3..b6650c5 100644
--- a/src/mainboard/gizmosphere/gizmo2/romstage.c
+++ b/src/mainboard/gizmosphere/gizmo2/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/Kconfig b/src/mainboard/google/Kconfig
index 4552897..981db9f 100644
--- a/src/mainboard/google/Kconfig
+++ b/src/mainboard/google/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_GOOGLE
 
diff --git a/src/mainboard/google/auron/Makefile.inc b/src/mainboard/google/auron/Makefile.inc
index 68ba413..359272a 100644
--- a/src/mainboard/google/auron/Makefile.inc
+++ b/src/mainboard/google/auron/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/google/auron/acpi/chromeos.asl b/src/mainboard/google/auron/acpi/chromeos.asl
index d929717..8308f96 100644
--- a/src/mainboard/google/auron/acpi/chromeos.asl
+++ b/src/mainboard/google/auron/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/auron/acpi/ec.asl b/src/mainboard/google/auron/acpi/ec.asl
index 712da33..106f54a 100644
--- a/src/mainboard/google/auron/acpi/ec.asl
+++ b/src/mainboard/google/auron/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/auron/acpi/haswell_pci_irqs.asl b/src/mainboard/google/auron/acpi/haswell_pci_irqs.asl
index 28a7ada..b32cd4e 100644
--- a/src/mainboard/google/auron/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/auron/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/auron/acpi/mainboard.asl b/src/mainboard/google/auron/acpi/mainboard.asl
index 8461a9d..5a21d05 100644
--- a/src/mainboard/google/auron/acpi/mainboard.asl
+++ b/src/mainboard/google/auron/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/auron/onboard.h>
diff --git a/src/mainboard/google/auron/acpi/platform.asl b/src/mainboard/google/auron/acpi/platform.asl
index 72913f6..d438b40 100644
--- a/src/mainboard/google/auron/acpi/platform.asl
+++ b/src/mainboard/google/auron/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/auron/acpi/superio.asl b/src/mainboard/google/auron/acpi/superio.asl
index 11ae2d7..02003b6 100644
--- a/src/mainboard/google/auron/acpi/superio.asl
+++ b/src/mainboard/google/auron/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/auron/acpi/thermal.asl b/src/mainboard/google/auron/acpi/thermal.asl
index 2839497..43c9e4c 100644
--- a/src/mainboard/google/auron/acpi/thermal.asl
+++ b/src/mainboard/google/auron/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/auron/thermal.h>
diff --git a/src/mainboard/google/auron/acpi/video.asl b/src/mainboard/google/auron/acpi/video.asl
index b0a637a..4b4f424 100644
--- a/src/mainboard/google/auron/acpi/video.asl
+++ b/src/mainboard/google/auron/acpi/video.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Brightness write
diff --git a/src/mainboard/google/auron/acpi_tables.c b/src/mainboard/google/auron/acpi_tables.c
index 540fe44..8c40623 100644
--- a/src/mainboard/google/auron/acpi_tables.c
+++ b/src/mainboard/google/auron/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/auron/chromeos.c b/src/mainboard/google/auron/chromeos.c
index 38bb8d9..5725b8c 100644
--- a/src/mainboard/google/auron/chromeos.c
+++ b/src/mainboard/google/auron/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/auron/cmos.layout b/src/mainboard/google/auron/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/auron/cmos.layout
+++ b/src/mainboard/google/auron/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/auron/dsdt.asl b/src/mainboard/google/auron/dsdt.asl
index 1c10f80..8150664 100644
--- a/src/mainboard/google/auron/dsdt.asl
+++ b/src/mainboard/google/auron/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/auron/ec.c b/src/mainboard/google/auron/ec.c
index 54a42a7..93a6ee8 100644
--- a/src/mainboard/google/auron/ec.c
+++ b/src/mainboard/google/auron/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/auron/ec.h b/src/mainboard/google/auron/ec.h
index 8e71fdb..76c91c5 100644
--- a/src/mainboard/google/auron/ec.h
+++ b/src/mainboard/google/auron/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/auron/fadt.c b/src/mainboard/google/auron/fadt.c
index 237954c..c795280 100644
--- a/src/mainboard/google/auron/fadt.c
+++ b/src/mainboard/google/auron/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/auron/gpio.h b/src/mainboard/google/auron/gpio.h
index 5452df8..9b04942 100644
--- a/src/mainboard/google/auron/gpio.h
+++ b/src/mainboard/google/auron/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AURON_GPIO_H
diff --git a/src/mainboard/google/auron/hda_verb.c b/src/mainboard/google/auron/hda_verb.c
index e015a83..076838e 100644
--- a/src/mainboard/google/auron/hda_verb.c
+++ b/src/mainboard/google/auron/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/auron/mainboard.c b/src/mainboard/google/auron/mainboard.c
index 13eec7e..eee5504 100644
--- a/src/mainboard/google/auron/mainboard.c
+++ b/src/mainboard/google/auron/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/auron/onboard.h b/src/mainboard/google/auron/onboard.h
index c9b8696..46d56d7 100644
--- a/src/mainboard/google/auron/onboard.h
+++ b/src/mainboard/google/auron/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/auron/pei_data.c b/src/mainboard/google/auron/pei_data.c
index 162ae9c..7c9774b 100644
--- a/src/mainboard/google/auron/pei_data.c
+++ b/src/mainboard/google/auron/pei_data.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c
index 17279e3..5c8a341 100644
--- a/src/mainboard/google/auron/romstage.c
+++ b/src/mainboard/google/auron/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/auron/smihandler.c b/src/mainboard/google/auron/smihandler.c
index 2f46260..5590fba 100644
--- a/src/mainboard/google/auron/smihandler.c
+++ b/src/mainboard/google/auron/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/auron/spd/Makefile.inc b/src/mainboard/google/auron/spd/Makefile.inc
index 7b0292d..66732ce 100644
--- a/src/mainboard/google/auron/spd/Makefile.inc
+++ b/src/mainboard/google/auron/spd/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/google/auron/spd/spd.c b/src/mainboard/google/auron/spd/spd.c
index 2f3f20c..71eb164 100644
--- a/src/mainboard/google/auron/spd/spd.c
+++ b/src/mainboard/google/auron/spd/spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/auron/spd/spd.h b/src/mainboard/google/auron/spd/spd.h
index 27b1a4e..bbac054 100644
--- a/src/mainboard/google/auron/spd/spd.h
+++ b/src/mainboard/google/auron/spd/spd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_SPD_H
diff --git a/src/mainboard/google/auron/thermal.h b/src/mainboard/google/auron/thermal.h
index 48579f1..15402b1 100644
--- a/src/mainboard/google/auron/thermal.h
+++ b/src/mainboard/google/auron/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/bolt/Makefile.inc b/src/mainboard/google/bolt/Makefile.inc
index 901fb41..dde2410 100644
--- a/src/mainboard/google/bolt/Makefile.inc
+++ b/src/mainboard/google/bolt/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
diff --git a/src/mainboard/google/bolt/acpi/chromeos.asl b/src/mainboard/google/bolt/acpi/chromeos.asl
index 4749a73..404a055 100644
--- a/src/mainboard/google/bolt/acpi/chromeos.asl
+++ b/src/mainboard/google/bolt/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/bolt/acpi/ec.asl b/src/mainboard/google/bolt/acpi/ec.asl
index 6274d0f..57a586b 100644
--- a/src/mainboard/google/bolt/acpi/ec.asl
+++ b/src/mainboard/google/bolt/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/bolt/acpi/haswell_pci_irqs.asl b/src/mainboard/google/bolt/acpi/haswell_pci_irqs.asl
index f96c5e6..7312c0e 100644
--- a/src/mainboard/google/bolt/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/bolt/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/bolt/acpi/mainboard.asl b/src/mainboard/google/bolt/acpi/mainboard.asl
index dc97ef7..2ea9311 100644
--- a/src/mainboard/google/bolt/acpi/mainboard.asl
+++ b/src/mainboard/google/bolt/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/bolt/onboard.h>
diff --git a/src/mainboard/google/bolt/acpi/platform.asl b/src/mainboard/google/bolt/acpi/platform.asl
index 72913f6..d438b40 100644
--- a/src/mainboard/google/bolt/acpi/platform.asl
+++ b/src/mainboard/google/bolt/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/bolt/acpi/superio.asl b/src/mainboard/google/bolt/acpi/superio.asl
index fe338f0..be3d2aa 100644
--- a/src/mainboard/google/bolt/acpi/superio.asl
+++ b/src/mainboard/google/bolt/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/bolt/acpi/thermal.asl b/src/mainboard/google/bolt/acpi/thermal.asl
index 097c1a3..23571d1 100644
--- a/src/mainboard/google/bolt/acpi/thermal.asl
+++ b/src/mainboard/google/bolt/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/bolt/acpi_tables.c b/src/mainboard/google/bolt/acpi_tables.c
index 42dcb07..5336f98 100644
--- a/src/mainboard/google/bolt/acpi_tables.c
+++ b/src/mainboard/google/bolt/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/bolt/chromeos.c b/src/mainboard/google/bolt/chromeos.c
index 6ccb154..44bb216 100644
--- a/src/mainboard/google/bolt/chromeos.c
+++ b/src/mainboard/google/bolt/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/bolt/cmos.layout b/src/mainboard/google/bolt/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/bolt/cmos.layout
+++ b/src/mainboard/google/bolt/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/bolt/dsdt.asl b/src/mainboard/google/bolt/dsdt.asl
index 76998ba..3122a84 100644
--- a/src/mainboard/google/bolt/dsdt.asl
+++ b/src/mainboard/google/bolt/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/google/bolt/ec.c b/src/mainboard/google/bolt/ec.c
index dbe7348..83cab44 100644
--- a/src/mainboard/google/bolt/ec.c
+++ b/src/mainboard/google/bolt/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/bolt/ec.h b/src/mainboard/google/bolt/ec.h
index 706993c..11a8907 100644
--- a/src/mainboard/google/bolt/ec.h
+++ b/src/mainboard/google/bolt/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/bolt/fadt.c b/src/mainboard/google/bolt/fadt.c
index bae03d6..6b9aa08 100644
--- a/src/mainboard/google/bolt/fadt.c
+++ b/src/mainboard/google/bolt/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/bolt/gpio.h b/src/mainboard/google/bolt/gpio.h
index 40651dd..f07155d 100644
--- a/src/mainboard/google/bolt/gpio.h
+++ b/src/mainboard/google/bolt/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BOLT_GPIO_H
diff --git a/src/mainboard/google/bolt/hda_verb.c b/src/mainboard/google/bolt/hda_verb.c
index 6b23953..2c58c32 100644
--- a/src/mainboard/google/bolt/hda_verb.c
+++ b/src/mainboard/google/bolt/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/bolt/mainboard.c b/src/mainboard/google/bolt/mainboard.c
index 1a2216c..975ff53 100644
--- a/src/mainboard/google/bolt/mainboard.c
+++ b/src/mainboard/google/bolt/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/bolt/onboard.h b/src/mainboard/google/bolt/onboard.h
index c262e0b..528ec28 100644
--- a/src/mainboard/google/bolt/onboard.h
+++ b/src/mainboard/google/bolt/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/bolt/romstage.c b/src/mainboard/google/bolt/romstage.c
index f721a70..38e0b1b 100644
--- a/src/mainboard/google/bolt/romstage.c
+++ b/src/mainboard/google/bolt/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/bolt/smihandler.c b/src/mainboard/google/bolt/smihandler.c
index a927ec9..182fc68 100644
--- a/src/mainboard/google/bolt/smihandler.c
+++ b/src/mainboard/google/bolt/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/bolt/thermal.h b/src/mainboard/google/bolt/thermal.h
index 9c16e1c..49bd621 100644
--- a/src/mainboard/google/bolt/thermal.h
+++ b/src/mainboard/google/bolt/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/butterfly/Makefile.inc b/src/mainboard/google/butterfly/Makefile.inc
index e07ed7f..ca48cd8 100644
--- a/src/mainboard/google/butterfly/Makefile.inc
+++ b/src/mainboard/google/butterfly/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += ec.c
diff --git a/src/mainboard/google/butterfly/acpi/chromeos.asl b/src/mainboard/google/butterfly/acpi/chromeos.asl
index ee9dc15..abef052 100644
--- a/src/mainboard/google/butterfly/acpi/chromeos.asl
+++ b/src/mainboard/google/butterfly/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/butterfly/acpi/ec.asl b/src/mainboard/google/butterfly/acpi/ec.asl
index d7363da..50a0be6 100644
--- a/src/mainboard/google/butterfly/acpi/ec.asl
+++ b/src/mainboard/google/butterfly/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/butterfly/acpi/mainboard.asl b/src/mainboard/google/butterfly/acpi/mainboard.asl
index 5efd833..ccfb7d0 100644
--- a/src/mainboard/google/butterfly/acpi/mainboard.asl
+++ b/src/mainboard/google/butterfly/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/butterfly/onboard.h>
diff --git a/src/mainboard/google/butterfly/acpi/platform.asl b/src/mainboard/google/butterfly/acpi/platform.asl
index 34f2845..22e5f06 100644
--- a/src/mainboard/google/butterfly/acpi/platform.asl
+++ b/src/mainboard/google/butterfly/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/google/butterfly/acpi/superio.asl b/src/mainboard/google/butterfly/acpi/superio.asl
index 47e4e67..6a0ed1a 100644
--- a/src/mainboard/google/butterfly/acpi/superio.asl
+++ b/src/mainboard/google/butterfly/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/butterfly/acpi/thermal.asl b/src/mainboard/google/butterfly/acpi/thermal.asl
index a108088..5b32325 100644
--- a/src/mainboard/google/butterfly/acpi/thermal.asl
+++ b/src/mainboard/google/butterfly/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/butterfly/acpi_tables.c b/src/mainboard/google/butterfly/acpi_tables.c
index bf0c0dc..099dd50 100644
--- a/src/mainboard/google/butterfly/acpi_tables.c
+++ b/src/mainboard/google/butterfly/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/butterfly/chromeos.c b/src/mainboard/google/butterfly/chromeos.c
index c23f827..274c643 100644
--- a/src/mainboard/google/butterfly/chromeos.c
+++ b/src/mainboard/google/butterfly/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/butterfly/cmos.layout b/src/mainboard/google/butterfly/cmos.layout
index 15c5283..5c856b0 100644
--- a/src/mainboard/google/butterfly/cmos.layout
+++ b/src/mainboard/google/butterfly/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/butterfly/dsdt.asl b/src/mainboard/google/butterfly/dsdt.asl
index 0a2f37d..a1895da 100644
--- a/src/mainboard/google/butterfly/dsdt.asl
+++ b/src/mainboard/google/butterfly/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/butterfly/ec.c b/src/mainboard/google/butterfly/ec.c
index c3e5f20..1898738 100644
--- a/src/mainboard/google/butterfly/ec.c
+++ b/src/mainboard/google/butterfly/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/butterfly/ec.h b/src/mainboard/google/butterfly/ec.h
index 527ef9f..2d48bb6 100644
--- a/src/mainboard/google/butterfly/ec.h
+++ b/src/mainboard/google/butterfly/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BUTTERFLY_EC_H
diff --git a/src/mainboard/google/butterfly/gpio.c b/src/mainboard/google/butterfly/gpio.c
index ceaec79..cad0163 100644
--- a/src/mainboard/google/butterfly/gpio.c
+++ b/src/mainboard/google/butterfly/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "southbridge/intel/bd82x6x/gpio.h"
diff --git a/src/mainboard/google/butterfly/hda_verb.c b/src/mainboard/google/butterfly/hda_verb.c
index a412d22..fa85ccb 100644
--- a/src/mainboard/google/butterfly/hda_verb.c
+++ b/src/mainboard/google/butterfly/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : IDT
diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c
index 6cacc9a..24d0906 100644
--- a/src/mainboard/google/butterfly/mainboard.c
+++ b/src/mainboard/google/butterfly/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/butterfly/mainboard_smi.c b/src/mainboard/google/butterfly/mainboard_smi.c
index 1596fdb..ddcbc0b 100644
--- a/src/mainboard/google/butterfly/mainboard_smi.c
+++ b/src/mainboard/google/butterfly/mainboard_smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/butterfly/onboard.h b/src/mainboard/google/butterfly/onboard.h
index f9b08fa..1eba374 100644
--- a/src/mainboard/google/butterfly/onboard.h
+++ b/src/mainboard/google/butterfly/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BUTTERFLY_ONBOARD_H
diff --git a/src/mainboard/google/butterfly/romstage.c b/src/mainboard/google/butterfly/romstage.c
index b25492d..0ce3168 100644
--- a/src/mainboard/google/butterfly/romstage.c
+++ b/src/mainboard/google/butterfly/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/butterfly/thermal.h b/src/mainboard/google/butterfly/thermal.h
index f4d6d52..83ea3b4 100644
--- a/src/mainboard/google/butterfly/thermal.h
+++ b/src/mainboard/google/butterfly/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BUTTERFLY_THERMAL_H
diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig
index 70a5e09..73d3725 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_COSMOS
diff --git a/src/mainboard/google/cosmos/Makefile.inc b/src/mainboard/google/cosmos/Makefile.inc
index e8c0869..dd43690 100644
--- a/src/mainboard/google/cosmos/Makefile.inc
+++ b/src/mainboard/google/cosmos/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/cosmos/boardid.c b/src/mainboard/google/cosmos/boardid.c
index 6c3f350..234d842 100644
--- a/src/mainboard/google/cosmos/boardid.c
+++ b/src/mainboard/google/cosmos/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/cosmos/bootblock.c b/src/mainboard/google/cosmos/bootblock.c
index 9a8d576..d440607 100644
--- a/src/mainboard/google/cosmos/bootblock.c
+++ b/src/mainboard/google/cosmos/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootblock_common.h>
diff --git a/src/mainboard/google/cosmos/chromeos.c b/src/mainboard/google/cosmos/chromeos.c
index e287453..175d5b5 100644
--- a/src/mainboard/google/cosmos/chromeos.c
+++ b/src/mainboard/google/cosmos/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/cosmos/devicetree.cb b/src/mainboard/google/cosmos/devicetree.cb
index 96f557c..8a63b55 100644
--- a/src/mainboard/google/cosmos/devicetree.cb
+++ b/src/mainboard/google/cosmos/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/cosmos/mainboard.c b/src/mainboard/google/cosmos/mainboard.c
index d572554..e252d97 100644
--- a/src/mainboard/google/cosmos/mainboard.c
+++ b/src/mainboard/google/cosmos/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/google/cosmos/reset.c b/src/mainboard/google/cosmos/reset.c
index 8b48f48..9dd01fd 100644
--- a/src/mainboard/google/cosmos/reset.c
+++ b/src/mainboard/google/cosmos/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/mainboard/google/cosmos/romstage.c b/src/mainboard/google/cosmos/romstage.c
index 0f07354..d49bcd9 100644
--- a/src/mainboard/google/cosmos/romstage.c
+++ b/src/mainboard/google/cosmos/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc
index 0d3a9b1..72252c2 100755
--- a/src/mainboard/google/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/google/cyan/acpi/chromeos.asl b/src/mainboard/google/cyan/acpi/chromeos.asl
index 4e5cd54..4ee4f0e 100644
--- a/src/mainboard/google/cyan/acpi/chromeos.asl
+++ b/src/mainboard/google/cyan/acpi/chromeos.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/google/cyan/acpi/dptf.asl b/src/mainboard/google/cyan/acpi/dptf.asl
index 5b0da39..a648048 100755
--- a/src/mainboard/google/cyan/acpi/dptf.asl
+++ b/src/mainboard/google/cyan/acpi/dptf.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define DPTF_TSR0_SENSOR_ID	0
diff --git a/src/mainboard/google/cyan/acpi/ec.asl b/src/mainboard/google/cyan/acpi/ec.asl
index 16f515c..e3c6ec2 100644
--- a/src/mainboard/google/cyan/acpi/ec.asl
+++ b/src/mainboard/google/cyan/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/cyan/acpi/mainboard.asl b/src/mainboard/google/cyan/acpi/mainboard.asl
index 9918672..fa719f8 100755
--- a/src/mainboard/google/cyan/acpi/mainboard.asl
+++ b/src/mainboard/google/cyan/acpi/mainboard.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <onboard.h>
diff --git a/src/mainboard/google/cyan/acpi/superio.asl b/src/mainboard/google/cyan/acpi/superio.asl
index abc1bf6..fcf6c8d 100755
--- a/src/mainboard/google/cyan/acpi/superio.asl
+++ b/src/mainboard/google/cyan/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/cyan/acpi_tables.c b/src/mainboard/google/cyan/acpi_tables.c
index d01e65c..2b49641 100755
--- a/src/mainboard/google/cyan/acpi_tables.c
+++ b/src/mainboard/google/cyan/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/cyan/boardid.c b/src/mainboard/google/cyan/boardid.c
index 9b0aa73..44c78ab 100644
--- a/src/mainboard/google/cyan/boardid.c
+++ b/src/mainboard/google/cyan/boardid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/cyan/chromeos.c b/src/mainboard/google/cyan/chromeos.c
index 9e4afe6..b8968ac 100644
--- a/src/mainboard/google/cyan/chromeos.c
+++ b/src/mainboard/google/cyan/chromeos.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/cyan/cmos.layout b/src/mainboard/google/cyan/cmos.layout
index b773b09..474f363 100644
--- a/src/mainboard/google/cyan/cmos.layout
+++ b/src/mainboard/google/cyan/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/cyan/com_init.c b/src/mainboard/google/cyan/com_init.c
index e94f585..a2169d8 100644
--- a/src/mainboard/google/cyan/com_init.c
+++ b/src/mainboard/google/cyan/com_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/cyan/dsdt.asl b/src/mainboard/google/cyan/dsdt.asl
index d87e6de..913e823 100755
--- a/src/mainboard/google/cyan/dsdt.asl
+++ b/src/mainboard/google/cyan/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/cyan/ec.c b/src/mainboard/google/cyan/ec.c
index bba1b07..aec0750 100755
--- a/src/mainboard/google/cyan/ec.c
+++ b/src/mainboard/google/cyan/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/cyan/ec.h b/src/mainboard/google/cyan/ec.h
index c5315da..9d3184c 100755
--- a/src/mainboard/google/cyan/ec.h
+++ b/src/mainboard/google/cyan/ec.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/cyan/fadt.c b/src/mainboard/google/cyan/fadt.c
index 9f08240..f98213d 100644
--- a/src/mainboard/google/cyan/fadt.c
+++ b/src/mainboard/google/cyan/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/acpi.h>
diff --git a/src/mainboard/google/cyan/gpio.c b/src/mainboard/google/cyan/gpio.c
index 3030477..dc47976 100644
--- a/src/mainboard/google/cyan/gpio.c
+++ b/src/mainboard/google/cyan/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/google/cyan/gpio.h b/src/mainboard/google/cyan/gpio.h
index 618524f..7a1c0d0 100644
--- a/src/mainboard/google/cyan/gpio.h
+++ b/src/mainboard/google/cyan/gpio.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _BOARD_GPIO_H_
 #define _BOARD_GPIO_H_
diff --git a/src/mainboard/google/cyan/gpio_pre_evt.c b/src/mainboard/google/cyan/gpio_pre_evt.c
index eb285ac..2edb453 100644
--- a/src/mainboard/google/cyan/gpio_pre_evt.c
+++ b/src/mainboard/google/cyan/gpio_pre_evt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/google/cyan/irqroute.c b/src/mainboard/google/cyan/irqroute.c
index e993c7f..7ea00f6 100644
--- a/src/mainboard/google/cyan/irqroute.c
+++ b/src/mainboard/google/cyan/irqroute.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/google/cyan/irqroute.h b/src/mainboard/google/cyan/irqroute.h
index e66c87f..f26144a 100644
--- a/src/mainboard/google/cyan/irqroute.h
+++ b/src/mainboard/google/cyan/irqroute.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/irq.h>
diff --git a/src/mainboard/google/cyan/mainboard.c b/src/mainboard/google/cyan/mainboard.c
index 60165e0..036bab2 100755
--- a/src/mainboard/google/cyan/mainboard.c
+++ b/src/mainboard/google/cyan/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/mainboard/google/cyan/onboard.h b/src/mainboard/google/cyan/onboard.h
index 7e77024..6d6f0b5 100755
--- a/src/mainboard/google/cyan/onboard.h
+++ b/src/mainboard/google/cyan/onboard.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/cyan/ramstage.c b/src/mainboard/google/cyan/ramstage.c
index 7315785..09d80b0 100644
--- a/src/mainboard/google/cyan/ramstage.c
+++ b/src/mainboard/google/cyan/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/ramstage.h>
diff --git a/src/mainboard/google/cyan/romstage.c b/src/mainboard/google/cyan/romstage.c
index 0e47d35..9b9c1d3 100755
--- a/src/mainboard/google/cyan/romstage.c
+++ b/src/mainboard/google/cyan/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/cyan/smihandler.c b/src/mainboard/google/cyan/smihandler.c
index 7c4e518..c7e59dc 100644
--- a/src/mainboard/google/cyan/smihandler.c
+++ b/src/mainboard/google/cyan/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/cyan/spd/Makefile.inc b/src/mainboard/google/cyan/spd/Makefile.inc
index 1886a69..b1e1071 100644
--- a/src/mainboard/google/cyan/spd/Makefile.inc
+++ b/src/mainboard/google/cyan/spd/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/google/cyan/spd/spd.c b/src/mainboard/google/cyan/spd/spd.c
index fd88460..f7e6906 100644
--- a/src/mainboard/google/cyan/spd/spd.c
+++ b/src/mainboard/google/cyan/spd/spd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/cyan/w25q64.c b/src/mainboard/google/cyan/w25q64.c
index 3af7b81..a253670 100644
--- a/src/mainboard/google/cyan/w25q64.c
+++ b/src/mainboard/google/cyan/w25q64.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/spi.h>
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index 5c3b643..5292977 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_DAISY
diff --git a/src/mainboard/google/daisy/Makefile.inc b/src/mainboard/google/daisy/Makefile.inc
index 12a4943..7809ed7 100644
--- a/src/mainboard/google/daisy/Makefile.inc
+++ b/src/mainboard/google/daisy/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bootblock-y += wakeup.c
diff --git a/src/mainboard/google/daisy/chromeos.c b/src/mainboard/google/daisy/chromeos.c
index dfd8858..eaca74a 100644
--- a/src/mainboard/google/daisy/chromeos.c
+++ b/src/mainboard/google/daisy/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/daisy/devicetree.cb b/src/mainboard/google/daisy/devicetree.cb
index d39498f..284d3ec 100644
--- a/src/mainboard/google/daisy/devicetree.cb
+++ b/src/mainboard/google/daisy/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/samsung/exynos5250
diff --git a/src/mainboard/google/daisy/exynos5250.h b/src/mainboard/google/daisy/exynos5250.h
index 95099c7..0847053 100644
--- a/src/mainboard/google/daisy/exynos5250.h
+++ b/src/mainboard/google/daisy/exynos5250.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* I2C */
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 9bbd88e..61f3646 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/daisy/memory.c b/src/mainboard/google/daisy/memory.c
index 9930085..39bab2e 100644
--- a/src/mainboard/google/daisy/memory.c
+++ b/src/mainboard/google/daisy/memory.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c
index b559c85..77cb181 100644
--- a/src/mainboard/google/daisy/romstage.c
+++ b/src/mainboard/google/daisy/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/daisy/wakeup.c b/src/mainboard/google/daisy/wakeup.c
index 9e1006a..4999d3a 100644
--- a/src/mainboard/google/daisy/wakeup.c
+++ b/src/mainboard/google/daisy/wakeup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/gpio.h>
diff --git a/src/mainboard/google/falco/Makefile.inc b/src/mainboard/google/falco/Makefile.inc
index e02545a..d2626fe 100644
--- a/src/mainboard/google/falco/Makefile.inc
+++ b/src/mainboard/google/falco/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
diff --git a/src/mainboard/google/falco/acpi/chromeos.asl b/src/mainboard/google/falco/acpi/chromeos.asl
index 9db5509..907fb8d 100644
--- a/src/mainboard/google/falco/acpi/chromeos.asl
+++ b/src/mainboard/google/falco/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/falco/acpi/ec.asl b/src/mainboard/google/falco/acpi/ec.asl
index fd8fce9..6c23488 100644
--- a/src/mainboard/google/falco/acpi/ec.asl
+++ b/src/mainboard/google/falco/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/falco/acpi/haswell_pci_irqs.asl b/src/mainboard/google/falco/acpi/haswell_pci_irqs.asl
index 28a7ada..b32cd4e 100644
--- a/src/mainboard/google/falco/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/falco/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/falco/acpi/mainboard.asl b/src/mainboard/google/falco/acpi/mainboard.asl
index ab7094c..7d929e7 100644
--- a/src/mainboard/google/falco/acpi/mainboard.asl
+++ b/src/mainboard/google/falco/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/falco/onboard.h>
diff --git a/src/mainboard/google/falco/acpi/platform.asl b/src/mainboard/google/falco/acpi/platform.asl
index 72913f6..d438b40 100644
--- a/src/mainboard/google/falco/acpi/platform.asl
+++ b/src/mainboard/google/falco/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/falco/acpi/superio.asl b/src/mainboard/google/falco/acpi/superio.asl
index bbc096a..b96c4e3 100644
--- a/src/mainboard/google/falco/acpi/superio.asl
+++ b/src/mainboard/google/falco/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/falco/acpi/thermal.asl b/src/mainboard/google/falco/acpi/thermal.asl
index fd10dda..6062bea 100644
--- a/src/mainboard/google/falco/acpi/thermal.asl
+++ b/src/mainboard/google/falco/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/falco/acpi_tables.c b/src/mainboard/google/falco/acpi_tables.c
index 8a6ef01..bf661fa 100644
--- a/src/mainboard/google/falco/acpi_tables.c
+++ b/src/mainboard/google/falco/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/falco/chromeos.c b/src/mainboard/google/falco/chromeos.c
index cd2728e..35cee90 100644
--- a/src/mainboard/google/falco/chromeos.c
+++ b/src/mainboard/google/falco/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/falco/cmos.layout b/src/mainboard/google/falco/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/falco/cmos.layout
+++ b/src/mainboard/google/falco/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/falco/dsdt.asl b/src/mainboard/google/falco/dsdt.asl
index c9e9bb0..e3564ad 100644
--- a/src/mainboard/google/falco/dsdt.asl
+++ b/src/mainboard/google/falco/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/google/falco/ec.c b/src/mainboard/google/falco/ec.c
index dbe7348..83cab44 100644
--- a/src/mainboard/google/falco/ec.c
+++ b/src/mainboard/google/falco/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/falco/ec.h b/src/mainboard/google/falco/ec.h
index e99e716..b61de39 100644
--- a/src/mainboard/google/falco/ec.h
+++ b/src/mainboard/google/falco/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/falco/fadt.c b/src/mainboard/google/falco/fadt.c
index bae03d6..6b9aa08 100644
--- a/src/mainboard/google/falco/fadt.c
+++ b/src/mainboard/google/falco/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/falco/gma.c b/src/mainboard/google/falco/gma.c
index 6c936d7..2eb4974 100644
--- a/src/mainboard/google/falco/gma.c
+++ b/src/mainboard/google/falco/gma.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/falco/gpio.h b/src/mainboard/google/falco/gpio.h
index 6e64833..8938839 100644
--- a/src/mainboard/google/falco/gpio.h
+++ b/src/mainboard/google/falco/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FALCO_GPIO_H
diff --git a/src/mainboard/google/falco/hda_verb.c b/src/mainboard/google/falco/hda_verb.c
index cfe586f..e145328 100644
--- a/src/mainboard/google/falco/hda_verb.c
+++ b/src/mainboard/google/falco/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/falco/i915io.c b/src/mainboard/google/falco/i915io.c
index e0b3bc6..1af0bba 100644
--- a/src/mainboard/google/falco/i915io.c
+++ b/src/mainboard/google/falco/i915io.c
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 /* This code was originally generated using an i915tool program. It has been
diff --git a/src/mainboard/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c
index 1a2216c..975ff53 100644
--- a/src/mainboard/google/falco/mainboard.c
+++ b/src/mainboard/google/falco/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/falco/mainboard.h b/src/mainboard/google/falco/mainboard.h
index f1decee..ffd957d 100644
--- a/src/mainboard/google/falco/mainboard.h
+++ b/src/mainboard/google/falco/mainboard.h
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #ifndef __MAINBOARD_H_
diff --git a/src/mainboard/google/falco/onboard.h b/src/mainboard/google/falco/onboard.h
index f224ecd..6497655 100644
--- a/src/mainboard/google/falco/onboard.h
+++ b/src/mainboard/google/falco/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/falco/romstage.c b/src/mainboard/google/falco/romstage.c
index 7282c1e..5bfb45d 100644
--- a/src/mainboard/google/falco/romstage.c
+++ b/src/mainboard/google/falco/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/falco/smihandler.c b/src/mainboard/google/falco/smihandler.c
index d079e0c..9e211f3 100644
--- a/src/mainboard/google/falco/smihandler.c
+++ b/src/mainboard/google/falco/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/falco/thermal.h b/src/mainboard/google/falco/thermal.h
index b2384e4..f88ced0 100644
--- a/src/mainboard/google/falco/thermal.h
+++ b/src/mainboard/google/falco/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index 86c6d73..a5a709c 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_FOSTER
diff --git a/src/mainboard/google/foster/Makefile.inc b/src/mainboard/google/foster/Makefile.inc
index 51208c7..6653758 100644
--- a/src/mainboard/google/foster/Makefile.inc
+++ b/src/mainboard/google/foster/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/foster/bct/Makefile.inc b/src/mainboard/google/foster/bct/Makefile.inc
index 88fed7e..6a6b58d 100644
--- a/src/mainboard/google/foster/bct/Makefile.inc
+++ b/src/mainboard/google/foster/bct/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_FOSTER_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/foster/bct/cfg2inc.sh b/src/mainboard/google/foster/bct/cfg2inc.sh
index f8f3c44..b3422da 100644
--- a/src/mainboard/google/foster/bct/cfg2inc.sh
+++ b/src/mainboard/google/foster/bct/cfg2inc.sh
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 bct_cfg2inc() {
 	local in_file="$1"
diff --git a/src/mainboard/google/foster/boardid.c b/src/mainboard/google/foster/boardid.c
index d5a352e..b805103 100644
--- a/src/mainboard/google/foster/boardid.c
+++ b/src/mainboard/google/foster/boardid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/foster/bootblock.c b/src/mainboard/google/foster/bootblock.c
index e2ad465..0ce9e2d1 100644
--- a/src/mainboard/google/foster/bootblock.c
+++ b/src/mainboard/google/foster/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/foster/chromeos.c b/src/mainboard/google/foster/chromeos.c
index 83dd652..4db7e82 100644
--- a/src/mainboard/google/foster/chromeos.c
+++ b/src/mainboard/google/foster/chromeos.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/foster/devicetree.cb b/src/mainboard/google/foster/devicetree.cb
index 947a269..6b8148a 100644
--- a/src/mainboard/google/foster/devicetree.cb
+++ b/src/mainboard/google/foster/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra210
diff --git a/src/mainboard/google/foster/mainboard.c b/src/mainboard/google/foster/mainboard.c
index 3f4e10f..c93b4a2 100644
--- a/src/mainboard/google/foster/mainboard.c
+++ b/src/mainboard/google/foster/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/foster/pmic.c b/src/mainboard/google/foster/pmic.c
index b549107..8c708f6 100644
--- a/src/mainboard/google/foster/pmic.c
+++ b/src/mainboard/google/foster/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/foster/pmic.h b/src/mainboard/google/foster/pmic.h
index a2556f5..1a60431 100644
--- a/src/mainboard/google/foster/pmic.h
+++ b/src/mainboard/google/foster/pmic.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_FOSTER_PMIC_H__
diff --git a/src/mainboard/google/foster/reset.c b/src/mainboard/google/foster/reset.c
index 0c44a64..0641c86 100644
--- a/src/mainboard/google/foster/reset.c
+++ b/src/mainboard/google/foster/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/foster/romstage.c b/src/mainboard/google/foster/romstage.c
index 178ac10..5a7b26e 100644
--- a/src/mainboard/google/foster/romstage.c
+++ b/src/mainboard/google/foster/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.inc
index b73570a..66c1517 100644
--- a/src/mainboard/google/glados/Makefile.inc
+++ b/src/mainboard/google/glados/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/google/glados/acpi/chromeos.asl b/src/mainboard/google/glados/acpi/chromeos.asl
index 6b16dbc..db9148c 100644
--- a/src/mainboard/google/glados/acpi/chromeos.asl
+++ b/src/mainboard/google/glados/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../gpio.h"
diff --git a/src/mainboard/google/glados/acpi/dptf.asl b/src/mainboard/google/glados/acpi/dptf.asl
index 77578f6..5126e8b 100644
--- a/src/mainboard/google/glados/acpi/dptf.asl
+++ b/src/mainboard/google/glados/acpi/dptf.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define DPTF_CPU_PASSIVE        80
diff --git a/src/mainboard/google/glados/acpi/ec.asl b/src/mainboard/google/glados/acpi/ec.asl
index 6546a75..6145fe0 100644
--- a/src/mainboard/google/glados/acpi/ec.asl
+++ b/src/mainboard/google/glados/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/glados/acpi/mainboard.asl b/src/mainboard/google/glados/acpi/mainboard.asl
index b449ec4..022a51e 100644
--- a/src/mainboard/google/glados/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../gpio.h"
diff --git a/src/mainboard/google/glados/acpi/superio.asl b/src/mainboard/google/glados/acpi/superio.asl
index 822821e..d4d0863 100644
--- a/src/mainboard/google/glados/acpi/superio.asl
+++ b/src/mainboard/google/glados/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/glados/acpi_tables.c b/src/mainboard/google/glados/acpi_tables.c
index 6b6e038..3e9d31f 100644
--- a/src/mainboard/google/glados/acpi_tables.c
+++ b/src/mainboard/google/glados/acpi_tables.c
@@ -14,6 +14,5 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
diff --git a/src/mainboard/google/glados/boardid.c b/src/mainboard/google/glados/boardid.c
index 59c6fff..802f166 100644
--- a/src/mainboard/google/glados/boardid.c
+++ b/src/mainboard/google/glados/boardid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/glados/chromeos.c b/src/mainboard/google/glados/chromeos.c
index 7d42808..4be1dcf 100644
--- a/src/mainboard/google/glados/chromeos.c
+++ b/src/mainboard/google/glados/chromeos.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/glados/cmos.layout b/src/mainboard/google/glados/cmos.layout
index 20afaf7..3ca2f66 100644
--- a/src/mainboard/google/glados/cmos.layout
+++ b/src/mainboard/google/glados/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/glados/dsdt.asl b/src/mainboard/google/glados/dsdt.asl
index ba1b263..d022e8a 100644
--- a/src/mainboard/google/glados/dsdt.asl
+++ b/src/mainboard/google/glados/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/glados/ec.c b/src/mainboard/google/glados/ec.c
index 5473cfc..a44e6f9 100644
--- a/src/mainboard/google/glados/ec.c
+++ b/src/mainboard/google/glados/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/glados/ec.h b/src/mainboard/google/glados/ec.h
index 6408815..424c9a9 100644
--- a/src/mainboard/google/glados/ec.h
+++ b/src/mainboard/google/glados/ec.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/glados/fadt.c b/src/mainboard/google/glados/fadt.c
index 7948f93..a25d6b8 100644
--- a/src/mainboard/google/glados/fadt.c
+++ b/src/mainboard/google/glados/fadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/glados/gpio.h b/src/mainboard/google/glados/gpio.h
index c3d0835..62801ec 100644
--- a/src/mainboard/google/glados/gpio.h
+++ b/src/mainboard/google/glados/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_GPIO_H
diff --git a/src/mainboard/google/glados/mainboard.c b/src/mainboard/google/glados/mainboard.c
index ac4a2ad..4403199 100644
--- a/src/mainboard/google/glados/mainboard.c
+++ b/src/mainboard/google/glados/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/google/glados/pei_data.c b/src/mainboard/google/glados/pei_data.c
index 6d2ae15..0500c22 100644
--- a/src/mainboard/google/glados/pei_data.c
+++ b/src/mainboard/google/glados/pei_data.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/glados/ramstage.c b/src/mainboard/google/glados/ramstage.c
index 4816fec..a92ed3a 100644
--- a/src/mainboard/google/glados/ramstage.c
+++ b/src/mainboard/google/glados/ramstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/ramstage.h>
diff --git a/src/mainboard/google/glados/romstage.c b/src/mainboard/google/glados/romstage.c
index 69e6e0d..9e1888f 100644
--- a/src/mainboard/google/glados/romstage.c
+++ b/src/mainboard/google/glados/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/glados/smihandler.c b/src/mainboard/google/glados/smihandler.c
index 2a90089..4bcb280 100644
--- a/src/mainboard/google/glados/smihandler.c
+++ b/src/mainboard/google/glados/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/glados/spd/Makefile.inc b/src/mainboard/google/glados/spd/Makefile.inc
index f415ef8..5dba3ef 100644
--- a/src/mainboard/google/glados/spd/Makefile.inc
+++ b/src/mainboard/google/glados/spd/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/google/glados/spd/spd.c b/src/mainboard/google/glados/spd/spd.c
index 0a17d68..d21323c 100644
--- a/src/mainboard/google/glados/spd/spd.c
+++ b/src/mainboard/google/glados/spd/spd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/byteorder.h>
diff --git a/src/mainboard/google/glados/spd/spd.h b/src/mainboard/google/glados/spd/spd.h
index f1b733f..03343af 100644
--- a/src/mainboard/google/glados/spd/spd.h
+++ b/src/mainboard/google/glados/spd/spd.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_SPD_H
diff --git a/src/mainboard/google/jecht/Makefile.inc b/src/mainboard/google/jecht/Makefile.inc
index cc80453..1f4e2e6 100644
--- a/src/mainboard/google/jecht/Makefile.inc
+++ b/src/mainboard/google/jecht/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/google/jecht/acpi/chromeos.asl b/src/mainboard/google/jecht/acpi/chromeos.asl
index 5928678..dd90dc2 100644
--- a/src/mainboard/google/jecht/acpi/chromeos.asl
+++ b/src/mainboard/google/jecht/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/jecht/acpi/haswell_pci_irqs.asl b/src/mainboard/google/jecht/acpi/haswell_pci_irqs.asl
index 28a7ada..b32cd4e 100644
--- a/src/mainboard/google/jecht/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/jecht/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/jecht/acpi/mainboard.asl b/src/mainboard/google/jecht/acpi/mainboard.asl
index 236f881..1622b93 100644
--- a/src/mainboard/google/jecht/acpi/mainboard.asl
+++ b/src/mainboard/google/jecht/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/jecht/onboard.h>
diff --git a/src/mainboard/google/jecht/acpi/platform.asl b/src/mainboard/google/jecht/acpi/platform.asl
index 145fd2f..ac88c37 100644
--- a/src/mainboard/google/jecht/acpi/platform.asl
+++ b/src/mainboard/google/jecht/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/jecht/acpi/superio.asl b/src/mainboard/google/jecht/acpi/superio.asl
index 1f83630..0a317cb 100644
--- a/src/mainboard/google/jecht/acpi/superio.asl
+++ b/src/mainboard/google/jecht/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/google/jecht/acpi/thermal.asl b/src/mainboard/google/jecht/acpi/thermal.asl
index 74211ed..acbcb83 100644
--- a/src/mainboard/google/jecht/acpi/thermal.asl
+++ b/src/mainboard/google/jecht/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../thermal.h"
diff --git a/src/mainboard/google/jecht/acpi_tables.c b/src/mainboard/google/jecht/acpi_tables.c
index 4158d2b..ef49121 100644
--- a/src/mainboard/google/jecht/acpi_tables.c
+++ b/src/mainboard/google/jecht/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/jecht/chromeos.c b/src/mainboard/google/jecht/chromeos.c
index 46c9871..becae12 100644
--- a/src/mainboard/google/jecht/chromeos.c
+++ b/src/mainboard/google/jecht/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/jecht/cmos.layout b/src/mainboard/google/jecht/cmos.layout
index 418089b..96e3b8b 100644
--- a/src/mainboard/google/jecht/cmos.layout
+++ b/src/mainboard/google/jecht/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/jecht/dsdt.asl b/src/mainboard/google/jecht/dsdt.asl
index e219538..fa2f6a1 100644
--- a/src/mainboard/google/jecht/dsdt.asl
+++ b/src/mainboard/google/jecht/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/jecht/fadt.c b/src/mainboard/google/jecht/fadt.c
index aeb7fd6..7d77e5b 100644
--- a/src/mainboard/google/jecht/fadt.c
+++ b/src/mainboard/google/jecht/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/jecht/gpio.h b/src/mainboard/google/jecht/gpio.h
index 0a1e987..c209b7c 100644
--- a/src/mainboard/google/jecht/gpio.h
+++ b/src/mainboard/google/jecht/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef JECHT_GPIO_H
diff --git a/src/mainboard/google/jecht/hda_verb.c b/src/mainboard/google/jecht/hda_verb.c
index f4b5982..e8b65a2 100644
--- a/src/mainboard/google/jecht/hda_verb.c
+++ b/src/mainboard/google/jecht/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/jecht/lan.c b/src/mainboard/google/jecht/lan.c
index 8abbe1d..bb86f85 100644
--- a/src/mainboard/google/jecht/lan.c
+++ b/src/mainboard/google/jecht/lan.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/jecht/mainboard.c b/src/mainboard/google/jecht/mainboard.c
index f0b2e37..ae71aa0 100644
--- a/src/mainboard/google/jecht/mainboard.c
+++ b/src/mainboard/google/jecht/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/jecht/onboard.h b/src/mainboard/google/jecht/onboard.h
index d0f7844..d06be5b 100644
--- a/src/mainboard/google/jecht/onboard.h
+++ b/src/mainboard/google/jecht/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/jecht/pei_data.c b/src/mainboard/google/jecht/pei_data.c
index 46f13de..76f0edc 100644
--- a/src/mainboard/google/jecht/pei_data.c
+++ b/src/mainboard/google/jecht/pei_data.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/jecht/romstage.c b/src/mainboard/google/jecht/romstage.c
index 756381e..6fa5eae 100644
--- a/src/mainboard/google/jecht/romstage.c
+++ b/src/mainboard/google/jecht/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/jecht/smihandler.c b/src/mainboard/google/jecht/smihandler.c
index ca8c318..0599dff 100644
--- a/src/mainboard/google/jecht/smihandler.c
+++ b/src/mainboard/google/jecht/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/jecht/spd/Makefile.inc b/src/mainboard/google/jecht/spd/Makefile.inc
index 6531fca..4a134a9 100644
--- a/src/mainboard/google/jecht/spd/Makefile.inc
+++ b/src/mainboard/google/jecht/spd/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/google/jecht/spd/spd.c b/src/mainboard/google/jecht/spd/spd.c
index 37247f5..b42288d 100644
--- a/src/mainboard/google/jecht/spd/spd.c
+++ b/src/mainboard/google/jecht/spd/spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/jecht/spd/spd.h b/src/mainboard/google/jecht/spd/spd.h
index ffdd5d8..608ba8b 100644
--- a/src/mainboard/google/jecht/spd/spd.h
+++ b/src/mainboard/google/jecht/spd/spd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_SPD_H
diff --git a/src/mainboard/google/jecht/thermal.h b/src/mainboard/google/jecht/thermal.h
index b5db531..c224c76 100644
--- a/src/mainboard/google/jecht/thermal.h
+++ b/src/mainboard/google/jecht/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc
index 6f27ab9..7d8e96e 100644
--- a/src/mainboard/google/link/Makefile.inc
+++ b/src/mainboard/google/link/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += ec.c
diff --git a/src/mainboard/google/link/acpi/chromeos.asl b/src/mainboard/google/link/acpi/chromeos.asl
index c909949..424fc31 100644
--- a/src/mainboard/google/link/acpi/chromeos.asl
+++ b/src/mainboard/google/link/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/link/acpi/ec.asl b/src/mainboard/google/link/acpi/ec.asl
index 97bec3e..6af496c 100644
--- a/src/mainboard/google/link/acpi/ec.asl
+++ b/src/mainboard/google/link/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/link/acpi/ivybridge_pci_irqs.asl b/src/mainboard/google/link/acpi/ivybridge_pci_irqs.asl
index 39f0f4c..e14a4b7 100644
--- a/src/mainboard/google/link/acpi/ivybridge_pci_irqs.asl
+++ b/src/mainboard/google/link/acpi/ivybridge_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/link/acpi/mainboard.asl b/src/mainboard/google/link/acpi/mainboard.asl
index 63169e5..a305146 100644
--- a/src/mainboard/google/link/acpi/mainboard.asl
+++ b/src/mainboard/google/link/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/link/onboard.h>
diff --git a/src/mainboard/google/link/acpi/platform.asl b/src/mainboard/google/link/acpi/platform.asl
index 9efcf87..87074af 100644
--- a/src/mainboard/google/link/acpi/platform.asl
+++ b/src/mainboard/google/link/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/google/link/acpi/superio.asl b/src/mainboard/google/link/acpi/superio.asl
index 25c5986..d66dd22 100644
--- a/src/mainboard/google/link/acpi/superio.asl
+++ b/src/mainboard/google/link/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/link/acpi/thermal.asl b/src/mainboard/google/link/acpi/thermal.asl
index b54d680..9a49885 100644
--- a/src/mainboard/google/link/acpi/thermal.asl
+++ b/src/mainboard/google/link/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/link/acpi_tables.c b/src/mainboard/google/link/acpi_tables.c
index 071aacc..805a2fe 100644
--- a/src/mainboard/google/link/acpi_tables.c
+++ b/src/mainboard/google/link/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/link/chromeos.c b/src/mainboard/google/link/chromeos.c
index bc8a96a..9d00d21 100644
--- a/src/mainboard/google/link/chromeos.c
+++ b/src/mainboard/google/link/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/link/cmos.layout b/src/mainboard/google/link/cmos.layout
index b1f8a6a..d9289d9 100644
--- a/src/mainboard/google/link/cmos.layout
+++ b/src/mainboard/google/link/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/link/dsdt.asl b/src/mainboard/google/link/dsdt.asl
index a01533f..bfdcd5a 100644
--- a/src/mainboard/google/link/dsdt.asl
+++ b/src/mainboard/google/link/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/link/ec.c b/src/mainboard/google/link/ec.c
index c313603..fdac9bc 100644
--- a/src/mainboard/google/link/ec.c
+++ b/src/mainboard/google/link/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/link/ec.h b/src/mainboard/google/link/ec.h
index da9e131..0558850 100644
--- a/src/mainboard/google/link/ec.h
+++ b/src/mainboard/google/link/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LINK_EC_H
diff --git a/src/mainboard/google/link/gpio.h b/src/mainboard/google/link/gpio.h
index 1902096..4139566 100644
--- a/src/mainboard/google/link/gpio.h
+++ b/src/mainboard/google/link/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LINK_GPIO_H
diff --git a/src/mainboard/google/link/hda_verb.c b/src/mainboard/google/link/hda_verb.c
index 43461e3..bef4521 100644
--- a/src/mainboard/google/link/hda_verb.c
+++ b/src/mainboard/google/link/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/link/i915.c b/src/mainboard/google/link/i915.c
index ad15f40..ce039e1 100644
--- a/src/mainboard/google/link/i915.c
+++ b/src/mainboard/google/link/i915.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/link/i915io.c b/src/mainboard/google/link/i915io.c
index f93b8b7..90724ec 100644
--- a/src/mainboard/google/link/i915io.c
+++ b/src/mainboard/google/link/i915io.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/link/i915io.h b/src/mainboard/google/link/i915io.h
index d10a113..036661a 100644
--- a/src/mainboard/google/link/i915io.h
+++ b/src/mainboard/google/link/i915io.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <drivers/intel/gma/i915_reg.h>
diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c
index fc95f59..79ebc71 100644
--- a/src/mainboard/google/link/mainboard.c
+++ b/src/mainboard/google/link/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/link/mainboard_smi.c b/src/mainboard/google/link/mainboard_smi.c
index 2280e41..f3cb779 100644
--- a/src/mainboard/google/link/mainboard_smi.c
+++ b/src/mainboard/google/link/mainboard_smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/link/onboard.h b/src/mainboard/google/link/onboard.h
index 5c5a677..763b250 100644
--- a/src/mainboard/google/link/onboard.h
+++ b/src/mainboard/google/link/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LINK_ONBOARD_H
diff --git a/src/mainboard/google/link/romstage.c b/src/mainboard/google/link/romstage.c
index aa36bc5..e916eb4 100644
--- a/src/mainboard/google/link/romstage.c
+++ b/src/mainboard/google/link/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/link/thermal.h b/src/mainboard/google/link/thermal.h
index 4c01910..83aedbc 100644
--- a/src/mainboard/google/link/thermal.h
+++ b/src/mainboard/google/link/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LINK_THERMAL_H
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index 5f4ad81..77c9799 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_NYAN
diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc
index 97c1a94..e52ef59 100644
--- a/src/mainboard/google/nyan/Makefile.inc
+++ b/src/mainboard/google/nyan/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.inc
index cb92971..c1714ef 100644
--- a/src/mainboard/google/nyan/bct/Makefile.inc
+++ b/src/mainboard/google/nyan/bct/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_NYAN_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/nyan/bct/cfg2inc.sh b/src/mainboard/google/nyan/bct/cfg2inc.sh
index f8f3c44..b3422da 100755
--- a/src/mainboard/google/nyan/bct/cfg2inc.sh
+++ b/src/mainboard/google/nyan/bct/cfg2inc.sh
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 bct_cfg2inc() {
 	local in_file="$1"
diff --git a/src/mainboard/google/nyan/boardid.c b/src/mainboard/google/nyan/boardid.c
index d11940e..8637fef 100644
--- a/src/mainboard/google/nyan/boardid.c
+++ b/src/mainboard/google/nyan/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/nyan/bootblock.c b/src/mainboard/google/nyan/bootblock.c
index 1fecbf1..05a4885 100644
--- a/src/mainboard/google/nyan/bootblock.c
+++ b/src/mainboard/google/nyan/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan/chromeos.c b/src/mainboard/google/nyan/chromeos.c
index 25beba3..ce3ce42 100644
--- a/src/mainboard/google/nyan/chromeos.c
+++ b/src/mainboard/google/nyan/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/nyan/devicetree.cb b/src/mainboard/google/nyan/devicetree.cb
index 9818e06..e82cf9b 100644
--- a/src/mainboard/google/nyan/devicetree.cb
+++ b/src/mainboard/google/nyan/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra124
diff --git a/src/mainboard/google/nyan/early_configs.c b/src/mainboard/google/nyan/early_configs.c
index c991964..da5dfa6 100644
--- a/src/mainboard/google/nyan/early_configs.c
+++ b/src/mainboard/google/nyan/early_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gpio.h>
diff --git a/src/mainboard/google/nyan/mainboard.c b/src/mainboard/google/nyan/mainboard.c
index 17f7118..4acf597 100644
--- a/src/mainboard/google/nyan/mainboard.c
+++ b/src/mainboard/google/nyan/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c
index 6608068..c53d27f 100644
--- a/src/mainboard/google/nyan/pmic.c
+++ b/src/mainboard/google/nyan/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/nyan/pmic.h b/src/mainboard/google/nyan/pmic.h
index 38ae776..3362b79 100644
--- a/src/mainboard/google/nyan/pmic.h
+++ b/src/mainboard/google/nyan/pmic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_NYAN_PMIC_H__
diff --git a/src/mainboard/google/nyan/reset.c b/src/mainboard/google/nyan/reset.c
index bdbb512b..d9c7a2a 100644
--- a/src/mainboard/google/nyan/reset.c
+++ b/src/mainboard/google/nyan/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index 0f8e947..39b42e6 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/nyan/sdram_configs.c b/src/mainboard/google/nyan/sdram_configs.c
index d0d079e..d390e13 100644
--- a/src/mainboard/google/nyan/sdram_configs.c
+++ b/src/mainboard/google/nyan/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/nyan/sdram_configs.h b/src/mainboard/google/nyan/sdram_configs.h
index d2cbba6..888f9cb 100644
--- a/src/mainboard/google/nyan/sdram_configs.h
+++ b/src/mainboard/google/nyan/sdram_configs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_NYAN_SDRAM_CONFIG_H__
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index cd744ca..dbf3613 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_NYAN_BIG
diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.inc
index 3c9699f..c1d0f70 100644
--- a/src/mainboard/google/nyan_big/Makefile.inc
+++ b/src/mainboard/google/nyan_big/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/nyan_big/bct/Makefile.inc b/src/mainboard/google/nyan_big/bct/Makefile.inc
index 757fe0e..ff316d5 100644
--- a/src/mainboard/google/nyan_big/bct/Makefile.inc
+++ b/src/mainboard/google/nyan_big/bct/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/nyan_big/boardid.c b/src/mainboard/google/nyan_big/boardid.c
index 328927e..9687d1c 100644
--- a/src/mainboard/google/nyan_big/boardid.c
+++ b/src/mainboard/google/nyan_big/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/nyan_big/bootblock.c b/src/mainboard/google/nyan_big/bootblock.c
index d9cbe1a..0c4e036 100644
--- a/src/mainboard/google/nyan_big/bootblock.c
+++ b/src/mainboard/google/nyan_big/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan_big/chromeos.c b/src/mainboard/google/nyan_big/chromeos.c
index 36c79aa..70d6f44 100644
--- a/src/mainboard/google/nyan_big/chromeos.c
+++ b/src/mainboard/google/nyan_big/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/nyan_big/devicetree.cb b/src/mainboard/google/nyan_big/devicetree.cb
index 9818e06..e82cf9b 100644
--- a/src/mainboard/google/nyan_big/devicetree.cb
+++ b/src/mainboard/google/nyan_big/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra124
diff --git a/src/mainboard/google/nyan_big/early_configs.c b/src/mainboard/google/nyan_big/early_configs.c
index c991964..da5dfa6 100644
--- a/src/mainboard/google/nyan_big/early_configs.c
+++ b/src/mainboard/google/nyan_big/early_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gpio.h>
diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c
index 57bfb30..4a114e5 100644
--- a/src/mainboard/google/nyan_big/mainboard.c
+++ b/src/mainboard/google/nyan_big/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c
index 7ce7997..2fbd63b 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/nyan_big/pmic.h b/src/mainboard/google/nyan_big/pmic.h
index f859550..11e946e 100644
--- a/src/mainboard/google/nyan_big/pmic.h
+++ b/src/mainboard/google/nyan_big/pmic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_NYAN_BIG_PMIC_H__
diff --git a/src/mainboard/google/nyan_big/reset.c b/src/mainboard/google/nyan_big/reset.c
index bdbb512b..d9c7a2a 100644
--- a/src/mainboard/google/nyan_big/reset.c
+++ b/src/mainboard/google/nyan_big/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index 0f8e947..39b42e6 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/nyan_big/sdram_configs.c b/src/mainboard/google/nyan_big/sdram_configs.c
index 434b7ba..e763688 100644
--- a/src/mainboard/google/nyan_big/sdram_configs.c
+++ b/src/mainboard/google/nyan_big/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/nyan_big/sdram_configs.h b/src/mainboard/google/nyan_big/sdram_configs.h
index 5fa957d..63188e5 100644
--- a/src/mainboard/google/nyan_big/sdram_configs.h
+++ b/src/mainboard/google/nyan_big/sdram_configs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_NYAN_BIG_SDRAM_CONFIG_H__
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 94e7172..2be0aac 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_NYAN_BLAZE
diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc
index 6f1f33e..d5e504a 100644
--- a/src/mainboard/google/nyan_blaze/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.inc b/src/mainboard/google/nyan_blaze/bct/Makefile.inc
index a816b3b..f6e3986 100644
--- a/src/mainboard/google/nyan_blaze/bct/Makefile.inc
+++ b/src/mainboard/google/nyan_blaze/bct/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/nyan_blaze/boardid.c b/src/mainboard/google/nyan_blaze/boardid.c
index 328927e..9687d1c 100644
--- a/src/mainboard/google/nyan_blaze/boardid.c
+++ b/src/mainboard/google/nyan_blaze/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/nyan_blaze/bootblock.c b/src/mainboard/google/nyan_blaze/bootblock.c
index d9cbe1a..0c4e036 100644
--- a/src/mainboard/google/nyan_blaze/bootblock.c
+++ b/src/mainboard/google/nyan_blaze/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan_blaze/chromeos.c b/src/mainboard/google/nyan_blaze/chromeos.c
index 7970f4d..0f0667e 100644
--- a/src/mainboard/google/nyan_blaze/chromeos.c
+++ b/src/mainboard/google/nyan_blaze/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/nyan_blaze/devicetree.cb b/src/mainboard/google/nyan_blaze/devicetree.cb
index 9818e06..e82cf9b 100644
--- a/src/mainboard/google/nyan_blaze/devicetree.cb
+++ b/src/mainboard/google/nyan_blaze/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra124
diff --git a/src/mainboard/google/nyan_blaze/early_configs.c b/src/mainboard/google/nyan_blaze/early_configs.c
index c991964..da5dfa6 100644
--- a/src/mainboard/google/nyan_blaze/early_configs.c
+++ b/src/mainboard/google/nyan_blaze/early_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gpio.h>
diff --git a/src/mainboard/google/nyan_blaze/mainboard.c b/src/mainboard/google/nyan_blaze/mainboard.c
index 26fe789..6b0925b 100644
--- a/src/mainboard/google/nyan_blaze/mainboard.c
+++ b/src/mainboard/google/nyan_blaze/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index 7ce7997..2fbd63b 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/nyan_blaze/pmic.h b/src/mainboard/google/nyan_blaze/pmic.h
index fc7d4c2..9c48cda 100644
--- a/src/mainboard/google/nyan_blaze/pmic.h
+++ b/src/mainboard/google/nyan_blaze/pmic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_NYAN_BLAZE_PMIC_H__
diff --git a/src/mainboard/google/nyan_blaze/reset.c b/src/mainboard/google/nyan_blaze/reset.c
index bdbb512b..d9c7a2a 100644
--- a/src/mainboard/google/nyan_blaze/reset.c
+++ b/src/mainboard/google/nyan_blaze/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index d62e303..635a512 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.c b/src/mainboard/google/nyan_blaze/sdram_configs.c
index d6b8391..756b5a0 100644
--- a/src/mainboard/google/nyan_blaze/sdram_configs.c
+++ b/src/mainboard/google/nyan_blaze/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/nyan_blaze/sdram_configs.h b/src/mainboard/google/nyan_blaze/sdram_configs.h
index 609d38e..81c4841 100644
--- a/src/mainboard/google/nyan_blaze/sdram_configs.h
+++ b/src/mainboard/google/nyan_blaze/sdram_configs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_NYAN_BLAZE_SDRAM_CONFIG_H__
diff --git a/src/mainboard/google/panther/Makefile.inc b/src/mainboard/google/panther/Makefile.inc
index abc3bbe..1dfdcc5 100644
--- a/src/mainboard/google/panther/Makefile.inc
+++ b/src/mainboard/google/panther/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += chromeos.c
diff --git a/src/mainboard/google/panther/acpi/chromeos.asl b/src/mainboard/google/panther/acpi/chromeos.asl
index 5ac4c41..1970633 100644
--- a/src/mainboard/google/panther/acpi/chromeos.asl
+++ b/src/mainboard/google/panther/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/panther/acpi/haswell_pci_irqs.asl b/src/mainboard/google/panther/acpi/haswell_pci_irqs.asl
index 28a7ada..b32cd4e 100644
--- a/src/mainboard/google/panther/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/panther/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/panther/acpi/mainboard.asl b/src/mainboard/google/panther/acpi/mainboard.asl
index 4eee219..28955f5 100644
--- a/src/mainboard/google/panther/acpi/mainboard.asl
+++ b/src/mainboard/google/panther/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/panther/onboard.h>
diff --git a/src/mainboard/google/panther/acpi/platform.asl b/src/mainboard/google/panther/acpi/platform.asl
index 97641f0..0629caf 100644
--- a/src/mainboard/google/panther/acpi/platform.asl
+++ b/src/mainboard/google/panther/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/panther/acpi/superio.asl b/src/mainboard/google/panther/acpi/superio.asl
index da2d40f..9203ac3 100644
--- a/src/mainboard/google/panther/acpi/superio.asl
+++ b/src/mainboard/google/panther/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/google/panther/acpi/thermal.asl b/src/mainboard/google/panther/acpi/thermal.asl
index 0a65a2d..844ceba 100644
--- a/src/mainboard/google/panther/acpi/thermal.asl
+++ b/src/mainboard/google/panther/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/panther/acpi_tables.c b/src/mainboard/google/panther/acpi_tables.c
index c4efd7e..0efd394 100644
--- a/src/mainboard/google/panther/acpi_tables.c
+++ b/src/mainboard/google/panther/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/mainboard/google/panther/chromeos.c b/src/mainboard/google/panther/chromeos.c
index 98af76e..991c5ec 100644
--- a/src/mainboard/google/panther/chromeos.c
+++ b/src/mainboard/google/panther/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/panther/cmos.layout b/src/mainboard/google/panther/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/panther/cmos.layout
+++ b/src/mainboard/google/panther/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/panther/dsdt.asl b/src/mainboard/google/panther/dsdt.asl
index e108717..a1ec653 100644
--- a/src/mainboard/google/panther/dsdt.asl
+++ b/src/mainboard/google/panther/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/google/panther/fadt.c b/src/mainboard/google/panther/fadt.c
index 97e02be..c84adbb 100644
--- a/src/mainboard/google/panther/fadt.c
+++ b/src/mainboard/google/panther/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/panther/gpio.h b/src/mainboard/google/panther/gpio.h
index 788537f..362dc08 100644
--- a/src/mainboard/google/panther/gpio.h
+++ b/src/mainboard/google/panther/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PANTHER_GPIO_H
diff --git a/src/mainboard/google/panther/hda_verb.c b/src/mainboard/google/panther/hda_verb.c
index 7460364..fd4a01d 100644
--- a/src/mainboard/google/panther/hda_verb.c
+++ b/src/mainboard/google/panther/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HDA_VERB_H
diff --git a/src/mainboard/google/panther/lan.c b/src/mainboard/google/panther/lan.c
index 5d806db..8e31591 100644
--- a/src/mainboard/google/panther/lan.c
+++ b/src/mainboard/google/panther/lan.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/panther/mainboard.c b/src/mainboard/google/panther/mainboard.c
index 7134d3f..643318e 100644
--- a/src/mainboard/google/panther/mainboard.c
+++ b/src/mainboard/google/panther/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <smbios.h>
diff --git a/src/mainboard/google/panther/romstage.c b/src/mainboard/google/panther/romstage.c
index 141ec57..4e0fe14 100644
--- a/src/mainboard/google/panther/romstage.c
+++ b/src/mainboard/google/panther/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/panther/smihandler.c b/src/mainboard/google/panther/smihandler.c
index 8b3b32d..d490bf2 100644
--- a/src/mainboard/google/panther/smihandler.c
+++ b/src/mainboard/google/panther/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/panther/thermal.h b/src/mainboard/google/panther/thermal.h
index e971bc9..e608856 100644
--- a/src/mainboard/google/panther/thermal.h
+++ b/src/mainboard/google/panther/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/parrot/Makefile.inc b/src/mainboard/google/parrot/Makefile.inc
index c8e56dd..8c8a96f 100644
--- a/src/mainboard/google/parrot/Makefile.inc
+++ b/src/mainboard/google/parrot/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += ec.c
diff --git a/src/mainboard/google/parrot/acpi/chromeos.asl b/src/mainboard/google/parrot/acpi/chromeos.asl
index 309314a..adfa175 100644
--- a/src/mainboard/google/parrot/acpi/chromeos.asl
+++ b/src/mainboard/google/parrot/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/parrot/acpi/ec.asl b/src/mainboard/google/parrot/acpi/ec.asl
index e1a4802..69a0672 100644
--- a/src/mainboard/google/parrot/acpi/ec.asl
+++ b/src/mainboard/google/parrot/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl b/src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl
index 39f0f4c..e14a4b7 100644
--- a/src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl
+++ b/src/mainboard/google/parrot/acpi/ivybridge_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/parrot/acpi/mainboard.asl b/src/mainboard/google/parrot/acpi/mainboard.asl
index 77fdd36..694a47d 100644
--- a/src/mainboard/google/parrot/acpi/mainboard.asl
+++ b/src/mainboard/google/parrot/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/parrot/onboard.h>
diff --git a/src/mainboard/google/parrot/acpi/platform.asl b/src/mainboard/google/parrot/acpi/platform.asl
index 69043cc..d29c2de 100644
--- a/src/mainboard/google/parrot/acpi/platform.asl
+++ b/src/mainboard/google/parrot/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/google/parrot/acpi/superio.asl b/src/mainboard/google/parrot/acpi/superio.asl
index 4a0c407..9484606 100644
--- a/src/mainboard/google/parrot/acpi/superio.asl
+++ b/src/mainboard/google/parrot/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/parrot/acpi/thermal.asl b/src/mainboard/google/parrot/acpi/thermal.asl
index 13a41e3..02c5576 100644
--- a/src/mainboard/google/parrot/acpi/thermal.asl
+++ b/src/mainboard/google/parrot/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/parrot/acpi_tables.c b/src/mainboard/google/parrot/acpi_tables.c
index 0132e33..58adc99 100644
--- a/src/mainboard/google/parrot/acpi_tables.c
+++ b/src/mainboard/google/parrot/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/parrot/chromeos.c b/src/mainboard/google/parrot/chromeos.c
index 164e192..603b8ec 100644
--- a/src/mainboard/google/parrot/chromeos.c
+++ b/src/mainboard/google/parrot/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/parrot/cmos.layout b/src/mainboard/google/parrot/cmos.layout
index b1f8a6a..d9289d9 100644
--- a/src/mainboard/google/parrot/cmos.layout
+++ b/src/mainboard/google/parrot/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/parrot/dsdt.asl b/src/mainboard/google/parrot/dsdt.asl
index 0a2f37d..a1895da 100644
--- a/src/mainboard/google/parrot/dsdt.asl
+++ b/src/mainboard/google/parrot/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/parrot/ec.c b/src/mainboard/google/parrot/ec.c
index 098ce5e..97c3883 100644
--- a/src/mainboard/google/parrot/ec.c
+++ b/src/mainboard/google/parrot/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/parrot/ec.h b/src/mainboard/google/parrot/ec.h
index 993f98f..915fad1 100644
--- a/src/mainboard/google/parrot/ec.h
+++ b/src/mainboard/google/parrot/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PARROT_EC_H
diff --git a/src/mainboard/google/parrot/gpio.h b/src/mainboard/google/parrot/gpio.h
index e5d1e41..e8bbeb1 100644
--- a/src/mainboard/google/parrot/gpio.h
+++ b/src/mainboard/google/parrot/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PARROT_GPIO_H
diff --git a/src/mainboard/google/parrot/hda_verb.c b/src/mainboard/google/parrot/hda_verb.c
index 9c8a920..6b71ec9 100644
--- a/src/mainboard/google/parrot/hda_verb.c
+++ b/src/mainboard/google/parrot/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c
index 3f29312..0e4a832 100644
--- a/src/mainboard/google/parrot/mainboard.c
+++ b/src/mainboard/google/parrot/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/parrot/onboard.h b/src/mainboard/google/parrot/onboard.h
index f03c408..b7c78f3 100644
--- a/src/mainboard/google/parrot/onboard.h
+++ b/src/mainboard/google/parrot/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PARROT_ONBOARD_H
diff --git a/src/mainboard/google/parrot/romstage.c b/src/mainboard/google/parrot/romstage.c
index 582d9e0..ca28576 100644
--- a/src/mainboard/google/parrot/romstage.c
+++ b/src/mainboard/google/parrot/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/parrot/smihandler.c b/src/mainboard/google/parrot/smihandler.c
index 2a279cd..83c3a13 100644
--- a/src/mainboard/google/parrot/smihandler.c
+++ b/src/mainboard/google/parrot/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/parrot/thermal.h b/src/mainboard/google/parrot/thermal.h
index 1836c9b..a241b9a 100644
--- a/src/mainboard/google/parrot/thermal.h
+++ b/src/mainboard/google/parrot/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PARROT_THERMAL_H
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index 016ecb9..bd9a6ea 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_PEACH_PIT
diff --git a/src/mainboard/google/peach_pit/Makefile.inc b/src/mainboard/google/peach_pit/Makefile.inc
index 12a4943..7809ed7 100644
--- a/src/mainboard/google/peach_pit/Makefile.inc
+++ b/src/mainboard/google/peach_pit/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bootblock-y += wakeup.c
diff --git a/src/mainboard/google/peach_pit/chromeos.c b/src/mainboard/google/peach_pit/chromeos.c
index 59a6129..a54a9f8 100644
--- a/src/mainboard/google/peach_pit/chromeos.c
+++ b/src/mainboard/google/peach_pit/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/peach_pit/devicetree.cb b/src/mainboard/google/peach_pit/devicetree.cb
index ad7e902..08dc055 100644
--- a/src/mainboard/google/peach_pit/devicetree.cb
+++ b/src/mainboard/google/peach_pit/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/samsung/exynos5420
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index 37f5986..e5a0d88 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/peach_pit/memory.c b/src/mainboard/google/peach_pit/memory.c
index 5d9e8c1..870b1cd 100644
--- a/src/mainboard/google/peach_pit/memory.c
+++ b/src/mainboard/google/peach_pit/memory.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c
index d5fdfb1..609924c 100644
--- a/src/mainboard/google/peach_pit/romstage.c
+++ b/src/mainboard/google/peach_pit/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/peach_pit/wakeup.c b/src/mainboard/google/peach_pit/wakeup.c
index 54af549..3ba6774 100644
--- a/src/mainboard/google/peach_pit/wakeup.c
+++ b/src/mainboard/google/peach_pit/wakeup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/gpio.h>
diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc
index 97eacca..cc07645 100644
--- a/src/mainboard/google/peppy/Makefile.inc
+++ b/src/mainboard/google/peppy/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
diff --git a/src/mainboard/google/peppy/acpi/chromeos.asl b/src/mainboard/google/peppy/acpi/chromeos.asl
index 9db5509..907fb8d 100644
--- a/src/mainboard/google/peppy/acpi/chromeos.asl
+++ b/src/mainboard/google/peppy/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/peppy/acpi/ec.asl b/src/mainboard/google/peppy/acpi/ec.asl
index d8b6286..8f88ada 100644
--- a/src/mainboard/google/peppy/acpi/ec.asl
+++ b/src/mainboard/google/peppy/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/peppy/acpi/haswell_pci_irqs.asl b/src/mainboard/google/peppy/acpi/haswell_pci_irqs.asl
index 28a7ada..b32cd4e 100644
--- a/src/mainboard/google/peppy/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/peppy/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/peppy/acpi/mainboard.asl b/src/mainboard/google/peppy/acpi/mainboard.asl
index 3406e8c..80fddc6 100644
--- a/src/mainboard/google/peppy/acpi/mainboard.asl
+++ b/src/mainboard/google/peppy/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/peppy/onboard.h>
diff --git a/src/mainboard/google/peppy/acpi/platform.asl b/src/mainboard/google/peppy/acpi/platform.asl
index 72913f6..d438b40 100644
--- a/src/mainboard/google/peppy/acpi/platform.asl
+++ b/src/mainboard/google/peppy/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/peppy/acpi/superio.asl b/src/mainboard/google/peppy/acpi/superio.asl
index 0203cad..2f12d39 100644
--- a/src/mainboard/google/peppy/acpi/superio.asl
+++ b/src/mainboard/google/peppy/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/peppy/acpi/thermal.asl b/src/mainboard/google/peppy/acpi/thermal.asl
index 0533048..9ffd022 100644
--- a/src/mainboard/google/peppy/acpi/thermal.asl
+++ b/src/mainboard/google/peppy/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/peppy/acpi_tables.c b/src/mainboard/google/peppy/acpi_tables.c
index 47288aa..18fd502 100644
--- a/src/mainboard/google/peppy/acpi_tables.c
+++ b/src/mainboard/google/peppy/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/peppy/chromeos.c b/src/mainboard/google/peppy/chromeos.c
index cd2728e..35cee90 100644
--- a/src/mainboard/google/peppy/chromeos.c
+++ b/src/mainboard/google/peppy/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/peppy/cmos.layout b/src/mainboard/google/peppy/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/peppy/cmos.layout
+++ b/src/mainboard/google/peppy/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/peppy/dsdt.asl b/src/mainboard/google/peppy/dsdt.asl
index 76998ba..3122a84 100644
--- a/src/mainboard/google/peppy/dsdt.asl
+++ b/src/mainboard/google/peppy/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/google/peppy/ec.c b/src/mainboard/google/peppy/ec.c
index dbe7348..83cab44 100644
--- a/src/mainboard/google/peppy/ec.c
+++ b/src/mainboard/google/peppy/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/peppy/ec.h b/src/mainboard/google/peppy/ec.h
index 706993c..11a8907 100644
--- a/src/mainboard/google/peppy/ec.h
+++ b/src/mainboard/google/peppy/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/peppy/fadt.c b/src/mainboard/google/peppy/fadt.c
index bae03d6..6b9aa08 100644
--- a/src/mainboard/google/peppy/fadt.c
+++ b/src/mainboard/google/peppy/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/peppy/gma.c b/src/mainboard/google/peppy/gma.c
index 4e2fc5f..121403d 100644
--- a/src/mainboard/google/peppy/gma.c
+++ b/src/mainboard/google/peppy/gma.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/peppy/gpio.h b/src/mainboard/google/peppy/gpio.h
index 147b914..1dd5ef5 100644
--- a/src/mainboard/google/peppy/gpio.h
+++ b/src/mainboard/google/peppy/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PEPPY_GPIO_H
diff --git a/src/mainboard/google/peppy/hda_verb.c b/src/mainboard/google/peppy/hda_verb.c
index fc341b8..d468302 100644
--- a/src/mainboard/google/peppy/hda_verb.c
+++ b/src/mainboard/google/peppy/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/peppy/i915io.c b/src/mainboard/google/peppy/i915io.c
index eb7b136..7c32bf7 100644
--- a/src/mainboard/google/peppy/i915io.c
+++ b/src/mainboard/google/peppy/i915io.c
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c
index 1a2216c..975ff53 100644
--- a/src/mainboard/google/peppy/mainboard.c
+++ b/src/mainboard/google/peppy/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/peppy/mainboard.h b/src/mainboard/google/peppy/mainboard.h
index f1decee..ffd957d 100644
--- a/src/mainboard/google/peppy/mainboard.h
+++ b/src/mainboard/google/peppy/mainboard.h
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #ifndef __MAINBOARD_H_
diff --git a/src/mainboard/google/peppy/onboard.h b/src/mainboard/google/peppy/onboard.h
index 0f717a1..04154e5 100644
--- a/src/mainboard/google/peppy/onboard.h
+++ b/src/mainboard/google/peppy/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c
index 6957783..7fac215 100644
--- a/src/mainboard/google/peppy/romstage.c
+++ b/src/mainboard/google/peppy/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/mainboard/google/peppy/smihandler.c b/src/mainboard/google/peppy/smihandler.c
index 5d7df37..318120a 100644
--- a/src/mainboard/google/peppy/smihandler.c
+++ b/src/mainboard/google/peppy/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/peppy/thermal.h b/src/mainboard/google/peppy/thermal.h
index e9f4688..58e5ab0 100644
--- a/src/mainboard/google/peppy/thermal.h
+++ b/src/mainboard/google/peppy/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig
index 67aaca5..a9a22c2 100644
--- a/src/mainboard/google/purin/Kconfig
+++ b/src/mainboard/google/purin/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_PURIN
diff --git a/src/mainboard/google/purin/Makefile.inc b/src/mainboard/google/purin/Makefile.inc
index 00e6af7..bde004c 100644
--- a/src/mainboard/google/purin/Makefile.inc
+++ b/src/mainboard/google/purin/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/purin/boardid.c b/src/mainboard/google/purin/boardid.c
index 7db255a..103a4ca 100644
--- a/src/mainboard/google/purin/boardid.c
+++ b/src/mainboard/google/purin/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/purin/bootblock.c b/src/mainboard/google/purin/bootblock.c
index 8eda98c..7a4384c 100644
--- a/src/mainboard/google/purin/bootblock.c
+++ b/src/mainboard/google/purin/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootblock_common.h>
diff --git a/src/mainboard/google/purin/chromeos.c b/src/mainboard/google/purin/chromeos.c
index dfe4bba..e84d32d 100644
--- a/src/mainboard/google/purin/chromeos.c
+++ b/src/mainboard/google/purin/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/purin/devicetree.cb b/src/mainboard/google/purin/devicetree.cb
index 458cbc6..5271093 100644
--- a/src/mainboard/google/purin/devicetree.cb
+++ b/src/mainboard/google/purin/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/purin/mainboard.c b/src/mainboard/google/purin/mainboard.c
index 5ee4076..46e41a6 100644
--- a/src/mainboard/google/purin/mainboard.c
+++ b/src/mainboard/google/purin/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/google/purin/reset.c b/src/mainboard/google/purin/reset.c
index 4f4e5bb..bc9fb3f 100644
--- a/src/mainboard/google/purin/reset.c
+++ b/src/mainboard/google/purin/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/mainboard/google/rambi/Makefile.inc b/src/mainboard/google/rambi/Makefile.inc
index 4f61948..ef218ce 100644
--- a/src/mainboard/google/rambi/Makefile.inc
+++ b/src/mainboard/google/rambi/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/google/rambi/acpi/chromeos.asl b/src/mainboard/google/rambi/acpi/chromeos.asl
index 56dd767..3e30f8d 100644
--- a/src/mainboard/google/rambi/acpi/chromeos.asl
+++ b/src/mainboard/google/rambi/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/google/rambi/acpi/ec.asl b/src/mainboard/google/rambi/acpi/ec.asl
index d50cf07..4a296d3 100644
--- a/src/mainboard/google/rambi/acpi/ec.asl
+++ b/src/mainboard/google/rambi/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/rambi/acpi/mainboard.asl b/src/mainboard/google/rambi/acpi/mainboard.asl
index e8cd3c2..9321d6d 100644
--- a/src/mainboard/google/rambi/acpi/mainboard.asl
+++ b/src/mainboard/google/rambi/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/rambi/onboard.h>
diff --git a/src/mainboard/google/rambi/acpi/superio.asl b/src/mainboard/google/rambi/acpi/superio.asl
index 2c866de..7f01aeb 100644
--- a/src/mainboard/google/rambi/acpi/superio.asl
+++ b/src/mainboard/google/rambi/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c
index d7ef665..80d1e91 100644
--- a/src/mainboard/google/rambi/acpi_tables.c
+++ b/src/mainboard/google/rambi/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/rambi/chromeos.c b/src/mainboard/google/rambi/chromeos.c
index 3e07044..b69e459 100644
--- a/src/mainboard/google/rambi/chromeos.c
+++ b/src/mainboard/google/rambi/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/rambi/cmos.layout b/src/mainboard/google/rambi/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/rambi/cmos.layout
+++ b/src/mainboard/google/rambi/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/rambi/dsdt.asl b/src/mainboard/google/rambi/dsdt.asl
index a447b14..36285d4 100644
--- a/src/mainboard/google/rambi/dsdt.asl
+++ b/src/mainboard/google/rambi/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/google/rambi/ec.c b/src/mainboard/google/rambi/ec.c
index 1cdd105..2c0deb3 100644
--- a/src/mainboard/google/rambi/ec.c
+++ b/src/mainboard/google/rambi/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/rambi/ec.h b/src/mainboard/google/rambi/ec.h
index 40694dc..597bf75 100644
--- a/src/mainboard/google/rambi/ec.h
+++ b/src/mainboard/google/rambi/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/rambi/fadt.c b/src/mainboard/google/rambi/fadt.c
index e575425..6303522 100644
--- a/src/mainboard/google/rambi/fadt.c
+++ b/src/mainboard/google/rambi/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/rambi/gpio.c b/src/mainboard/google/rambi/gpio.c
index ce398e9..8d577a7 100644
--- a/src/mainboard/google/rambi/gpio.c
+++ b/src/mainboard/google/rambi/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/google/rambi/irqroute.c b/src/mainboard/google/rambi/irqroute.c
index 1ace03b..432243d 100644
--- a/src/mainboard/google/rambi/irqroute.c
+++ b/src/mainboard/google/rambi/irqroute.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/google/rambi/irqroute.h b/src/mainboard/google/rambi/irqroute.h
index 41d5c32..da86374 100644
--- a/src/mainboard/google/rambi/irqroute.h
+++ b/src/mainboard/google/rambi/irqroute.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/irq.h>
diff --git a/src/mainboard/google/rambi/mainboard.c b/src/mainboard/google/rambi/mainboard.c
index f4666ab..9a5af71 100644
--- a/src/mainboard/google/rambi/mainboard.c
+++ b/src/mainboard/google/rambi/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/rambi/mainboard_smi.c b/src/mainboard/google/rambi/mainboard_smi.c
index ab65632..f06ddb9 100644
--- a/src/mainboard/google/rambi/mainboard_smi.c
+++ b/src/mainboard/google/rambi/mainboard_smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/rambi/onboard.h b/src/mainboard/google/rambi/onboard.h
index b721542..64bd225 100644
--- a/src/mainboard/google/rambi/onboard.h
+++ b/src/mainboard/google/rambi/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/rambi/romstage.c b/src/mainboard/google/rambi/romstage.c
index adbdffb..ceeda17 100644
--- a/src/mainboard/google/rambi/romstage.c
+++ b/src/mainboard/google/rambi/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/rambi/spd/Makefile.inc b/src/mainboard/google/rambi/spd/Makefile.inc
index 4395dd9..5133bdf 100644
--- a/src/mainboard/google/rambi/spd/Makefile.inc
+++ b/src/mainboard/google/rambi/spd/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 SPD_BIN = $(obj)/spd.bin
diff --git a/src/mainboard/google/rambi/w25q64.c b/src/mainboard/google/rambi/w25q64.c
index 7ab3da2..3bd7aed 100644
--- a/src/mainboard/google/rambi/w25q64.c
+++ b/src/mainboard/google/rambi/w25q64.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig
index d8b38d1..86946de 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_RUSH
diff --git a/src/mainboard/google/rush/Makefile.inc b/src/mainboard/google/rush/Makefile.inc
index 9e3536b..5e10599 100644
--- a/src/mainboard/google/rush/Makefile.inc
+++ b/src/mainboard/google/rush/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/rush/bct/Makefile.inc b/src/mainboard/google/rush/bct/Makefile.inc
index e61aae4..42f01e4 100644
--- a/src/mainboard/google/rush/bct/Makefile.inc
+++ b/src/mainboard/google/rush/bct/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_RUSH_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/rush/bct/cfg2inc.sh b/src/mainboard/google/rush/bct/cfg2inc.sh
index f8f3c44..b3422da 100755
--- a/src/mainboard/google/rush/bct/cfg2inc.sh
+++ b/src/mainboard/google/rush/bct/cfg2inc.sh
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 bct_cfg2inc() {
 	local in_file="$1"
diff --git a/src/mainboard/google/rush/boardid.c b/src/mainboard/google/rush/boardid.c
index 2e994b1..09a776a 100644
--- a/src/mainboard/google/rush/boardid.c
+++ b/src/mainboard/google/rush/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/rush/bootblock.c b/src/mainboard/google/rush/bootblock.c
index b815cba..4eb0068 100644
--- a/src/mainboard/google/rush/bootblock.c
+++ b/src/mainboard/google/rush/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/rush/chromeos.c b/src/mainboard/google/rush/chromeos.c
index 8831fe6..8483319 100644
--- a/src/mainboard/google/rush/chromeos.c
+++ b/src/mainboard/google/rush/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/rush/devicetree.cb b/src/mainboard/google/rush/devicetree.cb
index 659de00..00dfd85 100644
--- a/src/mainboard/google/rush/devicetree.cb
+++ b/src/mainboard/google/rush/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra132
diff --git a/src/mainboard/google/rush/mainboard.c b/src/mainboard/google/rush/mainboard.c
index aa67ec2..9f02493 100644
--- a/src/mainboard/google/rush/mainboard.c
+++ b/src/mainboard/google/rush/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/mmu.h>
diff --git a/src/mainboard/google/rush/pmic.c b/src/mainboard/google/rush/pmic.c
index 402bfbc..f3384c8 100644
--- a/src/mainboard/google/rush/pmic.c
+++ b/src/mainboard/google/rush/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/rush/pmic.h b/src/mainboard/google/rush/pmic.h
index c26846e..ba9217a 100644
--- a/src/mainboard/google/rush/pmic.h
+++ b/src/mainboard/google/rush/pmic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_RUSH_PMIC_H__
diff --git a/src/mainboard/google/rush/reset.c b/src/mainboard/google/rush/reset.c
index caabf8b..1ea1023 100644
--- a/src/mainboard/google/rush/reset.c
+++ b/src/mainboard/google/rush/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/rush/romstage.c b/src/mainboard/google/rush/romstage.c
index 14b1728..96cacd5 100644
--- a/src/mainboard/google/rush/romstage.c
+++ b/src/mainboard/google/rush/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/mainboard/google/rush/sdram_configs.c b/src/mainboard/google/rush/sdram_configs.c
index 239c0da..835c469 100644
--- a/src/mainboard/google/rush/sdram_configs.c
+++ b/src/mainboard/google/rush/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/rush/verstage.c b/src/mainboard/google/rush/verstage.c
index ab02bb1..7ebb030 100644
--- a/src/mainboard/google/rush/verstage.c
+++ b/src/mainboard/google/rush/verstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index 5965abe..fc9a963 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_RUSH_RYU
diff --git a/src/mainboard/google/rush_ryu/Makefile.inc b/src/mainboard/google/rush_ryu/Makefile.inc
index a90f9fa..20984b2 100644
--- a/src/mainboard/google/rush_ryu/Makefile.inc
+++ b/src/mainboard/google/rush_ryu/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/rush_ryu/bct/Makefile.inc b/src/mainboard/google/rush_ryu/bct/Makefile.inc
index 624973f..1af276b 100644
--- a/src/mainboard/google/rush_ryu/bct/Makefile.inc
+++ b/src/mainboard/google/rush_ryu/bct/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_RUSH_RYU_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/rush_ryu/bct/cfg2inc.sh b/src/mainboard/google/rush_ryu/bct/cfg2inc.sh
index f8f3c44..b3422da 100755
--- a/src/mainboard/google/rush_ryu/bct/cfg2inc.sh
+++ b/src/mainboard/google/rush_ryu/bct/cfg2inc.sh
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 bct_cfg2inc() {
 	local in_file="$1"
diff --git a/src/mainboard/google/rush_ryu/boardid.c b/src/mainboard/google/rush_ryu/boardid.c
index a5d33a9..92949c4 100644
--- a/src/mainboard/google/rush_ryu/boardid.c
+++ b/src/mainboard/google/rush_ryu/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/rush_ryu/bootblock.c b/src/mainboard/google/rush_ryu/bootblock.c
index 72bb4aa..3f1b65e 100644
--- a/src/mainboard/google/rush_ryu/bootblock.c
+++ b/src/mainboard/google/rush_ryu/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/rush_ryu/chromeos.c b/src/mainboard/google/rush_ryu/chromeos.c
index dd5d74a..4edaf6c 100644
--- a/src/mainboard/google/rush_ryu/chromeos.c
+++ b/src/mainboard/google/rush_ryu/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/rush_ryu/devicetree.cb b/src/mainboard/google/rush_ryu/devicetree.cb
index c7f504b..72277fa 100644
--- a/src/mainboard/google/rush_ryu/devicetree.cb
+++ b/src/mainboard/google/rush_ryu/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra132
diff --git a/src/mainboard/google/rush_ryu/gpio.h b/src/mainboard/google/rush_ryu/gpio.h
index 32d9b8f..2945037 100644
--- a/src/mainboard/google/rush_ryu/gpio.h
+++ b/src/mainboard/google/rush_ryu/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_RUSH_RYU_GPIO_H__
diff --git a/src/mainboard/google/rush_ryu/mainboard.c b/src/mainboard/google/rush_ryu/mainboard.c
index 1af7395..fe28ed1 100644
--- a/src/mainboard/google/rush_ryu/mainboard.c
+++ b/src/mainboard/google/rush_ryu/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/mmu.h>
diff --git a/src/mainboard/google/rush_ryu/pmic.c b/src/mainboard/google/rush_ryu/pmic.c
index c92cefc..9f9778e 100644
--- a/src/mainboard/google/rush_ryu/pmic.c
+++ b/src/mainboard/google/rush_ryu/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/rush_ryu/pmic.h b/src/mainboard/google/rush_ryu/pmic.h
index c0de4ac..52bbfad 100644
--- a/src/mainboard/google/rush_ryu/pmic.h
+++ b/src/mainboard/google/rush_ryu/pmic.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_RUSH_RYU_PMIC_H__
diff --git a/src/mainboard/google/rush_ryu/reset.c b/src/mainboard/google/rush_ryu/reset.c
index dd570c6..8f0d466 100644
--- a/src/mainboard/google/rush_ryu/reset.c
+++ b/src/mainboard/google/rush_ryu/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/rush_ryu/romstage.c b/src/mainboard/google/rush_ryu/romstage.c
index 829f4cd..69c3cdc 100644
--- a/src/mainboard/google/rush_ryu/romstage.c
+++ b/src/mainboard/google/rush_ryu/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/mainboard/google/rush_ryu/sdram_configs.c b/src/mainboard/google/rush_ryu/sdram_configs.c
index 030f8b3..4188923 100644
--- a/src/mainboard/google/rush_ryu/sdram_configs.c
+++ b/src/mainboard/google/rush_ryu/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/rush_ryu/verstage.c b/src/mainboard/google/rush_ryu/verstage.c
index e6cbc98..72328d4 100644
--- a/src/mainboard/google/rush_ryu/verstage.c
+++ b/src/mainboard/google/rush_ryu/verstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/mainboard/google/samus/Makefile.inc b/src/mainboard/google/samus/Makefile.inc
index 4bf34da..81c459c 100644
--- a/src/mainboard/google/samus/Makefile.inc
+++ b/src/mainboard/google/samus/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/google/samus/acpi/chromeos.asl b/src/mainboard/google/samus/acpi/chromeos.asl
index 7214501..e8c36d2 100644
--- a/src/mainboard/google/samus/acpi/chromeos.asl
+++ b/src/mainboard/google/samus/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (OIPG, Package() {
diff --git a/src/mainboard/google/samus/acpi/ec.asl b/src/mainboard/google/samus/acpi/ec.asl
index 1147fcf..1b5ce17 100644
--- a/src/mainboard/google/samus/acpi/ec.asl
+++ b/src/mainboard/google/samus/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/samus/acpi/mainboard.asl b/src/mainboard/google/samus/acpi/mainboard.asl
index 5a1ac57..98dc139 100644
--- a/src/mainboard/google/samus/acpi/mainboard.asl
+++ b/src/mainboard/google/samus/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #undef ENABLE_TOUCH_WAKE
diff --git a/src/mainboard/google/samus/acpi/superio.asl b/src/mainboard/google/samus/acpi/superio.asl
index d3689a7..076a7f4 100644
--- a/src/mainboard/google/samus/acpi/superio.asl
+++ b/src/mainboard/google/samus/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/samus/acpi/thermal.asl b/src/mainboard/google/samus/acpi/thermal.asl
index f37b3a8..21a7b34 100644
--- a/src/mainboard/google/samus/acpi/thermal.asl
+++ b/src/mainboard/google/samus/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/samus/acpi_tables.c b/src/mainboard/google/samus/acpi_tables.c
index ceef199..776feb3 100644
--- a/src/mainboard/google/samus/acpi_tables.c
+++ b/src/mainboard/google/samus/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/samus/board_version.c b/src/mainboard/google/samus/board_version.c
index adfc294..502ea78 100644
--- a/src/mainboard/google/samus/board_version.c
+++ b/src/mainboard/google/samus/board_version.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/google/chromeec/ec.h>
diff --git a/src/mainboard/google/samus/board_version.h b/src/mainboard/google/samus/board_version.h
index cdf774f..2918a14 100644
--- a/src/mainboard/google/samus/board_version.h
+++ b/src/mainboard/google/samus/board_version.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SAMUS_BOARD_VERSION_H
diff --git a/src/mainboard/google/samus/chromeos.c b/src/mainboard/google/samus/chromeos.c
index dc28ed1..5f8ab7a 100644
--- a/src/mainboard/google/samus/chromeos.c
+++ b/src/mainboard/google/samus/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/samus/cmos.layout b/src/mainboard/google/samus/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/samus/cmos.layout
+++ b/src/mainboard/google/samus/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/samus/dsdt.asl b/src/mainboard/google/samus/dsdt.asl
index 07b0530..f5260f8 100644
--- a/src/mainboard/google/samus/dsdt.asl
+++ b/src/mainboard/google/samus/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/samus/ec.c b/src/mainboard/google/samus/ec.c
index 463c265..22e6e60 100644
--- a/src/mainboard/google/samus/ec.c
+++ b/src/mainboard/google/samus/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/samus/ec.h b/src/mainboard/google/samus/ec.h
index fc54d40..ff84322 100644
--- a/src/mainboard/google/samus/ec.h
+++ b/src/mainboard/google/samus/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/samus/fadt.c b/src/mainboard/google/samus/fadt.c
index 237954c..c795280 100644
--- a/src/mainboard/google/samus/fadt.c
+++ b/src/mainboard/google/samus/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/samus/gpio.h b/src/mainboard/google/samus/gpio.h
index 2f673d9..a3a474a 100644
--- a/src/mainboard/google/samus/gpio.h
+++ b/src/mainboard/google/samus/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SAMUS_GPIO_H
diff --git a/src/mainboard/google/samus/mainboard.c b/src/mainboard/google/samus/mainboard.c
index c4dda12..f89b379 100644
--- a/src/mainboard/google/samus/mainboard.c
+++ b/src/mainboard/google/samus/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/samus/pei_data.c b/src/mainboard/google/samus/pei_data.c
index 634a187..c624fee 100644
--- a/src/mainboard/google/samus/pei_data.c
+++ b/src/mainboard/google/samus/pei_data.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/samus/romstage.c b/src/mainboard/google/samus/romstage.c
index d9efdd4..c476442 100644
--- a/src/mainboard/google/samus/romstage.c
+++ b/src/mainboard/google/samus/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/samus/smihandler.c b/src/mainboard/google/samus/smihandler.c
index 6ef39af..cba1ae0 100644
--- a/src/mainboard/google/samus/smihandler.c
+++ b/src/mainboard/google/samus/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/samus/spd/Makefile.inc b/src/mainboard/google/samus/spd/Makefile.inc
index 1a1892d..0358c06 100644
--- a/src/mainboard/google/samus/spd/Makefile.inc
+++ b/src/mainboard/google/samus/spd/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/google/samus/spd/spd.c b/src/mainboard/google/samus/spd/spd.c
index 1979f8c..f7cf2e4 100644
--- a/src/mainboard/google/samus/spd/spd.c
+++ b/src/mainboard/google/samus/spd/spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/google/samus/spd/spd.h b/src/mainboard/google/samus/spd/spd.h
index c8a85fa..c8f4e72 100644
--- a/src/mainboard/google/samus/spd/spd.h
+++ b/src/mainboard/google/samus/spd/spd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_SPD_H
diff --git a/src/mainboard/google/samus/thermal.h b/src/mainboard/google/samus/thermal.h
index 5cc7838..9c9fd71 100644
--- a/src/mainboard/google/samus/thermal.h
+++ b/src/mainboard/google/samus/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/slippy/Makefile.inc b/src/mainboard/google/slippy/Makefile.inc
index 2743cf4..7703ba3 100644
--- a/src/mainboard/google/slippy/Makefile.inc
+++ b/src/mainboard/google/slippy/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c
diff --git a/src/mainboard/google/slippy/acpi/chromeos.asl b/src/mainboard/google/slippy/acpi/chromeos.asl
index 9db5509..907fb8d 100644
--- a/src/mainboard/google/slippy/acpi/chromeos.asl
+++ b/src/mainboard/google/slippy/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/slippy/acpi/ec.asl b/src/mainboard/google/slippy/acpi/ec.asl
index 9922f4c..e0b8bcd 100644
--- a/src/mainboard/google/slippy/acpi/ec.asl
+++ b/src/mainboard/google/slippy/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/slippy/acpi/haswell_pci_irqs.asl b/src/mainboard/google/slippy/acpi/haswell_pci_irqs.asl
index 28a7ada..b32cd4e 100644
--- a/src/mainboard/google/slippy/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/google/slippy/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/google/slippy/acpi/mainboard.asl b/src/mainboard/google/slippy/acpi/mainboard.asl
index 3602119..5e93a9c 100644
--- a/src/mainboard/google/slippy/acpi/mainboard.asl
+++ b/src/mainboard/google/slippy/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/google/slippy/onboard.h>
diff --git a/src/mainboard/google/slippy/acpi/platform.asl b/src/mainboard/google/slippy/acpi/platform.asl
index 72913f6..d438b40 100644
--- a/src/mainboard/google/slippy/acpi/platform.asl
+++ b/src/mainboard/google/slippy/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/google/slippy/acpi/superio.asl b/src/mainboard/google/slippy/acpi/superio.asl
index bd564be..dfcf3f9 100644
--- a/src/mainboard/google/slippy/acpi/superio.asl
+++ b/src/mainboard/google/slippy/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/slippy/acpi/thermal.asl b/src/mainboard/google/slippy/acpi/thermal.asl
index 097c1a3..23571d1 100644
--- a/src/mainboard/google/slippy/acpi/thermal.asl
+++ b/src/mainboard/google/slippy/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/slippy/acpi_tables.c b/src/mainboard/google/slippy/acpi_tables.c
index 42dcb07..5336f98 100644
--- a/src/mainboard/google/slippy/acpi_tables.c
+++ b/src/mainboard/google/slippy/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/slippy/chromeos.c b/src/mainboard/google/slippy/chromeos.c
index cd2728e..35cee90 100644
--- a/src/mainboard/google/slippy/chromeos.c
+++ b/src/mainboard/google/slippy/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/slippy/cmos.layout b/src/mainboard/google/slippy/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/google/slippy/cmos.layout
+++ b/src/mainboard/google/slippy/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/slippy/dsdt.asl b/src/mainboard/google/slippy/dsdt.asl
index 76998ba..3122a84 100644
--- a/src/mainboard/google/slippy/dsdt.asl
+++ b/src/mainboard/google/slippy/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/google/slippy/ec.c b/src/mainboard/google/slippy/ec.c
index dbe7348..83cab44 100644
--- a/src/mainboard/google/slippy/ec.c
+++ b/src/mainboard/google/slippy/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/slippy/ec.h b/src/mainboard/google/slippy/ec.h
index 706993c..11a8907 100644
--- a/src/mainboard/google/slippy/ec.h
+++ b/src/mainboard/google/slippy/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/google/slippy/fadt.c b/src/mainboard/google/slippy/fadt.c
index bae03d6..6b9aa08 100644
--- a/src/mainboard/google/slippy/fadt.c
+++ b/src/mainboard/google/slippy/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/slippy/gpio.h b/src/mainboard/google/slippy/gpio.h
index b4affa0..0a1abb5 100644
--- a/src/mainboard/google/slippy/gpio.h
+++ b/src/mainboard/google/slippy/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SLIPPY_GPIO_H
diff --git a/src/mainboard/google/slippy/hda_verb.c b/src/mainboard/google/slippy/hda_verb.c
index a780a58..6af87a4 100644
--- a/src/mainboard/google/slippy/hda_verb.c
+++ b/src/mainboard/google/slippy/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c
index 1a2216c..975ff53 100644
--- a/src/mainboard/google/slippy/mainboard.c
+++ b/src/mainboard/google/slippy/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/slippy/mainboard.h b/src/mainboard/google/slippy/mainboard.h
index f1decee..ffd957d 100644
--- a/src/mainboard/google/slippy/mainboard.h
+++ b/src/mainboard/google/slippy/mainboard.h
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #ifndef __MAINBOARD_H_
diff --git a/src/mainboard/google/slippy/onboard.h b/src/mainboard/google/slippy/onboard.h
index f224ecd..6497655 100644
--- a/src/mainboard/google/slippy/onboard.h
+++ b/src/mainboard/google/slippy/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/google/slippy/romstage.c b/src/mainboard/google/slippy/romstage.c
index 6948756..f614289 100644
--- a/src/mainboard/google/slippy/romstage.c
+++ b/src/mainboard/google/slippy/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/mainboard/google/slippy/smihandler.c b/src/mainboard/google/slippy/smihandler.c
index 95eb4b7..1f7321b 100644
--- a/src/mainboard/google/slippy/smihandler.c
+++ b/src/mainboard/google/slippy/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/slippy/thermal.h b/src/mainboard/google/slippy/thermal.h
index 4bd20fd..c2aa56e 100644
--- a/src/mainboard/google/slippy/thermal.h
+++ b/src/mainboard/google/slippy/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THERMAL_H
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 6ccf5b1..51d1072 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_SMAUG
diff --git a/src/mainboard/google/smaug/Makefile.inc b/src/mainboard/google/smaug/Makefile.inc
index b2284fd..532985e 100644
--- a/src/mainboard/google/smaug/Makefile.inc
+++ b/src/mainboard/google/smaug/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Add a handler for BCT config files
diff --git a/src/mainboard/google/smaug/bct/Makefile.inc b/src/mainboard/google/smaug/bct/Makefile.inc
index 74ff385..9daad2a 100644
--- a/src/mainboard/google/smaug/bct/Makefile.inc
+++ b/src/mainboard/google/smaug/bct/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bct-cfg-$(CONFIG_SMAUG_BCT_CFG_EMMC) += emmc.cfg
diff --git a/src/mainboard/google/smaug/bct/cfg2inc.sh b/src/mainboard/google/smaug/bct/cfg2inc.sh
index cfa6709..27f42f3 100644
--- a/src/mainboard/google/smaug/bct/cfg2inc.sh
+++ b/src/mainboard/google/smaug/bct/cfg2inc.sh
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 bct_cfg2inc() {
 	local in_file="$1"
diff --git a/src/mainboard/google/smaug/boardid.c b/src/mainboard/google/smaug/boardid.c
index 525d1f1..d446211 100644
--- a/src/mainboard/google/smaug/boardid.c
+++ b/src/mainboard/google/smaug/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/smaug/bootblock.c b/src/mainboard/google/smaug/bootblock.c
index 77c8441..bc6c421 100644
--- a/src/mainboard/google/smaug/bootblock.c
+++ b/src/mainboard/google/smaug/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/smaug/chromeos.c b/src/mainboard/google/smaug/chromeos.c
index 8ae5ac0..8815bf4 100644
--- a/src/mainboard/google/smaug/chromeos.c
+++ b/src/mainboard/google/smaug/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/smaug/devicetree.cb b/src/mainboard/google/smaug/devicetree.cb
index 65f02b2..e97d064 100644
--- a/src/mainboard/google/smaug/devicetree.cb
+++ b/src/mainboard/google/smaug/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/nvidia/tegra210
diff --git a/src/mainboard/google/smaug/gpio.h b/src/mainboard/google/smaug/gpio.h
index 2574c4f..21c1376 100644
--- a/src/mainboard/google/smaug/gpio.h
+++ b/src/mainboard/google/smaug/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_SMAUG_GPIO_H__
diff --git a/src/mainboard/google/smaug/mainboard.c b/src/mainboard/google/smaug/mainboard.c
index 6e3393d..9d189bd 100644
--- a/src/mainboard/google/smaug/mainboard.c
+++ b/src/mainboard/google/smaug/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/smaug/pmic.c b/src/mainboard/google/smaug/pmic.c
index b10e67b..58a26e6 100644
--- a/src/mainboard/google/smaug/pmic.c
+++ b/src/mainboard/google/smaug/pmic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/smaug/pmic.h b/src/mainboard/google/smaug/pmic.h
index 4cdae42..0a4100c 100644
--- a/src/mainboard/google/smaug/pmic.h
+++ b/src/mainboard/google/smaug/pmic.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_FOSTER_PMIC_H__
diff --git a/src/mainboard/google/smaug/reset.c b/src/mainboard/google/smaug/reset.c
index 9c72a77..8e0a0ef 100644
--- a/src/mainboard/google/smaug/reset.c
+++ b/src/mainboard/google/smaug/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/smaug/romstage.c b/src/mainboard/google/smaug/romstage.c
index 5229a9f..2d1c310 100644
--- a/src/mainboard/google/smaug/romstage.c
+++ b/src/mainboard/google/smaug/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 2d97634..4140a47 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_STORM
diff --git a/src/mainboard/google/storm/Makefile.inc b/src/mainboard/google/storm/Makefile.inc
index 8eccc3e..9b36ce9 100644
--- a/src/mainboard/google/storm/Makefile.inc
+++ b/src/mainboard/google/storm/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bootblock-y += bootblock.c
diff --git a/src/mainboard/google/storm/boardid.c b/src/mainboard/google/storm/boardid.c
index 39d4d2d..335f164 100644
--- a/src/mainboard/google/storm/boardid.c
+++ b/src/mainboard/google/storm/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/storm/chromeos.c b/src/mainboard/google/storm/chromeos.c
index caa79e3..fbb73ff 100644
--- a/src/mainboard/google/storm/chromeos.c
+++ b/src/mainboard/google/storm/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/storm/devicetree.cb b/src/mainboard/google/storm/devicetree.cb
index 16a1c07..6e14a1c 100644
--- a/src/mainboard/google/storm/devicetree.cb
+++ b/src/mainboard/google/storm/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/qualcomm/ipq806x
diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c
index 4b311d1..bed1595 100644
--- a/src/mainboard/google/storm/mainboard.c
+++ b/src/mainboard/google/storm/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/storm/reset.c b/src/mainboard/google/storm/reset.c
index 27d1093..d42cf03 100644
--- a/src/mainboard/google/storm/reset.c
+++ b/src/mainboard/google/storm/reset.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/google/storm/romstage.c b/src/mainboard/google/storm/romstage.c
index a0a1329..d31c232 100644
--- a/src/mainboard/google/storm/romstage.c
+++ b/src/mainboard/google/storm/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/mainboard/google/stout/Makefile.inc b/src/mainboard/google/stout/Makefile.inc
index 48fa3ec..8e60185 100644
--- a/src/mainboard/google/stout/Makefile.inc
+++ b/src/mainboard/google/stout/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += ec.c
diff --git a/src/mainboard/google/stout/acpi/chromeos.asl b/src/mainboard/google/stout/acpi/chromeos.asl
index 3ac02c2..f73e697 100644
--- a/src/mainboard/google/stout/acpi/chromeos.asl
+++ b/src/mainboard/google/stout/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/google/stout/acpi/ec.asl b/src/mainboard/google/stout/acpi/ec.asl
index d340a00..027b039 100644
--- a/src/mainboard/google/stout/acpi/ec.asl
+++ b/src/mainboard/google/stout/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/stout/acpi/mainboard.asl b/src/mainboard/google/stout/acpi/mainboard.asl
index a2e79ad..4fa581f 100644
--- a/src/mainboard/google/stout/acpi/mainboard.asl
+++ b/src/mainboard/google/stout/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/mainboard/google/stout/acpi/platform.asl b/src/mainboard/google/stout/acpi/platform.asl
index bdf2b18..672e31a 100644
--- a/src/mainboard/google/stout/acpi/platform.asl
+++ b/src/mainboard/google/stout/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/google/stout/acpi/superio.asl b/src/mainboard/google/stout/acpi/superio.asl
index 09365c3..c258050 100644
--- a/src/mainboard/google/stout/acpi/superio.asl
+++ b/src/mainboard/google/stout/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/google/stout/acpi/thermal.asl b/src/mainboard/google/stout/acpi/thermal.asl
index 498a238..c79c6be 100644
--- a/src/mainboard/google/stout/acpi/thermal.asl
+++ b/src/mainboard/google/stout/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/google/stout/acpi_tables.c b/src/mainboard/google/stout/acpi_tables.c
index 587e189..5be94fa 100644
--- a/src/mainboard/google/stout/acpi_tables.c
+++ b/src/mainboard/google/stout/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/stout/chromeos.c b/src/mainboard/google/stout/chromeos.c
index b2ca6a7..f5524d8 100644
--- a/src/mainboard/google/stout/chromeos.c
+++ b/src/mainboard/google/stout/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/google/stout/cmos.layout b/src/mainboard/google/stout/cmos.layout
index b1f8a6a..d9289d9 100644
--- a/src/mainboard/google/stout/cmos.layout
+++ b/src/mainboard/google/stout/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/google/stout/dsdt.asl b/src/mainboard/google/stout/dsdt.asl
index 01e4001..2d9b468 100644
--- a/src/mainboard/google/stout/dsdt.asl
+++ b/src/mainboard/google/stout/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/google/stout/ec.c b/src/mainboard/google/stout/ec.c
index e652a41..64000ce 100644
--- a/src/mainboard/google/stout/ec.c
+++ b/src/mainboard/google/stout/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/google/stout/ec.h b/src/mainboard/google/stout/ec.h
index 33332fe..45154cf 100644
--- a/src/mainboard/google/stout/ec.h
+++ b/src/mainboard/google/stout/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef STOUT_EC_H
diff --git a/src/mainboard/google/stout/gpio.h b/src/mainboard/google/stout/gpio.h
index 1326cdc..ad566f7 100644
--- a/src/mainboard/google/stout/gpio.h
+++ b/src/mainboard/google/stout/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef STOUT_GPIO_H
diff --git a/src/mainboard/google/stout/hda_verb.c b/src/mainboard/google/stout/hda_verb.c
index 5a22fdf..07f5dcb 100644
--- a/src/mainboard/google/stout/hda_verb.c
+++ b/src/mainboard/google/stout/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c
index 0d3d8e0..00ff9e3 100644
--- a/src/mainboard/google/stout/mainboard.c
+++ b/src/mainboard/google/stout/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/google/stout/mainboard_smi.c b/src/mainboard/google/stout/mainboard_smi.c
index 2e3686c..e550508 100644
--- a/src/mainboard/google/stout/mainboard_smi.c
+++ b/src/mainboard/google/stout/mainboard_smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/stout/onboard.h b/src/mainboard/google/stout/onboard.h
index 93942f1..5e64514 100644
--- a/src/mainboard/google/stout/onboard.h
+++ b/src/mainboard/google/stout/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef STOUT_ONBOARD_H
diff --git a/src/mainboard/google/stout/romstage.c b/src/mainboard/google/stout/romstage.c
index 3d18f18..eca99cb 100644
--- a/src/mainboard/google/stout/romstage.c
+++ b/src/mainboard/google/stout/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/google/stout/thermal.h b/src/mainboard/google/stout/thermal.h
index bd67af6..640d690 100644
--- a/src/mainboard/google/stout/thermal.h
+++ b/src/mainboard/google/stout/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef STOUT_THERMAL_H
diff --git a/src/mainboard/google/urara/Kconfig b/src/mainboard/google/urara/Kconfig
index eb7e09f..0f4cea8 100644
--- a/src/mainboard/google/urara/Kconfig
+++ b/src/mainboard/google/urara/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_GOOGLE_URARA
diff --git a/src/mainboard/google/urara/Makefile.inc b/src/mainboard/google/urara/Makefile.inc
index 10140b3..a3e61aa 100644
--- a/src/mainboard/google/urara/Makefile.inc
+++ b/src/mainboard/google/urara/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/urara/boardid.c b/src/mainboard/google/urara/boardid.c
index 564fd4b..be96c3c 100644
--- a/src/mainboard/google/urara/boardid.c
+++ b/src/mainboard/google/urara/boardid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/google/urara/bootblock.c b/src/mainboard/google/urara/bootblock.c
index 408a790..ee2d1b5 100644
--- a/src/mainboard/google/urara/bootblock.c
+++ b/src/mainboard/google/urara/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/urara/chromeos.c b/src/mainboard/google/urara/chromeos.c
index 620289d..e55141f 100644
--- a/src/mainboard/google/urara/chromeos.c
+++ b/src/mainboard/google/urara/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/urara/devicetree.cb b/src/mainboard/google/urara/devicetree.cb
index baaa367..2d22674 100644
--- a/src/mainboard/google/urara/devicetree.cb
+++ b/src/mainboard/google/urara/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 chip soc/imgtec/pistachio
diff --git a/src/mainboard/google/urara/mainboard.c b/src/mainboard/google/urara/mainboard.c
index 77d0337..2bc27ae 100644
--- a/src/mainboard/google/urara/mainboard.c
+++ b/src/mainboard/google/urara/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <symbols.h>
diff --git a/src/mainboard/google/veyron/Kconfig b/src/mainboard/google/veyron/Kconfig
index 38a9ef6..36237b5 100644
--- a/src/mainboard/google/veyron/Kconfig
+++ b/src/mainboard/google/veyron/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config BOARD_GOOGLE_VEYRON # dummy option to be selected by variant boards
diff --git a/src/mainboard/google/veyron/Makefile.inc b/src/mainboard/google/veyron/Makefile.inc
index ea1c606..7f23483 100644
--- a/src/mainboard/google/veyron/Makefile.inc
+++ b/src/mainboard/google/veyron/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/veyron/board.h b/src/mainboard/google/veyron/board.h
index a200e16..e008c2c 100644
--- a/src/mainboard/google/veyron/board.h
+++ b/src/mainboard/google/veyron/board.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_VEYRON_BOARD_H
diff --git a/src/mainboard/google/veyron/boardid.c b/src/mainboard/google/veyron/boardid.c
index f7cddcc..7fc2885 100644
--- a/src/mainboard/google/veyron/boardid.c
+++ b/src/mainboard/google/veyron/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron/bootblock.c b/src/mainboard/google/veyron/bootblock.c
index e4126a4..cc972f9 100644
--- a/src/mainboard/google/veyron/bootblock.c
+++ b/src/mainboard/google/veyron/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron/chromeos.c b/src/mainboard/google/veyron/chromeos.c
index 5489639..91f81fe 100644
--- a/src/mainboard/google/veyron/chromeos.c
+++ b/src/mainboard/google/veyron/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/veyron/devicetree.cb b/src/mainboard/google/veyron/devicetree.cb
index b958e26..5057244 100644
--- a/src/mainboard/google/veyron/devicetree.cb
+++ b/src/mainboard/google/veyron/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c
index b8f9aae..0e11669 100644
--- a/src/mainboard/google/veyron/mainboard.c
+++ b/src/mainboard/google/veyron/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron/reset.c b/src/mainboard/google/veyron/reset.c
index bc26ece..a6adac4 100644
--- a/src/mainboard/google/veyron/reset.c
+++ b/src/mainboard/google/veyron/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c
index a8d8f7d..03f4bdf 100644
--- a/src/mainboard/google/veyron/romstage.c
+++ b/src/mainboard/google/veyron/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron/sdram_configs.c b/src/mainboard/google/veyron/sdram_configs.c
index 023eb37..a043a02 100644
--- a/src/mainboard/google/veyron/sdram_configs.c
+++ b/src/mainboard/google/veyron/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig
index f96e92c..8e58c7e 100644
--- a/src/mainboard/google/veyron_brain/Kconfig
+++ b/src/mainboard/google/veyron_brain/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_VEYRON_BRAIN
diff --git a/src/mainboard/google/veyron_brain/Makefile.inc b/src/mainboard/google/veyron_brain/Makefile.inc
index ea1c606..7f23483 100644
--- a/src/mainboard/google/veyron_brain/Makefile.inc
+++ b/src/mainboard/google/veyron_brain/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/veyron_brain/board.h b/src/mainboard/google/veyron_brain/board.h
index 881e486..ce0c25c 100644
--- a/src/mainboard/google/veyron_brain/board.h
+++ b/src/mainboard/google/veyron_brain/board.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_VEYRON_BRAIN_BOARD_H
diff --git a/src/mainboard/google/veyron_brain/boardid.c b/src/mainboard/google/veyron_brain/boardid.c
index f7cddcc..7fc2885 100644
--- a/src/mainboard/google/veyron_brain/boardid.c
+++ b/src/mainboard/google/veyron_brain/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_brain/bootblock.c b/src/mainboard/google/veyron_brain/bootblock.c
index 50d8ef1..e7b3f6f 100644
--- a/src/mainboard/google/veyron_brain/bootblock.c
+++ b/src/mainboard/google/veyron_brain/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_brain/chromeos.c b/src/mainboard/google/veyron_brain/chromeos.c
index 7eed42e..3d92805 100644
--- a/src/mainboard/google/veyron_brain/chromeos.c
+++ b/src/mainboard/google/veyron_brain/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/veyron_brain/devicetree.cb b/src/mainboard/google/veyron_brain/devicetree.cb
index 3ed746c..6d73ebb 100644
--- a/src/mainboard/google/veyron_brain/devicetree.cb
+++ b/src/mainboard/google/veyron_brain/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/veyron_brain/mainboard.c b/src/mainboard/google/veyron_brain/mainboard.c
index c54e96f..ff5ce3f 100644
--- a/src/mainboard/google/veyron_brain/mainboard.c
+++ b/src/mainboard/google/veyron_brain/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_brain/reset.c b/src/mainboard/google/veyron_brain/reset.c
index bc26ece..a6adac4 100644
--- a/src/mainboard/google/veyron_brain/reset.c
+++ b/src/mainboard/google/veyron_brain/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_brain/romstage.c b/src/mainboard/google/veyron_brain/romstage.c
index e946cc6..71d63e3 100644
--- a/src/mainboard/google/veyron_brain/romstage.c
+++ b/src/mainboard/google/veyron_brain/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_brain/sdram_configs.c b/src/mainboard/google/veyron_brain/sdram_configs.c
index 023eb37..a043a02 100644
--- a/src/mainboard/google/veyron_brain/sdram_configs.c
+++ b/src/mainboard/google/veyron_brain/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig
index 4c213f2..74d5978 100644
--- a/src/mainboard/google/veyron_danger/Kconfig
+++ b/src/mainboard/google/veyron_danger/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_VEYRON_DANGER
diff --git a/src/mainboard/google/veyron_danger/Makefile.inc b/src/mainboard/google/veyron_danger/Makefile.inc
index 4fbb227..f7836aa 100644
--- a/src/mainboard/google/veyron_danger/Makefile.inc
+++ b/src/mainboard/google/veyron_danger/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/veyron_danger/board.h b/src/mainboard/google/veyron_danger/board.h
index aa703c2..2324854 100644
--- a/src/mainboard/google/veyron_danger/board.h
+++ b/src/mainboard/google/veyron_danger/board.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_VEYRON_DANGER_BOARD_H
diff --git a/src/mainboard/google/veyron_danger/boardid.c b/src/mainboard/google/veyron_danger/boardid.c
index d9a4c85..14b2234 100644
--- a/src/mainboard/google/veyron_danger/boardid.c
+++ b/src/mainboard/google/veyron_danger/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_danger/bootblock.c b/src/mainboard/google/veyron_danger/bootblock.c
index 50d8ef1..e7b3f6f 100644
--- a/src/mainboard/google/veyron_danger/bootblock.c
+++ b/src/mainboard/google/veyron_danger/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_danger/chromeos.c b/src/mainboard/google/veyron_danger/chromeos.c
index 62bc1a4..af6665e 100644
--- a/src/mainboard/google/veyron_danger/chromeos.c
+++ b/src/mainboard/google/veyron_danger/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/veyron_danger/devicetree.cb b/src/mainboard/google/veyron_danger/devicetree.cb
index 64f1779..3dac908 100644
--- a/src/mainboard/google/veyron_danger/devicetree.cb
+++ b/src/mainboard/google/veyron_danger/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/veyron_danger/mainboard.c b/src/mainboard/google/veyron_danger/mainboard.c
index f105d36..ba31b85 100644
--- a/src/mainboard/google/veyron_danger/mainboard.c
+++ b/src/mainboard/google/veyron_danger/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_danger/reset.c b/src/mainboard/google/veyron_danger/reset.c
index bc26ece..a6adac4 100644
--- a/src/mainboard/google/veyron_danger/reset.c
+++ b/src/mainboard/google/veyron_danger/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_danger/romstage.c b/src/mainboard/google/veyron_danger/romstage.c
index 0c1bb31..7d49fe4 100644
--- a/src/mainboard/google/veyron_danger/romstage.c
+++ b/src/mainboard/google/veyron_danger/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_danger/sdmmc.c b/src/mainboard/google/veyron_danger/sdmmc.c
index 15dc275..db03fd2 100644
--- a/src/mainboard/google/veyron_danger/sdmmc.c
+++ b/src/mainboard/google/veyron_danger/sdmmc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "board.h"
diff --git a/src/mainboard/google/veyron_danger/sdram_configs.c b/src/mainboard/google/veyron_danger/sdram_configs.c
index 84ceba5..efc8352 100644
--- a/src/mainboard/google/veyron_danger/sdram_configs.c
+++ b/src/mainboard/google/veyron_danger/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index bbe5f7d..6fe9b6f 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_VEYRON_MICKEY
diff --git a/src/mainboard/google/veyron_mickey/Makefile.inc b/src/mainboard/google/veyron_mickey/Makefile.inc
index ea1c606..7f23483 100644
--- a/src/mainboard/google/veyron_mickey/Makefile.inc
+++ b/src/mainboard/google/veyron_mickey/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/veyron_mickey/board.h b/src/mainboard/google/veyron_mickey/board.h
index 98ffce0..779ab70 100644
--- a/src/mainboard/google/veyron_mickey/board.h
+++ b/src/mainboard/google/veyron_mickey/board.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_VEYRON_MICKEY_BOARD_H
diff --git a/src/mainboard/google/veyron_mickey/boardid.c b/src/mainboard/google/veyron_mickey/boardid.c
index f7cddcc..7fc2885 100644
--- a/src/mainboard/google/veyron_mickey/boardid.c
+++ b/src/mainboard/google/veyron_mickey/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_mickey/bootblock.c b/src/mainboard/google/veyron_mickey/bootblock.c
index 50d8ef1..e7b3f6f 100644
--- a/src/mainboard/google/veyron_mickey/bootblock.c
+++ b/src/mainboard/google/veyron_mickey/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_mickey/chromeos.c b/src/mainboard/google/veyron_mickey/chromeos.c
index 2222c0e..d683b79 100644
--- a/src/mainboard/google/veyron_mickey/chromeos.c
+++ b/src/mainboard/google/veyron_mickey/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/veyron_mickey/devicetree.cb b/src/mainboard/google/veyron_mickey/devicetree.cb
index 3ed746c..6d73ebb 100644
--- a/src/mainboard/google/veyron_mickey/devicetree.cb
+++ b/src/mainboard/google/veyron_mickey/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/veyron_mickey/mainboard.c b/src/mainboard/google/veyron_mickey/mainboard.c
index 17e4d4b..f89d21d 100644
--- a/src/mainboard/google/veyron_mickey/mainboard.c
+++ b/src/mainboard/google/veyron_mickey/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_mickey/reset.c b/src/mainboard/google/veyron_mickey/reset.c
index bc26ece..a6adac4 100644
--- a/src/mainboard/google/veyron_mickey/reset.c
+++ b/src/mainboard/google/veyron_mickey/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_mickey/romstage.c b/src/mainboard/google/veyron_mickey/romstage.c
index e946cc6..71d63e3 100644
--- a/src/mainboard/google/veyron_mickey/romstage.c
+++ b/src/mainboard/google/veyron_mickey/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_mickey/sdram_configs.c b/src/mainboard/google/veyron_mickey/sdram_configs.c
index 023eb37..a043a02 100644
--- a/src/mainboard/google/veyron_mickey/sdram_configs.c
+++ b/src/mainboard/google/veyron_mickey/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 0c72667..8cefc16 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_VEYRON_RIALTO
diff --git a/src/mainboard/google/veyron_rialto/Makefile.inc b/src/mainboard/google/veyron_rialto/Makefile.inc
index ea1c606..7f23483 100644
--- a/src/mainboard/google/veyron_rialto/Makefile.inc
+++ b/src/mainboard/google/veyron_rialto/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/veyron_rialto/board.h b/src/mainboard/google/veyron_rialto/board.h
index 5fd45db..f5e8e6c 100644
--- a/src/mainboard/google/veyron_rialto/board.h
+++ b/src/mainboard/google/veyron_rialto/board.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_VEYRON_RIALTO_BOARD_H
diff --git a/src/mainboard/google/veyron_rialto/boardid.c b/src/mainboard/google/veyron_rialto/boardid.c
index f7cddcc..7fc2885 100644
--- a/src/mainboard/google/veyron_rialto/boardid.c
+++ b/src/mainboard/google/veyron_rialto/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_rialto/bootblock.c b/src/mainboard/google/veyron_rialto/bootblock.c
index a539c08..db90c50 100644
--- a/src/mainboard/google/veyron_rialto/bootblock.c
+++ b/src/mainboard/google/veyron_rialto/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_rialto/chromeos.c b/src/mainboard/google/veyron_rialto/chromeos.c
index 267c935..ac11c21 100644
--- a/src/mainboard/google/veyron_rialto/chromeos.c
+++ b/src/mainboard/google/veyron_rialto/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/veyron_rialto/devicetree.cb b/src/mainboard/google/veyron_rialto/devicetree.cb
index c40bbbb..9b98d16 100644
--- a/src/mainboard/google/veyron_rialto/devicetree.cb
+++ b/src/mainboard/google/veyron_rialto/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c
index c2dde19..329d7b6 100644
--- a/src/mainboard/google/veyron_rialto/mainboard.c
+++ b/src/mainboard/google/veyron_rialto/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_rialto/reset.c b/src/mainboard/google/veyron_rialto/reset.c
index f358608..e2cea60 100644
--- a/src/mainboard/google/veyron_rialto/reset.c
+++ b/src/mainboard/google/veyron_rialto/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c
index e845a42..e3987a7 100644
--- a/src/mainboard/google/veyron_rialto/romstage.c
+++ b/src/mainboard/google/veyron_rialto/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_rialto/sdram_configs.c b/src/mainboard/google/veyron_rialto/sdram_configs.c
index 3213ff7..460f979 100644
--- a/src/mainboard/google/veyron_rialto/sdram_configs.c
+++ b/src/mainboard/google/veyron_rialto/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig
index 9cb6d89..b26415f 100644
--- a/src/mainboard/google/veyron_romy/Kconfig
+++ b/src/mainboard/google/veyron_romy/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_GOOGLE_VEYRON_ROMY
diff --git a/src/mainboard/google/veyron_romy/Makefile.inc b/src/mainboard/google/veyron_romy/Makefile.inc
index ea1c606..7f23483 100644
--- a/src/mainboard/google/veyron_romy/Makefile.inc
+++ b/src/mainboard/google/veyron_romy/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 bootblock-y += bootblock.c
 bootblock-y += boardid.c
diff --git a/src/mainboard/google/veyron_romy/board.h b/src/mainboard/google/veyron_romy/board.h
index 631e3a0..3d7d068 100644
--- a/src/mainboard/google/veyron_romy/board.h
+++ b/src/mainboard/google/veyron_romy/board.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __MAINBOARD_GOOGLE_VEYRON_ROMY_BOARD_H
diff --git a/src/mainboard/google/veyron_romy/boardid.c b/src/mainboard/google/veyron_romy/boardid.c
index f7cddcc..7fc2885 100644
--- a/src/mainboard/google/veyron_romy/boardid.c
+++ b/src/mainboard/google/veyron_romy/boardid.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/google/veyron_romy/bootblock.c b/src/mainboard/google/veyron_romy/bootblock.c
index 50d8ef1..e7b3f6f 100644
--- a/src/mainboard/google/veyron_romy/bootblock.c
+++ b/src/mainboard/google/veyron_romy/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_romy/chromeos.c b/src/mainboard/google/veyron_romy/chromeos.c
index 7eed42e..3d92805 100644
--- a/src/mainboard/google/veyron_romy/chromeos.c
+++ b/src/mainboard/google/veyron_romy/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/mainboard/google/veyron_romy/devicetree.cb b/src/mainboard/google/veyron_romy/devicetree.cb
index 64f1779..3dac908 100644
--- a/src/mainboard/google/veyron_romy/devicetree.cb
+++ b/src/mainboard/google/veyron_romy/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO fill with Versatile Express board data in QEMU.
diff --git a/src/mainboard/google/veyron_romy/mainboard.c b/src/mainboard/google/veyron_romy/mainboard.c
index 3c7da54..0a118c5 100644
--- a/src/mainboard/google/veyron_romy/mainboard.c
+++ b/src/mainboard/google/veyron_romy/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_romy/reset.c b/src/mainboard/google/veyron_romy/reset.c
index bc26ece..a6adac4 100644
--- a/src/mainboard/google/veyron_romy/reset.c
+++ b/src/mainboard/google/veyron_romy/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/google/veyron_romy/romstage.c b/src/mainboard/google/veyron_romy/romstage.c
index e946cc6..71d63e3 100644
--- a/src/mainboard/google/veyron_romy/romstage.c
+++ b/src/mainboard/google/veyron_romy/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/mainboard/google/veyron_romy/sdram_configs.c b/src/mainboard/google/veyron_romy/sdram_configs.c
index 023eb37..a043a02 100644
--- a/src/mainboard/google/veyron_romy/sdram_configs.c
+++ b/src/mainboard/google/veyron_romy/sdram_configs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <boardid.h>
diff --git a/src/mainboard/hp/abm/BiosCallOuts.c b/src/mainboard/hp/abm/BiosCallOuts.c
index 7168d8e..ecd0569 100644
--- a/src/mainboard/hp/abm/BiosCallOuts.c
+++ b/src/mainboard/hp/abm/BiosCallOuts.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/hp/abm/Kconfig b/src/mainboard/hp/abm/Kconfig
index e8acf47..07a5e9b 100644
--- a/src/mainboard/hp/abm/Kconfig
+++ b/src/mainboard/hp/abm/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_HP_ABM
diff --git a/src/mainboard/hp/abm/Makefile.inc b/src/mainboard/hp/abm/Makefile.inc
index 0008d6d..c84934c 100644
--- a/src/mainboard/hp/abm/Makefile.inc
+++ b/src/mainboard/hp/abm/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/hp/abm/OptionsIds.h b/src/mainboard/hp/abm/OptionsIds.h
index 3ff1315..887672e 100644
--- a/src/mainboard/hp/abm/OptionsIds.h
+++ b/src/mainboard/hp/abm/OptionsIds.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/hp/abm/PlatformGnbPcie.c b/src/mainboard/hp/abm/PlatformGnbPcie.c
index 06010ce..674e801 100644
--- a/src/mainboard/hp/abm/PlatformGnbPcie.c
+++ b/src/mainboard/hp/abm/PlatformGnbPcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/hp/abm/acpi/AmdImc.asl b/src/mainboard/hp/abm/acpi/AmdImc.asl
index 88d3381..1996f04 100644
--- a/src/mainboard/hp/abm/acpi/AmdImc.asl
+++ b/src/mainboard/hp/abm/acpi/AmdImc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //BTDC Due to IMC Fan, ACPI control codes
diff --git a/src/mainboard/hp/abm/acpi/gpe.asl b/src/mainboard/hp/abm/acpi/gpe.asl
index 33aab24..4204c1b 100644
--- a/src/mainboard/hp/abm/acpi/gpe.asl
+++ b/src/mainboard/hp/abm/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/hp/abm/acpi/ide.asl b/src/mainboard/hp/abm/acpi/ide.asl
index dfb4158..f8e323a 100644
--- a/src/mainboard/hp/abm/acpi/ide.asl
+++ b/src/mainboard/hp/abm/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No IDE functionality */
diff --git a/src/mainboard/hp/abm/acpi/mainboard.asl b/src/mainboard/hp/abm/acpi/mainboard.asl
index 4381084..296dfbc 100644
--- a/src/mainboard/hp/abm/acpi/mainboard.asl
+++ b/src/mainboard/hp/abm/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Memory related values */
diff --git a/src/mainboard/hp/abm/acpi/routing.asl b/src/mainboard/hp/abm/acpi/routing.asl
index cf5bae2..a99905b 100644
--- a/src/mainboard/hp/abm/acpi/routing.asl
+++ b/src/mainboard/hp/abm/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/hp/abm/acpi/sata.asl b/src/mainboard/hp/abm/acpi/sata.asl
index 9a96a9d..af1cff2 100644
--- a/src/mainboard/hp/abm/acpi/sata.asl
+++ b/src/mainboard/hp/abm/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/hp/abm/acpi/si.asl b/src/mainboard/hp/abm/acpi/si.asl
index 2ec5fb6..2e96cff 100644
--- a/src/mainboard/hp/abm/acpi/si.asl
+++ b/src/mainboard/hp/abm/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_SI) {
diff --git a/src/mainboard/hp/abm/acpi/sleep.asl b/src/mainboard/hp/abm/acpi/sleep.asl
index 6a2cef9..f0986df 100644
--- a/src/mainboard/hp/abm/acpi/sleep.asl
+++ b/src/mainboard/hp/abm/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/hp/abm/acpi/superio.asl b/src/mainboard/hp/abm/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/hp/abm/acpi/superio.asl
+++ b/src/mainboard/hp/abm/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/hp/abm/acpi/thermal.asl b/src/mainboard/hp/abm/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/hp/abm/acpi/thermal.asl
+++ b/src/mainboard/hp/abm/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/hp/abm/acpi/usb_oc.asl b/src/mainboard/hp/abm/acpi/usb_oc.asl
index 07ca7b4..44087cc 100644
--- a/src/mainboard/hp/abm/acpi/usb_oc.asl
+++ b/src/mainboard/hp/abm/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/hp/abm/acpi_tables.c b/src/mainboard/hp/abm/acpi_tables.c
index 6c061e0..94e1df6 100644
--- a/src/mainboard/hp/abm/acpi_tables.c
+++ b/src/mainboard/hp/abm/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/abm/buildOpts.c b/src/mainboard/hp/abm/buildOpts.c
index 540dfaa..5b733d1 100644
--- a/src/mainboard/hp/abm/buildOpts.c
+++ b/src/mainboard/hp/abm/buildOpts.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/hp/abm/cmos.layout b/src/mainboard/hp/abm/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/hp/abm/cmos.layout
+++ b/src/mainboard/hp/abm/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/hp/abm/devicetree.cb b/src/mainboard/hp/abm/devicetree.cb
index b9d11fc..72b7f46 100644
--- a/src/mainboard/hp/abm/devicetree.cb
+++ b/src/mainboard/hp/abm/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family16kb/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/hp/abm/dsdt.asl b/src/mainboard/hp/abm/dsdt.asl
index 3f1aa8b..6df107e 100644
--- a/src/mainboard/hp/abm/dsdt.asl
+++ b/src/mainboard/hp/abm/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/hp/abm/irq_tables.c b/src/mainboard/hp/abm/irq_tables.c
index 33ce343..cb8248e 100644
--- a/src/mainboard/hp/abm/irq_tables.c
+++ b/src/mainboard/hp/abm/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/abm/mainboard.c b/src/mainboard/hp/abm/mainboard.c
index 634c153..14a7386 100644
--- a/src/mainboard/hp/abm/mainboard.c
+++ b/src/mainboard/hp/abm/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/abm/mptable.c b/src/mainboard/hp/abm/mptable.c
index 45d3735..d2842f7 100644
--- a/src/mainboard/hp/abm/mptable.c
+++ b/src/mainboard/hp/abm/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/abm/romstage.c b/src/mainboard/hp/abm/romstage.c
index 5399ffb..4417c73 100644
--- a/src/mainboard/hp/abm/romstage.c
+++ b/src/mainboard/hp/abm/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/hp/dl145_g1/dsdt.asl b/src/mainboard/hp/dl145_g1/dsdt.asl
index cdf4232..407467b 100644
--- a/src/mainboard/hp/dl145_g1/dsdt.asl
+++ b/src/mainboard/hp/dl145_g1/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/hp/dl145_g3/get_bus_conf.c b/src/mainboard/hp/dl145_g3/get_bus_conf.c
index 944d328..784799c 100644
--- a/src/mainboard/hp/dl145_g3/get_bus_conf.c
+++ b/src/mainboard/hp/dl145_g3/get_bus_conf.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <device/pci.h>
diff --git a/src/mainboard/hp/dl145_g3/mb_sysconf.h b/src/mainboard/hp/dl145_g3/mb_sysconf.h
index ae33243..aa598dd 100644
--- a/src/mainboard/hp/dl145_g3/mb_sysconf.h
+++ b/src/mainboard/hp/dl145_g3/mb_sysconf.h
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c
index 1bd2f6c..8b150fa 100644
--- a/src/mainboard/hp/dl145_g3/mptable.c
+++ b/src/mainboard/hp/dl145_g3/mptable.c
@@ -23,8 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/dl145_g3/romstage.c b/src/mainboard/hp/dl145_g3/romstage.c
index d8e8a16..b550c11 100644
--- a/src/mainboard/hp/dl145_g3/romstage.c
+++ b/src/mainboard/hp/dl145_g3/romstage.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/cmos.layout b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
index 7cc6d81..24c8fc8 100644
--- a/src/mainboard/hp/dl165_g6_fam10/cmos.layout
+++ b/src/mainboard/hp/dl165_g6_fam10/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
index 395c612..49a5330 100644
--- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
+++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h b/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
index ae33243..aa598dd 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
+++ b/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/hp/dl165_g6_fam10/mptable.c b/src/mainboard/hp/dl165_g6_fam10/mptable.c
index 768800b..af426ee 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mptable.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c
@@ -23,8 +23,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/hp/dl165_g6_fam10/romstage.c b/src/mainboard/hp/dl165_g6_fam10/romstage.c
index 62fd6cb..d08e9e6 100644
--- a/src/mainboard/hp/dl165_g6_fam10/romstage.c
+++ b/src/mainboard/hp/dl165_g6_fam10/romstage.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAM10_SCAN_PCI_BUS 0
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index 1a2d31d..fce2255 100644
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # FIXME: It's a PC87360 actually.
diff --git a/src/mainboard/hp/e_vectra_p2706t/irq_tables.c b/src/mainboard/hp/e_vectra_p2706t/irq_tables.c
index 0be8b5e..18c7235 100644
--- a/src/mainboard/hp/e_vectra_p2706t/irq_tables.c
+++ b/src/mainboard/hp/e_vectra_p2706t/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/hp/e_vectra_p2706t/romstage.c b/src/mainboard/hp/e_vectra_p2706t/romstage.c
index 0efbafb..7433c9f 100644
--- a/src/mainboard/hp/e_vectra_p2706t/romstage.c
+++ b/src/mainboard/hp/e_vectra_p2706t/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c
index f5443ae..9e8e1b8 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
index e930667..f99df66 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_HP_PAVILION_M6_1035DX
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
index a683d4a..37f110c 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h b/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
index bbdcd5f..9f044a9 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
+++ b/src/mainboard/hp/pavilion_m6_1035dx/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/PlatformGnbPcie.c b/src/mainboard/hp/pavilion_m6_1035dx/PlatformGnbPcie.c
index 5ea0a9b..a2af82b 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/PlatformGnbPcie.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "Porting.h"
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
index 28230bd..d3b44c2 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
index 7231147..ebb1714 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/routing.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/routing.asl
index 809e3c6..56f77fb 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/routing.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Routing is in System Bus scope */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/sata.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/sata.asl
index bbd95d8..b09b369 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/sata.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/si.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/si.asl
index 28cf633..a12496a 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/si.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Scope(\_SI) {
 		Method(_SST, 1) {
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl
index ef1dc5d..5d84bde 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/superio.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/superio.asl
index 97304f9..514e0fd 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/superio.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/thermal.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/thermal.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi/usb_oc.asl b/src/mainboard/hp/pavilion_m6_1035dx/acpi/usb_oc.asl
index 74691ad..6eee042 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi/usb_oc.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* USB overcurrent mapping pins.   */
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
index f2f3e11..01ba895 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
index a6d66f5..fbc71b8 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb b/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb
index 6e68c0e..b7bce50 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb
+++ b/src/mainboard/hp/pavilion_m6_1035dx/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15tn/root_complex
 
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
index e1bd0b1..659d2ea 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
+++ b/src/mainboard/hp/pavilion_m6_1035dx/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "mainboard.h"
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c b/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c
index 144dd90..70f9de5 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
index b30cda2..6db4db9 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
index 107d35a..3dae53b 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/romstage.c b/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
index 9291ed6..c95b233 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/ibase/mb899/acpi/ec.asl b/src/mainboard/ibase/mb899/acpi/ec.asl
index 70cb110..4eb972c 100644
--- a/src/mainboard/ibase/mb899/acpi/ec.asl
+++ b/src/mainboard/ibase/mb899/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/ibase/mb899/acpi/i945_pci_irqs.asl b/src/mainboard/ibase/mb899/acpi/i945_pci_irqs.asl
index a7173b5..1fd1939 100644
--- a/src/mainboard/ibase/mb899/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/ibase/mb899/acpi/i945_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/ibase/mb899/acpi/ich7_pci_irqs.asl b/src/mainboard/ibase/mb899/acpi/ich7_pci_irqs.asl
index 559092c..7d69dfb 100644
--- a/src/mainboard/ibase/mb899/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/ibase/mb899/acpi/ich7_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/ibase/mb899/acpi/platform.asl b/src/mainboard/ibase/mb899/acpi/platform.asl
index 32d5468..4a2c4d2 100644
--- a/src/mainboard/ibase/mb899/acpi/platform.asl
+++ b/src/mainboard/ibase/mb899/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/ibase/mb899/acpi/superio.asl b/src/mainboard/ibase/mb899/acpi/superio.asl
index b3b7796..da1641f 100644
--- a/src/mainboard/ibase/mb899/acpi/superio.asl
+++ b/src/mainboard/ibase/mb899/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/ibase/mb899/acpi/thermal.asl b/src/mainboard/ibase/mb899/acpi/thermal.asl
index c889f2f..e49dc3b 100644
--- a/src/mainboard/ibase/mb899/acpi/thermal.asl
+++ b/src/mainboard/ibase/mb899/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/ibase/mb899/acpi_tables.c b/src/mainboard/ibase/mb899/acpi_tables.c
index 5972382..47c0001 100644
--- a/src/mainboard/ibase/mb899/acpi_tables.c
+++ b/src/mainboard/ibase/mb899/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/ibase/mb899/cmos.layout b/src/mainboard/ibase/mb899/cmos.layout
index e3d35be..8ce7eed 100644
--- a/src/mainboard/ibase/mb899/cmos.layout
+++ b/src/mainboard/ibase/mb899/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/ibase/mb899/dsdt.asl b/src/mainboard/ibase/mb899/dsdt.asl
index 9b78f33..45a778b 100644
--- a/src/mainboard/ibase/mb899/dsdt.asl
+++ b/src/mainboard/ibase/mb899/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/ibase/mb899/irq_tables.c b/src/mainboard/ibase/mb899/irq_tables.c
index 09943c4..3a5cc26 100644
--- a/src/mainboard/ibase/mb899/irq_tables.c
+++ b/src/mainboard/ibase/mb899/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c
index 1276a07..eb85665 100644
--- a/src/mainboard/ibase/mb899/mainboard.c
+++ b/src/mainboard/ibase/mb899/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c
index 51c398c..933ee5a 100644
--- a/src/mainboard/ibase/mb899/mptable.c
+++ b/src/mainboard/ibase/mb899/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/ibase/mb899/romstage.c b/src/mainboard/ibase/mb899/romstage.c
index 53138e2..ad71733 100644
--- a/src/mainboard/ibase/mb899/romstage.c
+++ b/src/mainboard/ibase/mb899/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/ibase/mb899/superio_hwm.c b/src/mainboard/ibase/mb899/superio_hwm.c
index 6c15181..2531816 100644
--- a/src/mainboard/ibase/mb899/superio_hwm.c
+++ b/src/mainboard/ibase/mb899/superio_hwm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/ibase/mb899/superio_hwm.h b/src/mainboard/ibase/mb899/superio_hwm.h
index 3d08c75..2ff4750 100644
--- a/src/mainboard/ibase/mb899/superio_hwm.h
+++ b/src/mainboard/ibase/mb899/superio_hwm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_HWM_H
diff --git a/src/mainboard/iei/Kconfig b/src/mainboard/iei/Kconfig
index 91c94c8..6122284 100644
--- a/src/mainboard/iei/Kconfig
+++ b/src/mainboard/iei/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_IEI
 
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/ide.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi/ide.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl
index be9ab74..e5a975e 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/sata.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi/sata.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl b/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
index e1f5590..da338b4 100644
--- a/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
index 1caf28f..418c84f 100644
--- a/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
+++ b/src/mainboard/iei/kino-780am2-fam10/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
+++ b/src/mainboard/iei/kino-780am2-fam10/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/irq_tables.c b/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
+++ b/src/mainboard/iei/kino-780am2-fam10/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/mainboard.c b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
index 9a4866f..36e5486 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mainboard.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/mb_sysconf.h b/src/mainboard/iei/kino-780am2-fam10/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mb_sysconf.h
+++ b/src/mainboard/iei/kino-780am2-fam10/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index 2378813..8e761cb 100644
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/iei/kino-780am2-fam10/resourcemap.c b/src/mainboard/iei/kino-780am2-fam10/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/iei/kino-780am2-fam10/resourcemap.c
+++ b/src/mainboard/iei/kino-780am2-fam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/iei/kino-780am2-fam10/romstage.c b/src/mainboard/iei/kino-780am2-fam10/romstage.c
index 6df828b..d653728 100644
--- a/src/mainboard/iei/kino-780am2-fam10/romstage.c
+++ b/src/mainboard/iei/kino-780am2-fam10/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c b/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c
index e5841d4..9858493 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
index 4e9e7e5..75c9963 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
+++ b/src/mainboard/iei/pcisa-lx-800-r10/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/iei/pm-lx-800-r11/Kconfig b/src/mainboard/iei/pm-lx-800-r11/Kconfig
index a93b55a..ff85935 100644
--- a/src/mainboard/iei/pm-lx-800-r11/Kconfig
+++ b/src/mainboard/iei/pm-lx-800-r11/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_IEI_PM_LX_800_R11
diff --git a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
index c19910f..bf6b622 100644
--- a/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
+++ b/src/mainboard/iei/pm-lx-800-r11/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/amd/lx
diff --git a/src/mainboard/iei/pm-lx-800-r11/irq_tables.c b/src/mainboard/iei/pm-lx-800-r11/irq_tables.c
index 99ce296..7df403d 100644
--- a/src/mainboard/iei/pm-lx-800-r11/irq_tables.c
+++ b/src/mainboard/iei/pm-lx-800-r11/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_ids.h>
diff --git a/src/mainboard/iei/pm-lx-800-r11/romstage.c b/src/mainboard/iei/pm-lx-800-r11/romstage.c
index 5becd0d..412d4cd 100644
--- a/src/mainboard/iei/pm-lx-800-r11/romstage.c
+++ b/src/mainboard/iei/pm-lx-800-r11/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/iei/pm-lx2-800-r10/Kconfig b/src/mainboard/iei/pm-lx2-800-r10/Kconfig
index 9018e4c..8d4c0f7 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/Kconfig
+++ b/src/mainboard/iei/pm-lx2-800-r10/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_IEI_PM_LX2_800_R10
diff --git a/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb b/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb
index 3d49d3b..25d9dd9 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb
+++ b/src/mainboard/iei/pm-lx2-800-r10/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/amd/lx
diff --git a/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c b/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c
index 3e5aa13..4ae02ae 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c
+++ b/src/mainboard/iei/pm-lx2-800-r10/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_ids.h>
diff --git a/src/mainboard/iei/pm-lx2-800-r10/mainboard.c b/src/mainboard/iei/pm-lx2-800-r10/mainboard.c
index 988ce9a..0362f56 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/mainboard.c
+++ b/src/mainboard/iei/pm-lx2-800-r10/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/iei/pm-lx2-800-r10/romstage.c b/src/mainboard/iei/pm-lx2-800-r10/romstage.c
index 7a0ed76..b2e61f4 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/romstage.c
+++ b/src/mainboard/iei/pm-lx2-800-r10/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/bakersport_fsp/Kconfig b/src/mainboard/intel/bakersport_fsp/Kconfig
index 0e18423..d91f2e2 100644
--- a/src/mainboard/intel/bakersport_fsp/Kconfig
+++ b/src/mainboard/intel/bakersport_fsp/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_INTEL_BAKERSPORT_FSP
diff --git a/src/mainboard/intel/baskingridge/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc
index b43064a..d8bc68e 100644
--- a/src/mainboard/intel/baskingridge/Makefile.inc
+++ b/src/mainboard/intel/baskingridge/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += chromeos.c
diff --git a/src/mainboard/intel/baskingridge/acpi/chromeos.asl b/src/mainboard/intel/baskingridge/acpi/chromeos.asl
index 322fc3e..139374a 100644
--- a/src/mainboard/intel/baskingridge/acpi/chromeos.asl
+++ b/src/mainboard/intel/baskingridge/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl b/src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl
index 4f838cb..0d64a82 100644
--- a/src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl
+++ b/src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/intel/baskingridge/acpi/mainboard.asl b/src/mainboard/intel/baskingridge/acpi/mainboard.asl
index a55894c..93eaf4a 100644
--- a/src/mainboard/intel/baskingridge/acpi/mainboard.asl
+++ b/src/mainboard/intel/baskingridge/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PWRB)
diff --git a/src/mainboard/intel/baskingridge/acpi/platform.asl b/src/mainboard/intel/baskingridge/acpi/platform.asl
index 9ef8349..f5acf66 100644
--- a/src/mainboard/intel/baskingridge/acpi/platform.asl
+++ b/src/mainboard/intel/baskingridge/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/intel/baskingridge/acpi/superio.asl b/src/mainboard/intel/baskingridge/acpi/superio.asl
index 1e256c4..11d5ccb 100644
--- a/src/mainboard/intel/baskingridge/acpi/superio.asl
+++ b/src/mainboard/intel/baskingridge/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/intel/baskingridge/acpi/thermal.asl b/src/mainboard/intel/baskingridge/acpi/thermal.asl
index f029586..3f36ae2 100644
--- a/src/mainboard/intel/baskingridge/acpi/thermal.asl
+++ b/src/mainboard/intel/baskingridge/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/intel/baskingridge/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
index 2f5e0cd..813fad3 100644
--- a/src/mainboard/intel/baskingridge/acpi_tables.c
+++ b/src/mainboard/intel/baskingridge/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/baskingridge/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c
index 72f6069..12013f6 100644
--- a/src/mainboard/intel/baskingridge/chromeos.c
+++ b/src/mainboard/intel/baskingridge/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/baskingridge/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
index e527692..9570aa7 100644
--- a/src/mainboard/intel/baskingridge/cmos.layout
+++ b/src/mainboard/intel/baskingridge/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/baskingridge/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl
index b586e34..eaa3a7f 100644
--- a/src/mainboard/intel/baskingridge/dsdt.asl
+++ b/src/mainboard/intel/baskingridge/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/intel/baskingridge/fadt.c b/src/mainboard/intel/baskingridge/fadt.c
index 84ed5bc..b9b44d2 100644
--- a/src/mainboard/intel/baskingridge/fadt.c
+++ b/src/mainboard/intel/baskingridge/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/baskingridge/gpio.h b/src/mainboard/intel/baskingridge/gpio.h
index 1e5ccf9..2ad941e 100644
--- a/src/mainboard/intel/baskingridge/gpio.h
+++ b/src/mainboard/intel/baskingridge/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BASKING_RIDGE_GPIO_H
diff --git a/src/mainboard/intel/baskingridge/hda_verb.c b/src/mainboard/intel/baskingridge/hda_verb.c
index 5318c42..c5720ee 100644
--- a/src/mainboard/intel/baskingridge/hda_verb.c
+++ b/src/mainboard/intel/baskingridge/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
index e7688b7..e64bacd 100644
--- a/src/mainboard/intel/baskingridge/mainboard.c
+++ b/src/mainboard/intel/baskingridge/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/baskingridge/mainboard_smi.c b/src/mainboard/intel/baskingridge/mainboard_smi.c
index 225dc8d..6084fc0 100644
--- a/src/mainboard/intel/baskingridge/mainboard_smi.c
+++ b/src/mainboard/intel/baskingridge/mainboard_smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/baskingridge/romstage.c b/src/mainboard/intel/baskingridge/romstage.c
index 1ad21ba..2c826e3 100644
--- a/src/mainboard/intel/baskingridge/romstage.c
+++ b/src/mainboard/intel/baskingridge/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/baskingridge/thermal.h b/src/mainboard/intel/baskingridge/thermal.h
index c30d588..53e524b 100644
--- a/src/mainboard/intel/baskingridge/thermal.h
+++ b/src/mainboard/intel/baskingridge/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BASKING_RIDGE_THERMAL_H
diff --git a/src/mainboard/intel/bayleybay_fsp/Kconfig b/src/mainboard/intel/bayleybay_fsp/Kconfig
index 8bf79b2..56d84d1 100644
--- a/src/mainboard/intel/bayleybay_fsp/Kconfig
+++ b/src/mainboard/intel/bayleybay_fsp/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_INTEL_BAYLEYBAY_FSP
diff --git a/src/mainboard/intel/bayleybay_fsp/Makefile.inc b/src/mainboard/intel/bayleybay_fsp/Makefile.inc
index 086532d..c4cfa10 100644
--- a/src/mainboard/intel/bayleybay_fsp/Makefile.inc
+++ b/src/mainboard/intel/bayleybay_fsp/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += gpio.c
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi/mainboard.asl b/src/mainboard/intel/bayleybay_fsp/acpi/mainboard.asl
index ba81669..d4635c5 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi/mainboard.asl
+++ b/src/mainboard/intel/bayleybay_fsp/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PWRB)
diff --git a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
index f7d585f..58ee48f 100644
--- a/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
+++ b/src/mainboard/intel/bayleybay_fsp/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/cmos.layout b/src/mainboard/intel/bayleybay_fsp/cmos.layout
index f848a83..9509055 100644
--- a/src/mainboard/intel/bayleybay_fsp/cmos.layout
+++ b/src/mainboard/intel/bayleybay_fsp/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/bayleybay_fsp/devicetree.cb b/src/mainboard/intel/bayleybay_fsp/devicetree.cb
index 23b2a2d..82f0c34 100644
--- a/src/mainboard/intel/bayleybay_fsp/devicetree.cb
+++ b/src/mainboard/intel/bayleybay_fsp/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/intel/fsp_baytrail
diff --git a/src/mainboard/intel/bayleybay_fsp/dsdt.asl b/src/mainboard/intel/bayleybay_fsp/dsdt.asl
index 0796b56..3cf782c 100644
--- a/src/mainboard/intel/bayleybay_fsp/dsdt.asl
+++ b/src/mainboard/intel/bayleybay_fsp/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define INCLUDE_LPE  1
diff --git a/src/mainboard/intel/bayleybay_fsp/fadt.c b/src/mainboard/intel/bayleybay_fsp/fadt.c
index cca3da3..7937ecd 100644
--- a/src/mainboard/intel/bayleybay_fsp/fadt.c
+++ b/src/mainboard/intel/bayleybay_fsp/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/gpio.c b/src/mainboard/intel/bayleybay_fsp/gpio.c
index f200aba..a7640c7 100644
--- a/src/mainboard/intel/bayleybay_fsp/gpio.c
+++ b/src/mainboard/intel/bayleybay_fsp/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/irqroute.c b/src/mainboard/intel/bayleybay_fsp/irqroute.c
index 1ace03b..432243d 100644
--- a/src/mainboard/intel/bayleybay_fsp/irqroute.c
+++ b/src/mainboard/intel/bayleybay_fsp/irqroute.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/intel/bayleybay_fsp/irqroute.h b/src/mainboard/intel/bayleybay_fsp/irqroute.h
index 9d9f53e..7197c48 100644
--- a/src/mainboard/intel/bayleybay_fsp/irqroute.h
+++ b/src/mainboard/intel/bayleybay_fsp/irqroute.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef IRQROUTE_H
diff --git a/src/mainboard/intel/bayleybay_fsp/mainboard.c b/src/mainboard/intel/bayleybay_fsp/mainboard.c
index 6909873..35d88d4 100644
--- a/src/mainboard/intel/bayleybay_fsp/mainboard.c
+++ b/src/mainboard/intel/bayleybay_fsp/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/romstage.c b/src/mainboard/intel/bayleybay_fsp/romstage.c
index f84cff3..3e2db53 100644
--- a/src/mainboard/intel/bayleybay_fsp/romstage.c
+++ b/src/mainboard/intel/bayleybay_fsp/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/mainboard/intel/bayleybay_fsp/thermal.h b/src/mainboard/intel/bayleybay_fsp/thermal.h
index fb200c7..dd2e372 100644
--- a/src/mainboard/intel/bayleybay_fsp/thermal.h
+++ b/src/mainboard/intel/bayleybay_fsp/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_THERMAL_H
diff --git a/src/mainboard/intel/d810e2cb/Kconfig b/src/mainboard/intel/d810e2cb/Kconfig
index 848aedb..6bd1a32 100644
--- a/src/mainboard/intel/d810e2cb/Kconfig
+++ b/src/mainboard/intel/d810e2cb/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_INTEL_D810E2CB
 
diff --git a/src/mainboard/intel/d810e2cb/devicetree.cb b/src/mainboard/intel/d810e2cb/devicetree.cb
index e4b316f..40b6c88 100644
--- a/src/mainboard/intel/d810e2cb/devicetree.cb
+++ b/src/mainboard/intel/d810e2cb/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i82810           # Northbridge
diff --git a/src/mainboard/intel/d810e2cb/gpio.c b/src/mainboard/intel/d810e2cb/gpio.c
index f0ba046..36def6a 100644
--- a/src/mainboard/intel/d810e2cb/gpio.c
+++ b/src/mainboard/intel/d810e2cb/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define PME_DEV			PNP_DEV(0x4e, 0x0a)
diff --git a/src/mainboard/intel/d810e2cb/irq_tables.c b/src/mainboard/intel/d810e2cb/irq_tables.c
index 0482645..4ed5300 100644
--- a/src/mainboard/intel/d810e2cb/irq_tables.c
+++ b/src/mainboard/intel/d810e2cb/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/intel/d810e2cb/romstage.c b/src/mainboard/intel/d810e2cb/romstage.c
index 3df0521..bf907b1 100644
--- a/src/mainboard/intel/d810e2cb/romstage.c
+++ b/src/mainboard/intel/d810e2cb/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index ca0caa2..937792d 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_INTEL_D945GCLF
 
diff --git a/src/mainboard/intel/d945gclf/acpi/ec.asl b/src/mainboard/intel/d945gclf/acpi/ec.asl
index c57d29f..f0924a3 100644
--- a/src/mainboard/intel/d945gclf/acpi/ec.asl
+++ b/src/mainboard/intel/d945gclf/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/intel/d945gclf/acpi/i945_pci_irqs.asl b/src/mainboard/intel/d945gclf/acpi/i945_pci_irqs.asl
index c2f3ef0..40c3102 100644
--- a/src/mainboard/intel/d945gclf/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/intel/d945gclf/acpi/i945_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/intel/d945gclf/acpi/ich7_pci_irqs.asl b/src/mainboard/intel/d945gclf/acpi/ich7_pci_irqs.asl
index e7bca4b..82fb01a 100644
--- a/src/mainboard/intel/d945gclf/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/intel/d945gclf/acpi/ich7_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/intel/d945gclf/acpi/mainboard.asl b/src/mainboard/intel/d945gclf/acpi/mainboard.asl
index f083471..88b5e19 100644
--- a/src/mainboard/intel/d945gclf/acpi/mainboard.asl
+++ b/src/mainboard/intel/d945gclf/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (SLPB)
diff --git a/src/mainboard/intel/d945gclf/acpi/platform.asl b/src/mainboard/intel/d945gclf/acpi/platform.asl
index d0332c5..4002275 100644
--- a/src/mainboard/intel/d945gclf/acpi/platform.asl
+++ b/src/mainboard/intel/d945gclf/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/intel/d945gclf/acpi/superio.asl b/src/mainboard/intel/d945gclf/acpi/superio.asl
index 8fe1486..85caceb 100644
--- a/src/mainboard/intel/d945gclf/acpi/superio.asl
+++ b/src/mainboard/intel/d945gclf/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/intel/d945gclf/acpi/thermal.asl b/src/mainboard/intel/d945gclf/acpi/thermal.asl
index 2ec79ab..0d411e7 100644
--- a/src/mainboard/intel/d945gclf/acpi/thermal.asl
+++ b/src/mainboard/intel/d945gclf/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/intel/d945gclf/acpi_tables.c b/src/mainboard/intel/d945gclf/acpi_tables.c
index 4c9e991..763b887 100644
--- a/src/mainboard/intel/d945gclf/acpi_tables.c
+++ b/src/mainboard/intel/d945gclf/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/d945gclf/cmos.layout b/src/mainboard/intel/d945gclf/cmos.layout
index 7c1b257..8c1f540 100644
--- a/src/mainboard/intel/d945gclf/cmos.layout
+++ b/src/mainboard/intel/d945gclf/cmos.layout
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/d945gclf/devicetree.cb b/src/mainboard/intel/d945gclf/devicetree.cb
index 3aa106b..d7f00b8 100644
--- a/src/mainboard/intel/d945gclf/devicetree.cb
+++ b/src/mainboard/intel/d945gclf/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i945
diff --git a/src/mainboard/intel/d945gclf/dsdt.asl b/src/mainboard/intel/d945gclf/dsdt.asl
index 8aa8881..26c7aad 100644
--- a/src/mainboard/intel/d945gclf/dsdt.asl
+++ b/src/mainboard/intel/d945gclf/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/intel/d945gclf/irq_tables.c b/src/mainboard/intel/d945gclf/irq_tables.c
index a95b7f1..d1869f1 100644
--- a/src/mainboard/intel/d945gclf/irq_tables.c
+++ b/src/mainboard/intel/d945gclf/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/intel/d945gclf/mptable.c b/src/mainboard/intel/d945gclf/mptable.c
index 38741ef..b96ef86 100644
--- a/src/mainboard/intel/d945gclf/mptable.c
+++ b/src/mainboard/intel/d945gclf/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/intel/d945gclf/romstage.c b/src/mainboard/intel/d945gclf/romstage.c
index 3869db0..a8b597a 100644
--- a/src/mainboard/intel/d945gclf/romstage.c
+++ b/src/mainboard/intel/d945gclf/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/intel/eagleheights/acpi_tables.c b/src/mainboard/intel/eagleheights/acpi_tables.c
index ac2c76b..0a83ebf 100644
--- a/src/mainboard/intel/eagleheights/acpi_tables.c
+++ b/src/mainboard/intel/eagleheights/acpi_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/eagleheights/cmos.layout b/src/mainboard/intel/eagleheights/cmos.layout
index 449d58f..fd45db1 100644
--- a/src/mainboard/intel/eagleheights/cmos.layout
+++ b/src/mainboard/intel/eagleheights/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/eagleheights/debug.c b/src/mainboard/intel/eagleheights/debug.c
index ba51cde..25d0441 100644
--- a/src/mainboard/intel/eagleheights/debug.c
+++ b/src/mainboard/intel/eagleheights/debug.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/mainboard/intel/eagleheights/dsdt.asl b/src/mainboard/intel/eagleheights/dsdt.asl
index fd33afa..6af56e9 100644
--- a/src/mainboard/intel/eagleheights/dsdt.asl
+++ b/src/mainboard/intel/eagleheights/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock ("DSDT", "DSDT", 1, "EAGLE", "COREBOOT", 0x0000001)
diff --git a/src/mainboard/intel/eagleheights/fadt.c b/src/mainboard/intel/eagleheights/fadt.c
index 61d86ed..815cc5a 100644
--- a/src/mainboard/intel/eagleheights/fadt.c
+++ b/src/mainboard/intel/eagleheights/fadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/eagleheights/irq_tables.c b/src/mainboard/intel/eagleheights/irq_tables.c
index 42a3be0..e45ff33 100644
--- a/src/mainboard/intel/eagleheights/irq_tables.c
+++ b/src/mainboard/intel/eagleheights/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/intel/eagleheights/mptable.c b/src/mainboard/intel/eagleheights/mptable.c
index 1d4cf4b..6f4a7b7 100644
--- a/src/mainboard/intel/eagleheights/mptable.c
+++ b/src/mainboard/intel/eagleheights/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c
index 6f950ec..d44c026 100644
--- a/src/mainboard/intel/eagleheights/romstage.c
+++ b/src/mainboard/intel/eagleheights/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/emeraldlake2/Makefile.inc b/src/mainboard/intel/emeraldlake2/Makefile.inc
index 32c8309..e9e4390 100644
--- a/src/mainboard/intel/emeraldlake2/Makefile.inc
+++ b/src/mainboard/intel/emeraldlake2/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += chromeos.c
diff --git a/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl b/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl
index d3313f3..77a9036 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl b/src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl
index 4f838cb..0d64a82 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/ivybridge_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for IvyBridge */
diff --git a/src/mainboard/intel/emeraldlake2/acpi/mainboard.asl b/src/mainboard/intel/emeraldlake2/acpi/mainboard.asl
index a55894c..93eaf4a 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/mainboard.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PWRB)
diff --git a/src/mainboard/intel/emeraldlake2/acpi/platform.asl b/src/mainboard/intel/emeraldlake2/acpi/platform.asl
index 549abd1..172d142 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/platform.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/intel/emeraldlake2/acpi/superio.asl b/src/mainboard/intel/emeraldlake2/acpi/superio.asl
index 1e256c4..11d5ccb 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/superio.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
index e67d7f5..0f0da6c 100644
--- a/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
+++ b/src/mainboard/intel/emeraldlake2/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/intel/emeraldlake2/acpi_tables.c b/src/mainboard/intel/emeraldlake2/acpi_tables.c
index ce42951..d5d4f21 100644
--- a/src/mainboard/intel/emeraldlake2/acpi_tables.c
+++ b/src/mainboard/intel/emeraldlake2/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/emeraldlake2/chromeos.c b/src/mainboard/intel/emeraldlake2/chromeos.c
index 6c574c5..cc264b9 100644
--- a/src/mainboard/intel/emeraldlake2/chromeos.c
+++ b/src/mainboard/intel/emeraldlake2/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/emeraldlake2/cmos.layout b/src/mainboard/intel/emeraldlake2/cmos.layout
index 6e10372..480712a 100644
--- a/src/mainboard/intel/emeraldlake2/cmos.layout
+++ b/src/mainboard/intel/emeraldlake2/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/emeraldlake2/dsdt.asl b/src/mainboard/intel/emeraldlake2/dsdt.asl
index b545838..538f17e 100644
--- a/src/mainboard/intel/emeraldlake2/dsdt.asl
+++ b/src/mainboard/intel/emeraldlake2/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/intel/emeraldlake2/ec.c b/src/mainboard/intel/emeraldlake2/ec.c
index 979505a..b190bc4 100644
--- a/src/mainboard/intel/emeraldlake2/ec.c
+++ b/src/mainboard/intel/emeraldlake2/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/emeraldlake2/ec.h b/src/mainboard/intel/emeraldlake2/ec.h
index 58c4495..187b821 100644
--- a/src/mainboard/intel/emeraldlake2/ec.h
+++ b/src/mainboard/intel/emeraldlake2/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LUMPY_EC_H
diff --git a/src/mainboard/intel/emeraldlake2/gpio.h b/src/mainboard/intel/emeraldlake2/gpio.h
index b3d1410..fc11bd0 100644
--- a/src/mainboard/intel/emeraldlake2/gpio.h
+++ b/src/mainboard/intel/emeraldlake2/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EMERALDLAKE2_GPIO_H
diff --git a/src/mainboard/intel/emeraldlake2/hda_verb.c b/src/mainboard/intel/emeraldlake2/hda_verb.c
index 5318c42..c5720ee 100644
--- a/src/mainboard/intel/emeraldlake2/hda_verb.c
+++ b/src/mainboard/intel/emeraldlake2/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c
index 2e1ed36..730919b 100644
--- a/src/mainboard/intel/emeraldlake2/mainboard.c
+++ b/src/mainboard/intel/emeraldlake2/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index 5bdbdc6..e22301e 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/emeraldlake2/smihandler.c b/src/mainboard/intel/emeraldlake2/smihandler.c
index 244fdc8..aa967d4 100644
--- a/src/mainboard/intel/emeraldlake2/smihandler.c
+++ b/src/mainboard/intel/emeraldlake2/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/emeraldlake2/thermal.h b/src/mainboard/intel/emeraldlake2/thermal.h
index 1ce65d0..3beedb7 100644
--- a/src/mainboard/intel/emeraldlake2/thermal.h
+++ b/src/mainboard/intel/emeraldlake2/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef EMERALDLAKE2_THERMAL_H
diff --git a/src/mainboard/intel/kunimitsu/Makefile.inc b/src/mainboard/intel/kunimitsu/Makefile.inc
index 61fdc7b..dec792c 100644
--- a/src/mainboard/intel/kunimitsu/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/intel/kunimitsu/acpi/chromeos.asl b/src/mainboard/intel/kunimitsu/acpi/chromeos.asl
index d3ab569..067ca7e 100644
--- a/src/mainboard/intel/kunimitsu/acpi/chromeos.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/chromeos.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../gpio.h"
diff --git a/src/mainboard/intel/kunimitsu/acpi/dptf.asl b/src/mainboard/intel/kunimitsu/acpi/dptf.asl
index 742ba71..b5f8393 100644
--- a/src/mainboard/intel/kunimitsu/acpi/dptf.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/dptf.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define DPTF_CPU_PASSIVE        80
diff --git a/src/mainboard/intel/kunimitsu/acpi/ec.asl b/src/mainboard/intel/kunimitsu/acpi/ec.asl
index 10ca834..4ad5515 100644
--- a/src/mainboard/intel/kunimitsu/acpi/ec.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl b/src/mainboard/intel/kunimitsu/acpi/mainboard.asl
index 22f8403..cf04276 100644
--- a/src/mainboard/intel/kunimitsu/acpi/mainboard.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../gpio.h"
diff --git a/src/mainboard/intel/kunimitsu/acpi/superio.asl b/src/mainboard/intel/kunimitsu/acpi/superio.asl
index 822821e..d4d0863 100644
--- a/src/mainboard/intel/kunimitsu/acpi/superio.asl
+++ b/src/mainboard/intel/kunimitsu/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/intel/kunimitsu/acpi_tables.c b/src/mainboard/intel/kunimitsu/acpi_tables.c
index 72a5888..241c4c0 100644
--- a/src/mainboard/intel/kunimitsu/acpi_tables.c
+++ b/src/mainboard/intel/kunimitsu/acpi_tables.c
@@ -14,6 +14,5 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
diff --git a/src/mainboard/intel/kunimitsu/boardid.c b/src/mainboard/intel/kunimitsu/boardid.c
index 59c6fff..802f166 100644
--- a/src/mainboard/intel/kunimitsu/boardid.c
+++ b/src/mainboard/intel/kunimitsu/boardid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/intel/kunimitsu/boardid.h b/src/mainboard/intel/kunimitsu/boardid.h
index ef003f3..eb2cc7d 100644
--- a/src/mainboard/intel/kunimitsu/boardid.h
+++ b/src/mainboard/intel/kunimitsu/boardid.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BOARDID_H_
diff --git a/src/mainboard/intel/kunimitsu/chromeos.c b/src/mainboard/intel/kunimitsu/chromeos.c
index 905de13..b172799 100644
--- a/src/mainboard/intel/kunimitsu/chromeos.c
+++ b/src/mainboard/intel/kunimitsu/chromeos.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/kunimitsu/cmos.layout b/src/mainboard/intel/kunimitsu/cmos.layout
index 32bf05d..e8a477b 100644
--- a/src/mainboard/intel/kunimitsu/cmos.layout
+++ b/src/mainboard/intel/kunimitsu/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/kunimitsu/dsdt.asl b/src/mainboard/intel/kunimitsu/dsdt.asl
index ba1b263..d022e8a 100644
--- a/src/mainboard/intel/kunimitsu/dsdt.asl
+++ b/src/mainboard/intel/kunimitsu/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/intel/kunimitsu/ec.c b/src/mainboard/intel/kunimitsu/ec.c
index 5473cfc..a44e6f9 100644
--- a/src/mainboard/intel/kunimitsu/ec.c
+++ b/src/mainboard/intel/kunimitsu/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/kunimitsu/ec.h b/src/mainboard/intel/kunimitsu/ec.h
index 6408815..424c9a9 100644
--- a/src/mainboard/intel/kunimitsu/ec.h
+++ b/src/mainboard/intel/kunimitsu/ec.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/intel/kunimitsu/fadt.c b/src/mainboard/intel/kunimitsu/fadt.c
index 83fe860..95439ad 100644
--- a/src/mainboard/intel/kunimitsu/fadt.c
+++ b/src/mainboard/intel/kunimitsu/fadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/kunimitsu/gpio.h b/src/mainboard/intel/kunimitsu/gpio.h
index 1441738..5127ce9 100755
--- a/src/mainboard/intel/kunimitsu/gpio.h
+++ b/src/mainboard/intel/kunimitsu/gpio.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_GPIO_H
diff --git a/src/mainboard/intel/kunimitsu/mainboard.c b/src/mainboard/intel/kunimitsu/mainboard.c
index 40becdc..dd081dc 100644
--- a/src/mainboard/intel/kunimitsu/mainboard.c
+++ b/src/mainboard/intel/kunimitsu/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/intel/kunimitsu/pei_data.c b/src/mainboard/intel/kunimitsu/pei_data.c
index f7525da..d146672 100644
--- a/src/mainboard/intel/kunimitsu/pei_data.c
+++ b/src/mainboard/intel/kunimitsu/pei_data.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/kunimitsu/ramstage.c b/src/mainboard/intel/kunimitsu/ramstage.c
index 2deaaa3..133fea2 100644
--- a/src/mainboard/intel/kunimitsu/ramstage.c
+++ b/src/mainboard/intel/kunimitsu/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/ramstage.h>
diff --git a/src/mainboard/intel/kunimitsu/romstage.c b/src/mainboard/intel/kunimitsu/romstage.c
index a0eeafc..a4e007b 100644
--- a/src/mainboard/intel/kunimitsu/romstage.c
+++ b/src/mainboard/intel/kunimitsu/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/intel/kunimitsu/smihandler.c b/src/mainboard/intel/kunimitsu/smihandler.c
index c2f9d81..fd6075a 100644
--- a/src/mainboard/intel/kunimitsu/smihandler.c
+++ b/src/mainboard/intel/kunimitsu/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/kunimitsu/spd/Makefile.inc b/src/mainboard/intel/kunimitsu/spd/Makefile.inc
index a344f0b..c86f3da 100644
--- a/src/mainboard/intel/kunimitsu/spd/Makefile.inc
+++ b/src/mainboard/intel/kunimitsu/spd/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/intel/kunimitsu/spd/spd.c b/src/mainboard/intel/kunimitsu/spd/spd.c
index b8e0be6..09814e6 100644
--- a/src/mainboard/intel/kunimitsu/spd/spd.c
+++ b/src/mainboard/intel/kunimitsu/spd/spd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/byteorder.h>
diff --git a/src/mainboard/intel/kunimitsu/spd/spd.h b/src/mainboard/intel/kunimitsu/spd/spd.h
index eaa873b..14c386f 100644
--- a/src/mainboard/intel/kunimitsu/spd/spd.h
+++ b/src/mainboard/intel/kunimitsu/spd/spd.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_SPD_H
diff --git a/src/mainboard/intel/minnowmax/Kconfig b/src/mainboard/intel/minnowmax/Kconfig
index e09efc9..ae9d87e 100644
--- a/src/mainboard/intel/minnowmax/Kconfig
+++ b/src/mainboard/intel/minnowmax/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_INTEL_MINNOWMAX
diff --git a/src/mainboard/intel/minnowmax/Makefile.inc b/src/mainboard/intel/minnowmax/Makefile.inc
index 086532d..c4cfa10 100644
--- a/src/mainboard/intel/minnowmax/Makefile.inc
+++ b/src/mainboard/intel/minnowmax/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += gpio.c
diff --git a/src/mainboard/intel/minnowmax/acpi/mainboard.asl b/src/mainboard/intel/minnowmax/acpi/mainboard.asl
index ba81669..d4635c5 100644
--- a/src/mainboard/intel/minnowmax/acpi/mainboard.asl
+++ b/src/mainboard/intel/minnowmax/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PWRB)
diff --git a/src/mainboard/intel/minnowmax/acpi_tables.c b/src/mainboard/intel/minnowmax/acpi_tables.c
index 7c35d71..4db3db3 100644
--- a/src/mainboard/intel/minnowmax/acpi_tables.c
+++ b/src/mainboard/intel/minnowmax/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/minnowmax/cmos.layout b/src/mainboard/intel/minnowmax/cmos.layout
index 6056583..6948de8 100644
--- a/src/mainboard/intel/minnowmax/cmos.layout
+++ b/src/mainboard/intel/minnowmax/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/minnowmax/devicetree.cb b/src/mainboard/intel/minnowmax/devicetree.cb
index fc6b95a..d29f0b3 100644
--- a/src/mainboard/intel/minnowmax/devicetree.cb
+++ b/src/mainboard/intel/minnowmax/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/intel/fsp_baytrail
diff --git a/src/mainboard/intel/minnowmax/dsdt.asl b/src/mainboard/intel/minnowmax/dsdt.asl
index 0796b56..3cf782c 100644
--- a/src/mainboard/intel/minnowmax/dsdt.asl
+++ b/src/mainboard/intel/minnowmax/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define INCLUDE_LPE  1
diff --git a/src/mainboard/intel/minnowmax/fadt.c b/src/mainboard/intel/minnowmax/fadt.c
index 7c9a673..18fe337 100644
--- a/src/mainboard/intel/minnowmax/fadt.c
+++ b/src/mainboard/intel/minnowmax/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/minnowmax/gpio.c b/src/mainboard/intel/minnowmax/gpio.c
index eae484d..d5519ba 100644
--- a/src/mainboard/intel/minnowmax/gpio.c
+++ b/src/mainboard/intel/minnowmax/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/intel/minnowmax/irqroute.c b/src/mainboard/intel/minnowmax/irqroute.c
index 1ace03b..432243d 100644
--- a/src/mainboard/intel/minnowmax/irqroute.c
+++ b/src/mainboard/intel/minnowmax/irqroute.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/intel/minnowmax/irqroute.h b/src/mainboard/intel/minnowmax/irqroute.h
index dae72b2..af718ac 100644
--- a/src/mainboard/intel/minnowmax/irqroute.h
+++ b/src/mainboard/intel/minnowmax/irqroute.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef IRQROUTE_H
diff --git a/src/mainboard/intel/minnowmax/mainboard.c b/src/mainboard/intel/minnowmax/mainboard.c
index 1de61b8..961b11e 100644
--- a/src/mainboard/intel/minnowmax/mainboard.c
+++ b/src/mainboard/intel/minnowmax/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/intel/minnowmax/romstage.c b/src/mainboard/intel/minnowmax/romstage.c
index 3d60840..4804c67 100644
--- a/src/mainboard/intel/minnowmax/romstage.c
+++ b/src/mainboard/intel/minnowmax/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <baytrail/romstage.h>
diff --git a/src/mainboard/intel/mtarvon/irq_tables.c b/src/mainboard/intel/mtarvon/irq_tables.c
index ef2b79c..b28d6ee 100644
--- a/src/mainboard/intel/mtarvon/irq_tables.c
+++ b/src/mainboard/intel/mtarvon/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/mainboard/intel/mtarvon/mptable.c b/src/mainboard/intel/mtarvon/mptable.c
index 8c37de8..a2f52eb 100644
--- a/src/mainboard/intel/mtarvon/mptable.c
+++ b/src/mainboard/intel/mtarvon/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This code is based on src/mainboard/intel/jarrell/mptable.c */
diff --git a/src/mainboard/intel/mtarvon/romstage.c b/src/mainboard/intel/mtarvon/romstage.c
index 47ba32d..b28121d 100644
--- a/src/mainboard/intel/mtarvon/romstage.c
+++ b/src/mainboard/intel/mtarvon/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/sklrvp/Makefile.inc b/src/mainboard/intel/sklrvp/Makefile.inc
index 266a92d..e9261c3 100644
--- a/src/mainboard/intel/sklrvp/Makefile.inc
+++ b/src/mainboard/intel/sklrvp/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/intel/sklrvp/acpi/chromeos.asl b/src/mainboard/intel/sklrvp/acpi/chromeos.asl
index c6665f9..b2a6402 100644
--- a/src/mainboard/intel/sklrvp/acpi/chromeos.asl
+++ b/src/mainboard/intel/sklrvp/acpi/chromeos.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (OIPG, Package() {
diff --git a/src/mainboard/intel/sklrvp/acpi/ec.asl b/src/mainboard/intel/sklrvp/acpi/ec.asl
index 9cfe6a6..5e40366 100644
--- a/src/mainboard/intel/sklrvp/acpi/ec.asl
+++ b/src/mainboard/intel/sklrvp/acpi/ec.asl
@@ -13,6 +13,5 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
diff --git a/src/mainboard/intel/sklrvp/acpi/mainboard.asl b/src/mainboard/intel/sklrvp/acpi/mainboard.asl
index c80a03d..95bf9f2 100644
--- a/src/mainboard/intel/sklrvp/acpi/mainboard.asl
+++ b/src/mainboard/intel/sklrvp/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/gpio.h>
diff --git a/src/mainboard/intel/sklrvp/acpi/superio.asl b/src/mainboard/intel/sklrvp/acpi/superio.asl
index 9cfe6a6..5e40366 100644
--- a/src/mainboard/intel/sklrvp/acpi/superio.asl
+++ b/src/mainboard/intel/sklrvp/acpi/superio.asl
@@ -13,6 +13,5 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
diff --git a/src/mainboard/intel/sklrvp/acpi_tables.c b/src/mainboard/intel/sklrvp/acpi_tables.c
index 72a5888..241c4c0 100644
--- a/src/mainboard/intel/sklrvp/acpi_tables.c
+++ b/src/mainboard/intel/sklrvp/acpi_tables.c
@@ -14,6 +14,5 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
diff --git a/src/mainboard/intel/sklrvp/chromeos.c b/src/mainboard/intel/sklrvp/chromeos.c
index b361888..f13c7f1 100644
--- a/src/mainboard/intel/sklrvp/chromeos.c
+++ b/src/mainboard/intel/sklrvp/chromeos.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/sklrvp/cmos.layout b/src/mainboard/intel/sklrvp/cmos.layout
index 32bf05d..e8a477b 100644
--- a/src/mainboard/intel/sklrvp/cmos.layout
+++ b/src/mainboard/intel/sklrvp/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/sklrvp/dsdt.asl b/src/mainboard/intel/sklrvp/dsdt.asl
index 8a8164a..8ff53b1 100644
--- a/src/mainboard/intel/sklrvp/dsdt.asl
+++ b/src/mainboard/intel/sklrvp/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/intel/sklrvp/fadt.c b/src/mainboard/intel/sklrvp/fadt.c
index 83a0d36..40ed7d2 100644
--- a/src/mainboard/intel/sklrvp/fadt.c
+++ b/src/mainboard/intel/sklrvp/fadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/sklrvp/gpio_rvp3.h b/src/mainboard/intel/sklrvp/gpio_rvp3.h
index c0dbb13..8630565 100644
--- a/src/mainboard/intel/sklrvp/gpio_rvp3.h
+++ b/src/mainboard/intel/sklrvp/gpio_rvp3.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _GPIORVP3_H_
 #define _GPIORVP3_H_
diff --git a/src/mainboard/intel/sklrvp/mainboard.c b/src/mainboard/intel/sklrvp/mainboard.c
index 5c5bd69..69e985b 100644
--- a/src/mainboard/intel/sklrvp/mainboard.c
+++ b/src/mainboard/intel/sklrvp/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/intel/sklrvp/pei_data.c b/src/mainboard/intel/sklrvp/pei_data.c
index b5302b9..f368e8c 100644
--- a/src/mainboard/intel/sklrvp/pei_data.c
+++ b/src/mainboard/intel/sklrvp/pei_data.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/sklrvp/ramstage.c b/src/mainboard/intel/sklrvp/ramstage.c
index c2cd08f..c059e09 100644
--- a/src/mainboard/intel/sklrvp/ramstage.c
+++ b/src/mainboard/intel/sklrvp/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "gpio_rvp3.h"
diff --git a/src/mainboard/intel/sklrvp/romstage.c b/src/mainboard/intel/sklrvp/romstage.c
index aaa8b8d..222261c 100644
--- a/src/mainboard/intel/sklrvp/romstage.c
+++ b/src/mainboard/intel/sklrvp/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/intel/sklrvp/spd/Makefile.inc b/src/mainboard/intel/sklrvp/spd/Makefile.inc
index d7877aa..38615ec 100644
--- a/src/mainboard/intel/sklrvp/spd/Makefile.inc
+++ b/src/mainboard/intel/sklrvp/spd/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/intel/sklrvp/spd/spd.c b/src/mainboard/intel/sklrvp/spd/spd.c
index 34a0999..11001bf 100644
--- a/src/mainboard/intel/sklrvp/spd/spd.c
+++ b/src/mainboard/intel/sklrvp/spd/spd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/byteorder.h>
diff --git a/src/mainboard/intel/sklrvp/spd/spd.h b/src/mainboard/intel/sklrvp/spd/spd.h
index 18d4e68..c70bc24 100644
--- a/src/mainboard/intel/sklrvp/spd/spd.h
+++ b/src/mainboard/intel/sklrvp/spd/spd.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _MAINBOARD_SPD_H_
diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.inc
index d94e5fd..416a049 100755
--- a/src/mainboard/intel/strago/Makefile.inc
+++ b/src/mainboard/intel/strago/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += spd
diff --git a/src/mainboard/intel/strago/acpi/chromeos.asl b/src/mainboard/intel/strago/acpi/chromeos.asl
index 4ba3857..33761a8 100644
--- a/src/mainboard/intel/strago/acpi/chromeos.asl
+++ b/src/mainboard/intel/strago/acpi/chromeos.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/intel/strago/acpi/dptf.asl b/src/mainboard/intel/strago/acpi/dptf.asl
index 4b85449..2d5e1a9 100755
--- a/src/mainboard/intel/strago/acpi/dptf.asl
+++ b/src/mainboard/intel/strago/acpi/dptf.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define DPTF_TSR0_SENSOR_ID	0
diff --git a/src/mainboard/intel/strago/acpi/ec.asl b/src/mainboard/intel/strago/acpi/ec.asl
index e03c180..35d8474 100755
--- a/src/mainboard/intel/strago/acpi/ec.asl
+++ b/src/mainboard/intel/strago/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/intel/strago/acpi/mainboard.asl b/src/mainboard/intel/strago/acpi/mainboard.asl
index eefa005..a61ce99 100755
--- a/src/mainboard/intel/strago/acpi/mainboard.asl
+++ b/src/mainboard/intel/strago/acpi/mainboard.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "onboard.h"
diff --git a/src/mainboard/intel/strago/acpi/superio.asl b/src/mainboard/intel/strago/acpi/superio.asl
index 0d4bc2a..7128437 100755
--- a/src/mainboard/intel/strago/acpi/superio.asl
+++ b/src/mainboard/intel/strago/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mainboard configuration */
diff --git a/src/mainboard/intel/strago/acpi_tables.c b/src/mainboard/intel/strago/acpi_tables.c
index 47c8933..d8a65d6 100755
--- a/src/mainboard/intel/strago/acpi_tables.c
+++ b/src/mainboard/intel/strago/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/strago/boardid.c b/src/mainboard/intel/strago/boardid.c
index 432e7c6..543629b 100644
--- a/src/mainboard/intel/strago/boardid.c
+++ b/src/mainboard/intel/strago/boardid.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boardid.h>
diff --git a/src/mainboard/intel/strago/chromeos.c b/src/mainboard/intel/strago/chromeos.c
index 8e4f984..9d8d044 100755
--- a/src/mainboard/intel/strago/chromeos.c
+++ b/src/mainboard/intel/strago/chromeos.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/strago/cmos.layout b/src/mainboard/intel/strago/cmos.layout
index b773b09..474f363 100644
--- a/src/mainboard/intel/strago/cmos.layout
+++ b/src/mainboard/intel/strago/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/strago/com_init.c b/src/mainboard/intel/strago/com_init.c
index 309a73d..f392ec2 100755
--- a/src/mainboard/intel/strago/com_init.c
+++ b/src/mainboard/intel/strago/com_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/strago/dsdt.asl b/src/mainboard/intel/strago/dsdt.asl
index 20c82bd..ec51aec 100755
--- a/src/mainboard/intel/strago/dsdt.asl
+++ b/src/mainboard/intel/strago/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/intel/strago/ec.c b/src/mainboard/intel/strago/ec.c
index 60e80d3..1b50399 100755
--- a/src/mainboard/intel/strago/ec.c
+++ b/src/mainboard/intel/strago/ec.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/intel/strago/ec.h b/src/mainboard/intel/strago/ec.h
index c5315da..9d3184c 100755
--- a/src/mainboard/intel/strago/ec.h
+++ b/src/mainboard/intel/strago/ec.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_EC_H
diff --git a/src/mainboard/intel/strago/fadt.c b/src/mainboard/intel/strago/fadt.c
index 9f08240..f98213d 100755
--- a/src/mainboard/intel/strago/fadt.c
+++ b/src/mainboard/intel/strago/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/acpi.h>
diff --git a/src/mainboard/intel/strago/gpio.c b/src/mainboard/intel/strago/gpio.c
index 3ca07e6..edf2276 100755
--- a/src/mainboard/intel/strago/gpio.c
+++ b/src/mainboard/intel/strago/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/intel/strago/gpio.h b/src/mainboard/intel/strago/gpio.h
index 9100c24..42e6f6e 100644
--- a/src/mainboard/intel/strago/gpio.h
+++ b/src/mainboard/intel/strago/gpio.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _BOARD_GPIO_H_
 #define _BOARD_GPIO_H_
diff --git a/src/mainboard/intel/strago/gpio_bcrd2.c b/src/mainboard/intel/strago/gpio_bcrd2.c
index 3b53842..8c104f4 100644
--- a/src/mainboard/intel/strago/gpio_bcrd2.c
+++ b/src/mainboard/intel/strago/gpio_bcrd2.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/intel/strago/gpio_dvt.c b/src/mainboard/intel/strago/gpio_dvt.c
index 920c9d4..cc96e41 100755
--- a/src/mainboard/intel/strago/gpio_dvt.c
+++ b/src/mainboard/intel/strago/gpio_dvt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/intel/strago/irqroute.c b/src/mainboard/intel/strago/irqroute.c
index e993c7f..7ea00f6 100644
--- a/src/mainboard/intel/strago/irqroute.c
+++ b/src/mainboard/intel/strago/irqroute.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/intel/strago/irqroute.h b/src/mainboard/intel/strago/irqroute.h
index e66c87f..f26144a 100644
--- a/src/mainboard/intel/strago/irqroute.h
+++ b/src/mainboard/intel/strago/irqroute.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/irq.h>
diff --git a/src/mainboard/intel/strago/mainboard.c b/src/mainboard/intel/strago/mainboard.c
index 60165e0..036bab2 100755
--- a/src/mainboard/intel/strago/mainboard.c
+++ b/src/mainboard/intel/strago/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/mainboard/intel/strago/onboard.h b/src/mainboard/intel/strago/onboard.h
index 4b4403c..915bd90 100755
--- a/src/mainboard/intel/strago/onboard.h
+++ b/src/mainboard/intel/strago/onboard.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ONBOARD_H
diff --git a/src/mainboard/intel/strago/ramstage.c b/src/mainboard/intel/strago/ramstage.c
index c51179b..a9642cc 100644
--- a/src/mainboard/intel/strago/ramstage.c
+++ b/src/mainboard/intel/strago/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/ramstage.h>
diff --git a/src/mainboard/intel/strago/romstage.c b/src/mainboard/intel/strago/romstage.c
index 07485ab..1661c13 100755
--- a/src/mainboard/intel/strago/romstage.c
+++ b/src/mainboard/intel/strago/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/intel/strago/smihandler.c b/src/mainboard/intel/strago/smihandler.c
index 42cc7d7..f46635e 100755
--- a/src/mainboard/intel/strago/smihandler.c
+++ b/src/mainboard/intel/strago/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/intel/strago/spd/Makefile.inc b/src/mainboard/intel/strago/spd/Makefile.inc
index 6ecd47e..ab388aa 100755
--- a/src/mainboard/intel/strago/spd/Makefile.inc
+++ b/src/mainboard/intel/strago/spd/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += spd.c
diff --git a/src/mainboard/intel/strago/spd/spd.c b/src/mainboard/intel/strago/spd/spd.c
index a37b4ac..e614baa 100755
--- a/src/mainboard/intel/strago/spd/spd.c
+++ b/src/mainboard/intel/strago/spd/spd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/mainboard/intel/strago/w25q64.c b/src/mainboard/intel/strago/w25q64.c
index 3af7b81..a253670 100755
--- a/src/mainboard/intel/strago/w25q64.c
+++ b/src/mainboard/intel/strago/w25q64.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/spi.h>
diff --git a/src/mainboard/intel/truxton/irq_tables.c b/src/mainboard/intel/truxton/irq_tables.c
index d8499b6..9ce550f 100644
--- a/src/mainboard/intel/truxton/irq_tables.c
+++ b/src/mainboard/intel/truxton/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/mainboard/intel/truxton/mptable.c b/src/mainboard/intel/truxton/mptable.c
index 6465db7..fba0fc0 100644
--- a/src/mainboard/intel/truxton/mptable.c
+++ b/src/mainboard/intel/truxton/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/intel/truxton/romstage.c b/src/mainboard/intel/truxton/romstage.c
index 46e68fc..b2b7c9b 100644
--- a/src/mainboard/intel/truxton/romstage.c
+++ b/src/mainboard/intel/truxton/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/wtm2/Makefile.inc b/src/mainboard/intel/wtm2/Makefile.inc
index 78bd51a..0a650ce 100644
--- a/src/mainboard/intel/wtm2/Makefile.inc
+++ b/src/mainboard/intel/wtm2/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += chromeos.c
diff --git a/src/mainboard/intel/wtm2/acpi/chromeos.asl b/src/mainboard/intel/wtm2/acpi/chromeos.asl
index 9b7727e..387af24 100644
--- a/src/mainboard/intel/wtm2/acpi/chromeos.asl
+++ b/src/mainboard/intel/wtm2/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/intel/wtm2/acpi/mainboard.asl b/src/mainboard/intel/wtm2/acpi/mainboard.asl
index f37b8b7..54b1d8b 100644
--- a/src/mainboard/intel/wtm2/acpi/mainboard.asl
+++ b/src/mainboard/intel/wtm2/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PWRB)
diff --git a/src/mainboard/intel/wtm2/acpi/platform.asl b/src/mainboard/intel/wtm2/acpi/platform.asl
index 24ddc91..9202029 100644
--- a/src/mainboard/intel/wtm2/acpi/platform.asl
+++ b/src/mainboard/intel/wtm2/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/intel/wtm2/acpi/superio.asl b/src/mainboard/intel/wtm2/acpi/superio.asl
index c9c14e4..1ae3797 100644
--- a/src/mainboard/intel/wtm2/acpi/superio.asl
+++ b/src/mainboard/intel/wtm2/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/intel/wtm2/acpi/thermal.asl b/src/mainboard/intel/wtm2/acpi/thermal.asl
index 061347c..884598e 100644
--- a/src/mainboard/intel/wtm2/acpi/thermal.asl
+++ b/src/mainboard/intel/wtm2/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/intel/wtm2/acpi_tables.c b/src/mainboard/intel/wtm2/acpi_tables.c
index a960397..78668e9 100644
--- a/src/mainboard/intel/wtm2/acpi_tables.c
+++ b/src/mainboard/intel/wtm2/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/wtm2/chromeos.c b/src/mainboard/intel/wtm2/chromeos.c
index fe80063..a3981ab 100644
--- a/src/mainboard/intel/wtm2/chromeos.c
+++ b/src/mainboard/intel/wtm2/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/wtm2/cmos.layout b/src/mainboard/intel/wtm2/cmos.layout
index 23faeeb..31a1785 100644
--- a/src/mainboard/intel/wtm2/cmos.layout
+++ b/src/mainboard/intel/wtm2/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/intel/wtm2/dsdt.asl b/src/mainboard/intel/wtm2/dsdt.asl
index ac12eb7..037037a 100644
--- a/src/mainboard/intel/wtm2/dsdt.asl
+++ b/src/mainboard/intel/wtm2/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define ENABLE_TPM
diff --git a/src/mainboard/intel/wtm2/fadt.c b/src/mainboard/intel/wtm2/fadt.c
index 61e0439..02ff917 100644
--- a/src/mainboard/intel/wtm2/fadt.c
+++ b/src/mainboard/intel/wtm2/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/intel/wtm2/gpio.h b/src/mainboard/intel/wtm2/gpio.h
index 8abb593..71789bc 100644
--- a/src/mainboard/intel/wtm2/gpio.h
+++ b/src/mainboard/intel/wtm2/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef INTEL_WTM2_GPIO_H
diff --git a/src/mainboard/intel/wtm2/graphics.c b/src/mainboard/intel/wtm2/graphics.c
index 64baf18..a9c3dc3 100644
--- a/src/mainboard/intel/wtm2/graphics.c
+++ b/src/mainboard/intel/wtm2/graphics.c
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 /* this file was for the most part machine generated, and in future
  * will be all machine generated. Avoid editing.
diff --git a/src/mainboard/intel/wtm2/hda_verb.c b/src/mainboard/intel/wtm2/hda_verb.c
index 1eb70c5..bf2a568 100644
--- a/src/mainboard/intel/wtm2/hda_verb.c
+++ b/src/mainboard/intel/wtm2/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/intel/wtm2/i915.c b/src/mainboard/intel/wtm2/i915.c
index 4a8d25b..e5cb1ca 100644
--- a/src/mainboard/intel/wtm2/i915.c
+++ b/src/mainboard/intel/wtm2/i915.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c
index 6027ca7..fbe66cb 100644
--- a/src/mainboard/intel/wtm2/mainboard.c
+++ b/src/mainboard/intel/wtm2/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/intel/wtm2/pei_data.c b/src/mainboard/intel/wtm2/pei_data.c
index f35ca0e..de3f95a 100644
--- a/src/mainboard/intel/wtm2/pei_data.c
+++ b/src/mainboard/intel/wtm2/pei_data.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/intel/wtm2/romstage.c b/src/mainboard/intel/wtm2/romstage.c
index 4435d64..d5bf188 100644
--- a/src/mainboard/intel/wtm2/romstage.c
+++ b/src/mainboard/intel/wtm2/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/intel/wtm2/thermal.h b/src/mainboard/intel/wtm2/thermal.h
index 5863466..a48a01b 100644
--- a/src/mainboard/intel/wtm2/thermal.h
+++ b/src/mainboard/intel/wtm2/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef WTM2_THERMAL_H
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/cpu.asl b/src/mainboard/iwave/iWRainbowG6/acpi/cpu.asl
index a4bef4f..6342c20 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/cpu.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Core (2) Duo CPU node support
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/ec.asl b/src/mainboard/iwave/iWRainbowG6/acpi/ec.asl
index 1fe5091..9f8daa4 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/ec.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/northbridge_pci_irqs.asl b/src/mainboard/iwave/iWRainbowG6/acpi/northbridge_pci_irqs.asl
index c104acc..1080044 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/northbridge_pci_irqs.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/northbridge_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/platform.asl b/src/mainboard/iwave/iWRainbowG6/acpi/platform.asl
index e10cd89..bebd0e9 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/platform.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/sleepstates.asl b/src/mainboard/iwave/iWRainbowG6/acpi/sleepstates.asl
index 460fd75..ac099c3 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/sleepstates.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(4){0x0,0x0,0,0})
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/southbridge_pci_irqs.asl b/src/mainboard/iwave/iWRainbowG6/acpi/southbridge_pci_irqs.asl
index 559092c..7d69dfb 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/southbridge_pci_irqs.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/southbridge_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/superio.asl b/src/mainboard/iwave/iWRainbowG6/acpi/superio.asl
index 05c96ea..0ab967a 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/superio.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl b/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl
index b1be7b7..e1f8ce3 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl
+++ b/src/mainboard/iwave/iWRainbowG6/acpi/thermal.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/iwave/iWRainbowG6/acpi_tables.c b/src/mainboard/iwave/iWRainbowG6/acpi_tables.c
index ef7ad44..b1f815a 100644
--- a/src/mainboard/iwave/iWRainbowG6/acpi_tables.c
+++ b/src/mainboard/iwave/iWRainbowG6/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/iwave/iWRainbowG6/cmos.layout b/src/mainboard/iwave/iWRainbowG6/cmos.layout
index 49f0940..0e6e04a 100644
--- a/src/mainboard/iwave/iWRainbowG6/cmos.layout
+++ b/src/mainboard/iwave/iWRainbowG6/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/iwave/iWRainbowG6/dsdt.asl b/src/mainboard/iwave/iWRainbowG6/dsdt.asl
index 3115bb1..d5df2f2 100644
--- a/src/mainboard/iwave/iWRainbowG6/dsdt.asl
+++ b/src/mainboard/iwave/iWRainbowG6/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/iwave/iWRainbowG6/fadt.c b/src/mainboard/iwave/iWRainbowG6/fadt.c
index 8befd7b..4f7fec0 100644
--- a/src/mainboard/iwave/iWRainbowG6/fadt.c
+++ b/src/mainboard/iwave/iWRainbowG6/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/iwave/iWRainbowG6/hda_verb.c b/src/mainboard/iwave/iWRainbowG6/hda_verb.c
index 21b230b..f11f614 100644
--- a/src/mainboard/iwave/iWRainbowG6/hda_verb.c
+++ b/src/mainboard/iwave/iWRainbowG6/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/iwave/iWRainbowG6/irq_tables.c b/src/mainboard/iwave/iWRainbowG6/irq_tables.c
index 65631f9..2956f42 100644
--- a/src/mainboard/iwave/iWRainbowG6/irq_tables.c
+++ b/src/mainboard/iwave/iWRainbowG6/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/iwave/iWRainbowG6/mainboard.c b/src/mainboard/iwave/iWRainbowG6/mainboard.c
index c888719..75b1266 100644
--- a/src/mainboard/iwave/iWRainbowG6/mainboard.c
+++ b/src/mainboard/iwave/iWRainbowG6/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/iwave/iWRainbowG6/mptable.c b/src/mainboard/iwave/iWRainbowG6/mptable.c
index be9a4a0..ca6e7a0 100644
--- a/src/mainboard/iwave/iWRainbowG6/mptable.c
+++ b/src/mainboard/iwave/iWRainbowG6/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/iwave/iWRainbowG6/romstage.c b/src/mainboard/iwave/iWRainbowG6/romstage.c
index 62fb3aa..30bcdab 100644
--- a/src/mainboard/iwave/iWRainbowG6/romstage.c
+++ b/src/mainboard/iwave/iWRainbowG6/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/jetway/j7f2/irq_tables.c b/src/mainboard/jetway/j7f2/irq_tables.c
index 6a3a8be..42fb4bc 100644
--- a/src/mainboard/jetway/j7f2/irq_tables.c
+++ b/src/mainboard/jetway/j7f2/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/jetway/j7f2/romstage.c b/src/mainboard/jetway/j7f2/romstage.c
index 2c373eb..20cfa8d 100644
--- a/src/mainboard/jetway/j7f2/romstage.c
+++ b/src/mainboard/jetway/j7f2/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
index 1f14ad4..bf4c8d0 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index b4a1ed8..0582964 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_JETWAY_NF81_T56N_LF
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Makefile.inc b/src/mainboard/jetway/nf81-t56n-lf/Makefile.inc
index e16e999..a1e39c5 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Makefile.inc
+++ b/src/mainboard/jetway/nf81-t56n-lf/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h b/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h
+++ b/src/mainboard/jetway/nf81-t56n-lf/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c b/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
index 79dce2f..0f2c1a6 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "PlatformGnbPcieComplex.h"
diff --git a/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcieComplex.h b/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcieComplex.h
index c9f933b..c9281dc 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcieComplex.h
+++ b/src/mainboard/jetway/nf81-t56n-lf/PlatformGnbPcieComplex.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl
index 998b9fa..f8cb779 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
index 9a5a292..80bf788 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/sata.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/sata.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/sleep.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/sleep.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/superio.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/superio.asl
index fc555fe..e836dcd 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/superio.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/superio.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <drivers/pc80/ps2_controller.asl>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
index dead4f2..d6b450c 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
index 666d826..b0e3d4e 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
index e08da55..9f2dda4 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
+++ b/src/mainboard/jetway/nf81-t56n-lf/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb b/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb
index 3345485..bac3251 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb
+++ b/src/mainboard/jetway/nf81-t56n-lf/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
index 64b00d0..96d4a80 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
+++ b/src/mainboard/jetway/nf81-t56n-lf/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c b/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c
index ed0935a..62b37cd 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
index 9f6cf78..99d05f1 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/BiosCallOuts.h>
diff --git a/src/mainboard/jetway/nf81-t56n-lf/mptable.c b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
index 29e7b22..57c5b6d 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/mptable.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/jetway/nf81-t56n-lf/platform_cfg.h b/src/mainboard/jetway/nf81-t56n-lf/platform_cfg.h
index c8e9909..74559e3 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/platform_cfg.h
+++ b/src/mainboard/jetway/nf81-t56n-lf/platform_cfg.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/jetway/nf81-t56n-lf/romstage.c b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
index 61a6584..ab6ec81 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/romstage.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl b/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/jetway/pa78vm5/acpi/ide.asl b/src/mainboard/jetway/pa78vm5/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/ide.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/jetway/pa78vm5/acpi/routing.asl b/src/mainboard/jetway/pa78vm5/acpi/routing.asl
index 09c8fac..66d0057 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/routing.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/jetway/pa78vm5/acpi/sata.asl b/src/mainboard/jetway/pa78vm5/acpi/sata.asl
index d189567..164dc1a 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/sata.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/jetway/pa78vm5/acpi/usb.asl b/src/mainboard/jetway/pa78vm5/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/jetway/pa78vm5/acpi/usb.asl
+++ b/src/mainboard/jetway/pa78vm5/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/jetway/pa78vm5/acpi_tables.c b/src/mainboard/jetway/pa78vm5/acpi_tables.c
index 611862c..fa965a2 100644
--- a/src/mainboard/jetway/pa78vm5/acpi_tables.c
+++ b/src/mainboard/jetway/pa78vm5/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/jetway/pa78vm5/dsdt.asl b/src/mainboard/jetway/pa78vm5/dsdt.asl
index 909c9c6..bd4c157 100644
--- a/src/mainboard/jetway/pa78vm5/dsdt.asl
+++ b/src/mainboard/jetway/pa78vm5/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/jetway/pa78vm5/get_bus_conf.c b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
index 3c274a8..35c9a13 100644
--- a/src/mainboard/jetway/pa78vm5/get_bus_conf.c
+++ b/src/mainboard/jetway/pa78vm5/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/jetway/pa78vm5/irq_tables.c b/src/mainboard/jetway/pa78vm5/irq_tables.c
index ce147b4..df01e15 100644
--- a/src/mainboard/jetway/pa78vm5/irq_tables.c
+++ b/src/mainboard/jetway/pa78vm5/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/jetway/pa78vm5/mainboard.c b/src/mainboard/jetway/pa78vm5/mainboard.c
index 9f854ef..d8f9cce 100644
--- a/src/mainboard/jetway/pa78vm5/mainboard.c
+++ b/src/mainboard/jetway/pa78vm5/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index d59f26d..b1514b1 100644
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/jetway/pa78vm5/resourcemap.c b/src/mainboard/jetway/pa78vm5/resourcemap.c
index 7a8ccb2..6ae88c9 100644
--- a/src/mainboard/jetway/pa78vm5/resourcemap.c
+++ b/src/mainboard/jetway/pa78vm5/resourcemap.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/jetway/pa78vm5/romstage.c b/src/mainboard/jetway/pa78vm5/romstage.c
index ac66ada..96e91b6 100644
--- a/src/mainboard/jetway/pa78vm5/romstage.c
+++ b/src/mainboard/jetway/pa78vm5/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */
diff --git a/src/mainboard/kontron/986lcd-m/acpi/ec.asl b/src/mainboard/kontron/986lcd-m/acpi/ec.asl
index 70cb110..4eb972c 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/ec.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/kontron/986lcd-m/acpi/i945_pci_irqs.asl b/src/mainboard/kontron/986lcd-m/acpi/i945_pci_irqs.asl
index c104acc..1080044 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/i945_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/kontron/986lcd-m/acpi/ich7_pci_irqs.asl b/src/mainboard/kontron/986lcd-m/acpi/ich7_pci_irqs.asl
index 559092c..7d69dfb 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/ich7_pci_irqs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/kontron/986lcd-m/acpi/platform.asl b/src/mainboard/kontron/986lcd-m/acpi/platform.asl
index 32d5468..4a2c4d2 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/platform.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/kontron/986lcd-m/acpi/superio.asl b/src/mainboard/kontron/986lcd-m/acpi/superio.asl
index b3b7796..da1641f 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/superio.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/kontron/986lcd-m/acpi/thermal.asl b/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
index c889f2f..e49dc3b 100644
--- a/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
+++ b/src/mainboard/kontron/986lcd-m/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/kontron/986lcd-m/acpi_tables.c b/src/mainboard/kontron/986lcd-m/acpi_tables.c
index 5972382..47c0001 100644
--- a/src/mainboard/kontron/986lcd-m/acpi_tables.c
+++ b/src/mainboard/kontron/986lcd-m/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/kontron/986lcd-m/cmos.layout b/src/mainboard/kontron/986lcd-m/cmos.layout
index 51950ed..2c26a56 100644
--- a/src/mainboard/kontron/986lcd-m/cmos.layout
+++ b/src/mainboard/kontron/986lcd-m/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/kontron/986lcd-m/dsdt.asl b/src/mainboard/kontron/986lcd-m/dsdt.asl
index 0740034..6412956 100644
--- a/src/mainboard/kontron/986lcd-m/dsdt.asl
+++ b/src/mainboard/kontron/986lcd-m/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/kontron/986lcd-m/irq_tables.c b/src/mainboard/kontron/986lcd-m/irq_tables.c
index 217d204..bb615bf 100644
--- a/src/mainboard/kontron/986lcd-m/irq_tables.c
+++ b/src/mainboard/kontron/986lcd-m/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index 34ee29c..5356317 100644
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c
index 2737425..dfcfa5b 100644
--- a/src/mainboard/kontron/986lcd-m/mptable.c
+++ b/src/mainboard/kontron/986lcd-m/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/kontron/986lcd-m/romstage.c b/src/mainboard/kontron/986lcd-m/romstage.c
index 06811eb..3de8e6b 100644
--- a/src/mainboard/kontron/986lcd-m/romstage.c
+++ b/src/mainboard/kontron/986lcd-m/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/kontron/kt690/acpi/ide.asl b/src/mainboard/kontron/kt690/acpi/ide.asl
index d84fc2e..13aeede 100644
--- a/src/mainboard/kontron/kt690/acpi/ide.asl
+++ b/src/mainboard/kontron/kt690/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/kontron/kt690/acpi/routing.asl b/src/mainboard/kontron/kt690/acpi/routing.asl
index 814150b..f0124e8 100644
--- a/src/mainboard/kontron/kt690/acpi/routing.asl
+++ b/src/mainboard/kontron/kt690/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/kontron/kt690/acpi/sata.asl b/src/mainboard/kontron/kt690/acpi/sata.asl
index ea8e4f5..0235ef0 100644
--- a/src/mainboard/kontron/kt690/acpi/sata.asl
+++ b/src/mainboard/kontron/kt690/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/kontron/kt690/acpi/usb.asl b/src/mainboard/kontron/kt690/acpi/usb.asl
index fd39183..707aa2e 100644
--- a/src/mainboard/kontron/kt690/acpi/usb.asl
+++ b/src/mainboard/kontron/kt690/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/kontron/kt690/acpi_tables.c b/src/mainboard/kontron/kt690/acpi_tables.c
index 628abfd..cf14699 100644
--- a/src/mainboard/kontron/kt690/acpi_tables.c
+++ b/src/mainboard/kontron/kt690/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/kontron/kt690/cmos.layout b/src/mainboard/kontron/kt690/cmos.layout
index 6da2266..d338a10 100644
--- a/src/mainboard/kontron/kt690/cmos.layout
+++ b/src/mainboard/kontron/kt690/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/kontron/kt690/dsdt.asl b/src/mainboard/kontron/kt690/dsdt.asl
index 5b51d5e..6c5898a 100644
--- a/src/mainboard/kontron/kt690/dsdt.asl
+++ b/src/mainboard/kontron/kt690/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/kontron/kt690/fadt.c b/src/mainboard/kontron/kt690/fadt.c
index 2a2d710..d91f818 100644
--- a/src/mainboard/kontron/kt690/fadt.c
+++ b/src/mainboard/kontron/kt690/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/kontron/kt690/get_bus_conf.c b/src/mainboard/kontron/kt690/get_bus_conf.c
index d35083c..6545b7d 100644
--- a/src/mainboard/kontron/kt690/get_bus_conf.c
+++ b/src/mainboard/kontron/kt690/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/kontron/kt690/irq_tables.c b/src/mainboard/kontron/kt690/irq_tables.c
index f2c21fe..3d65966 100644
--- a/src/mainboard/kontron/kt690/irq_tables.c
+++ b/src/mainboard/kontron/kt690/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/kontron/kt690/mainboard.c b/src/mainboard/kontron/kt690/mainboard.c
index 3256300..ca4c6e7 100644
--- a/src/mainboard/kontron/kt690/mainboard.c
+++ b/src/mainboard/kontron/kt690/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c
index 2c3a1e4..7118093 100644
--- a/src/mainboard/kontron/kt690/mptable.c
+++ b/src/mainboard/kontron/kt690/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/kontron/kt690/resourcemap.c b/src/mainboard/kontron/kt690/resourcemap.c
index e2a3332..2c07586 100644
--- a/src/mainboard/kontron/kt690/resourcemap.c
+++ b/src/mainboard/kontron/kt690/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_kt690_resource_map(void)
diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c
index d8db6aa..6f314f4 100644
--- a/src/mainboard/kontron/kt690/romstage.c
+++ b/src/mainboard/kontron/kt690/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/kontron/ktqm77/acpi/mainboard.asl b/src/mainboard/kontron/ktqm77/acpi/mainboard.asl
index b17c3a6..e3834bb 100644
--- a/src/mainboard/kontron/ktqm77/acpi/mainboard.asl
+++ b/src/mainboard/kontron/ktqm77/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB) {
diff --git a/src/mainboard/kontron/ktqm77/acpi/platform.asl b/src/mainboard/kontron/ktqm77/acpi/platform.asl
index 4f3391c..7ec75cd 100644
--- a/src/mainboard/kontron/ktqm77/acpi/platform.asl
+++ b/src/mainboard/kontron/ktqm77/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/kontron/ktqm77/acpi/thermal.asl b/src/mainboard/kontron/ktqm77/acpi/thermal.asl
index 01e8f8d..df11308 100644
--- a/src/mainboard/kontron/ktqm77/acpi/thermal.asl
+++ b/src/mainboard/kontron/ktqm77/acpi/thermal.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/kontron/ktqm77/acpi_tables.c b/src/mainboard/kontron/ktqm77/acpi_tables.c
index c2fa4bb..30bd61a 100644
--- a/src/mainboard/kontron/ktqm77/acpi_tables.c
+++ b/src/mainboard/kontron/ktqm77/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/kontron/ktqm77/cmos.layout b/src/mainboard/kontron/ktqm77/cmos.layout
index c71e235..a0eddf9 100644
--- a/src/mainboard/kontron/ktqm77/cmos.layout
+++ b/src/mainboard/kontron/ktqm77/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/kontron/ktqm77/dsdt.asl b/src/mainboard/kontron/ktqm77/dsdt.asl
index 9dbe7e5..fa35691 100644
--- a/src/mainboard/kontron/ktqm77/dsdt.asl
+++ b/src/mainboard/kontron/ktqm77/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/kontron/ktqm77/gpio.h b/src/mainboard/kontron/ktqm77/gpio.h
index 3f9492c..a8e364e 100644
--- a/src/mainboard/kontron/ktqm77/gpio.h
+++ b/src/mainboard/kontron/ktqm77/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef KTQM77_GPIO_H
diff --git a/src/mainboard/kontron/ktqm77/hda_verb.c b/src/mainboard/kontron/ktqm77/hda_verb.c
index 77b6aaf..1be704c 100644
--- a/src/mainboard/kontron/ktqm77/hda_verb.c
+++ b/src/mainboard/kontron/ktqm77/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index 9999e2e..4887155 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/kontron/ktqm77/romstage.c b/src/mainboard/kontron/ktqm77/romstage.c
index 57f8542..3e82241 100644
--- a/src/mainboard/kontron/ktqm77/romstage.c
+++ b/src/mainboard/kontron/ktqm77/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/kontron/ktqm77/thermal.h b/src/mainboard/kontron/ktqm77/thermal.h
index 3666ad7..47fdd8f 100644
--- a/src/mainboard/kontron/ktqm77/thermal.h
+++ b/src/mainboard/kontron/ktqm77/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef KTQM77_THERMAL_H
diff --git a/src/mainboard/lanner/em8510/irq_tables.c b/src/mainboard/lanner/em8510/irq_tables.c
index e36f929..d6b113d 100644
--- a/src/mainboard/lanner/em8510/irq_tables.c
+++ b/src/mainboard/lanner/em8510/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/lanner/em8510/romstage.c b/src/mainboard/lanner/em8510/romstage.c
index d025d92..7586fb1 100644
--- a/src/mainboard/lanner/em8510/romstage.c
+++ b/src/mainboard/lanner/em8510/romstage.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/g505s/BiosCallOuts.c b/src/mainboard/lenovo/g505s/BiosCallOuts.c
index f5443ae..9e8e1b8 100644
--- a/src/mainboard/lenovo/g505s/BiosCallOuts.c
+++ b/src/mainboard/lenovo/g505s/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/lenovo/g505s/Kconfig b/src/mainboard/lenovo/g505s/Kconfig
index 4481d72..d8f15a8 100644
--- a/src/mainboard/lenovo/g505s/Kconfig
+++ b/src/mainboard/lenovo/g505s/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_LENOVO_G505S
diff --git a/src/mainboard/lenovo/g505s/Makefile.inc b/src/mainboard/lenovo/g505s/Makefile.inc
index a683d4a..37f110c 100644
--- a/src/mainboard/lenovo/g505s/Makefile.inc
+++ b/src/mainboard/lenovo/g505s/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += buildOpts.c
diff --git a/src/mainboard/lenovo/g505s/OptionsIds.h b/src/mainboard/lenovo/g505s/OptionsIds.h
index c341a40..9ee91ad 100644
--- a/src/mainboard/lenovo/g505s/OptionsIds.h
+++ b/src/mainboard/lenovo/g505s/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/lenovo/g505s/PlatformGnbPcie.c b/src/mainboard/lenovo/g505s/PlatformGnbPcie.c
index 5ea0a9b..a2af82b 100644
--- a/src/mainboard/lenovo/g505s/PlatformGnbPcie.c
+++ b/src/mainboard/lenovo/g505s/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "Porting.h"
diff --git a/src/mainboard/lenovo/g505s/acpi/gpe.asl b/src/mainboard/lenovo/g505s/acpi/gpe.asl
index 28230bd..d3b44c2 100644
--- a/src/mainboard/lenovo/g505s/acpi/gpe.asl
+++ b/src/mainboard/lenovo/g505s/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/lenovo/g505s/acpi/mainboard.asl b/src/mainboard/lenovo/g505s/acpi/mainboard.asl
index 9e372b2..cc6c0e0 100644
--- a/src/mainboard/lenovo/g505s/acpi/mainboard.asl
+++ b/src/mainboard/lenovo/g505s/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/lenovo/g505s/acpi/routing.asl b/src/mainboard/lenovo/g505s/acpi/routing.asl
index 809e3c6..56f77fb 100644
--- a/src/mainboard/lenovo/g505s/acpi/routing.asl
+++ b/src/mainboard/lenovo/g505s/acpi/routing.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* Routing is in System Bus scope */
diff --git a/src/mainboard/lenovo/g505s/acpi/sata.asl b/src/mainboard/lenovo/g505s/acpi/sata.asl
index bbd95d8..b09b369 100644
--- a/src/mainboard/lenovo/g505s/acpi/sata.asl
+++ b/src/mainboard/lenovo/g505s/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No SATA functionality */
diff --git a/src/mainboard/lenovo/g505s/acpi/si.asl b/src/mainboard/lenovo/g505s/acpi/si.asl
index 28cf633..a12496a 100644
--- a/src/mainboard/lenovo/g505s/acpi/si.asl
+++ b/src/mainboard/lenovo/g505s/acpi/si.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 	Scope(\_SI) {
 		Method(_SST, 1) {
diff --git a/src/mainboard/lenovo/g505s/acpi/sleep.asl b/src/mainboard/lenovo/g505s/acpi/sleep.asl
index ef1dc5d..5d84bde 100644
--- a/src/mainboard/lenovo/g505s/acpi/sleep.asl
+++ b/src/mainboard/lenovo/g505s/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/lenovo/g505s/acpi/thermal.asl b/src/mainboard/lenovo/g505s/acpi/thermal.asl
index 4c24d96..61ae494 100644
--- a/src/mainboard/lenovo/g505s/acpi/thermal.asl
+++ b/src/mainboard/lenovo/g505s/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No thermal zone functionality */
diff --git a/src/mainboard/lenovo/g505s/acpi/usb_oc.asl b/src/mainboard/lenovo/g505s/acpi/usb_oc.asl
index 74691ad..6eee042 100644
--- a/src/mainboard/lenovo/g505s/acpi/usb_oc.asl
+++ b/src/mainboard/lenovo/g505s/acpi/usb_oc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* USB overcurrent mapping pins.   */
diff --git a/src/mainboard/lenovo/g505s/acpi_tables.c b/src/mainboard/lenovo/g505s/acpi_tables.c
index f2f3e11..01ba895 100644
--- a/src/mainboard/lenovo/g505s/acpi_tables.c
+++ b/src/mainboard/lenovo/g505s/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/lenovo/g505s/buildOpts.c b/src/mainboard/lenovo/g505s/buildOpts.c
index abbd493..9f3e720 100644
--- a/src/mainboard/lenovo/g505s/buildOpts.c
+++ b/src/mainboard/lenovo/g505s/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/lenovo/g505s/cmos.layout b/src/mainboard/lenovo/g505s/cmos.layout
index 50750a8..0411766 100644
--- a/src/mainboard/lenovo/g505s/cmos.layout
+++ b/src/mainboard/lenovo/g505s/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/lenovo/g505s/devicetree.cb b/src/mainboard/lenovo/g505s/devicetree.cb
index 2d5a36f..addd2ec 100644
--- a/src/mainboard/lenovo/g505s/devicetree.cb
+++ b/src/mainboard/lenovo/g505s/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15rl/root_complex
 
diff --git a/src/mainboard/lenovo/g505s/dsdt.asl b/src/mainboard/lenovo/g505s/dsdt.asl
index b3ca33d..1fa99a9 100644
--- a/src/mainboard/lenovo/g505s/dsdt.asl
+++ b/src/mainboard/lenovo/g505s/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "mainboard.h"
diff --git a/src/mainboard/lenovo/g505s/irq_tables.c b/src/mainboard/lenovo/g505s/irq_tables.c
index 144dd90..70f9de5 100644
--- a/src/mainboard/lenovo/g505s/irq_tables.c
+++ b/src/mainboard/lenovo/g505s/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/lenovo/g505s/mainboard.c b/src/mainboard/lenovo/g505s/mainboard.c
index 7ac6725..f64d5bf 100644
--- a/src/mainboard/lenovo/g505s/mainboard.c
+++ b/src/mainboard/lenovo/g505s/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/lenovo/g505s/mptable.c b/src/mainboard/lenovo/g505s/mptable.c
index 107d35a..3dae53b 100644
--- a/src/mainboard/lenovo/g505s/mptable.c
+++ b/src/mainboard/lenovo/g505s/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/mainboard/lenovo/g505s/romstage.c b/src/mainboard/lenovo/g505s/romstage.c
index 9291ed6..c95b233 100644
--- a/src/mainboard/lenovo/g505s/romstage.c
+++ b/src/mainboard/lenovo/g505s/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <northbridge/amd/agesa/agesawrapper.h>
diff --git a/src/mainboard/lenovo/t400/Makefile.inc b/src/mainboard/lenovo/t400/Makefile.inc
index b2e5c2a..f6c2be8 100644
--- a/src/mainboard/lenovo/t400/Makefile.inc
+++ b/src/mainboard/lenovo/t400/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += dock.c
diff --git a/src/mainboard/lenovo/t400/acpi/dock.asl b/src/mainboard/lenovo/t400/acpi/dock.asl
index f817acf..855c601 100644
--- a/src/mainboard/lenovo/t400/acpi/dock.asl
+++ b/src/mainboard/lenovo/t400/acpi/dock.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/mainboard/lenovo/t400/acpi/gm45_pci_irqs.asl b/src/mainboard/lenovo/t400/acpi/gm45_pci_irqs.asl
index 76b49fa..c952bf5 100644
--- a/src/mainboard/lenovo/t400/acpi/gm45_pci_irqs.asl
+++ b/src/mainboard/lenovo/t400/acpi/gm45_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/t400/acpi/gpe.asl b/src/mainboard/lenovo/t400/acpi/gpe.asl
index e1c806f..2b09ba9 100644
--- a/src/mainboard/lenovo/t400/acpi/gpe.asl
+++ b/src/mainboard/lenovo/t400/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_GPE)
diff --git a/src/mainboard/lenovo/t400/acpi/graphics.asl b/src/mainboard/lenovo/t400/acpi/graphics.asl
index 8edf582..e51cd01 100644
--- a/src/mainboard/lenovo/t400/acpi/graphics.asl
+++ b/src/mainboard/lenovo/t400/acpi/graphics.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* WARNING
diff --git a/src/mainboard/lenovo/t400/acpi/ich9_pci_irqs.asl b/src/mainboard/lenovo/t400/acpi/ich9_pci_irqs.asl
index 6471262..ae32697 100644
--- a/src/mainboard/lenovo/t400/acpi/ich9_pci_irqs.asl
+++ b/src/mainboard/lenovo/t400/acpi/ich9_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/t400/acpi/platform.asl b/src/mainboard/lenovo/t400/acpi/platform.asl
index edcf641..dd7303f 100644
--- a/src/mainboard/lenovo/t400/acpi/platform.asl
+++ b/src/mainboard/lenovo/t400/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These come from the dynamically created CPU SSDT */
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index fa69e7a..b244cee 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/t400/cmos.layout b/src/mainboard/lenovo/t400/cmos.layout
index 2dc91bf..e062442 100644
--- a/src/mainboard/lenovo/t400/cmos.layout
+++ b/src/mainboard/lenovo/t400/cmos.layout
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t400/cstates.c b/src/mainboard/lenovo/t400/cstates.c
index 1062308..6b4da1c 100644
--- a/src/mainboard/lenovo/t400/cstates.c
+++ b/src/mainboard/lenovo/t400/cstates.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpigen.h>
diff --git a/src/mainboard/lenovo/t400/dock.c b/src/mainboard/lenovo/t400/dock.c
index 63d4563..b060917 100644
--- a/src/mainboard/lenovo/t400/dock.c
+++ b/src/mainboard/lenovo/t400/dock.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/mainboard/lenovo/t400/dock.h b/src/mainboard/lenovo/t400/dock.h
index 0b97531..a58f72e 100644
--- a/src/mainboard/lenovo/t400/dock.h
+++ b/src/mainboard/lenovo/t400/dock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THINKPAD_T400_DOCK_H
diff --git a/src/mainboard/lenovo/t400/dsdt.asl b/src/mainboard/lenovo/t400/dsdt.asl
index 6274755..3d2aca9 100644
--- a/src/mainboard/lenovo/t400/dsdt.asl
+++ b/src/mainboard/lenovo/t400/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/t400/fadt.c b/src/mainboard/lenovo/t400/fadt.c
index 3833d26..877248f 100644
--- a/src/mainboard/lenovo/t400/fadt.c
+++ b/src/mainboard/lenovo/t400/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/t400/hda_verb.c b/src/mainboard/lenovo/t400/hda_verb.c
index 423d10c..b0fe450 100644
--- a/src/mainboard/lenovo/t400/hda_verb.c
+++ b/src/mainboard/lenovo/t400/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/lenovo/t400/mainboard.c b/src/mainboard/lenovo/t400/mainboard.c
index 6348b9c..df63cbb 100644
--- a/src/mainboard/lenovo/t400/mainboard.c
+++ b/src/mainboard/lenovo/t400/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/t400/romstage.c b/src/mainboard/lenovo/t400/romstage.c
index a739d18..9b6fa03 100644
--- a/src/mainboard/lenovo/t400/romstage.c
+++ b/src/mainboard/lenovo/t400/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/lenovo/t400/smihandler.c b/src/mainboard/lenovo/t400/smihandler.c
index 622b31a..aa4ab8d 100644
--- a/src/mainboard/lenovo/t400/smihandler.c
+++ b/src/mainboard/lenovo/t400/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/t420s/Makefile.inc b/src/mainboard/lenovo/t420s/Makefile.inc
index b0743b5..909af4b 100644
--- a/src/mainboard/lenovo/t420s/Makefile.inc
+++ b/src/mainboard/lenovo/t420s/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/t420s/acpi/ec.asl b/src/mainboard/lenovo/t420s/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/t420s/acpi/ec.asl
+++ b/src/mainboard/lenovo/t420s/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/t420s/acpi/platform.asl b/src/mainboard/lenovo/t420s/acpi/platform.asl
index 232f7d9..42bc76c 100644
--- a/src/mainboard/lenovo/t420s/acpi/platform.asl
+++ b/src/mainboard/lenovo/t420s/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/t420s/acpi_tables.c b/src/mainboard/lenovo/t420s/acpi_tables.c
index bcedb02..5e41c8e 100644
--- a/src/mainboard/lenovo/t420s/acpi_tables.c
+++ b/src/mainboard/lenovo/t420s/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t420s/cmos.layout b/src/mainboard/lenovo/t420s/cmos.layout
index 77c0a11..4a9568e 100644
--- a/src/mainboard/lenovo/t420s/cmos.layout
+++ b/src/mainboard/lenovo/t420s/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t420s/dsdt.asl b/src/mainboard/lenovo/t420s/dsdt.asl
index 64e4e9f..1370b6b 100644
--- a/src/mainboard/lenovo/t420s/dsdt.asl
+++ b/src/mainboard/lenovo/t420s/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/t420s/hda_verb.c b/src/mainboard/lenovo/t420s/hda_verb.c
index 8d22a4b..71661a5 100644
--- a/src/mainboard/lenovo/t420s/hda_verb.c
+++ b/src/mainboard/lenovo/t420s/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : Conexant
diff --git a/src/mainboard/lenovo/t420s/mainboard.c b/src/mainboard/lenovo/t420s/mainboard.c
index 96180ec..93c8c1a 100644
--- a/src/mainboard/lenovo/t420s/mainboard.c
+++ b/src/mainboard/lenovo/t420s/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t420s/romstage.c b/src/mainboard/lenovo/t420s/romstage.c
index c225980..75710c6 100644
--- a/src/mainboard/lenovo/t420s/romstage.c
+++ b/src/mainboard/lenovo/t420s/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/byteorder.h>
diff --git a/src/mainboard/lenovo/t420s/smihandler.c b/src/mainboard/lenovo/t420s/smihandler.c
index e9bf100..0c4329b 100644
--- a/src/mainboard/lenovo/t420s/smihandler.c
+++ b/src/mainboard/lenovo/t420s/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/t420s/thermal.h b/src/mainboard/lenovo/t420s/thermal.h
index 62265bc..158cc67 100644
--- a/src/mainboard/lenovo/t420s/thermal.h
+++ b/src/mainboard/lenovo/t420s/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef T420S_THERMAL_H
diff --git a/src/mainboard/lenovo/t430s/Makefile.inc b/src/mainboard/lenovo/t430s/Makefile.inc
index b0743b5..909af4b 100644
--- a/src/mainboard/lenovo/t430s/Makefile.inc
+++ b/src/mainboard/lenovo/t430s/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/t430s/acpi/ec.asl b/src/mainboard/lenovo/t430s/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/t430s/acpi/ec.asl
+++ b/src/mainboard/lenovo/t430s/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/t430s/acpi/platform.asl b/src/mainboard/lenovo/t430s/acpi/platform.asl
index 232f7d9..42bc76c 100644
--- a/src/mainboard/lenovo/t430s/acpi/platform.asl
+++ b/src/mainboard/lenovo/t430s/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/t430s/acpi_tables.c b/src/mainboard/lenovo/t430s/acpi_tables.c
index 041e4e3..c2f85d9 100644
--- a/src/mainboard/lenovo/t430s/acpi_tables.c
+++ b/src/mainboard/lenovo/t430s/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpigen.h>
diff --git a/src/mainboard/lenovo/t430s/cmos.layout b/src/mainboard/lenovo/t430s/cmos.layout
index f546d45..f568a22 100644
--- a/src/mainboard/lenovo/t430s/cmos.layout
+++ b/src/mainboard/lenovo/t430s/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t430s/dsdt.asl b/src/mainboard/lenovo/t430s/dsdt.asl
index 64e4e9f..1370b6b 100644
--- a/src/mainboard/lenovo/t430s/dsdt.asl
+++ b/src/mainboard/lenovo/t430s/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/t430s/hda_verb.c b/src/mainboard/lenovo/t430s/hda_verb.c
index 7a1984a..4896e94 100644
--- a/src/mainboard/lenovo/t430s/hda_verb.c
+++ b/src/mainboard/lenovo/t430s/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : Realtek
diff --git a/src/mainboard/lenovo/t430s/mainboard.c b/src/mainboard/lenovo/t430s/mainboard.c
index a5cd083..033ba93 100644
--- a/src/mainboard/lenovo/t430s/mainboard.c
+++ b/src/mainboard/lenovo/t430s/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t430s/romstage.c b/src/mainboard/lenovo/t430s/romstage.c
index 4f34149..48aadee 100644
--- a/src/mainboard/lenovo/t430s/romstage.c
+++ b/src/mainboard/lenovo/t430s/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/byteorder.h>
diff --git a/src/mainboard/lenovo/t430s/smihandler.c b/src/mainboard/lenovo/t430s/smihandler.c
index 6579adb..fa67170 100644
--- a/src/mainboard/lenovo/t430s/smihandler.c
+++ b/src/mainboard/lenovo/t430s/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/t430s/thermal.h b/src/mainboard/lenovo/t430s/thermal.h
index e53aa9a..981dff9 100644
--- a/src/mainboard/lenovo/t430s/thermal.h
+++ b/src/mainboard/lenovo/t430s/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef T430S_THERMAL_H
diff --git a/src/mainboard/lenovo/t520/Makefile.inc b/src/mainboard/lenovo/t520/Makefile.inc
index b0743b5..909af4b 100644
--- a/src/mainboard/lenovo/t520/Makefile.inc
+++ b/src/mainboard/lenovo/t520/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/t520/acpi/ec.asl b/src/mainboard/lenovo/t520/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/t520/acpi/ec.asl
+++ b/src/mainboard/lenovo/t520/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/t520/acpi/platform.asl b/src/mainboard/lenovo/t520/acpi/platform.asl
index 232f7d9..42bc76c 100644
--- a/src/mainboard/lenovo/t520/acpi/platform.asl
+++ b/src/mainboard/lenovo/t520/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c
index e899653..9b8570c 100644
--- a/src/mainboard/lenovo/t520/acpi_tables.c
+++ b/src/mainboard/lenovo/t520/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t520/cmos.layout b/src/mainboard/lenovo/t520/cmos.layout
index 2478542..2e9c5f1 100644
--- a/src/mainboard/lenovo/t520/cmos.layout
+++ b/src/mainboard/lenovo/t520/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t520/dsdt.asl b/src/mainboard/lenovo/t520/dsdt.asl
index f5f3ace..a487c20 100644
--- a/src/mainboard/lenovo/t520/dsdt.asl
+++ b/src/mainboard/lenovo/t520/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/t520/gpio.c b/src/mainboard/lenovo/t520/gpio.c
index 4370c73..faccb1a 100644
--- a/src/mainboard/lenovo/t520/gpio.c
+++ b/src/mainboard/lenovo/t520/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef T520_GPIO_H
diff --git a/src/mainboard/lenovo/t520/hda_verb.c b/src/mainboard/lenovo/t520/hda_verb.c
index dccdca2..4f5f357 100644
--- a/src/mainboard/lenovo/t520/hda_verb.c
+++ b/src/mainboard/lenovo/t520/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : Conexant
diff --git a/src/mainboard/lenovo/t520/mainboard.c b/src/mainboard/lenovo/t520/mainboard.c
index a67459d..e3001e8 100644
--- a/src/mainboard/lenovo/t520/mainboard.c
+++ b/src/mainboard/lenovo/t520/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t520/romstage.c b/src/mainboard/lenovo/t520/romstage.c
index e334bf3..fc6d9be 100644
--- a/src/mainboard/lenovo/t520/romstage.c
+++ b/src/mainboard/lenovo/t520/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/t520/smihandler.c b/src/mainboard/lenovo/t520/smihandler.c
index 17a480f..90f8486 100644
--- a/src/mainboard/lenovo/t520/smihandler.c
+++ b/src/mainboard/lenovo/t520/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/t520/thermal.h b/src/mainboard/lenovo/t520/thermal.h
index 3497cb1..b2feecb 100644
--- a/src/mainboard/lenovo/t520/thermal.h
+++ b/src/mainboard/lenovo/t520/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef T520_THERMAL_H
diff --git a/src/mainboard/lenovo/t530/Makefile.inc b/src/mainboard/lenovo/t530/Makefile.inc
index b0743b5..909af4b 100644
--- a/src/mainboard/lenovo/t530/Makefile.inc
+++ b/src/mainboard/lenovo/t530/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/t530/acpi/ec.asl b/src/mainboard/lenovo/t530/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/t530/acpi/ec.asl
+++ b/src/mainboard/lenovo/t530/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/t530/acpi/platform.asl b/src/mainboard/lenovo/t530/acpi/platform.asl
index e7eed91..b298fc4 100644
--- a/src/mainboard/lenovo/t530/acpi/platform.asl
+++ b/src/mainboard/lenovo/t530/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c
index e899653..9b8570c 100644
--- a/src/mainboard/lenovo/t530/acpi_tables.c
+++ b/src/mainboard/lenovo/t530/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t530/cmos.layout b/src/mainboard/lenovo/t530/cmos.layout
index 2478542..2e9c5f1 100644
--- a/src/mainboard/lenovo/t530/cmos.layout
+++ b/src/mainboard/lenovo/t530/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t530/dsdt.asl b/src/mainboard/lenovo/t530/dsdt.asl
index f5f3ace..a487c20 100644
--- a/src/mainboard/lenovo/t530/dsdt.asl
+++ b/src/mainboard/lenovo/t530/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/t530/hda_verb.c b/src/mainboard/lenovo/t530/hda_verb.c
index 317bd61..7d9f343 100644
--- a/src/mainboard/lenovo/t530/hda_verb.c
+++ b/src/mainboard/lenovo/t530/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : IDT
diff --git a/src/mainboard/lenovo/t530/mainboard.c b/src/mainboard/lenovo/t530/mainboard.c
index c258731..6928028 100644
--- a/src/mainboard/lenovo/t530/mainboard.c
+++ b/src/mainboard/lenovo/t530/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/t530/romstage.c b/src/mainboard/lenovo/t530/romstage.c
index 9e071f0..be156d3 100644
--- a/src/mainboard/lenovo/t530/romstage.c
+++ b/src/mainboard/lenovo/t530/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/t530/smihandler.c b/src/mainboard/lenovo/t530/smihandler.c
index 6ea76ce..3b3397f 100644
--- a/src/mainboard/lenovo/t530/smihandler.c
+++ b/src/mainboard/lenovo/t530/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/t530/thermal.h b/src/mainboard/lenovo/t530/thermal.h
index 466372e..930dcac 100644
--- a/src/mainboard/lenovo/t530/thermal.h
+++ b/src/mainboard/lenovo/t530/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef T530_THERMAL_H
diff --git a/src/mainboard/lenovo/t60/Makefile.inc b/src/mainboard/lenovo/t60/Makefile.inc
index aaf6f8f..1798480 100644
--- a/src/mainboard/lenovo/t60/Makefile.inc
+++ b/src/mainboard/lenovo/t60/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
diff --git a/src/mainboard/lenovo/t60/acpi/dock.asl b/src/mainboard/lenovo/t60/acpi/dock.asl
index f841988..44df776 100644
--- a/src/mainboard/lenovo/t60/acpi/dock.asl
+++ b/src/mainboard/lenovo/t60/acpi/dock.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/t60/acpi/ec.asl b/src/mainboard/lenovo/t60/acpi/ec.asl
index 02b7ca7..d646a59 100644
--- a/src/mainboard/lenovo/t60/acpi/ec.asl
+++ b/src/mainboard/lenovo/t60/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/t60/acpi/gpe.asl b/src/mainboard/lenovo/t60/acpi/gpe.asl
index 9a95342..26a9ec1 100644
--- a/src/mainboard/lenovo/t60/acpi/gpe.asl
+++ b/src/mainboard/lenovo/t60/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/t60/acpi/i945_pci_irqs.asl b/src/mainboard/lenovo/t60/acpi/i945_pci_irqs.asl
index e61b768..17fc4e2 100644
--- a/src/mainboard/lenovo/t60/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/lenovo/t60/acpi/i945_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/t60/acpi/ich7_pci_irqs.asl b/src/mainboard/lenovo/t60/acpi/ich7_pci_irqs.asl
index 463680d..826f455 100644
--- a/src/mainboard/lenovo/t60/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/lenovo/t60/acpi/ich7_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/t60/acpi/platform.asl b/src/mainboard/lenovo/t60/acpi/platform.asl
index 4197e79..61b1b69 100644
--- a/src/mainboard/lenovo/t60/acpi/platform.asl
+++ b/src/mainboard/lenovo/t60/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/t60/acpi/video.asl b/src/mainboard/lenovo/t60/acpi/video.asl
index 31d5b04..87d5d48 100644
--- a/src/mainboard/lenovo/t60/acpi/video.asl
+++ b/src/mainboard/lenovo/t60/acpi/video.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c
index 4e4cf1e..7949b4d 100644
--- a/src/mainboard/lenovo/t60/acpi_tables.c
+++ b/src/mainboard/lenovo/t60/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/t60/cmos.layout b/src/mainboard/lenovo/t60/cmos.layout
index 5d0e206..5d4131c 100644
--- a/src/mainboard/lenovo/t60/cmos.layout
+++ b/src/mainboard/lenovo/t60/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/t60/devicetree.cb b/src/mainboard/lenovo/t60/devicetree.cb
index b28f1ad..01c1c5b 100644
--- a/src/mainboard/lenovo/t60/devicetree.cb
+++ b/src/mainboard/lenovo/t60/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i945
diff --git a/src/mainboard/lenovo/t60/dock.c b/src/mainboard/lenovo/t60/dock.c
index ee5cab7..7f90dfc 100644
--- a/src/mainboard/lenovo/t60/dock.c
+++ b/src/mainboard/lenovo/t60/dock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/t60/dock.h b/src/mainboard/lenovo/t60/dock.h
index fe94ea5..92c103d 100644
--- a/src/mainboard/lenovo/t60/dock.h
+++ b/src/mainboard/lenovo/t60/dock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THINKPAD_X60_DOCK_H
diff --git a/src/mainboard/lenovo/t60/dsdt.asl b/src/mainboard/lenovo/t60/dsdt.asl
index b746b69..8b46d4d 100644
--- a/src/mainboard/lenovo/t60/dsdt.asl
+++ b/src/mainboard/lenovo/t60/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 28
diff --git a/src/mainboard/lenovo/t60/mainboard.c b/src/mainboard/lenovo/t60/mainboard.c
index 428e18a..98fb42c 100644
--- a/src/mainboard/lenovo/t60/mainboard.c
+++ b/src/mainboard/lenovo/t60/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/t60/mptable.c b/src/mainboard/lenovo/t60/mptable.c
index 31e4ca1..2c7bf98 100644
--- a/src/mainboard/lenovo/t60/mptable.c
+++ b/src/mainboard/lenovo/t60/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/lenovo/t60/romstage.c b/src/mainboard/lenovo/t60/romstage.c
index 16fa871..8cddc19 100644
--- a/src/mainboard/lenovo/t60/romstage.c
+++ b/src/mainboard/lenovo/t60/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/lenovo/t60/smi.h b/src/mainboard/lenovo/t60/smi.h
index a302a07..5d57597 100644
--- a/src/mainboard/lenovo/t60/smi.h
+++ b/src/mainboard/lenovo/t60/smi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_LENOVO_X60_SMI_H
diff --git a/src/mainboard/lenovo/t60/smihandler.c b/src/mainboard/lenovo/t60/smihandler.c
index e8db9a0..863c050 100644
--- a/src/mainboard/lenovo/t60/smihandler.c
+++ b/src/mainboard/lenovo/t60/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x200/Makefile.inc b/src/mainboard/lenovo/x200/Makefile.inc
index b2e5c2a..f6c2be8 100644
--- a/src/mainboard/lenovo/x200/Makefile.inc
+++ b/src/mainboard/lenovo/x200/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += dock.c
diff --git a/src/mainboard/lenovo/x200/acpi/dock.asl b/src/mainboard/lenovo/x200/acpi/dock.asl
index f817acf..855c601 100644
--- a/src/mainboard/lenovo/x200/acpi/dock.asl
+++ b/src/mainboard/lenovo/x200/acpi/dock.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/mainboard/lenovo/x200/acpi/gm45_pci_irqs.asl b/src/mainboard/lenovo/x200/acpi/gm45_pci_irqs.asl
index 93b4525..97c825d 100644
--- a/src/mainboard/lenovo/x200/acpi/gm45_pci_irqs.asl
+++ b/src/mainboard/lenovo/x200/acpi/gm45_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/x200/acpi/gpe.asl b/src/mainboard/lenovo/x200/acpi/gpe.asl
index e1c806f..2b09ba9 100644
--- a/src/mainboard/lenovo/x200/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x200/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_GPE)
diff --git a/src/mainboard/lenovo/x200/acpi/ich9_pci_irqs.asl b/src/mainboard/lenovo/x200/acpi/ich9_pci_irqs.asl
index 3ef5d3b..23cc6ea 100644
--- a/src/mainboard/lenovo/x200/acpi/ich9_pci_irqs.asl
+++ b/src/mainboard/lenovo/x200/acpi/ich9_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/x200/acpi/platform.asl b/src/mainboard/lenovo/x200/acpi/platform.asl
index d5cb076..c2f4e23 100644
--- a/src/mainboard/lenovo/x200/acpi/platform.asl
+++ b/src/mainboard/lenovo/x200/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These come from the dynamically created CPU SSDT */
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index fa69e7a..b244cee 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/x200/cmos.layout b/src/mainboard/lenovo/x200/cmos.layout
index 39ced9b..cd8eff5 100644
--- a/src/mainboard/lenovo/x200/cmos.layout
+++ b/src/mainboard/lenovo/x200/cmos.layout
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x200/cstates.c b/src/mainboard/lenovo/x200/cstates.c
index 1062308..6b4da1c 100644
--- a/src/mainboard/lenovo/x200/cstates.c
+++ b/src/mainboard/lenovo/x200/cstates.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpigen.h>
diff --git a/src/mainboard/lenovo/x200/dock.c b/src/mainboard/lenovo/x200/dock.c
index 63d4563..b060917 100644
--- a/src/mainboard/lenovo/x200/dock.c
+++ b/src/mainboard/lenovo/x200/dock.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/mainboard/lenovo/x200/dock.h b/src/mainboard/lenovo/x200/dock.h
index a5029e1..74d2f8a 100644
--- a/src/mainboard/lenovo/x200/dock.h
+++ b/src/mainboard/lenovo/x200/dock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THINKPAD_X200_DOCK_H
diff --git a/src/mainboard/lenovo/x200/dsdt.asl b/src/mainboard/lenovo/x200/dsdt.asl
index 5545c94..283f8a2 100644
--- a/src/mainboard/lenovo/x200/dsdt.asl
+++ b/src/mainboard/lenovo/x200/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/x200/fadt.c b/src/mainboard/lenovo/x200/fadt.c
index 3833d26..877248f 100644
--- a/src/mainboard/lenovo/x200/fadt.c
+++ b/src/mainboard/lenovo/x200/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/x200/hda_verb.c b/src/mainboard/lenovo/x200/hda_verb.c
index beb637f..5362c7b 100644
--- a/src/mainboard/lenovo/x200/hda_verb.c
+++ b/src/mainboard/lenovo/x200/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/lenovo/x200/mainboard.c b/src/mainboard/lenovo/x200/mainboard.c
index d91e225..6ac2ebf 100644
--- a/src/mainboard/lenovo/x200/mainboard.c
+++ b/src/mainboard/lenovo/x200/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/x200/romstage.c b/src/mainboard/lenovo/x200/romstage.c
index 455dd35..71c7ce8 100644
--- a/src/mainboard/lenovo/x200/romstage.c
+++ b/src/mainboard/lenovo/x200/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/lenovo/x200/smihandler.c b/src/mainboard/lenovo/x200/smihandler.c
index 622b31a..aa4ab8d 100644
--- a/src/mainboard/lenovo/x200/smihandler.c
+++ b/src/mainboard/lenovo/x200/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x201/Makefile.inc b/src/mainboard/lenovo/x201/Makefile.inc
index 932df82..534f894 100644
--- a/src/mainboard/lenovo/x201/Makefile.inc
+++ b/src/mainboard/lenovo/x201/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
diff --git a/src/mainboard/lenovo/x201/acpi/dock.asl b/src/mainboard/lenovo/x201/acpi/dock.asl
index d7e2b69..87c791b 100644
--- a/src/mainboard/lenovo/x201/acpi/dock.asl
+++ b/src/mainboard/lenovo/x201/acpi/dock.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x201/acpi/ec.asl b/src/mainboard/lenovo/x201/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/x201/acpi/ec.asl
+++ b/src/mainboard/lenovo/x201/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/x201/acpi/gpe.asl b/src/mainboard/lenovo/x201/acpi/gpe.asl
index 9a95342..26a9ec1 100644
--- a/src/mainboard/lenovo/x201/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x201/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x201/acpi/platform.asl b/src/mainboard/lenovo/x201/acpi/platform.asl
index c44dcb6..b4abc54 100644
--- a/src/mainboard/lenovo/x201/acpi/platform.asl
+++ b/src/mainboard/lenovo/x201/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These come from the dynamically created CPU SSDT */
diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index 2dd9da8..84e3cc2 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/x201/cmos.layout b/src/mainboard/lenovo/x201/cmos.layout
index e59dc2b..05a371b 100644
--- a/src/mainboard/lenovo/x201/cmos.layout
+++ b/src/mainboard/lenovo/x201/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x201/devicetree.cb b/src/mainboard/lenovo/x201/devicetree.cb
index 0b53e22..fe17137 100644
--- a/src/mainboard/lenovo/x201/devicetree.cb
+++ b/src/mainboard/lenovo/x201/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/nehalem
diff --git a/src/mainboard/lenovo/x201/dock.c b/src/mainboard/lenovo/x201/dock.c
index baa741c..d6fe074 100644
--- a/src/mainboard/lenovo/x201/dock.c
+++ b/src/mainboard/lenovo/x201/dock.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/mainboard/lenovo/x201/dock.h b/src/mainboard/lenovo/x201/dock.h
index 97d1f50..b7f3509 100644
--- a/src/mainboard/lenovo/x201/dock.h
+++ b/src/mainboard/lenovo/x201/dock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THINKPAD_X201_DOCK_H
diff --git a/src/mainboard/lenovo/x201/dsdt.asl b/src/mainboard/lenovo/x201/dsdt.asl
index f2f0a89..72d873c 100644
--- a/src/mainboard/lenovo/x201/dsdt.asl
+++ b/src/mainboard/lenovo/x201/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/x201/gpio.h b/src/mainboard/lenovo/x201/gpio.h
index 57a344a..72eed8e 100644
--- a/src/mainboard/lenovo/x201/gpio.h
+++ b/src/mainboard/lenovo/x201/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LENOVO_X201_GPIO_H
diff --git a/src/mainboard/lenovo/x201/hda_verb.c b/src/mainboard/lenovo/x201/hda_verb.c
index 90fbfa6..62cb47b 100644
--- a/src/mainboard/lenovo/x201/hda_verb.c
+++ b/src/mainboard/lenovo/x201/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/lenovo/x201/mainboard.c b/src/mainboard/lenovo/x201/mainboard.c
index 62e4fc9..d14e760 100644
--- a/src/mainboard/lenovo/x201/mainboard.c
+++ b/src/mainboard/lenovo/x201/mainboard.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index 4be1ead..53201bd 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* __PRE_RAM__ means: use "unsigned" for device, not a struct.  */
diff --git a/src/mainboard/lenovo/x201/smi.h b/src/mainboard/lenovo/x201/smi.h
index e8b3650..86099ed 100644
--- a/src/mainboard/lenovo/x201/smi.h
+++ b/src/mainboard/lenovo/x201/smi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_LENOVO_X60_SMI_H
diff --git a/src/mainboard/lenovo/x201/smihandler.c b/src/mainboard/lenovo/x201/smihandler.c
index 1a04866..3bc6040 100644
--- a/src/mainboard/lenovo/x201/smihandler.c
+++ b/src/mainboard/lenovo/x201/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x220/Makefile.inc b/src/mainboard/lenovo/x220/Makefile.inc
index b0743b5..909af4b 100644
--- a/src/mainboard/lenovo/x220/Makefile.inc
+++ b/src/mainboard/lenovo/x220/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/x220/acpi/ec.asl b/src/mainboard/lenovo/x220/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/x220/acpi/ec.asl
+++ b/src/mainboard/lenovo/x220/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/x220/acpi/platform.asl b/src/mainboard/lenovo/x220/acpi/platform.asl
index e7eed91..b298fc4 100644
--- a/src/mainboard/lenovo/x220/acpi/platform.asl
+++ b/src/mainboard/lenovo/x220/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/x220/acpi_tables.c b/src/mainboard/lenovo/x220/acpi_tables.c
index 9b28f00..7785780 100644
--- a/src/mainboard/lenovo/x220/acpi_tables.c
+++ b/src/mainboard/lenovo/x220/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/x220/cmos.layout b/src/mainboard/lenovo/x220/cmos.layout
index 3b44799..6770325 100644
--- a/src/mainboard/lenovo/x220/cmos.layout
+++ b/src/mainboard/lenovo/x220/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x220/dsdt.asl b/src/mainboard/lenovo/x220/dsdt.asl
index f5f3ace..a487c20 100644
--- a/src/mainboard/lenovo/x220/dsdt.asl
+++ b/src/mainboard/lenovo/x220/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/x220/hda_verb.c b/src/mainboard/lenovo/x220/hda_verb.c
index 31b74bc..213d3cb 100644
--- a/src/mainboard/lenovo/x220/hda_verb.c
+++ b/src/mainboard/lenovo/x220/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : Conexant
diff --git a/src/mainboard/lenovo/x220/mainboard.c b/src/mainboard/lenovo/x220/mainboard.c
index c557031..ad017c8 100644
--- a/src/mainboard/lenovo/x220/mainboard.c
+++ b/src/mainboard/lenovo/x220/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/x220/romstage.c b/src/mainboard/lenovo/x220/romstage.c
index a47153e..ed069bc 100644
--- a/src/mainboard/lenovo/x220/romstage.c
+++ b/src/mainboard/lenovo/x220/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/x220/smihandler.c b/src/mainboard/lenovo/x220/smihandler.c
index 6ea76ce..3b3397f 100644
--- a/src/mainboard/lenovo/x220/smihandler.c
+++ b/src/mainboard/lenovo/x220/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x220/thermal.h b/src/mainboard/lenovo/x220/thermal.h
index 28affcb..dd240d6 100644
--- a/src/mainboard/lenovo/x220/thermal.h
+++ b/src/mainboard/lenovo/x220/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef X230_THERMAL_H
diff --git a/src/mainboard/lenovo/x230/Makefile.inc b/src/mainboard/lenovo/x230/Makefile.inc
index b0743b5..909af4b 100644
--- a/src/mainboard/lenovo/x230/Makefile.inc
+++ b/src/mainboard/lenovo/x230/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/lenovo/x230/acpi/ec.asl b/src/mainboard/lenovo/x230/acpi/ec.asl
index 1bacbba..f234d1a 100644
--- a/src/mainboard/lenovo/x230/acpi/ec.asl
+++ b/src/mainboard/lenovo/x230/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/x230/acpi/platform.asl b/src/mainboard/lenovo/x230/acpi/platform.asl
index e7eed91..b298fc4 100644
--- a/src/mainboard/lenovo/x230/acpi/platform.asl
+++ b/src/mainboard/lenovo/x230/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c
index 9b28f00..7785780 100644
--- a/src/mainboard/lenovo/x230/acpi_tables.c
+++ b/src/mainboard/lenovo/x230/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/x230/cmos.layout b/src/mainboard/lenovo/x230/cmos.layout
index 7ae370f..334254e 100644
--- a/src/mainboard/lenovo/x230/cmos.layout
+++ b/src/mainboard/lenovo/x230/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x230/dsdt.asl b/src/mainboard/lenovo/x230/dsdt.asl
index 1c71c3c..4516e28 100644
--- a/src/mainboard/lenovo/x230/dsdt.asl
+++ b/src/mainboard/lenovo/x230/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define THINKPAD_EC_GPE 17
diff --git a/src/mainboard/lenovo/x230/gpio.c b/src/mainboard/lenovo/x230/gpio.c
index d390093..ab9e3a7 100644
--- a/src/mainboard/lenovo/x230/gpio.c
+++ b/src/mainboard/lenovo/x230/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef X230_GPIO_H
diff --git a/src/mainboard/lenovo/x230/hda_verb.c b/src/mainboard/lenovo/x230/hda_verb.c
index 210f493..709c5c9 100644
--- a/src/mainboard/lenovo/x230/hda_verb.c
+++ b/src/mainboard/lenovo/x230/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*	Vendor Name    : IDT
diff --git a/src/mainboard/lenovo/x230/mainboard.c b/src/mainboard/lenovo/x230/mainboard.c
index 285020f..96afd12 100644
--- a/src/mainboard/lenovo/x230/mainboard.c
+++ b/src/mainboard/lenovo/x230/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/lenovo/x230/romstage.c b/src/mainboard/lenovo/x230/romstage.c
index 4489040..49ca351 100644
--- a/src/mainboard/lenovo/x230/romstage.c
+++ b/src/mainboard/lenovo/x230/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lenovo/x230/smihandler.c b/src/mainboard/lenovo/x230/smihandler.c
index f0ef637..e944f4b 100644
--- a/src/mainboard/lenovo/x230/smihandler.c
+++ b/src/mainboard/lenovo/x230/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lenovo/x230/thermal.h b/src/mainboard/lenovo/x230/thermal.h
index 28affcb..dd240d6 100644
--- a/src/mainboard/lenovo/x230/thermal.h
+++ b/src/mainboard/lenovo/x230/thermal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef X230_THERMAL_H
diff --git a/src/mainboard/lenovo/x60/Makefile.inc b/src/mainboard/lenovo/x60/Makefile.inc
index a3449db..b431bf3 100644
--- a/src/mainboard/lenovo/x60/Makefile.inc
+++ b/src/mainboard/lenovo/x60/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += dock.c
diff --git a/src/mainboard/lenovo/x60/acpi/dock.asl b/src/mainboard/lenovo/x60/acpi/dock.asl
index ee36e16..8414935 100644
--- a/src/mainboard/lenovo/x60/acpi/dock.asl
+++ b/src/mainboard/lenovo/x60/acpi/dock.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x60/acpi/ec.asl b/src/mainboard/lenovo/x60/acpi/ec.asl
index 02b7ca7..d646a59 100644
--- a/src/mainboard/lenovo/x60/acpi/ec.asl
+++ b/src/mainboard/lenovo/x60/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ec/lenovo/h8/acpi/ec.asl>
diff --git a/src/mainboard/lenovo/x60/acpi/gpe.asl b/src/mainboard/lenovo/x60/acpi/gpe.asl
index 9a95342..26a9ec1 100644
--- a/src/mainboard/lenovo/x60/acpi/gpe.asl
+++ b/src/mainboard/lenovo/x60/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x60/acpi/i945_pci_irqs.asl b/src/mainboard/lenovo/x60/acpi/i945_pci_irqs.asl
index e61b768..17fc4e2 100644
--- a/src/mainboard/lenovo/x60/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/lenovo/x60/acpi/i945_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/x60/acpi/ich7_pci_irqs.asl b/src/mainboard/lenovo/x60/acpi/ich7_pci_irqs.asl
index 463680d..826f455 100644
--- a/src/mainboard/lenovo/x60/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/lenovo/x60/acpi/ich7_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/lenovo/x60/acpi/platform.asl b/src/mainboard/lenovo/x60/acpi/platform.asl
index 4197e79..61b1b69 100644
--- a/src/mainboard/lenovo/x60/acpi/platform.asl
+++ b/src/mainboard/lenovo/x60/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index 4e4cf1e..7949b4d 100644
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout
index a39ed72..31ed3fb 100644
--- a/src/mainboard/lenovo/x60/cmos.layout
+++ b/src/mainboard/lenovo/x60/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/lenovo/x60/devicetree.cb b/src/mainboard/lenovo/x60/devicetree.cb
index b4d1144..6e63c17 100644
--- a/src/mainboard/lenovo/x60/devicetree.cb
+++ b/src/mainboard/lenovo/x60/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i945
diff --git a/src/mainboard/lenovo/x60/dock.c b/src/mainboard/lenovo/x60/dock.c
index 6656c29..8290cfe 100644
--- a/src/mainboard/lenovo/x60/dock.c
+++ b/src/mainboard/lenovo/x60/dock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/x60/dock.h b/src/mainboard/lenovo/x60/dock.h
index 5ce5929..7c8c6d6 100644
--- a/src/mainboard/lenovo/x60/dock.h
+++ b/src/mainboard/lenovo/x60/dock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef THINKPAD_X60_DOCK_H
diff --git a/src/mainboard/lenovo/x60/dsdt.asl b/src/mainboard/lenovo/x60/dsdt.asl
index 40e5d05..1f82bba 100644
--- a/src/mainboard/lenovo/x60/dsdt.asl
+++ b/src/mainboard/lenovo/x60/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smi.h"
diff --git a/src/mainboard/lenovo/x60/irq_tables.c b/src/mainboard/lenovo/x60/irq_tables.c
index bdcd516..723c9b8 100644
--- a/src/mainboard/lenovo/x60/irq_tables.c
+++ b/src/mainboard/lenovo/x60/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/lenovo/x60/mainboard.c b/src/mainboard/lenovo/x60/mainboard.c
index b137aaa..7bf41cd 100644
--- a/src/mainboard/lenovo/x60/mainboard.c
+++ b/src/mainboard/lenovo/x60/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lenovo/x60/mptable.c b/src/mainboard/lenovo/x60/mptable.c
index c6fa303..81beb8d 100644
--- a/src/mainboard/lenovo/x60/mptable.c
+++ b/src/mainboard/lenovo/x60/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/lenovo/x60/romstage.c b/src/mainboard/lenovo/x60/romstage.c
index 7765812..75bdf89 100644
--- a/src/mainboard/lenovo/x60/romstage.c
+++ b/src/mainboard/lenovo/x60/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/lenovo/x60/smi.h b/src/mainboard/lenovo/x60/smi.h
index 83894b0..0ca568d 100644
--- a/src/mainboard/lenovo/x60/smi.h
+++ b/src/mainboard/lenovo/x60/smi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_LENOVO_X60_SMI_H
diff --git a/src/mainboard/lenovo/x60/smihandler.c b/src/mainboard/lenovo/x60/smihandler.c
index d49643d..5442411 100644
--- a/src/mainboard/lenovo/x60/smihandler.c
+++ b/src/mainboard/lenovo/x60/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
index cb81532..049294d 100644
--- a/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
+++ b/src/mainboard/lippert/frontrunner-af/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index ebf5158..e8a44ac 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_LIPPERT_FRONTRUNNER_AF
diff --git a/src/mainboard/lippert/frontrunner-af/Makefile.inc b/src/mainboard/lippert/frontrunner-af/Makefile.inc
index e16e999..a1e39c5 100644
--- a/src/mainboard/lippert/frontrunner-af/Makefile.inc
+++ b/src/mainboard/lippert/frontrunner-af/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/lippert/frontrunner-af/OptionsIds.h b/src/mainboard/lippert/frontrunner-af/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/lippert/frontrunner-af/OptionsIds.h
+++ b/src/mainboard/lippert/frontrunner-af/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c b/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c
index 44deb7d..efe4644 100644
--- a/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c
+++ b/src/mainboard/lippert/frontrunner-af/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/lippert/frontrunner-af/PlatformGnbPcieComplex.h b/src/mainboard/lippert/frontrunner-af/PlatformGnbPcieComplex.h
index 1315429..f1dc967 100644
--- a/src/mainboard/lippert/frontrunner-af/PlatformGnbPcieComplex.h
+++ b/src/mainboard/lippert/frontrunner-af/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl b/src/mainboard/lippert/frontrunner-af/acpi/routing.asl
index fe3aeef..8c0a976 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi/routing.asl
+++ b/src/mainboard/lippert/frontrunner-af/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/lippert/frontrunner-af/acpi/sata.asl b/src/mainboard/lippert/frontrunner-af/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi/sata.asl
+++ b/src/mainboard/lippert/frontrunner-af/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/lippert/frontrunner-af/acpi/superio.asl b/src/mainboard/lippert/frontrunner-af/acpi/superio.asl
index 61a32c9..9216286 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi/superio.asl
+++ b/src/mainboard/lippert/frontrunner-af/acpi/superio.asl
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PS/2 Keyboard */
diff --git a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl b/src/mainboard/lippert/frontrunner-af/acpi/usb.asl
index 2640397..bb37132 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi/usb.asl
+++ b/src/mainboard/lippert/frontrunner-af/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/lippert/frontrunner-af/acpi_tables.c b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
index 73d9556..4d2e29a 100644
--- a/src/mainboard/lippert/frontrunner-af/acpi_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lippert/frontrunner-af/buildOpts.c b/src/mainboard/lippert/frontrunner-af/buildOpts.c
index 6adabec..dbaffdc 100644
--- a/src/mainboard/lippert/frontrunner-af/buildOpts.c
+++ b/src/mainboard/lippert/frontrunner-af/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/lippert/frontrunner-af/cmos.layout b/src/mainboard/lippert/frontrunner-af/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/lippert/frontrunner-af/cmos.layout
+++ b/src/mainboard/lippert/frontrunner-af/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/lippert/frontrunner-af/devicetree.cb b/src/mainboard/lippert/frontrunner-af/devicetree.cb
index 403be6f..3ec63a3 100644
--- a/src/mainboard/lippert/frontrunner-af/devicetree.cb
+++ b/src/mainboard/lippert/frontrunner-af/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/lippert/frontrunner-af/dsdt.asl b/src/mainboard/lippert/frontrunner-af/dsdt.asl
index 3b05054..d44c700 100644
--- a/src/mainboard/lippert/frontrunner-af/dsdt.asl
+++ b/src/mainboard/lippert/frontrunner-af/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/lippert/frontrunner-af/irq_tables.c b/src/mainboard/lippert/frontrunner-af/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/lippert/frontrunner-af/irq_tables.c
+++ b/src/mainboard/lippert/frontrunner-af/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/lippert/frontrunner-af/mainboard.c b/src/mainboard/lippert/frontrunner-af/mainboard.c
index 692e2a6..5e4d4a8 100644
--- a/src/mainboard/lippert/frontrunner-af/mainboard.c
+++ b/src/mainboard/lippert/frontrunner-af/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/lippert/frontrunner-af/mptable.c b/src/mainboard/lippert/frontrunner-af/mptable.c
index 435557a..0b39bfb 100644
--- a/src/mainboard/lippert/frontrunner-af/mptable.c
+++ b/src/mainboard/lippert/frontrunner-af/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/lippert/frontrunner-af/platform_cfg.h b/src/mainboard/lippert/frontrunner-af/platform_cfg.h
index 78708d1..2c85013 100644
--- a/src/mainboard/lippert/frontrunner-af/platform_cfg.h
+++ b/src/mainboard/lippert/frontrunner-af/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/lippert/frontrunner-af/romstage.c b/src/mainboard/lippert/frontrunner-af/romstage.c
index 83fc049..263a036 100644
--- a/src/mainboard/lippert/frontrunner-af/romstage.c
+++ b/src/mainboard/lippert/frontrunner-af/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/lippert/hurricane-lx/irq_tables.c b/src/mainboard/lippert/hurricane-lx/irq_tables.c
index ede2c92..3d47528 100644
--- a/src/mainboard/lippert/hurricane-lx/irq_tables.c
+++ b/src/mainboard/lippert/hurricane-lx/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on irq_tables.c from the SpaceRunner-LX mainboard. */
diff --git a/src/mainboard/lippert/hurricane-lx/mainboard.c b/src/mainboard/lippert/hurricane-lx/mainboard.c
index 8673e38..d6505b7 100644
--- a/src/mainboard/lippert/hurricane-lx/mainboard.c
+++ b/src/mainboard/lippert/hurricane-lx/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on mainboard.c from the SpaceRunner-LX mainboard. */
diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c
index 9d7c652..f54cd58 100644
--- a/src/mainboard/lippert/hurricane-lx/romstage.c
+++ b/src/mainboard/lippert/hurricane-lx/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on romstage.c from the SpaceRunner-LX mainboard. */
diff --git a/src/mainboard/lippert/literunner-lx/irq_tables.c b/src/mainboard/lippert/literunner-lx/irq_tables.c
index 2712c49..b789130 100644
--- a/src/mainboard/lippert/literunner-lx/irq_tables.c
+++ b/src/mainboard/lippert/literunner-lx/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on irq_tables.c from the SpaceRunner-LX mainboard. */
diff --git a/src/mainboard/lippert/literunner-lx/mainboard.c b/src/mainboard/lippert/literunner-lx/mainboard.c
index 5f877bc..2c58120 100644
--- a/src/mainboard/lippert/literunner-lx/mainboard.c
+++ b/src/mainboard/lippert/literunner-lx/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on mainboard.c from the SpaceRunner-LX mainboard. */
diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c
index 3de2f14..a47c93f 100644
--- a/src/mainboard/lippert/literunner-lx/romstage.c
+++ b/src/mainboard/lippert/literunner-lx/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on romstage.c from the SpaceRunner-LX mainboard. */
diff --git a/src/mainboard/lippert/roadrunner-lx/irq_tables.c b/src/mainboard/lippert/roadrunner-lx/irq_tables.c
index 9fd4db5..070b8e5 100644
--- a/src/mainboard/lippert/roadrunner-lx/irq_tables.c
+++ b/src/mainboard/lippert/roadrunner-lx/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on irq_tables.c from AMD's DB800 mainboard. */
diff --git a/src/mainboard/lippert/roadrunner-lx/mainboard.c b/src/mainboard/lippert/roadrunner-lx/mainboard.c
index f1ae3f2..24f166c 100644
--- a/src/mainboard/lippert/roadrunner-lx/mainboard.c
+++ b/src/mainboard/lippert/roadrunner-lx/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on mainboard.c from AMD's DB800 mainboard. */
diff --git a/src/mainboard/lippert/roadrunner-lx/romstage.c b/src/mainboard/lippert/roadrunner-lx/romstage.c
index 882b271..50b1648 100644
--- a/src/mainboard/lippert/roadrunner-lx/romstage.c
+++ b/src/mainboard/lippert/roadrunner-lx/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on romstage.c from AMD's DB800 and DBM690T mainboards. */
diff --git a/src/mainboard/lippert/spacerunner-lx/irq_tables.c b/src/mainboard/lippert/spacerunner-lx/irq_tables.c
index d1ebcf6..a2d2365 100644
--- a/src/mainboard/lippert/spacerunner-lx/irq_tables.c
+++ b/src/mainboard/lippert/spacerunner-lx/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on irq_tables.c from AMD's DB800 mainboard. */
diff --git a/src/mainboard/lippert/spacerunner-lx/mainboard.c b/src/mainboard/lippert/spacerunner-lx/mainboard.c
index 141ab77..6b8d44c 100644
--- a/src/mainboard/lippert/spacerunner-lx/mainboard.c
+++ b/src/mainboard/lippert/spacerunner-lx/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on mainboard.c from AMD's DB800 mainboard. */
diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index e7560fd..dda6e75 100644
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/src/mainboard/lippert/spacerunner-lx/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on romstage.c from AMD's DB800 and DBM690T mainboards. */
diff --git a/src/mainboard/lippert/toucan-af/BiosCallOuts.c b/src/mainboard/lippert/toucan-af/BiosCallOuts.c
index 95e8f2e..0486717 100644
--- a/src/mainboard/lippert/toucan-af/BiosCallOuts.c
+++ b/src/mainboard/lippert/toucan-af/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 0305f18..0e49671 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_LIPPERT_TOUCAN_AF
diff --git a/src/mainboard/lippert/toucan-af/Makefile.inc b/src/mainboard/lippert/toucan-af/Makefile.inc
index e16e999..a1e39c5 100644
--- a/src/mainboard/lippert/toucan-af/Makefile.inc
+++ b/src/mainboard/lippert/toucan-af/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/lippert/toucan-af/OptionsIds.h b/src/mainboard/lippert/toucan-af/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/lippert/toucan-af/OptionsIds.h
+++ b/src/mainboard/lippert/toucan-af/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c b/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c
index 545388e..15ac74c 100644
--- a/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c
+++ b/src/mainboard/lippert/toucan-af/PlatformGnbPcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/lippert/toucan-af/PlatformGnbPcieComplex.h b/src/mainboard/lippert/toucan-af/PlatformGnbPcieComplex.h
index de89167..198b57e 100644
--- a/src/mainboard/lippert/toucan-af/PlatformGnbPcieComplex.h
+++ b/src/mainboard/lippert/toucan-af/PlatformGnbPcieComplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/lippert/toucan-af/acpi/routing.asl b/src/mainboard/lippert/toucan-af/acpi/routing.asl
index d61acc7..56d091e 100644
--- a/src/mainboard/lippert/toucan-af/acpi/routing.asl
+++ b/src/mainboard/lippert/toucan-af/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/lippert/toucan-af/acpi/sata.asl b/src/mainboard/lippert/toucan-af/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/lippert/toucan-af/acpi/sata.asl
+++ b/src/mainboard/lippert/toucan-af/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/lippert/toucan-af/acpi/superio.asl b/src/mainboard/lippert/toucan-af/acpi/superio.asl
index 61a32c9..9216286 100644
--- a/src/mainboard/lippert/toucan-af/acpi/superio.asl
+++ b/src/mainboard/lippert/toucan-af/acpi/superio.asl
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PS/2 Keyboard */
diff --git a/src/mainboard/lippert/toucan-af/acpi/usb.asl b/src/mainboard/lippert/toucan-af/acpi/usb.asl
index 2640397..bb37132 100644
--- a/src/mainboard/lippert/toucan-af/acpi/usb.asl
+++ b/src/mainboard/lippert/toucan-af/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/lippert/toucan-af/acpi_tables.c b/src/mainboard/lippert/toucan-af/acpi_tables.c
index 73d9556..4d2e29a 100644
--- a/src/mainboard/lippert/toucan-af/acpi_tables.c
+++ b/src/mainboard/lippert/toucan-af/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/lippert/toucan-af/buildOpts.c b/src/mainboard/lippert/toucan-af/buildOpts.c
index 6adabec..dbaffdc 100644
--- a/src/mainboard/lippert/toucan-af/buildOpts.c
+++ b/src/mainboard/lippert/toucan-af/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/lippert/toucan-af/cmos.layout b/src/mainboard/lippert/toucan-af/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/lippert/toucan-af/cmos.layout
+++ b/src/mainboard/lippert/toucan-af/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/lippert/toucan-af/devicetree.cb b/src/mainboard/lippert/toucan-af/devicetree.cb
index ae7e44c..5014306 100644
--- a/src/mainboard/lippert/toucan-af/devicetree.cb
+++ b/src/mainboard/lippert/toucan-af/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/lippert/toucan-af/dsdt.asl b/src/mainboard/lippert/toucan-af/dsdt.asl
index 4ff28d9..9543af0 100644
--- a/src/mainboard/lippert/toucan-af/dsdt.asl
+++ b/src/mainboard/lippert/toucan-af/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/lippert/toucan-af/irq_tables.c b/src/mainboard/lippert/toucan-af/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/lippert/toucan-af/irq_tables.c
+++ b/src/mainboard/lippert/toucan-af/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/lippert/toucan-af/mainboard.c b/src/mainboard/lippert/toucan-af/mainboard.c
index 4afef23..0fbdac9 100644
--- a/src/mainboard/lippert/toucan-af/mainboard.c
+++ b/src/mainboard/lippert/toucan-af/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/lippert/toucan-af/mptable.c b/src/mainboard/lippert/toucan-af/mptable.c
index 435557a..0b39bfb 100644
--- a/src/mainboard/lippert/toucan-af/mptable.c
+++ b/src/mainboard/lippert/toucan-af/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/lippert/toucan-af/platform_cfg.h b/src/mainboard/lippert/toucan-af/platform_cfg.h
index dded8b4..c7e1453 100644
--- a/src/mainboard/lippert/toucan-af/platform_cfg.h
+++ b/src/mainboard/lippert/toucan-af/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/romstage.c
index 03942b3..51ac563 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index 40676d2..2bdf3be 100644
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_MITAC_6513WU
 
diff --git a/src/mainboard/mitac/6513wu/devicetree.cb b/src/mainboard/mitac/6513wu/devicetree.cb
index 5aa5121..59b5952 100644
--- a/src/mainboard/mitac/6513wu/devicetree.cb
+++ b/src/mainboard/mitac/6513wu/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i82810           # Northbridge
diff --git a/src/mainboard/mitac/6513wu/irq_tables.c b/src/mainboard/mitac/6513wu/irq_tables.c
index 03c13ec..a4d4fdd 100644
--- a/src/mainboard/mitac/6513wu/irq_tables.c
+++ b/src/mainboard/mitac/6513wu/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/mitac/6513wu/romstage.c b/src/mainboard/mitac/6513wu/romstage.c
index 04c0093..b608ab4 100644
--- a/src/mainboard/mitac/6513wu/romstage.c
+++ b/src/mainboard/mitac/6513wu/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/mitac/Kconfig b/src/mainboard/mitac/Kconfig
index eb44b0a..035ee12 100644
--- a/src/mainboard/mitac/Kconfig
+++ b/src/mainboard/mitac/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_MITAC
 
diff --git a/src/mainboard/msi/Kconfig b/src/mainboard/msi/Kconfig
index 4b1e36b..d982908 100644
--- a/src/mainboard/msi/Kconfig
+++ b/src/mainboard/msi/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_MSI
 
diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
index a4f056e..987658b 100644
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_MSI_MS_6119
 
diff --git a/src/mainboard/msi/ms6119/irq_tables.c b/src/mainboard/msi/ms6119/irq_tables.c
index 259c791..f9c25f7 100644
--- a/src/mainboard/msi/ms6119/irq_tables.c
+++ b/src/mainboard/msi/ms6119/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/msi/ms6119/romstage.c b/src/mainboard/msi/ms6119/romstage.c
index 9789b09..5cf14a4 100644
--- a/src/mainboard/msi/ms6119/romstage.c
+++ b/src/mainboard/msi/ms6119/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
index 34f2341..b67072e 100644
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_MSI_MS_6147
 
diff --git a/src/mainboard/msi/ms6147/irq_tables.c b/src/mainboard/msi/ms6147/irq_tables.c
index 8fc1e26..1c93d84 100644
--- a/src/mainboard/msi/ms6147/irq_tables.c
+++ b/src/mainboard/msi/ms6147/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/msi/ms6147/romstage.c b/src/mainboard/msi/ms6147/romstage.c
index e4a7156..afddc68 100644
--- a/src/mainboard/msi/ms6147/romstage.c
+++ b/src/mainboard/msi/ms6147/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig
index cb3f9d7..01f7c1e 100644
--- a/src/mainboard/msi/ms6156/Kconfig
+++ b/src/mainboard/msi/ms6156/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_MSI_MS_6156
 
diff --git a/src/mainboard/msi/ms6156/devicetree.cb b/src/mainboard/msi/ms6156/devicetree.cb
index d3b5db4..7678050 100644
--- a/src/mainboard/msi/ms6156/devicetree.cb
+++ b/src/mainboard/msi/ms6156/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
diff --git a/src/mainboard/msi/ms6156/irq_tables.c b/src/mainboard/msi/ms6156/irq_tables.c
index c18d9da..9df0b9c 100644
--- a/src/mainboard/msi/ms6156/irq_tables.c
+++ b/src/mainboard/msi/ms6156/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/msi/ms6156/romstage.c b/src/mainboard/msi/ms6156/romstage.c
index f53e62e..e9c3ee0 100644
--- a/src/mainboard/msi/ms6156/romstage.c
+++ b/src/mainboard/msi/ms6156/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index 45636d9..48fa5ab 100644
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_MSI_MS_6178
 
diff --git a/src/mainboard/msi/ms6178/devicetree.cb b/src/mainboard/msi/ms6178/devicetree.cb
index ab90fe2..a48888b 100644
--- a/src/mainboard/msi/ms6178/devicetree.cb
+++ b/src/mainboard/msi/ms6178/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i82810			# Northbridge
diff --git a/src/mainboard/msi/ms6178/irq_tables.c b/src/mainboard/msi/ms6178/irq_tables.c
index a7a48ed..ce822bb 100644
--- a/src/mainboard/msi/ms6178/irq_tables.c
+++ b/src/mainboard/msi/ms6178/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/msi/ms6178/romstage.c b/src/mainboard/msi/ms6178/romstage.c
index 4e18410..feb2b25 100644
--- a/src/mainboard/msi/ms6178/romstage.c
+++ b/src/mainboard/msi/ms6178/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms7135/dsdt.asl b/src/mainboard/msi/ms7135/dsdt.asl
index eba0ffd..b05ac71 100644
--- a/src/mainboard/msi/ms7135/dsdt.asl
+++ b/src/mainboard/msi/ms7135/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/msi/ms7135/get_bus_conf.c b/src/mainboard/msi/ms7135/get_bus_conf.c
index 5feab46..66e0436 100644
--- a/src/mainboard/msi/ms7135/get_bus_conf.c
+++ b/src/mainboard/msi/ms7135/get_bus_conf.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms7135/irq_tables.c b/src/mainboard/msi/ms7135/irq_tables.c
index d62d7bf..5cafb23 100644
--- a/src/mainboard/msi/ms7135/irq_tables.c
+++ b/src/mainboard/msi/ms7135/irq_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Documentation at: http://www.microsoft.com/hwdev/busbios/PCIIRQ.HTM */
diff --git a/src/mainboard/msi/ms7135/mptable.c b/src/mainboard/msi/ms7135/mptable.c
index d8913fd..560ff24 100644
--- a/src/mainboard/msi/ms7135/mptable.c
+++ b/src/mainboard/msi/ms7135/mptable.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms7135/romstage.c b/src/mainboard/msi/ms7135/romstage.c
index 68cddad..ba2e43c 100644
--- a/src/mainboard/msi/ms7135/romstage.c
+++ b/src/mainboard/msi/ms7135/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms7260/cmos.layout b/src/mainboard/msi/ms7260/cmos.layout
index 9f85a90..3c37391 100644
--- a/src/mainboard/msi/ms7260/cmos.layout
+++ b/src/mainboard/msi/ms7260/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # TODO: Check and fix up the values as needed.
diff --git a/src/mainboard/msi/ms7260/get_bus_conf.c b/src/mainboard/msi/ms7260/get_bus_conf.c
index 8a7da11..7294a17 100644
--- a/src/mainboard/msi/ms7260/get_bus_conf.c
+++ b/src/mainboard/msi/ms7260/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms7260/irq_tables.c b/src/mainboard/msi/ms7260/irq_tables.c
index 46073c7..bff0f82 100644
--- a/src/mainboard/msi/ms7260/irq_tables.c
+++ b/src/mainboard/msi/ms7260/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms7260/mainboard.c b/src/mainboard/msi/ms7260/mainboard.c
index 7d2f6c6..834ff10 100644
--- a/src/mainboard/msi/ms7260/mainboard.c
+++ b/src/mainboard/msi/ms7260/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/msi/ms7260/mptable.c b/src/mainboard/msi/ms7260/mptable.c
index c90f483..6cc484e 100644
--- a/src/mainboard/msi/ms7260/mptable.c
+++ b/src/mainboard/msi/ms7260/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms7260/resourcemap.c b/src/mainboard/msi/ms7260/resourcemap.c
index 43de79c..0394fc1 100644
--- a/src/mainboard/msi/ms7260/resourcemap.c
+++ b/src/mainboard/msi/ms7260/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* TODO: This is copied from the GIGABYTE GA-M57SLI-S4 target. */
diff --git a/src/mainboard/msi/ms7260/romstage.c b/src/mainboard/msi/ms7260/romstage.c
index 15f389a..526893c 100644
--- a/src/mainboard/msi/ms7260/romstage.c
+++ b/src/mainboard/msi/ms7260/romstage.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms9185/get_bus_conf.c b/src/mainboard/msi/ms9185/get_bus_conf.c
index dd6e2c1..84a831c 100644
--- a/src/mainboard/msi/ms9185/get_bus_conf.c
+++ b/src/mainboard/msi/ms9185/get_bus_conf.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <device/pci.h>
diff --git a/src/mainboard/msi/ms9185/irq_tables.c b/src/mainboard/msi/ms9185/irq_tables.c
index b0487d5..d68e22d 100644
--- a/src/mainboard/msi/ms9185/irq_tables.c
+++ b/src/mainboard/msi/ms9185/irq_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/msi/ms9185/mb_sysconf.h b/src/mainboard/msi/ms9185/mb_sysconf.h
index 3e51d29..25ebd98 100644
--- a/src/mainboard/msi/ms9185/mb_sysconf.h
+++ b/src/mainboard/msi/ms9185/mb_sysconf.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/msi/ms9185/mptable.c b/src/mainboard/msi/ms9185/mptable.c
index 28076a2..0a2f0c5 100644
--- a/src/mainboard/msi/ms9185/mptable.c
+++ b/src/mainboard/msi/ms9185/mptable.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9185/resourcemap.c b/src/mainboard/msi/ms9185/resourcemap.c
index c84ddeb..2d4fd52 100644
--- a/src/mainboard/msi/ms9185/resourcemap.c
+++ b/src/mainboard/msi/ms9185/resourcemap.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/msi/ms9185/romstage.c b/src/mainboard/msi/ms9185/romstage.c
index 795a890..f2bbe0f 100644
--- a/src/mainboard/msi/ms9185/romstage.c
+++ b/src/mainboard/msi/ms9185/romstage.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms9282/get_bus_conf.c b/src/mainboard/msi/ms9282/get_bus_conf.c
index 14c63d5..0591160 100644
--- a/src/mainboard/msi/ms9282/get_bus_conf.c
+++ b/src/mainboard/msi/ms9282/get_bus_conf.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9282/irq_tables.c b/src/mainboard/msi/ms9282/irq_tables.c
index 221ab57..3b10f64 100644
--- a/src/mainboard/msi/ms9282/irq_tables.c
+++ b/src/mainboard/msi/ms9282/irq_tables.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/msi/ms9282/mainboard.c b/src/mainboard/msi/ms9282/mainboard.c
index 148ffc1..d3a82cb 100644
--- a/src/mainboard/msi/ms9282/mainboard.c
+++ b/src/mainboard/msi/ms9282/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9282/mb_sysconf.h b/src/mainboard/msi/ms9282/mb_sysconf.h
index 4f0a738..5a83eb6 100644
--- a/src/mainboard/msi/ms9282/mb_sysconf.h
+++ b/src/mainboard/msi/ms9282/mb_sysconf.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/msi/ms9282/mptable.c b/src/mainboard/msi/ms9282/mptable.c
index 1fcb250..a83cdd1 100644
--- a/src/mainboard/msi/ms9282/mptable.c
+++ b/src/mainboard/msi/ms9282/mptable.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9282/resourcemap.c b/src/mainboard/msi/ms9282/resourcemap.c
index fb13bf9..8406416 100644
--- a/src/mainboard/msi/ms9282/resourcemap.c
+++ b/src/mainboard/msi/ms9282/resourcemap.c
@@ -20,8 +20,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/msi/ms9282/romstage.c b/src/mainboard/msi/ms9282/romstage.c
index f5b75cc..6630631 100644
--- a/src/mainboard/msi/ms9282/romstage.c
+++ b/src/mainboard/msi/ms9282/romstage.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index 3f77e17..c1287b6 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9652_fam10/cmos.layout b/src/mainboard/msi/ms9652_fam10/cmos.layout
index 02e0382..ed5537c 100644
--- a/src/mainboard/msi/ms9652_fam10/cmos.layout
+++ b/src/mainboard/msi/ms9652_fam10/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/msi/ms9652_fam10/devicetree.cb b/src/mainboard/msi/ms9652_fam10/devicetree.cb
index 7c02ddb..c37561b 100644
--- a/src/mainboard/msi/ms9652_fam10/devicetree.cb
+++ b/src/mainboard/msi/ms9652_fam10/devicetree.cb
@@ -17,8 +17,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/amd/amdfam10/root_complex	# Root complex
diff --git a/src/mainboard/msi/ms9652_fam10/dsdt.asl b/src/mainboard/msi/ms9652_fam10/dsdt.asl
index 305faf9..9111abf 100644
--- a/src/mainboard/msi/ms9652_fam10/dsdt.asl
+++ b/src/mainboard/msi/ms9652_fam10/dsdt.asl
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock ("DSDT.aml", "DSDT", 1, "CORE  ", "COREBOOT", 1)
diff --git a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
index 3956ce5..8fc9bbd 100644
--- a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
+++ b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9652_fam10/irq_tables.c b/src/mainboard/msi/ms9652_fam10/irq_tables.c
index b82999b..60584b5 100644
--- a/src/mainboard/msi/ms9652_fam10/irq_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/msi/ms9652_fam10/mainboard.c b/src/mainboard/msi/ms9652_fam10/mainboard.c
index 2687f09..5919347 100644
--- a/src/mainboard/msi/ms9652_fam10/mainboard.c
+++ b/src/mainboard/msi/ms9652_fam10/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9652_fam10/mb_sysconf.h b/src/mainboard/msi/ms9652_fam10/mb_sysconf.h
index 26a4b1d..87297b1 100644
--- a/src/mainboard/msi/ms9652_fam10/mb_sysconf.h
+++ b/src/mainboard/msi/ms9652_fam10/mb_sysconf.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index 7e6bebd..491ae1d 100644
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/msi/ms9652_fam10/resourcemap.c b/src/mainboard/msi/ms9652_fam10/resourcemap.c
index dd1ec20..f456221 100644
--- a/src/mainboard/msi/ms9652_fam10/resourcemap.c
+++ b/src/mainboard/msi/ms9652_fam10/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index b8fca64..b2b679f 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAM10_SCAN_PCI_BUS 0
diff --git a/src/mainboard/nec/Kconfig b/src/mainboard/nec/Kconfig
index 0579037..0b35125 100644
--- a/src/mainboard/nec/Kconfig
+++ b/src/mainboard/nec/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_NEC
 
diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 08f1548..9aa4f58 100644
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_NEC_POWERMATE_2000
 
diff --git a/src/mainboard/nec/powermate2000/irq_tables.c b/src/mainboard/nec/powermate2000/irq_tables.c
index 8077d12..c602f59 100644
--- a/src/mainboard/nec/powermate2000/irq_tables.c
+++ b/src/mainboard/nec/powermate2000/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/nec/powermate2000/romstage.c b/src/mainboard/nec/powermate2000/romstage.c
index efad748..f86a5c4 100644
--- a/src/mainboard/nec/powermate2000/romstage.c
+++ b/src/mainboard/nec/powermate2000/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/nokia/Kconfig b/src/mainboard/nokia/Kconfig
index 7164545..16589bd 100644
--- a/src/mainboard/nokia/Kconfig
+++ b/src/mainboard/nokia/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_NOKIA
 
diff --git a/src/mainboard/nokia/ip530/Kconfig b/src/mainboard/nokia/ip530/Kconfig
index af76fa4..ba020a0 100644
--- a/src/mainboard/nokia/ip530/Kconfig
+++ b/src/mainboard/nokia/ip530/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_NOKIA_IP530
 
diff --git a/src/mainboard/nokia/ip530/devicetree.cb b/src/mainboard/nokia/ip530/devicetree.cb
index 890f101..128618e 100644
--- a/src/mainboard/nokia/ip530/devicetree.cb
+++ b/src/mainboard/nokia/ip530/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
diff --git a/src/mainboard/nokia/ip530/irq_tables.c b/src/mainboard/nokia/ip530/irq_tables.c
index 5ef848a..a2d2ff1 100644
--- a/src/mainboard/nokia/ip530/irq_tables.c
+++ b/src/mainboard/nokia/ip530/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/nokia/ip530/romstage.c b/src/mainboard/nokia/ip530/romstage.c
index 007301b..11e4313 100644
--- a/src/mainboard/nokia/ip530/romstage.c
+++ b/src/mainboard/nokia/ip530/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/cmos.layout b/src/mainboard/nvidia/l1_2pvv/cmos.layout
index aa4ee3e..b63a627 100644
--- a/src/mainboard/nvidia/l1_2pvv/cmos.layout
+++ b/src/mainboard/nvidia/l1_2pvv/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
index 09d4a64..13044c3 100644
--- a/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
+++ b/src/mainboard/nvidia/l1_2pvv/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/hda_verb.c b/src/mainboard/nvidia/l1_2pvv/hda_verb.c
index 68076f9..f176809 100644
--- a/src/mainboard/nvidia/l1_2pvv/hda_verb.c
+++ b/src/mainboard/nvidia/l1_2pvv/hda_verb.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/irq_tables.c b/src/mainboard/nvidia/l1_2pvv/irq_tables.c
index 0f5b8d6..2b364c7 100644
--- a/src/mainboard/nvidia/l1_2pvv/irq_tables.c
+++ b/src/mainboard/nvidia/l1_2pvv/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/nvidia/l1_2pvv/mainboard.c b/src/mainboard/nvidia/l1_2pvv/mainboard.c
index e09f86e..7747762 100644
--- a/src/mainboard/nvidia/l1_2pvv/mainboard.c
+++ b/src/mainboard/nvidia/l1_2pvv/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/mb_sysconf.h b/src/mainboard/nvidia/l1_2pvv/mb_sysconf.h
index cbffb89..c2329d8 100644
--- a/src/mainboard/nvidia/l1_2pvv/mb_sysconf.h
+++ b/src/mainboard/nvidia/l1_2pvv/mb_sysconf.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/nvidia/l1_2pvv/mptable.c b/src/mainboard/nvidia/l1_2pvv/mptable.c
index a6b46de..896d20c 100644
--- a/src/mainboard/nvidia/l1_2pvv/mptable.c
+++ b/src/mainboard/nvidia/l1_2pvv/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/resourcemap.c b/src/mainboard/nvidia/l1_2pvv/resourcemap.c
index 62b927b..e590162 100644
--- a/src/mainboard/nvidia/l1_2pvv/resourcemap.c
+++ b/src/mainboard/nvidia/l1_2pvv/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/nvidia/l1_2pvv/romstage.c b/src/mainboard/nvidia/l1_2pvv/romstage.c
index b5731c8..7004e41 100644
--- a/src/mainboard/nvidia/l1_2pvv/romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/packardbell/ms2290/Makefile.inc b/src/mainboard/packardbell/ms2290/Makefile.inc
index 041e2db..d2f589c 100644
--- a/src/mainboard/packardbell/ms2290/Makefile.inc
+++ b/src/mainboard/packardbell/ms2290/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
diff --git a/src/mainboard/packardbell/ms2290/acpi/ac.asl b/src/mainboard/packardbell/ms2290/acpi/ac.asl
index 0962133..716caf4 100644
--- a/src/mainboard/packardbell/ms2290/acpi/ac.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/ac.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(AC)
diff --git a/src/mainboard/packardbell/ms2290/acpi/ec.asl b/src/mainboard/packardbell/ms2290/acpi/ec.asl
index f06aba7..bb3ca34 100644
--- a/src/mainboard/packardbell/ms2290/acpi/ec.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC)
diff --git a/src/mainboard/packardbell/ms2290/acpi/gpe.asl b/src/mainboard/packardbell/ms2290/acpi/gpe.asl
index f23414d..96a6f81 100644
--- a/src/mainboard/packardbell/ms2290/acpi/gpe.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_GPE)
diff --git a/src/mainboard/packardbell/ms2290/acpi/platform.asl b/src/mainboard/packardbell/ms2290/acpi/platform.asl
index 8f7f087..4f1a736 100644
--- a/src/mainboard/packardbell/ms2290/acpi/platform.asl
+++ b/src/mainboard/packardbell/ms2290/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These come from the dynamically created CPU SSDT */
diff --git a/src/mainboard/packardbell/ms2290/acpi_tables.c b/src/mainboard/packardbell/ms2290/acpi_tables.c
index 2dd9da8..84e3cc2 100644
--- a/src/mainboard/packardbell/ms2290/acpi_tables.c
+++ b/src/mainboard/packardbell/ms2290/acpi_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/packardbell/ms2290/cmos.layout b/src/mainboard/packardbell/ms2290/cmos.layout
index 5c4907f..2632937 100644
--- a/src/mainboard/packardbell/ms2290/cmos.layout
+++ b/src/mainboard/packardbell/ms2290/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/packardbell/ms2290/devicetree.cb b/src/mainboard/packardbell/ms2290/devicetree.cb
index 54fd8ae..6500642 100644
--- a/src/mainboard/packardbell/ms2290/devicetree.cb
+++ b/src/mainboard/packardbell/ms2290/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/nehalem
diff --git a/src/mainboard/packardbell/ms2290/dsdt.asl b/src/mainboard/packardbell/ms2290/dsdt.asl
index c2d96f3..2aaa3e6 100644
--- a/src/mainboard/packardbell/ms2290/dsdt.asl
+++ b/src/mainboard/packardbell/ms2290/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/packardbell/ms2290/hda_verb.c b/src/mainboard/packardbell/ms2290/hda_verb.c
index 5d23bb1..ab8dc83 100644
--- a/src/mainboard/packardbell/ms2290/hda_verb.c
+++ b/src/mainboard/packardbell/ms2290/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/packardbell/ms2290/mainboard.c b/src/mainboard/packardbell/ms2290/mainboard.c
index bddc8a8..8c66f6d 100644
--- a/src/mainboard/packardbell/ms2290/mainboard.c
+++ b/src/mainboard/packardbell/ms2290/mainboard.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 074b31c..440d05f 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* __PRE_RAM__ means: use "unsigned" for device, not a struct.  */
diff --git a/src/mainboard/packardbell/ms2290/smihandler.c b/src/mainboard/packardbell/ms2290/smihandler.c
index 1cae47a..50257cb 100644
--- a/src/mainboard/packardbell/ms2290/smihandler.c
+++ b/src/mainboard/packardbell/ms2290/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/pcengines/alix1c/irq_tables.c b/src/mainboard/pcengines/alix1c/irq_tables.c
index 1555af9..2fe4dd6 100644
--- a/src/mainboard/pcengines/alix1c/irq_tables.c
+++ b/src/mainboard/pcengines/alix1c/irq_tables.c
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/pcengines/alix1c/mainboard.c b/src/mainboard/pcengines/alix1c/mainboard.c
index c08ef54..64cf242 100644
--- a/src/mainboard/pcengines/alix1c/mainboard.c
+++ b/src/mainboard/pcengines/alix1c/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c
index 349062d..14e1364 100644
--- a/src/mainboard/pcengines/alix1c/romstage.c
+++ b/src/mainboard/pcengines/alix1c/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/pcengines/alix2d/irq_tables.c b/src/mainboard/pcengines/alix2d/irq_tables.c
index 474aa19..09a826a 100644
--- a/src/mainboard/pcengines/alix2d/irq_tables.c
+++ b/src/mainboard/pcengines/alix2d/irq_tables.c
@@ -13,8 +13,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
-* along with this program; if not, write to the Free Software
-* Foundation, Inc.
+* along with this program.
 */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/pcengines/alix2d/mainboard.c b/src/mainboard/pcengines/alix2d/mainboard.c
index 4330f5f..739f2f6 100644
--- a/src/mainboard/pcengines/alix2d/mainboard.c
+++ b/src/mainboard/pcengines/alix2d/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c
index ce12ab4..fd7c2ad 100644
--- a/src/mainboard/pcengines/alix2d/romstage.c
+++ b/src/mainboard/pcengines/alix2d/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/pcengines/apu1/BiosCallOuts.c b/src/mainboard/pcengines/apu1/BiosCallOuts.c
index 23ea05e..43dd850 100644
--- a/src/mainboard/pcengines/apu1/BiosCallOuts.c
+++ b/src/mainboard/pcengines/apu1/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex b/src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex
index c836f9b..7e44ba3 100644
--- a/src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex
+++ b/src/mainboard/pcengines/apu1/HYNIX-H5TQ2G83CFR.spd.hex
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 # HYNIX-H5TQ2G83CFR
 
diff --git a/src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex b/src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex
index 4af1bf8..917f454 100644
--- a/src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex
+++ b/src/mainboard/pcengines/apu1/HYNIX-H5TQ4G83MFR.spd.hex
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 
 # HYNIX-H5TQ4G83MFR
 
diff --git a/src/mainboard/pcengines/apu1/Kconfig b/src/mainboard/pcengines/apu1/Kconfig
index 7ea1821..c92545d 100644
--- a/src/mainboard/pcengines/apu1/Kconfig
+++ b/src/mainboard/pcengines/apu1/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_PCENGINES_APU1
diff --git a/src/mainboard/pcengines/apu1/Makefile.inc b/src/mainboard/pcengines/apu1/Makefile.inc
index c54a4f2..b03c493 100644
--- a/src/mainboard/pcengines/apu1/Makefile.inc
+++ b/src/mainboard/pcengines/apu1/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AHCI_BIOS),y)
diff --git a/src/mainboard/pcengines/apu1/OptionsIds.h b/src/mainboard/pcengines/apu1/OptionsIds.h
index 02b4be9..0a6cd92 100644
--- a/src/mainboard/pcengines/apu1/OptionsIds.h
+++ b/src/mainboard/pcengines/apu1/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/pcengines/apu1/PlatformGnbPcie.c b/src/mainboard/pcengines/apu1/PlatformGnbPcie.c
index 34740cb..7bb7fcd 100644
--- a/src/mainboard/pcengines/apu1/PlatformGnbPcie.c
+++ b/src/mainboard/pcengines/apu1/PlatformGnbPcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "PlatformGnbPcieComplex.h"
diff --git a/src/mainboard/pcengines/apu1/PlatformGnbPcieComplex.h b/src/mainboard/pcengines/apu1/PlatformGnbPcieComplex.h
index 30e2b11..7b6c67c 100644
--- a/src/mainboard/pcengines/apu1/PlatformGnbPcieComplex.h
+++ b/src/mainboard/pcengines/apu1/PlatformGnbPcieComplex.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_GNB_PCIE_COMPLEX_H
diff --git a/src/mainboard/pcengines/apu1/acpi/buttons.asl b/src/mainboard/pcengines/apu1/acpi/buttons.asl
index e7c3165..0f674b8 100644
--- a/src/mainboard/pcengines/apu1/acpi/buttons.asl
+++ b/src/mainboard/pcengines/apu1/acpi/buttons.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB.PCI0.SBUS)
diff --git a/src/mainboard/pcengines/apu1/acpi/gpe.asl b/src/mainboard/pcengines/apu1/acpi/gpe.asl
index 998b9fa..f8cb779 100644
--- a/src/mainboard/pcengines/apu1/acpi/gpe.asl
+++ b/src/mainboard/pcengines/apu1/acpi/gpe.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\_GPE) {	/* Start Scope GPE */
diff --git a/src/mainboard/pcengines/apu1/acpi/gpio.asl b/src/mainboard/pcengines/apu1/acpi/gpio.asl
index 50fe7e1..70bef2b 100644
--- a/src/mainboard/pcengines/apu1/acpi/gpio.asl
+++ b/src/mainboard/pcengines/apu1/acpi/gpio.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB.PCI0.SBUS)
diff --git a/src/mainboard/pcengines/apu1/acpi/leds.asl b/src/mainboard/pcengines/apu1/acpi/leds.asl
index ce4a0c8..cea335b 100644
--- a/src/mainboard/pcengines/apu1/acpi/leds.asl
+++ b/src/mainboard/pcengines/apu1/acpi/leds.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB.PCI0.SBUS)
diff --git a/src/mainboard/pcengines/apu1/acpi/mainboard.asl b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
index 59c3acf..b824eaf 100644
--- a/src/mainboard/pcengines/apu1/acpi/mainboard.asl
+++ b/src/mainboard/pcengines/apu1/acpi/mainboard.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Data to be patched by the BIOS during POST */
diff --git a/src/mainboard/pcengines/apu1/acpi/routing.asl b/src/mainboard/pcengines/apu1/acpi/routing.asl
index e5cf4e5..c63aedf 100644
--- a/src/mainboard/pcengines/apu1/acpi/routing.asl
+++ b/src/mainboard/pcengines/apu1/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/pcengines/apu1/acpi/sata.asl b/src/mainboard/pcengines/apu1/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/pcengines/apu1/acpi/sata.asl
+++ b/src/mainboard/pcengines/apu1/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/pcengines/apu1/acpi/sleep.asl b/src/mainboard/pcengines/apu1/acpi/sleep.asl
index 3feb5fe..8add20f 100644
--- a/src/mainboard/pcengines/apu1/acpi/sleep.asl
+++ b/src/mainboard/pcengines/apu1/acpi/sleep.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Wake status package */
diff --git a/src/mainboard/pcengines/apu1/acpi/superio.asl b/src/mainboard/pcengines/apu1/acpi/superio.asl
index dcfdc06..94c79b3 100644
--- a/src/mainboard/pcengines/apu1/acpi/superio.asl
+++ b/src/mainboard/pcengines/apu1/acpi/superio.asl
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* No Super I/O device or functionality yet */
diff --git a/src/mainboard/pcengines/apu1/acpi/usb_oc.asl b/src/mainboard/pcengines/apu1/acpi/usb_oc.asl
index dead4f2..d6b450c 100644
--- a/src/mainboard/pcengines/apu1/acpi/usb_oc.asl
+++ b/src/mainboard/pcengines/apu1/acpi/usb_oc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/pcengines/apu1/acpi_tables.c b/src/mainboard/pcengines/apu1/acpi_tables.c
index 0ccc311..e2c1ad0 100644
--- a/src/mainboard/pcengines/apu1/acpi_tables.c
+++ b/src/mainboard/pcengines/apu1/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/pcengines/apu1/buildOpts.c b/src/mainboard/pcengines/apu1/buildOpts.c
index 03c5d17..196b73c 100644
--- a/src/mainboard/pcengines/apu1/buildOpts.c
+++ b/src/mainboard/pcengines/apu1/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/pcengines/apu1/devicetree.cb b/src/mainboard/pcengines/apu1/devicetree.cb
index c156d4c..5298cda 100644
--- a/src/mainboard/pcengines/apu1/devicetree.cb
+++ b/src/mainboard/pcengines/apu1/devicetree.cb
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family14/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/pcengines/apu1/dsdt.asl b/src/mainboard/pcengines/apu1/dsdt.asl
index b70528f..16d3a01 100644
--- a/src/mainboard/pcengines/apu1/dsdt.asl
+++ b/src/mainboard/pcengines/apu1/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/pcengines/apu1/gpio_ftns.c b/src/mainboard/pcengines/apu1/gpio_ftns.c
index c0fcd35..190ac1d 100644
--- a/src/mainboard/pcengines/apu1/gpio_ftns.c
+++ b/src/mainboard/pcengines/apu1/gpio_ftns.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/pcengines/apu1/gpio_ftns.h b/src/mainboard/pcengines/apu1/gpio_ftns.h
index c74fb62..f3eaf73 100644
--- a/src/mainboard/pcengines/apu1/gpio_ftns.h
+++ b/src/mainboard/pcengines/apu1/gpio_ftns.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef GPIO_FTNS_H
diff --git a/src/mainboard/pcengines/apu1/irq_tables.c b/src/mainboard/pcengines/apu1/irq_tables.c
index 6ed3ba0..a6428ed 100644
--- a/src/mainboard/pcengines/apu1/irq_tables.c
+++ b/src/mainboard/pcengines/apu1/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c
index 6bc94da7..02cedfb 100644
--- a/src/mainboard/pcengines/apu1/mainboard.c
+++ b/src/mainboard/pcengines/apu1/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/pcengines/apu1/mptable.c b/src/mainboard/pcengines/apu1/mptable.c
index a377bae..1c2e29b 100644
--- a/src/mainboard/pcengines/apu1/mptable.c
+++ b/src/mainboard/pcengines/apu1/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/pcengines/apu1/platform_cfg.h b/src/mainboard/pcengines/apu1/platform_cfg.h
index 3a7c9ec..21e49e2 100644
--- a/src/mainboard/pcengines/apu1/platform_cfg.h
+++ b/src/mainboard/pcengines/apu1/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/pcengines/apu1/romstage.c b/src/mainboard/pcengines/apu1/romstage.c
index e4ff67e..50d9d08 100644
--- a/src/mainboard/pcengines/apu1/romstage.c
+++ b/src/mainboard/pcengines/apu1/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/rca/rm4100/gpio.c b/src/mainboard/rca/rm4100/gpio.c
index 925ca86..5a02f04 100644
--- a/src/mainboard/rca/rm4100/gpio.c
+++ b/src/mainboard/rca/rm4100/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define PME_DEV			PNP_DEV(0x2e, 0x0a)
diff --git a/src/mainboard/rca/rm4100/irq_tables.c b/src/mainboard/rca/rm4100/irq_tables.c
index a6e2dfd..b213ee8 100644
--- a/src/mainboard/rca/rm4100/irq_tables.c
+++ b/src/mainboard/rca/rm4100/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/rca/rm4100/mainboard.c b/src/mainboard/rca/rm4100/mainboard.c
index 1b8a851..c8ade50 100644
--- a/src/mainboard/rca/rm4100/mainboard.c
+++ b/src/mainboard/rca/rm4100/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/rca/rm4100/romstage.c b/src/mainboard/rca/rm4100/romstage.c
index 6dbe434..fd4a047 100644
--- a/src/mainboard/rca/rm4100/romstage.c
+++ b/src/mainboard/rca/rm4100/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/rca/rm4100/smihandler.c b/src/mainboard/rca/rm4100/smihandler.c
index 199629f..19ff339 100644
--- a/src/mainboard/rca/rm4100/smihandler.c
+++ b/src/mainboard/rca/rm4100/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/rca/rm4100/spd_table.h b/src/mainboard/rca/rm4100/spd_table.h
index 3a4bda2..506c718 100644
--- a/src/mainboard/rca/rm4100/spd_table.h
+++ b/src/mainboard/rca/rm4100/spd_table.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/mainboard/roda/rk886ex/Makefile.inc b/src/mainboard/roda/rk886ex/Makefile.inc
index 38d0a9e..4aa645f 100644
--- a/src/mainboard/roda/rk886ex/Makefile.inc
+++ b/src/mainboard/roda/rk886ex/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += m3885.c
diff --git a/src/mainboard/roda/rk886ex/acpi/battery.asl b/src/mainboard/roda/rk886ex/acpi/battery.asl
index fc57efc..a9d535b 100644
--- a/src/mainboard/roda/rk886ex/acpi/battery.asl
+++ b/src/mainboard/roda/rk886ex/acpi/battery.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\CBA1, 0x60)
diff --git a/src/mainboard/roda/rk886ex/acpi/ec.asl b/src/mainboard/roda/rk886ex/acpi/ec.asl
index d033f46..68abaad 100644
--- a/src/mainboard/roda/rk886ex/acpi/ec.asl
+++ b/src/mainboard/roda/rk886ex/acpi/ec.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/roda/rk886ex/acpi/gpe.asl b/src/mainboard/roda/rk886ex/acpi/gpe.asl
index 24644ad..2c21536 100644
--- a/src/mainboard/roda/rk886ex/acpi/gpe.asl
+++ b/src/mainboard/roda/rk886ex/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (_GPE)
diff --git a/src/mainboard/roda/rk886ex/acpi/i945_pci_irqs.asl b/src/mainboard/roda/rk886ex/acpi/i945_pci_irqs.asl
index f4e43f9..8bd6b8a 100644
--- a/src/mainboard/roda/rk886ex/acpi/i945_pci_irqs.asl
+++ b/src/mainboard/roda/rk886ex/acpi/i945_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/roda/rk886ex/acpi/ich7_pci_irqs.asl b/src/mainboard/roda/rk886ex/acpi/ich7_pci_irqs.asl
index d165bd1..5628b01 100644
--- a/src/mainboard/roda/rk886ex/acpi/ich7_pci_irqs.asl
+++ b/src/mainboard/roda/rk886ex/acpi/ich7_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/roda/rk886ex/acpi/mainboard.asl b/src/mainboard/roda/rk886ex/acpi/mainboard.asl
index df67936..900d54a 100644
--- a/src/mainboard/roda/rk886ex/acpi/mainboard.asl
+++ b/src/mainboard/roda/rk886ex/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LID0)
diff --git a/src/mainboard/roda/rk886ex/acpi/platform.asl b/src/mainboard/roda/rk886ex/acpi/platform.asl
index 3ce2a33..4804cdc 100644
--- a/src/mainboard/roda/rk886ex/acpi/platform.asl
+++ b/src/mainboard/roda/rk886ex/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/roda/rk886ex/acpi/superio.asl b/src/mainboard/roda/rk886ex/acpi/superio.asl
index 45d171c..fd8a045 100644
--- a/src/mainboard/roda/rk886ex/acpi/superio.asl
+++ b/src/mainboard/roda/rk886ex/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMSC LPC47N227 */
diff --git a/src/mainboard/roda/rk886ex/acpi/thermal.asl b/src/mainboard/roda/rk886ex/acpi/thermal.asl
index cb0c6b6..26ca03c 100644
--- a/src/mainboard/roda/rk886ex/acpi/thermal.asl
+++ b/src/mainboard/roda/rk886ex/acpi/thermal.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index 4e4cf1e..7949b4d 100644
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/roda/rk886ex/cmos.layout b/src/mainboard/roda/rk886ex/cmos.layout
index 376f171..82e1dc3 100644
--- a/src/mainboard/roda/rk886ex/cmos.layout
+++ b/src/mainboard/roda/rk886ex/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/roda/rk886ex/devicetree.cb b/src/mainboard/roda/rk886ex/devicetree.cb
index 589abed..4c8d6db 100644
--- a/src/mainboard/roda/rk886ex/devicetree.cb
+++ b/src/mainboard/roda/rk886ex/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i945
diff --git a/src/mainboard/roda/rk886ex/dsdt.asl b/src/mainboard/roda/rk886ex/dsdt.asl
index 168cf6d..5d8d5b7 100644
--- a/src/mainboard/roda/rk886ex/dsdt.asl
+++ b/src/mainboard/roda/rk886ex/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/roda/rk886ex/irq_tables.c b/src/mainboard/roda/rk886ex/irq_tables.c
index 72b9e20..a050b7b 100644
--- a/src/mainboard/roda/rk886ex/irq_tables.c
+++ b/src/mainboard/roda/rk886ex/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/roda/rk886ex/m3885.c b/src/mainboard/roda/rk886ex/m3885.c
index 2e8870a..2a69dc5 100644
--- a/src/mainboard/roda/rk886ex/m3885.c
+++ b/src/mainboard/roda/rk886ex/m3885.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/roda/rk886ex/m3885.h b/src/mainboard/roda/rk886ex/m3885.h
index 3904cac..4079bdf 100644
--- a/src/mainboard/roda/rk886ex/m3885.h
+++ b/src/mainboard/roda/rk886ex/m3885.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _MAINBOARD_M3885_H
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index 8957034..63a4407 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c
index 80549a1..b46bb38 100644
--- a/src/mainboard/roda/rk886ex/mptable.c
+++ b/src/mainboard/roda/rk886ex/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index f4db6b7..92bbc4d 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/roda/rk9/Makefile.inc b/src/mainboard/roda/rk9/Makefile.inc
index aa59e72..3ab3fd7 100644
--- a/src/mainboard/roda/rk9/Makefile.inc
+++ b/src/mainboard/roda/rk9/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_CARDBUS_PLUGIN_SUPPORT) += ti_pci7xx1.c
diff --git a/src/mainboard/roda/rk9/acpi/battery.asl b/src/mainboard/roda/rk9/acpi/battery.asl
index 5a80726..5c72324 100644
--- a/src/mainboard/roda/rk9/acpi/battery.asl
+++ b/src/mainboard/roda/rk9/acpi/battery.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\CBA1, 0x60)
diff --git a/src/mainboard/roda/rk9/acpi/ec.asl b/src/mainboard/roda/rk9/acpi/ec.asl
index 3704022..afae2fd 100644
--- a/src/mainboard/roda/rk9/acpi/ec.asl
+++ b/src/mainboard/roda/rk9/acpi/ec.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(EC0)
diff --git a/src/mainboard/roda/rk9/acpi/gm45_pci_irqs.asl b/src/mainboard/roda/rk9/acpi/gm45_pci_irqs.asl
index 93b4525..97c825d 100644
--- a/src/mainboard/roda/rk9/acpi/gm45_pci_irqs.asl
+++ b/src/mainboard/roda/rk9/acpi/gm45_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/roda/rk9/acpi/gpe.asl b/src/mainboard/roda/rk9/acpi/gpe.asl
index f795620..561d792 100644
--- a/src/mainboard/roda/rk9/acpi/gpe.asl
+++ b/src/mainboard/roda/rk9/acpi/gpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (_GPE)
diff --git a/src/mainboard/roda/rk9/acpi/ich9_pci_irqs.asl b/src/mainboard/roda/rk9/acpi/ich9_pci_irqs.asl
index 3ef5d3b..23cc6ea 100644
--- a/src/mainboard/roda/rk9/acpi/ich9_pci_irqs.asl
+++ b/src/mainboard/roda/rk9/acpi/ich9_pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is board specific information: IRQ routing for the
diff --git a/src/mainboard/roda/rk9/acpi/mainboard.asl b/src/mainboard/roda/rk9/acpi/mainboard.asl
index 24ef317..57b9956 100644
--- a/src/mainboard/roda/rk9/acpi/mainboard.asl
+++ b/src/mainboard/roda/rk9/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LID0)
diff --git a/src/mainboard/roda/rk9/acpi/platform.asl b/src/mainboard/roda/rk9/acpi/platform.asl
index 52b83fb..55c7649 100644
--- a/src/mainboard/roda/rk9/acpi/platform.asl
+++ b/src/mainboard/roda/rk9/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These come from the dynamically created CPU SSDT */
diff --git a/src/mainboard/roda/rk9/acpi/superio.asl b/src/mainboard/roda/rk9/acpi/superio.asl
index 45d171c..fd8a045 100644
--- a/src/mainboard/roda/rk9/acpi/superio.asl
+++ b/src/mainboard/roda/rk9/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMSC LPC47N227 */
diff --git a/src/mainboard/roda/rk9/acpi/thermal.asl b/src/mainboard/roda/rk9/acpi/thermal.asl
index 1cff44a..eaa84c3 100644
--- a/src/mainboard/roda/rk9/acpi/thermal.asl
+++ b/src/mainboard/roda/rk9/acpi/thermal.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/roda/rk9/acpi_tables.c b/src/mainboard/roda/rk9/acpi_tables.c
index fa69e7a..b244cee 100644
--- a/src/mainboard/roda/rk9/acpi_tables.c
+++ b/src/mainboard/roda/rk9/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/roda/rk9/cmos.layout b/src/mainboard/roda/rk9/cmos.layout
index bb5e404..f0625ca 100644
--- a/src/mainboard/roda/rk9/cmos.layout
+++ b/src/mainboard/roda/rk9/cmos.layout
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/roda/rk9/cstates.c b/src/mainboard/roda/rk9/cstates.c
index 1062308..6b4da1c 100644
--- a/src/mainboard/roda/rk9/cstates.c
+++ b/src/mainboard/roda/rk9/cstates.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpigen.h>
diff --git a/src/mainboard/roda/rk9/dsdt.asl b/src/mainboard/roda/rk9/dsdt.asl
index c955c86..bb75ce5 100644
--- a/src/mainboard/roda/rk9/dsdt.asl
+++ b/src/mainboard/roda/rk9/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define DISPLAY_DEVICE_2_IS_LCD_SCREEN 1
diff --git a/src/mainboard/roda/rk9/fadt.c b/src/mainboard/roda/rk9/fadt.c
index 3833d26..877248f 100644
--- a/src/mainboard/roda/rk9/fadt.c
+++ b/src/mainboard/roda/rk9/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/roda/rk9/hda_verb.c b/src/mainboard/roda/rk9/hda_verb.c
index fe20aea..f08a8d9 100644
--- a/src/mainboard/roda/rk9/hda_verb.c
+++ b/src/mainboard/roda/rk9/hda_verb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/roda/rk9/mainboard.c b/src/mainboard/roda/rk9/mainboard.c
index d0d9b55..e9339f0 100644
--- a/src/mainboard/roda/rk9/mainboard.c
+++ b/src/mainboard/roda/rk9/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/roda/rk9/romstage.c b/src/mainboard/roda/rk9/romstage.c
index 889b940..859c8a1 100644
--- a/src/mainboard/roda/rk9/romstage.c
+++ b/src/mainboard/roda/rk9/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // __PRE_RAM__ means: use "unsigned" for device, not a struct.
diff --git a/src/mainboard/roda/rk9/smihandler.c b/src/mainboard/roda/rk9/smihandler.c
index 622b31a..aa4ab8d 100644
--- a/src/mainboard/roda/rk9/smihandler.c
+++ b/src/mainboard/roda/rk9/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/roda/rk9/ti_pci7xx1.c b/src/mainboard/roda/rk9/ti_pci7xx1.c
index c48090d..090e34e 100644
--- a/src/mainboard/roda/rk9/ti_pci7xx1.c
+++ b/src/mainboard/roda/rk9/ti_pci7xx1.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/samsung/lumpy/Makefile.inc b/src/mainboard/samsung/lumpy/Makefile.inc
index ef0ae60..6e0ebf8 100644
--- a/src/mainboard/samsung/lumpy/Makefile.inc
+++ b/src/mainboard/samsung/lumpy/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-y += ec.c
diff --git a/src/mainboard/samsung/lumpy/acpi/chromeos.asl b/src/mainboard/samsung/lumpy/acpi/chromeos.asl
index d7b311d..47cc9bc 100644
--- a/src/mainboard/samsung/lumpy/acpi/chromeos.asl
+++ b/src/mainboard/samsung/lumpy/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/samsung/lumpy/acpi/ec.asl b/src/mainboard/samsung/lumpy/acpi/ec.asl
index cd41ced..f5be7c4 100644
--- a/src/mainboard/samsung/lumpy/acpi/ec.asl
+++ b/src/mainboard/samsung/lumpy/acpi/ec.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* EC configuration */
diff --git a/src/mainboard/samsung/lumpy/acpi/mainboard.asl b/src/mainboard/samsung/lumpy/acpi/mainboard.asl
index f2ee05f..d162c33 100644
--- a/src/mainboard/samsung/lumpy/acpi/mainboard.asl
+++ b/src/mainboard/samsung/lumpy/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <mainboard/samsung/lumpy/onboard.h>
diff --git a/src/mainboard/samsung/lumpy/acpi/platform.asl b/src/mainboard/samsung/lumpy/acpi/platform.asl
index 8835107..2ab015d 100644
--- a/src/mainboard/samsung/lumpy/acpi/platform.asl
+++ b/src/mainboard/samsung/lumpy/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/samsung/lumpy/acpi/superio.asl b/src/mainboard/samsung/lumpy/acpi/superio.asl
index 70b35db..9cd25c2 100644
--- a/src/mainboard/samsung/lumpy/acpi/superio.asl
+++ b/src/mainboard/samsung/lumpy/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/samsung/lumpy/acpi/thermal.asl b/src/mainboard/samsung/lumpy/acpi/thermal.asl
index 4614c6c..cde1627 100644
--- a/src/mainboard/samsung/lumpy/acpi/thermal.asl
+++ b/src/mainboard/samsung/lumpy/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/samsung/lumpy/acpi_tables.c b/src/mainboard/samsung/lumpy/acpi_tables.c
index 0e79348..369af49 100644
--- a/src/mainboard/samsung/lumpy/acpi_tables.c
+++ b/src/mainboard/samsung/lumpy/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/samsung/lumpy/chromeos.c b/src/mainboard/samsung/lumpy/chromeos.c
index 8b772be..93cab01 100644
--- a/src/mainboard/samsung/lumpy/chromeos.c
+++ b/src/mainboard/samsung/lumpy/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/samsung/lumpy/cmos.layout b/src/mainboard/samsung/lumpy/cmos.layout
index 7443875..f0e9e62 100644
--- a/src/mainboard/samsung/lumpy/cmos.layout
+++ b/src/mainboard/samsung/lumpy/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/samsung/lumpy/dsdt.asl b/src/mainboard/samsung/lumpy/dsdt.asl
index 1ab6322..8fdb495 100644
--- a/src/mainboard/samsung/lumpy/dsdt.asl
+++ b/src/mainboard/samsung/lumpy/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/samsung/lumpy/ec.c b/src/mainboard/samsung/lumpy/ec.c
index 8ef80c0..dc36994 100644
--- a/src/mainboard/samsung/lumpy/ec.c
+++ b/src/mainboard/samsung/lumpy/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/samsung/lumpy/ec.h b/src/mainboard/samsung/lumpy/ec.h
index 1f7c606..37fcf70 100644
--- a/src/mainboard/samsung/lumpy/ec.h
+++ b/src/mainboard/samsung/lumpy/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LUMPY_EC_H
diff --git a/src/mainboard/samsung/lumpy/gpio.h b/src/mainboard/samsung/lumpy/gpio.h
index 4b4d890..65a626c 100644
--- a/src/mainboard/samsung/lumpy/gpio.h
+++ b/src/mainboard/samsung/lumpy/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LUMPY_GPIO_H
diff --git a/src/mainboard/samsung/lumpy/hda_verb.c b/src/mainboard/samsung/lumpy/hda_verb.c
index 9d3e64c..d917e8f 100644
--- a/src/mainboard/samsung/lumpy/hda_verb.c
+++ b/src/mainboard/samsung/lumpy/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c
index f34f887..16feff9 100644
--- a/src/mainboard/samsung/lumpy/mainboard.c
+++ b/src/mainboard/samsung/lumpy/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/samsung/lumpy/onboard.h b/src/mainboard/samsung/lumpy/onboard.h
index 313b9d1..2183d8f 100644
--- a/src/mainboard/samsung/lumpy/onboard.h
+++ b/src/mainboard/samsung/lumpy/onboard.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LUMPY_ONBOARD_H
diff --git a/src/mainboard/samsung/lumpy/romstage.c b/src/mainboard/samsung/lumpy/romstage.c
index f2d5f4c..bfd9713 100644
--- a/src/mainboard/samsung/lumpy/romstage.c
+++ b/src/mainboard/samsung/lumpy/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/samsung/lumpy/smihandler.c b/src/mainboard/samsung/lumpy/smihandler.c
index 5160822..ed65e6f 100644
--- a/src/mainboard/samsung/lumpy/smihandler.c
+++ b/src/mainboard/samsung/lumpy/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/samsung/lumpy/thermal.h b/src/mainboard/samsung/lumpy/thermal.h
index 667ff09..df60c86 100644
--- a/src/mainboard/samsung/lumpy/thermal.h
+++ b/src/mainboard/samsung/lumpy/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LUMPY_THERMAL_H
diff --git a/src/mainboard/samsung/stumpy/Makefile.inc b/src/mainboard/samsung/stumpy/Makefile.inc
index 32c8309..e9e4390 100644
--- a/src/mainboard/samsung/stumpy/Makefile.inc
+++ b/src/mainboard/samsung/stumpy/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += chromeos.c
diff --git a/src/mainboard/samsung/stumpy/acpi/chromeos.asl b/src/mainboard/samsung/stumpy/acpi/chromeos.asl
index 9c9b85e..2825e3c 100644
--- a/src/mainboard/samsung/stumpy/acpi/chromeos.asl
+++ b/src/mainboard/samsung/stumpy/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(OIPG, Package() {
diff --git a/src/mainboard/samsung/stumpy/acpi/mainboard.asl b/src/mainboard/samsung/stumpy/acpi/mainboard.asl
index 440887d..08520f8 100644
--- a/src/mainboard/samsung/stumpy/acpi/mainboard.asl
+++ b/src/mainboard/samsung/stumpy/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB) {
diff --git a/src/mainboard/samsung/stumpy/acpi/platform.asl b/src/mainboard/samsung/stumpy/acpi/platform.asl
index cd8442a..cb3f2ab 100644
--- a/src/mainboard/samsung/stumpy/acpi/platform.asl
+++ b/src/mainboard/samsung/stumpy/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The _PTS method (Prepare To Sleep) is called before the OS is
diff --git a/src/mainboard/samsung/stumpy/acpi/superio.asl b/src/mainboard/samsung/stumpy/acpi/superio.asl
index da7a7f0..330fa4d 100644
--- a/src/mainboard/samsung/stumpy/acpi/superio.asl
+++ b/src/mainboard/samsung/stumpy/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Values should match those defined in devicetree.cb */
diff --git a/src/mainboard/samsung/stumpy/acpi/thermal.asl b/src/mainboard/samsung/stumpy/acpi/thermal.asl
index e67d7f5..0f0da6c 100644
--- a/src/mainboard/samsung/stumpy/acpi/thermal.asl
+++ b/src/mainboard/samsung/stumpy/acpi/thermal.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Thermal Zone
diff --git a/src/mainboard/samsung/stumpy/acpi_tables.c b/src/mainboard/samsung/stumpy/acpi_tables.c
index f6275b4..a3d16ec 100644
--- a/src/mainboard/samsung/stumpy/acpi_tables.c
+++ b/src/mainboard/samsung/stumpy/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/samsung/stumpy/chromeos.c b/src/mainboard/samsung/stumpy/chromeos.c
index d579c18..eecfea8 100644
--- a/src/mainboard/samsung/stumpy/chromeos.c
+++ b/src/mainboard/samsung/stumpy/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/samsung/stumpy/cmos.layout b/src/mainboard/samsung/stumpy/cmos.layout
index d075ba7..b6ce2d0 100644
--- a/src/mainboard/samsung/stumpy/cmos.layout
+++ b/src/mainboard/samsung/stumpy/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/samsung/stumpy/dsdt.asl b/src/mainboard/samsung/stumpy/dsdt.asl
index 0a2f37d..a1895da 100644
--- a/src/mainboard/samsung/stumpy/dsdt.asl
+++ b/src/mainboard/samsung/stumpy/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock(
diff --git a/src/mainboard/samsung/stumpy/gpio.h b/src/mainboard/samsung/stumpy/gpio.h
index 422fbc6..547be0c 100644
--- a/src/mainboard/samsung/stumpy/gpio.h
+++ b/src/mainboard/samsung/stumpy/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef STUMPY_GPIO_H
diff --git a/src/mainboard/samsung/stumpy/hda_verb.c b/src/mainboard/samsung/stumpy/hda_verb.c
index 21bc6a3..9c0fd04 100644
--- a/src/mainboard/samsung/stumpy/hda_verb.c
+++ b/src/mainboard/samsung/stumpy/hda_verb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c
index 2e1ed36..730919b 100644
--- a/src/mainboard/samsung/stumpy/mainboard.c
+++ b/src/mainboard/samsung/stumpy/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/samsung/stumpy/romstage.c b/src/mainboard/samsung/stumpy/romstage.c
index 7fa93b8..b100b9d 100644
--- a/src/mainboard/samsung/stumpy/romstage.c
+++ b/src/mainboard/samsung/stumpy/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/samsung/stumpy/smihandler.c b/src/mainboard/samsung/stumpy/smihandler.c
index 776f4b1..1172bf0 100644
--- a/src/mainboard/samsung/stumpy/smihandler.c
+++ b/src/mainboard/samsung/stumpy/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/samsung/stumpy/thermal.h b/src/mainboard/samsung/stumpy/thermal.h
index ad93d11..97ed89a 100644
--- a/src/mainboard/samsung/stumpy/thermal.h
+++ b/src/mainboard/samsung/stumpy/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef STUMPY_THERMAL_H
diff --git a/src/mainboard/siemens/mc_tcu3/Kconfig b/src/mainboard/siemens/mc_tcu3/Kconfig
index 729b305..fb7fc80 100644
--- a/src/mainboard/siemens/mc_tcu3/Kconfig
+++ b/src/mainboard/siemens/mc_tcu3/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_SIEMENS_MC_TCU3
diff --git a/src/mainboard/siemens/mc_tcu3/Makefile.inc b/src/mainboard/siemens/mc_tcu3/Makefile.inc
index cdf76cb..b7981a6 100644
--- a/src/mainboard/siemens/mc_tcu3/Makefile.inc
+++ b/src/mainboard/siemens/mc_tcu3/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-y += modhwinfo.c
diff --git a/src/mainboard/siemens/mc_tcu3/acpi/mainboard.asl b/src/mainboard/siemens/mc_tcu3/acpi/mainboard.asl
index ba81669..d4635c5 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi/mainboard.asl
+++ b/src/mainboard/siemens/mc_tcu3/acpi/mainboard.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PWRB)
diff --git a/src/mainboard/siemens/mc_tcu3/acpi_tables.c b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
index f7d585f..58ee48f 100644
--- a/src/mainboard/siemens/mc_tcu3/acpi_tables.c
+++ b/src/mainboard/siemens/mc_tcu3/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/siemens/mc_tcu3/cmos.layout b/src/mainboard/siemens/mc_tcu3/cmos.layout
index af5041f..7491386 100644
--- a/src/mainboard/siemens/mc_tcu3/cmos.layout
+++ b/src/mainboard/siemens/mc_tcu3/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/siemens/mc_tcu3/devicetree.cb b/src/mainboard/siemens/mc_tcu3/devicetree.cb
index 8ddbeca..77617f2 100644
--- a/src/mainboard/siemens/mc_tcu3/devicetree.cb
+++ b/src/mainboard/siemens/mc_tcu3/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip soc/intel/fsp_baytrail
diff --git a/src/mainboard/siemens/mc_tcu3/dsdt.asl b/src/mainboard/siemens/mc_tcu3/dsdt.asl
index 0796b56..3cf782c 100644
--- a/src/mainboard/siemens/mc_tcu3/dsdt.asl
+++ b/src/mainboard/siemens/mc_tcu3/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define INCLUDE_LPE  1
diff --git a/src/mainboard/siemens/mc_tcu3/fadt.c b/src/mainboard/siemens/mc_tcu3/fadt.c
index cca3da3..7937ecd 100644
--- a/src/mainboard/siemens/mc_tcu3/fadt.c
+++ b/src/mainboard/siemens/mc_tcu3/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/mainboard/siemens/mc_tcu3/gpio.c b/src/mainboard/siemens/mc_tcu3/gpio.c
index ab1c59c..aefabed 100644
--- a/src/mainboard/siemens/mc_tcu3/gpio.c
+++ b/src/mainboard/siemens/mc_tcu3/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/siemens/mc_tcu3/irqroute.c b/src/mainboard/siemens/mc_tcu3/irqroute.c
index 1ace03b..432243d 100644
--- a/src/mainboard/siemens/mc_tcu3/irqroute.c
+++ b/src/mainboard/siemens/mc_tcu3/irqroute.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "irqroute.h"
diff --git a/src/mainboard/siemens/mc_tcu3/irqroute.h b/src/mainboard/siemens/mc_tcu3/irqroute.h
index 9d9f53e..7197c48 100644
--- a/src/mainboard/siemens/mc_tcu3/irqroute.h
+++ b/src/mainboard/siemens/mc_tcu3/irqroute.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef IRQROUTE_H
diff --git a/src/mainboard/siemens/mc_tcu3/lcd_panel.c b/src/mainboard/siemens/mc_tcu3/lcd_panel.c
index b76f4e8..fa2df20 100644
--- a/src/mainboard/siemens/mc_tcu3/lcd_panel.c
+++ b/src/mainboard/siemens/mc_tcu3/lcd_panel.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <cbfs.h>
 #include <console/console.h>
diff --git a/src/mainboard/siemens/mc_tcu3/lcd_panel.h b/src/mainboard/siemens/mc_tcu3/lcd_panel.h
index f4dec26..d214d9e 100644
--- a/src/mainboard/siemens/mc_tcu3/lcd_panel.h
+++ b/src/mainboard/siemens/mc_tcu3/lcd_panel.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _LCD_PANEL_H_
diff --git a/src/mainboard/siemens/mc_tcu3/mainboard.c b/src/mainboard/siemens/mc_tcu3/mainboard.c
index 43b9cbe..43a3d7c 100644
--- a/src/mainboard/siemens/mc_tcu3/mainboard.c
+++ b/src/mainboard/siemens/mc_tcu3/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/siemens/mc_tcu3/modhwinfo.c b/src/mainboard/siemens/mc_tcu3/modhwinfo.c
index a024095..7922de3 100644
--- a/src/mainboard/siemens/mc_tcu3/modhwinfo.c
+++ b/src/mainboard/siemens/mc_tcu3/modhwinfo.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "modhwinfo.h"
diff --git a/src/mainboard/siemens/mc_tcu3/modhwinfo.h b/src/mainboard/siemens/mc_tcu3/modhwinfo.h
index 19548a0..d3a2b56 100644
--- a/src/mainboard/siemens/mc_tcu3/modhwinfo.h
+++ b/src/mainboard/siemens/mc_tcu3/modhwinfo.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _MODHWINFO_H_
diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.c b/src/mainboard/siemens/mc_tcu3/ptn3460.c
index 1a43d19..70c7147 100644
--- a/src/mainboard/siemens/mc_tcu3/ptn3460.c
+++ b/src/mainboard/siemens/mc_tcu3/ptn3460.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/siemens/mc_tcu3/ptn3460.h b/src/mainboard/siemens/mc_tcu3/ptn3460.h
index 6120b99..f03b229 100644
--- a/src/mainboard/siemens/mc_tcu3/ptn3460.h
+++ b/src/mainboard/siemens/mc_tcu3/ptn3460.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PTN3460_H_
diff --git a/src/mainboard/siemens/mc_tcu3/romstage.c b/src/mainboard/siemens/mc_tcu3/romstage.c
index 285a860..d38ea34 100644
--- a/src/mainboard/siemens/mc_tcu3/romstage.c
+++ b/src/mainboard/siemens/mc_tcu3/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/mainboard/siemens/mc_tcu3/thermal.h b/src/mainboard/siemens/mc_tcu3/thermal.h
index fb200c7..dd2e372 100644
--- a/src/mainboard/siemens/mc_tcu3/thermal.h
+++ b/src/mainboard/siemens/mc_tcu3/thermal.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MAINBOARD_THERMAL_H
diff --git a/src/mainboard/siemens/sitemp_g1p1/Makefile.inc b/src/mainboard/siemens/sitemp_g1p1/Makefile.inc
index 9a20654..d40c9fe 100644
--- a/src/mainboard/siemens/sitemp_g1p1/Makefile.inc
+++ b/src/mainboard/siemens/sitemp_g1p1/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_PCI_OPTION_ROM_RUN_REALMODE) += int15_func.c
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/debug.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/debug.asl
index 7262a6a..36ebfdf 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/debug.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/debug.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/event.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/event.asl
index e0bf8b3..fa0c5f2 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/event.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/event.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Supported sleep states: */
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/globutil.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/globutil.asl
index 4ff814a..c19e12b 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/globutil.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/globutil.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/ide.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/ide.asl
index d48cc68..4149d31 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/ide.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
index a2ef362..a9d22b7 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/platform.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(PCIF, 0)
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/routing.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/routing.asl
index a36b5ac..6defccc 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/routing.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/routing.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Routing is in System Bus scope */
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/sata.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/sata.asl
index 83a9143..f002fe5 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/sata.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/statdef.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/statdef.asl
index b5ab2ff..41ae9f0 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/statdef.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/statdef.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl
index 9732120..bfa7dd4 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/thermal.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi/usb.asl b/src/mainboard/siemens/sitemp_g1p1/acpi/usb.asl
index 2ee4ebe..401d907 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi/usb.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c
index 3337c6d..875700c 100644
--- a/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c
+++ b/src/mainboard/siemens/sitemp_g1p1/acpi_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/siemens/sitemp_g1p1/cmos.layout b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
index f8d8a81..8dd17fc 100644
--- a/src/mainboard/siemens/sitemp_g1p1/cmos.layout
+++ b/src/mainboard/siemens/sitemp_g1p1/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/siemens/sitemp_g1p1/dsdt.asl b/src/mainboard/siemens/sitemp_g1p1/dsdt.asl
index 15770c5..034d559 100644
--- a/src/mainboard/siemens/sitemp_g1p1/dsdt.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/ioapic.h>
 #include <cpu/x86/lapic_def.h>
diff --git a/src/mainboard/siemens/sitemp_g1p1/fadt.c b/src/mainboard/siemens/sitemp_g1p1/fadt.c
index cee3754..07d667d 100644
--- a/src/mainboard/siemens/sitemp_g1p1/fadt.c
+++ b/src/mainboard/siemens/sitemp_g1p1/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c b/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
index d35083c..6545b7d 100644
--- a/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
+++ b/src/mainboard/siemens/sitemp_g1p1/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/siemens/sitemp_g1p1/int15_func.c b/src/mainboard/siemens/sitemp_g1p1/int15_func.c
index 09b0be4..06d5aa7 100644
--- a/src/mainboard/siemens/sitemp_g1p1/int15_func.c
+++ b/src/mainboard/siemens/sitemp_g1p1/int15_func.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/siemens/sitemp_g1p1/int15_func.h b/src/mainboard/siemens/sitemp_g1p1/int15_func.h
index c19ab54..6335265 100644
--- a/src/mainboard/siemens/sitemp_g1p1/int15_func.h
+++ b/src/mainboard/siemens/sitemp_g1p1/int15_func.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/mainboard/siemens/sitemp_g1p1/irq_tables.c b/src/mainboard/siemens/sitemp_g1p1/irq_tables.c
index 1927443..a7557bb 100644
--- a/src/mainboard/siemens/sitemp_g1p1/irq_tables.c
+++ b/src/mainboard/siemens/sitemp_g1p1/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/siemens/sitemp_g1p1/mainboard.c b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
index 5c7b936..c956926 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mainboard.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mainboard.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/siemens/sitemp_g1p1/mptable.c b/src/mainboard/siemens/sitemp_g1p1/mptable.c
index 9ce3397..a4eabfd 100644
--- a/src/mainboard/siemens/sitemp_g1p1/mptable.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/siemens/sitemp_g1p1/resourcemap.c b/src/mainboard/siemens/sitemp_g1p1/resourcemap.c
index a0dcc6b..2dc4ef2 100644
--- a/src/mainboard/siemens/sitemp_g1p1/resourcemap.c
+++ b/src/mainboard/siemens/sitemp_g1p1/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_sitemp_resource_map(void)
diff --git a/src/mainboard/siemens/sitemp_g1p1/romstage.c b/src/mainboard/siemens/sitemp_g1p1/romstage.c
index 1b2501f..019c845 100644
--- a/src/mainboard/siemens/sitemp_g1p1/romstage.c
+++ b/src/mainboard/siemens/sitemp_g1p1/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/soyo/Kconfig b/src/mainboard/soyo/Kconfig
index 73a741c..13f044c 100644
--- a/src/mainboard/soyo/Kconfig
+++ b/src/mainboard/soyo/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_SOYO
 
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
index af253be..7963eb4 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_SOYO_SY_6BA_PLUS_III
 
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
index 71f205b..da2c29a 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i440bx		# Northbridge
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/irq_tables.c b/src/mainboard/soyo/sy-6ba-plus-iii/irq_tables.c
index 6f4f3fc..52ea711 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/irq_tables.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
index 88c9a1b..46a39b3 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/supermicro/h8dme/cmos.layout b/src/mainboard/supermicro/h8dme/cmos.layout
index aa4ee3e..b63a627 100644
--- a/src/mainboard/supermicro/h8dme/cmos.layout
+++ b/src/mainboard/supermicro/h8dme/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/supermicro/h8dme/get_bus_conf.c b/src/mainboard/supermicro/h8dme/get_bus_conf.c
index c000000..fdb1cc82 100644
--- a/src/mainboard/supermicro/h8dme/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dme/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8dme/irq_tables.c b/src/mainboard/supermicro/h8dme/irq_tables.c
index 250b717..4cfe3b0 100644
--- a/src/mainboard/supermicro/h8dme/irq_tables.c
+++ b/src/mainboard/supermicro/h8dme/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/supermicro/h8dme/mptable.c b/src/mainboard/supermicro/h8dme/mptable.c
index 031bb81..b46e65e 100644
--- a/src/mainboard/supermicro/h8dme/mptable.c
+++ b/src/mainboard/supermicro/h8dme/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8dme/resourcemap.c b/src/mainboard/supermicro/h8dme/resourcemap.c
index dc1dd69..45f1435 100644
--- a/src/mainboard/supermicro/h8dme/resourcemap.c
+++ b/src/mainboard/supermicro/h8dme/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/supermicro/h8dme/romstage.c b/src/mainboard/supermicro/h8dme/romstage.c
index c10aba4..d993996 100644
--- a/src/mainboard/supermicro/h8dme/romstage.c
+++ b/src/mainboard/supermicro/h8dme/romstage.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/supermicro/h8dmr/cmos.layout b/src/mainboard/supermicro/h8dmr/cmos.layout
index aa4ee3e..b63a627 100644
--- a/src/mainboard/supermicro/h8dmr/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/supermicro/h8dmr/get_bus_conf.c b/src/mainboard/supermicro/h8dmr/get_bus_conf.c
index c000000..fdb1cc82 100644
--- a/src/mainboard/supermicro/h8dmr/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8dmr/irq_tables.c b/src/mainboard/supermicro/h8dmr/irq_tables.c
index 250b717..4cfe3b0 100644
--- a/src/mainboard/supermicro/h8dmr/irq_tables.c
+++ b/src/mainboard/supermicro/h8dmr/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/supermicro/h8dmr/mptable.c b/src/mainboard/supermicro/h8dmr/mptable.c
index 9bda237..34b4ace 100644
--- a/src/mainboard/supermicro/h8dmr/mptable.c
+++ b/src/mainboard/supermicro/h8dmr/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8dmr/resourcemap.c b/src/mainboard/supermicro/h8dmr/resourcemap.c
index dc1dd69..45f1435 100644
--- a/src/mainboard/supermicro/h8dmr/resourcemap.c
+++ b/src/mainboard/supermicro/h8dmr/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/supermicro/h8dmr/romstage.c b/src/mainboard/supermicro/h8dmr/romstage.c
index 1e5582c..423afce 100644
--- a/src/mainboard/supermicro/h8dmr/romstage.c
+++ b/src/mainboard/supermicro/h8dmr/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
index 02e0382..ed5537c 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8dmr_fam10/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
index 6b1d1b8..1df5727 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
index b82999b..60584b5 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h
index 26a4b1d..87297b1 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h
+++ b/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index d750c6b..6971f9d 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c b/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c
index 00647d4..080eca0 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index d94d917..4d1c6b7 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAM10_SCAN_PCI_BUS 0
diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
index 0d6f39c..925a29f 100644
--- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig
index f5d69d4..a0718ab 100644
--- a/src/mainboard/supermicro/h8qgi/Kconfig
+++ b/src/mainboard/supermicro/h8qgi/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_SUPERMICRO_H8QGI
diff --git a/src/mainboard/supermicro/h8qgi/Makefile.inc b/src/mainboard/supermicro/h8qgi/Makefile.inc
index 22ae72b..4c5811d 100644
--- a/src/mainboard/supermicro/h8qgi/Makefile.inc
+++ b/src/mainboard/supermicro/h8qgi/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += rd890_cfg.c
diff --git a/src/mainboard/supermicro/h8qgi/OptionsIds.h b/src/mainboard/supermicro/h8qgi/OptionsIds.h
index cd4b1b1..4a793fd 100644
--- a/src/mainboard/supermicro/h8qgi/OptionsIds.h
+++ b/src/mainboard/supermicro/h8qgi/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/supermicro/h8qgi/acpi/routing.asl b/src/mainboard/supermicro/h8qgi/acpi/routing.asl
index e7d9c47..d2372b0 100644
--- a/src/mainboard/supermicro/h8qgi/acpi/routing.asl
+++ b/src/mainboard/supermicro/h8qgi/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/supermicro/h8qgi/acpi/sata.asl b/src/mainboard/supermicro/h8qgi/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/supermicro/h8qgi/acpi/sata.asl
+++ b/src/mainboard/supermicro/h8qgi/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/supermicro/h8qgi/acpi/usb.asl b/src/mainboard/supermicro/h8qgi/acpi/usb.asl
index 0b647ed..36bb3df 100644
--- a/src/mainboard/supermicro/h8qgi/acpi/usb.asl
+++ b/src/mainboard/supermicro/h8qgi/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/supermicro/h8qgi/acpi_tables.c b/src/mainboard/supermicro/h8qgi/acpi_tables.c
index 8d3fd0b..27aa8d1 100644
--- a/src/mainboard/supermicro/h8qgi/acpi_tables.c
+++ b/src/mainboard/supermicro/h8qgi/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8qgi/buildOpts.c b/src/mainboard/supermicro/h8qgi/buildOpts.c
index 426fb42..064a64b 100644
--- a/src/mainboard/supermicro/h8qgi/buildOpts.c
+++ b/src/mainboard/supermicro/h8qgi/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/supermicro/h8qgi/cmos.layout b/src/mainboard/supermicro/h8qgi/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/supermicro/h8qgi/cmos.layout
+++ b/src/mainboard/supermicro/h8qgi/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb
index 59740c9..148f839 100644
--- a/src/mainboard/supermicro/h8qgi/devicetree.cb
+++ b/src/mainboard/supermicro/h8qgi/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/supermicro/h8qgi/dsdt.asl b/src/mainboard/supermicro/h8qgi/dsdt.asl
index 2155ec4..2dc1b57 100644
--- a/src/mainboard/supermicro/h8qgi/dsdt.asl
+++ b/src/mainboard/supermicro/h8qgi/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/supermicro/h8qgi/fadt.c b/src/mainboard/supermicro/h8qgi/fadt.c
index 54de8ca..d402959 100644
--- a/src/mainboard/supermicro/h8qgi/fadt.c
+++ b/src/mainboard/supermicro/h8qgi/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8qgi/irq_tables.c b/src/mainboard/supermicro/h8qgi/irq_tables.c
index 70f54c0..42d910f 100644
--- a/src/mainboard/supermicro/h8qgi/irq_tables.c
+++ b/src/mainboard/supermicro/h8qgi/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8qgi/mainboard.c b/src/mainboard/supermicro/h8qgi/mainboard.c
index cd0718d..625d472 100644
--- a/src/mainboard/supermicro/h8qgi/mainboard.c
+++ b/src/mainboard/supermicro/h8qgi/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 9880812..37ded4f 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8qgi/platform_cfg.h b/src/mainboard/supermicro/h8qgi/platform_cfg.h
index 6855802..f6eb8f2 100644
--- a/src/mainboard/supermicro/h8qgi/platform_cfg.h
+++ b/src/mainboard/supermicro/h8qgi/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_CFG_H_
diff --git a/src/mainboard/supermicro/h8qgi/rd890_cfg.c b/src/mainboard/supermicro/h8qgi/rd890_cfg.c
index 1e78f93..ad54d53 100644
--- a/src/mainboard/supermicro/h8qgi/rd890_cfg.c
+++ b/src/mainboard/supermicro/h8qgi/rd890_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "NbPlatform.h"
diff --git a/src/mainboard/supermicro/h8qgi/rd890_cfg.h b/src/mainboard/supermicro/h8qgi/rd890_cfg.h
index 0fab3b6..a62e07d 100644
--- a/src/mainboard/supermicro/h8qgi/rd890_cfg.h
+++ b/src/mainboard/supermicro/h8qgi/rd890_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef  _RD890_CFG_H_
diff --git a/src/mainboard/supermicro/h8qgi/romstage.c b/src/mainboard/supermicro/h8qgi/romstage.c
index d79e442..a866604 100644
--- a/src/mainboard/supermicro/h8qgi/romstage.c
+++ b/src/mainboard/supermicro/h8qgi/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/mainboard/supermicro/h8qgi/sb700_cfg.c b/src/mainboard/supermicro/h8qgi/sb700_cfg.c
index 9c3adb2..3473d7b 100644
--- a/src/mainboard/supermicro/h8qgi/sb700_cfg.c
+++ b/src/mainboard/supermicro/h8qgi/sb700_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8qgi/sb700_cfg.h b/src/mainboard/supermicro/h8qgi/sb700_cfg.h
index 500f162..94c2831 100644
--- a/src/mainboard/supermicro/h8qgi/sb700_cfg.h
+++ b/src/mainboard/supermicro/h8qgi/sb700_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8qme_fam10/cmos.layout b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
index 02e0382..ed5537c 100644
--- a/src/mainboard/supermicro/h8qme_fam10/cmos.layout
+++ b/src/mainboard/supermicro/h8qme_fam10/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
index bcdd0fd..4319e03 100644
--- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
index 718d416..c3e29f5 100644
--- a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h
index 4730bc9..8a6b3eb 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h
+++ b/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index f052d33..9d191a5 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8qme_fam10/resourcemap.c b/src/mainboard/supermicro/h8qme_fam10/resourcemap.c
index 00647d4..080eca0 100644
--- a/src/mainboard/supermicro/h8qme_fam10/resourcemap.c
+++ b/src/mainboard/supermicro/h8qme_fam10/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index c79c2b1..cbcfef1 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAM10_SCAN_PCI_BUS 0
diff --git a/src/mainboard/supermicro/h8scm/BiosCallOuts.c b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
index d7870a5..2e28b13 100644
--- a/src/mainboard/supermicro/h8scm/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/supermicro/h8scm/Kconfig b/src/mainboard/supermicro/h8scm/Kconfig
index 5cf2305..d6984c6 100644
--- a/src/mainboard/supermicro/h8scm/Kconfig
+++ b/src/mainboard/supermicro/h8scm/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_SUPERMICRO_H8SCM
diff --git a/src/mainboard/supermicro/h8scm/Makefile.inc b/src/mainboard/supermicro/h8scm/Makefile.inc
index 22ae72b..4c5811d 100644
--- a/src/mainboard/supermicro/h8scm/Makefile.inc
+++ b/src/mainboard/supermicro/h8scm/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += rd890_cfg.c
diff --git a/src/mainboard/supermicro/h8scm/OptionsIds.h b/src/mainboard/supermicro/h8scm/OptionsIds.h
index e921d40..023f154 100644
--- a/src/mainboard/supermicro/h8scm/OptionsIds.h
+++ b/src/mainboard/supermicro/h8scm/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/supermicro/h8scm/acpi/cpstate.asl b/src/mainboard/supermicro/h8scm/acpi/cpstate.asl
index 55825f9..9d28c91 100644
--- a/src/mainboard/supermicro/h8scm/acpi/cpstate.asl
+++ b/src/mainboard/supermicro/h8scm/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/supermicro/h8scm/acpi/ide.asl b/src/mainboard/supermicro/h8scm/acpi/ide.asl
index 46973e2..e871b7c 100644
--- a/src/mainboard/supermicro/h8scm/acpi/ide.asl
+++ b/src/mainboard/supermicro/h8scm/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/supermicro/h8scm/acpi/routing.asl b/src/mainboard/supermicro/h8scm/acpi/routing.asl
index ab8d1bf..0a7568d 100644
--- a/src/mainboard/supermicro/h8scm/acpi/routing.asl
+++ b/src/mainboard/supermicro/h8scm/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/supermicro/h8scm/acpi/sata.asl b/src/mainboard/supermicro/h8scm/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/supermicro/h8scm/acpi/sata.asl
+++ b/src/mainboard/supermicro/h8scm/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/supermicro/h8scm/acpi/usb.asl b/src/mainboard/supermicro/h8scm/acpi/usb.asl
index 0b647ed..36bb3df 100644
--- a/src/mainboard/supermicro/h8scm/acpi/usb.asl
+++ b/src/mainboard/supermicro/h8scm/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/supermicro/h8scm/acpi_tables.c b/src/mainboard/supermicro/h8scm/acpi_tables.c
index 8d3fd0b..27aa8d1 100644
--- a/src/mainboard/supermicro/h8scm/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8scm/buildOpts.c b/src/mainboard/supermicro/h8scm/buildOpts.c
index 4c3e7ed..792b29b 100644
--- a/src/mainboard/supermicro/h8scm/buildOpts.c
+++ b/src/mainboard/supermicro/h8scm/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/supermicro/h8scm/chip.h b/src/mainboard/supermicro/h8scm/chip.h
index 59c00ab..bfc0329 100644
--- a/src/mainboard/supermicro/h8scm/chip.h
+++ b/src/mainboard/supermicro/h8scm/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm/cmos.layout b/src/mainboard/supermicro/h8scm/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/supermicro/h8scm/cmos.layout
+++ b/src/mainboard/supermicro/h8scm/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/supermicro/h8scm/devicetree.cb b/src/mainboard/supermicro/h8scm/devicetree.cb
index b8fb823..00d7459 100644
--- a/src/mainboard/supermicro/h8scm/devicetree.cb
+++ b/src/mainboard/supermicro/h8scm/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/supermicro/h8scm/dsdt.asl b/src/mainboard/supermicro/h8scm/dsdt.asl
index 5a0cc15..7824e30 100644
--- a/src/mainboard/supermicro/h8scm/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/supermicro/h8scm/fadt.c b/src/mainboard/supermicro/h8scm/fadt.c
index d91ae6f..77ec477 100644
--- a/src/mainboard/supermicro/h8scm/fadt.c
+++ b/src/mainboard/supermicro/h8scm/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm/irq_tables.c b/src/mainboard/supermicro/h8scm/irq_tables.c
index c25f693..4c46fae 100644
--- a/src/mainboard/supermicro/h8scm/irq_tables.c
+++ b/src/mainboard/supermicro/h8scm/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm/mainboard.c b/src/mainboard/supermicro/h8scm/mainboard.c
index bb12c54..16d32c1 100644
--- a/src/mainboard/supermicro/h8scm/mainboard.c
+++ b/src/mainboard/supermicro/h8scm/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index d5ee68d..90b2d35 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm/platform_cfg.h b/src/mainboard/supermicro/h8scm/platform_cfg.h
index 6855802..f6eb8f2 100644
--- a/src/mainboard/supermicro/h8scm/platform_cfg.h
+++ b/src/mainboard/supermicro/h8scm/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_CFG_H_
diff --git a/src/mainboard/supermicro/h8scm/rd890_cfg.c b/src/mainboard/supermicro/h8scm/rd890_cfg.c
index 1e78f93..ad54d53 100644
--- a/src/mainboard/supermicro/h8scm/rd890_cfg.c
+++ b/src/mainboard/supermicro/h8scm/rd890_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "NbPlatform.h"
diff --git a/src/mainboard/supermicro/h8scm/rd890_cfg.h b/src/mainboard/supermicro/h8scm/rd890_cfg.h
index 0fab3b6..a62e07d 100644
--- a/src/mainboard/supermicro/h8scm/rd890_cfg.h
+++ b/src/mainboard/supermicro/h8scm/rd890_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef  _RD890_CFG_H_
diff --git a/src/mainboard/supermicro/h8scm/romstage.c b/src/mainboard/supermicro/h8scm/romstage.c
index 4962fc9..13c6406 100644
--- a/src/mainboard/supermicro/h8scm/romstage.c
+++ b/src/mainboard/supermicro/h8scm/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/mainboard/supermicro/h8scm/sb700_cfg.c b/src/mainboard/supermicro/h8scm/sb700_cfg.c
index 1a6c19d..3909811 100644
--- a/src/mainboard/supermicro/h8scm/sb700_cfg.c
+++ b/src/mainboard/supermicro/h8scm/sb700_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm/sb700_cfg.h b/src/mainboard/supermicro/h8scm/sb700_cfg.h
index a20af8e..a9a2032 100644
--- a/src/mainboard/supermicro/h8scm/sb700_cfg.h
+++ b/src/mainboard/supermicro/h8scm/sb700_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl
index 1f43614..84a8f76 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi/cpstate.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file defines the processor and performance state capability
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/ide.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/ide.asl
index 690e54c..d5264df 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi/ide.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl
index 9314787..104edf8 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/sata.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/sata.asl
index 5cfcc50..0a49ebc 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi/sata.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl b/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl
index f65813e..76e6b56 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
index 61d16d7..7b631b3 100644
--- a/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
index c82f73c..b1a0622 100644
--- a/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
+++ b/src/mainboard/supermicro/h8scm_fam10/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
index 8e1a8ab..6efeca0 100644
--- a/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8scm_fam10/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
index 6a173ae..2a1f371 100644
--- a/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8scm_fam10/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/mainboard.c b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
index ca77a61..c83a757 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mainboard.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h
index 062b559..ec4b467 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h
+++ b/src/mainboard/supermicro/h8scm_fam10/mb_sysconf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index 3d9a800..d928c30 100644
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm_fam10/resourcemap.c b/src/mainboard/supermicro/h8scm_fam10/resourcemap.c
index 7155411..3f21888 100644
--- a/src/mainboard/supermicro/h8scm_fam10/resourcemap.c
+++ b/src/mainboard/supermicro/h8scm_fam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/supermicro/h8scm_fam10/romstage.c b/src/mainboard/supermicro/h8scm_fam10/romstage.c
index b3174ae..dd525eb 100644
--- a/src/mainboard/supermicro/h8scm_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8scm_fam10/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 //#define SYSTEM_TYPE 0	/* SERVER */ //FIXME SERVER enable ECC, cause linux hang
diff --git a/src/mainboard/supermicro/x7db8/cmos.layout b/src/mainboard/supermicro/x7db8/cmos.layout
index 0f67e68..e7e1731 100644
--- a/src/mainboard/supermicro/x7db8/cmos.layout
+++ b/src/mainboard/supermicro/x7db8/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/supermicro/x7db8/devicetree.cb b/src/mainboard/supermicro/x7db8/devicetree.cb
index 0f658ec..105d457 100644
--- a/src/mainboard/supermicro/x7db8/devicetree.cb
+++ b/src/mainboard/supermicro/x7db8/devicetree.cb
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/intel/i5000
diff --git a/src/mainboard/supermicro/x7db8/irq_tables.c b/src/mainboard/supermicro/x7db8/irq_tables.c
index 350650e..06326ea 100644
--- a/src/mainboard/supermicro/x7db8/irq_tables.c
+++ b/src/mainboard/supermicro/x7db8/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/supermicro/x7db8/mainboard.c b/src/mainboard/supermicro/x7db8/mainboard.c
index db4ace2..785be30 100644
--- a/src/mainboard/supermicro/x7db8/mainboard.c
+++ b/src/mainboard/supermicro/x7db8/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/supermicro/x7db8/romstage.c b/src/mainboard/supermicro/x7db8/romstage.c
index c3e920f..36d7401 100644
--- a/src/mainboard/supermicro/x7db8/romstage.c
+++ b/src/mainboard/supermicro/x7db8/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/technexion/tim5690/Makefile.inc b/src/mainboard/technexion/tim5690/Makefile.inc
index 08af1a0..ec50a6a 100644
--- a/src/mainboard/technexion/tim5690/Makefile.inc
+++ b/src/mainboard/technexion/tim5690/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Needed by irq_tables and mptable and acpi_tables.
diff --git a/src/mainboard/technexion/tim5690/acpi/ide.asl b/src/mainboard/technexion/tim5690/acpi/ide.asl
index d84fc2e..13aeede 100644
--- a/src/mainboard/technexion/tim5690/acpi/ide.asl
+++ b/src/mainboard/technexion/tim5690/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/technexion/tim5690/acpi/routing.asl b/src/mainboard/technexion/tim5690/acpi/routing.asl
index 3e4c63a..7503c22 100644
--- a/src/mainboard/technexion/tim5690/acpi/routing.asl
+++ b/src/mainboard/technexion/tim5690/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/technexion/tim5690/acpi/sata.asl b/src/mainboard/technexion/tim5690/acpi/sata.asl
index ea8e4f5..0235ef0 100644
--- a/src/mainboard/technexion/tim5690/acpi/sata.asl
+++ b/src/mainboard/technexion/tim5690/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/technexion/tim5690/acpi/usb.asl b/src/mainboard/technexion/tim5690/acpi/usb.asl
index fbce5da..1a37358 100644
--- a/src/mainboard/technexion/tim5690/acpi/usb.asl
+++ b/src/mainboard/technexion/tim5690/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/technexion/tim5690/acpi_tables.c b/src/mainboard/technexion/tim5690/acpi_tables.c
index 628abfd..cf14699 100644
--- a/src/mainboard/technexion/tim5690/acpi_tables.c
+++ b/src/mainboard/technexion/tim5690/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim5690/cmos.layout b/src/mainboard/technexion/tim5690/cmos.layout
index 6da2266..d338a10 100644
--- a/src/mainboard/technexion/tim5690/cmos.layout
+++ b/src/mainboard/technexion/tim5690/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/technexion/tim5690/dsdt.asl b/src/mainboard/technexion/tim5690/dsdt.asl
index d5776d7..2e42d37 100644
--- a/src/mainboard/technexion/tim5690/dsdt.asl
+++ b/src/mainboard/technexion/tim5690/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/technexion/tim5690/fadt.c b/src/mainboard/technexion/tim5690/fadt.c
index 2a2d710..d91f818 100644
--- a/src/mainboard/technexion/tim5690/fadt.c
+++ b/src/mainboard/technexion/tim5690/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/technexion/tim5690/get_bus_conf.c b/src/mainboard/technexion/tim5690/get_bus_conf.c
index d35083c..6545b7d 100644
--- a/src/mainboard/technexion/tim5690/get_bus_conf.c
+++ b/src/mainboard/technexion/tim5690/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim5690/irq_tables.c b/src/mainboard/technexion/tim5690/irq_tables.c
index f2c21fe..3d65966 100644
--- a/src/mainboard/technexion/tim5690/irq_tables.c
+++ b/src/mainboard/technexion/tim5690/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/technexion/tim5690/mainboard.c b/src/mainboard/technexion/tim5690/mainboard.c
index 107c0d6..3766ace 100644
--- a/src/mainboard/technexion/tim5690/mainboard.c
+++ b/src/mainboard/technexion/tim5690/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim5690/mptable.c b/src/mainboard/technexion/tim5690/mptable.c
index 2c3a1e4..7118093 100644
--- a/src/mainboard/technexion/tim5690/mptable.c
+++ b/src/mainboard/technexion/tim5690/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim5690/resourcemap.c b/src/mainboard/technexion/tim5690/resourcemap.c
index 681ebb3..c173142 100644
--- a/src/mainboard/technexion/tim5690/resourcemap.c
+++ b/src/mainboard/technexion/tim5690/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_tim5690_resource_map(void)
diff --git a/src/mainboard/technexion/tim5690/romstage.c b/src/mainboard/technexion/tim5690/romstage.c
index 27c0024..ac5691f 100644
--- a/src/mainboard/technexion/tim5690/romstage.c
+++ b/src/mainboard/technexion/tim5690/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/technexion/tim5690/speaker.c b/src/mainboard/technexion/tim5690/speaker.c
index 8098e22..dd1073e 100644
--- a/src/mainboard/technexion/tim5690/speaker.c
+++ b/src/mainboard/technexion/tim5690/speaker.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/technexion/tim5690/speaker.h b/src/mainboard/technexion/tim5690/speaker.h
index 3ee0111..3edf8c9 100644
--- a/src/mainboard/technexion/tim5690/speaker.h
+++ b/src/mainboard/technexion/tim5690/speaker.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void speaker_init(uint8_t time);
diff --git a/src/mainboard/technexion/tim5690/tn_post_code.c b/src/mainboard/technexion/tim5690/tn_post_code.c
index 404dde4..1d961e0 100644
--- a/src/mainboard/technexion/tim5690/tn_post_code.c
+++ b/src/mainboard/technexion/tim5690/tn_post_code.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/technexion/tim5690/tn_post_code.h b/src/mainboard/technexion/tim5690/tn_post_code.h
index 47b44a5..66c698b 100644
--- a/src/mainboard/technexion/tim5690/tn_post_code.h
+++ b/src/mainboard/technexion/tim5690/tn_post_code.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define LED_MESSAGE_START       0xFF
diff --git a/src/mainboard/technexion/tim5690/vgabios.c b/src/mainboard/technexion/tim5690/vgabios.c
index be9cb3c..672de6e 100644
--- a/src/mainboard/technexion/tim5690/vgabios.c
+++ b/src/mainboard/technexion/tim5690/vgabios.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/technexion/tim5690/vgabios.h b/src/mainboard/technexion/tim5690/vgabios.h
index 49d3dd7..d960cd5 100644
--- a/src/mainboard/technexion/tim5690/vgabios.h
+++ b/src/mainboard/technexion/tim5690/vgabios.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* AMD Chipset */
diff --git a/src/mainboard/technexion/tim8690/acpi/ide.asl b/src/mainboard/technexion/tim8690/acpi/ide.asl
index d84fc2e..13aeede 100644
--- a/src/mainboard/technexion/tim8690/acpi/ide.asl
+++ b/src/mainboard/technexion/tim8690/acpi/ide.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/technexion/tim8690/acpi/routing.asl b/src/mainboard/technexion/tim8690/acpi/routing.asl
index 3e4c63a..7503c22 100644
--- a/src/mainboard/technexion/tim8690/acpi/routing.asl
+++ b/src/mainboard/technexion/tim8690/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/technexion/tim8690/acpi/sata.asl b/src/mainboard/technexion/tim8690/acpi/sata.asl
index ea8e4f5..0235ef0 100644
--- a/src/mainboard/technexion/tim8690/acpi/sata.asl
+++ b/src/mainboard/technexion/tim8690/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/technexion/tim8690/acpi/usb.asl b/src/mainboard/technexion/tim8690/acpi/usb.asl
index fd39183..707aa2e 100644
--- a/src/mainboard/technexion/tim8690/acpi/usb.asl
+++ b/src/mainboard/technexion/tim8690/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/technexion/tim8690/acpi_tables.c b/src/mainboard/technexion/tim8690/acpi_tables.c
index 628abfd..cf14699 100644
--- a/src/mainboard/technexion/tim8690/acpi_tables.c
+++ b/src/mainboard/technexion/tim8690/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim8690/cmos.layout b/src/mainboard/technexion/tim8690/cmos.layout
index 6da2266..d338a10 100644
--- a/src/mainboard/technexion/tim8690/cmos.layout
+++ b/src/mainboard/technexion/tim8690/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ##
 ##
diff --git a/src/mainboard/technexion/tim8690/dsdt.asl b/src/mainboard/technexion/tim8690/dsdt.asl
index 6d3315c..b826526 100644
--- a/src/mainboard/technexion/tim8690/dsdt.asl
+++ b/src/mainboard/technexion/tim8690/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/technexion/tim8690/fadt.c b/src/mainboard/technexion/tim8690/fadt.c
index 2a2d710..d91f818 100644
--- a/src/mainboard/technexion/tim8690/fadt.c
+++ b/src/mainboard/technexion/tim8690/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/technexion/tim8690/get_bus_conf.c b/src/mainboard/technexion/tim8690/get_bus_conf.c
index d35083c..6545b7d 100644
--- a/src/mainboard/technexion/tim8690/get_bus_conf.c
+++ b/src/mainboard/technexion/tim8690/get_bus_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim8690/irq_tables.c b/src/mainboard/technexion/tim8690/irq_tables.c
index f2c21fe..3d65966 100644
--- a/src/mainboard/technexion/tim8690/irq_tables.c
+++ b/src/mainboard/technexion/tim8690/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c
index eded3e7..66551bd 100644
--- a/src/mainboard/technexion/tim8690/mainboard.c
+++ b/src/mainboard/technexion/tim8690/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim8690/mptable.c b/src/mainboard/technexion/tim8690/mptable.c
index 2c3a1e4..7118093 100644
--- a/src/mainboard/technexion/tim8690/mptable.c
+++ b/src/mainboard/technexion/tim8690/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/technexion/tim8690/resourcemap.c b/src/mainboard/technexion/tim8690/resourcemap.c
index 8714763..e0d7a41 100644
--- a/src/mainboard/technexion/tim8690/resourcemap.c
+++ b/src/mainboard/technexion/tim8690/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_tim8690_resource_map(void)
diff --git a/src/mainboard/technexion/tim8690/romstage.c b/src/mainboard/technexion/tim8690/romstage.c
index 4830bf9..f9c1511 100644
--- a/src/mainboard/technexion/tim8690/romstage.c
+++ b/src/mainboard/technexion/tim8690/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/thomson/ip1000/gpio.c b/src/mainboard/thomson/ip1000/gpio.c
index ab2d407..c3b311f 100644
--- a/src/mainboard/thomson/ip1000/gpio.c
+++ b/src/mainboard/thomson/ip1000/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define PME_DEV			PNP_DEV(0x2e, 0x0a)
diff --git a/src/mainboard/thomson/ip1000/irq_tables.c b/src/mainboard/thomson/ip1000/irq_tables.c
index a6e2dfd..b213ee8 100644
--- a/src/mainboard/thomson/ip1000/irq_tables.c
+++ b/src/mainboard/thomson/ip1000/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index d7b5370..3953c4e 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/thomson/ip1000/romstage.c b/src/mainboard/thomson/ip1000/romstage.c
index 3c906f3..c51257c 100644
--- a/src/mainboard/thomson/ip1000/romstage.c
+++ b/src/mainboard/thomson/ip1000/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/thomson/ip1000/smihandler.c b/src/mainboard/thomson/ip1000/smihandler.c
index 199629f..19ff339 100644
--- a/src/mainboard/thomson/ip1000/smihandler.c
+++ b/src/mainboard/thomson/ip1000/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/thomson/ip1000/spd_table.h b/src/mainboard/thomson/ip1000/spd_table.h
index d53634e..e2295f2 100644
--- a/src/mainboard/thomson/ip1000/spd_table.h
+++ b/src/mainboard/thomson/ip1000/spd_table.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/mainboard/ti/Kconfig b/src/mainboard/ti/Kconfig
index 31367b5..0c625e0 100644
--- a/src/mainboard/ti/Kconfig
+++ b/src/mainboard/ti/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if VENDOR_TI
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index 42503fd..3170661 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 if BOARD_TI_BEAGLEBONE
diff --git a/src/mainboard/ti/beaglebone/Makefile.inc b/src/mainboard/ti/beaglebone/Makefile.inc
index 29a613e..b74e116 100644
--- a/src/mainboard/ti/beaglebone/Makefile.inc
+++ b/src/mainboard/ti/beaglebone/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bootblock-y += bootblock.c
diff --git a/src/mainboard/ti/beaglebone/bootblock.c b/src/mainboard/ti/beaglebone/bootblock.c
index 92d01c0..d2cecf5 100644
--- a/src/mainboard/ti/beaglebone/bootblock.c
+++ b/src/mainboard/ti/beaglebone/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/mainboard/ti/beaglebone/devicetree.cb b/src/mainboard/ti/beaglebone/devicetree.cb
index 8cce0c6..b897d92 100644
--- a/src/mainboard/ti/beaglebone/devicetree.cb
+++ b/src/mainboard/ti/beaglebone/devicetree.cb
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip cpu/ti/am335x
diff --git a/src/mainboard/ti/beaglebone/romstage.c b/src/mainboard/ti/beaglebone/romstage.c
index 396bcb2..c330060 100644
--- a/src/mainboard/ti/beaglebone/romstage.c
+++ b/src/mainboard/ti/beaglebone/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/mainboard/traverse/geos/irq_tables.c b/src/mainboard/traverse/geos/irq_tables.c
index e847d82..d8071cf 100644
--- a/src/mainboard/traverse/geos/irq_tables.c
+++ b/src/mainboard/traverse/geos/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/traverse/geos/mainboard.c b/src/mainboard/traverse/geos/mainboard.c
index bacddc4..bc00c90 100644
--- a/src/mainboard/traverse/geos/mainboard.c
+++ b/src/mainboard/traverse/geos/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/traverse/geos/romstage.c b/src/mainboard/traverse/geos/romstage.c
index 9d23fe5..51b9a52 100644
--- a/src/mainboard/traverse/geos/romstage.c
+++ b/src/mainboard/traverse/geos/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/tyan/Kconfig b/src/mainboard/tyan/Kconfig
index e8d2644..fee7e5c 100644
--- a/src/mainboard/tyan/Kconfig
+++ b/src/mainboard/tyan/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_TYAN
 
diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index 1ea9b4f..867c5af 100644
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_TYAN_S1846
 
diff --git a/src/mainboard/tyan/s1846/romstage.c b/src/mainboard/tyan/s1846/romstage.c
index 4dd2323..eaa114b 100644
--- a/src/mainboard/tyan/s1846/romstage.c
+++ b/src/mainboard/tyan/s1846/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/tyan/s2891/dsdt.asl b/src/mainboard/tyan/s2891/dsdt.asl
index 6184590..5cae40b 100644
--- a/src/mainboard/tyan/s2891/dsdt.asl
+++ b/src/mainboard/tyan/s2891/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/tyan/s2892/dsdt.asl b/src/mainboard/tyan/s2892/dsdt.asl
index 3f76742..6de66a9 100644
--- a/src/mainboard/tyan/s2892/dsdt.asl
+++ b/src/mainboard/tyan/s2892/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/tyan/s2895/dsdt.asl b/src/mainboard/tyan/s2895/dsdt.asl
index 01740d8..e420a8d 100644
--- a/src/mainboard/tyan/s2895/dsdt.asl
+++ b/src/mainboard/tyan/s2895/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/tyan/s2912/cmos.layout b/src/mainboard/tyan/s2912/cmos.layout
index aa4ee3e..b63a627 100644
--- a/src/mainboard/tyan/s2912/cmos.layout
+++ b/src/mainboard/tyan/s2912/cmos.layout
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/tyan/s2912/get_bus_conf.c b/src/mainboard/tyan/s2912/get_bus_conf.c
index 281d667..c5a21b1 100644
--- a/src/mainboard/tyan/s2912/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/tyan/s2912/irq_tables.c b/src/mainboard/tyan/s2912/irq_tables.c
index 63f73df..81bdddf 100644
--- a/src/mainboard/tyan/s2912/irq_tables.c
+++ b/src/mainboard/tyan/s2912/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/tyan/s2912/mb_sysconf.h b/src/mainboard/tyan/s2912/mb_sysconf.h
index 26a4b1d..87297b1 100644
--- a/src/mainboard/tyan/s2912/mb_sysconf.h
+++ b/src/mainboard/tyan/s2912/mb_sysconf.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/tyan/s2912/mptable.c b/src/mainboard/tyan/s2912/mptable.c
index 52dd23a..cce52b5 100644
--- a/src/mainboard/tyan/s2912/mptable.c
+++ b/src/mainboard/tyan/s2912/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/tyan/s2912/resourcemap.c b/src/mainboard/tyan/s2912/resourcemap.c
index b1a6309..443bcea 100644
--- a/src/mainboard/tyan/s2912/resourcemap.c
+++ b/src/mainboard/tyan/s2912/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/tyan/s2912/romstage.c b/src/mainboard/tyan/s2912/romstage.c
index c608bb9..8c38acc 100644
--- a/src/mainboard/tyan/s2912/romstage.c
+++ b/src/mainboard/tyan/s2912/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/tyan/s2912_fam10/cmos.layout b/src/mainboard/tyan/s2912_fam10/cmos.layout
index 02e0382..ed5537c 100644
--- a/src/mainboard/tyan/s2912_fam10/cmos.layout
+++ b/src/mainboard/tyan/s2912_fam10/cmos.layout
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
index 919b37d..a19b4b1 100644
--- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/tyan/s2912_fam10/irq_tables.c b/src/mainboard/tyan/s2912_fam10/irq_tables.c
index b82999b..60584b5 100644
--- a/src/mainboard/tyan/s2912_fam10/irq_tables.c
+++ b/src/mainboard/tyan/s2912_fam10/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file was generated by getpir.c, do not modify!
diff --git a/src/mainboard/tyan/s2912_fam10/mb_sysconf.h b/src/mainboard/tyan/s2912_fam10/mb_sysconf.h
index 26a4b1d..87297b1 100644
--- a/src/mainboard/tyan/s2912_fam10/mb_sysconf.h
+++ b/src/mainboard/tyan/s2912_fam10/mb_sysconf.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MB_SYSCONF_H
diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index 6a01268..d64c22e 100644
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/tyan/s2912_fam10/resourcemap.c b/src/mainboard/tyan/s2912_fam10/resourcemap.c
index e9e3019..c357b32 100644
--- a/src/mainboard/tyan/s2912_fam10/resourcemap.c
+++ b/src/mainboard/tyan/s2912_fam10/resourcemap.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_mb_resource_map(void)
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index 1049014..5d7a226 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FAM10_SCAN_PCI_BUS 0
diff --git a/src/mainboard/tyan/s8226/BiosCallOuts.c b/src/mainboard/tyan/s8226/BiosCallOuts.c
index 67ce92f..fb76529 100644
--- a/src/mainboard/tyan/s8226/BiosCallOuts.c
+++ b/src/mainboard/tyan/s8226/BiosCallOuts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/mainboard/tyan/s8226/Kconfig b/src/mainboard/tyan/s8226/Kconfig
index dad85f0..a4f8fd3 100644
--- a/src/mainboard/tyan/s8226/Kconfig
+++ b/src/mainboard/tyan/s8226/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if BOARD_TYAN_S8226
diff --git a/src/mainboard/tyan/s8226/Makefile.inc b/src/mainboard/tyan/s8226/Makefile.inc
index 22ae72b..4c5811d 100644
--- a/src/mainboard/tyan/s8226/Makefile.inc
+++ b/src/mainboard/tyan/s8226/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += rd890_cfg.c
diff --git a/src/mainboard/tyan/s8226/OptionsIds.h b/src/mainboard/tyan/s8226/OptionsIds.h
index 35f02e2..718b1e6 100644
--- a/src/mainboard/tyan/s8226/OptionsIds.h
+++ b/src/mainboard/tyan/s8226/OptionsIds.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /**
diff --git a/src/mainboard/tyan/s8226/acpi/routing.asl b/src/mainboard/tyan/s8226/acpi/routing.asl
index 8579db4..49feb2e 100644
--- a/src/mainboard/tyan/s8226/acpi/routing.asl
+++ b/src/mainboard/tyan/s8226/acpi/routing.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/tyan/s8226/acpi/sata.asl b/src/mainboard/tyan/s8226/acpi/sata.asl
index cec0304..573ca84 100644
--- a/src/mainboard/tyan/s8226/acpi/sata.asl
+++ b/src/mainboard/tyan/s8226/acpi/sata.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/tyan/s8226/acpi/usb.asl b/src/mainboard/tyan/s8226/acpi/usb.asl
index 0b647ed..36bb3df 100644
--- a/src/mainboard/tyan/s8226/acpi/usb.asl
+++ b/src/mainboard/tyan/s8226/acpi/usb.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* simple name description */
diff --git a/src/mainboard/tyan/s8226/acpi_tables.c b/src/mainboard/tyan/s8226/acpi_tables.c
index 8d3fd0b..27aa8d1 100644
--- a/src/mainboard/tyan/s8226/acpi_tables.c
+++ b/src/mainboard/tyan/s8226/acpi_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/tyan/s8226/buildOpts.c b/src/mainboard/tyan/s8226/buildOpts.c
index fe316cb..2643df2 100644
--- a/src/mainboard/tyan/s8226/buildOpts.c
+++ b/src/mainboard/tyan/s8226/buildOpts.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/mainboard/tyan/s8226/cmos.layout b/src/mainboard/tyan/s8226/cmos.layout
index 996160e..82c4b40 100644
--- a/src/mainboard/tyan/s8226/cmos.layout
+++ b/src/mainboard/tyan/s8226/cmos.layout
@@ -14,8 +14,7 @@
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc.
+#  along with this program.
 #*****************************************************************************
 
 entries
diff --git a/src/mainboard/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb
index 64701a5..3c6d78b 100644
--- a/src/mainboard/tyan/s8226/devicetree.cb
+++ b/src/mainboard/tyan/s8226/devicetree.cb
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 chip northbridge/amd/agesa/family15/root_complex
 	device cpu_cluster 0 on
diff --git a/src/mainboard/tyan/s8226/dsdt.asl b/src/mainboard/tyan/s8226/dsdt.asl
index a2af52b..2599fb0 100644
--- a/src/mainboard/tyan/s8226/dsdt.asl
+++ b/src/mainboard/tyan/s8226/dsdt.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DefinitionBlock Statement */
diff --git a/src/mainboard/tyan/s8226/fadt.c b/src/mainboard/tyan/s8226/fadt.c
index d91ae6f..77ec477 100644
--- a/src/mainboard/tyan/s8226/fadt.c
+++ b/src/mainboard/tyan/s8226/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/tyan/s8226/irq_tables.c b/src/mainboard/tyan/s8226/irq_tables.c
index 70f54c0..42d910f 100644
--- a/src/mainboard/tyan/s8226/irq_tables.c
+++ b/src/mainboard/tyan/s8226/irq_tables.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/tyan/s8226/mainboard.c b/src/mainboard/tyan/s8226/mainboard.c
index e6a7c2e..a2bd54f 100644
--- a/src/mainboard/tyan/s8226/mainboard.c
+++ b/src/mainboard/tyan/s8226/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c
index 9880812..37ded4f 100644
--- a/src/mainboard/tyan/s8226/mptable.c
+++ b/src/mainboard/tyan/s8226/mptable.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/tyan/s8226/platform_cfg.h b/src/mainboard/tyan/s8226/platform_cfg.h
index 6855802..f6eb8f2 100644
--- a/src/mainboard/tyan/s8226/platform_cfg.h
+++ b/src/mainboard/tyan/s8226/platform_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PLATFORM_CFG_H_
diff --git a/src/mainboard/tyan/s8226/rd890_cfg.c b/src/mainboard/tyan/s8226/rd890_cfg.c
index 1e78f93..ad54d53 100644
--- a/src/mainboard/tyan/s8226/rd890_cfg.c
+++ b/src/mainboard/tyan/s8226/rd890_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "NbPlatform.h"
diff --git a/src/mainboard/tyan/s8226/rd890_cfg.h b/src/mainboard/tyan/s8226/rd890_cfg.h
index 0fab3b6..a62e07d 100644
--- a/src/mainboard/tyan/s8226/rd890_cfg.h
+++ b/src/mainboard/tyan/s8226/rd890_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef  _RD890_CFG_H_
diff --git a/src/mainboard/tyan/s8226/romstage.c b/src/mainboard/tyan/s8226/romstage.c
index 7a21cc6..aab82f0 100644
--- a/src/mainboard/tyan/s8226/romstage.c
+++ b/src/mainboard/tyan/s8226/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/mainboard/tyan/s8226/sb700_cfg.c b/src/mainboard/tyan/s8226/sb700_cfg.c
index 15c6f34..d2d7692 100644
--- a/src/mainboard/tyan/s8226/sb700_cfg.c
+++ b/src/mainboard/tyan/s8226/sb700_cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/tyan/s8226/sb700_cfg.h b/src/mainboard/tyan/s8226/sb700_cfg.h
index 2d056ab..516659f 100644
--- a/src/mainboard/tyan/s8226/sb700_cfg.h
+++ b/src/mainboard/tyan/s8226/sb700_cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/mainboard/via/epia-cn/irq_tables.c b/src/mainboard/via/epia-cn/irq_tables.c
index 16b1e42..2f5048d 100644
--- a/src/mainboard/via/epia-cn/irq_tables.c
+++ b/src/mainboard/via/epia-cn/irq_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/via/epia-cn/romstage.c b/src/mainboard/via/epia-cn/romstage.c
index 5f191ce..d732a5c 100644
--- a/src/mainboard/via/epia-cn/romstage.c
+++ b/src/mainboard/via/epia-cn/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/via/epia-m700/acpi_tables.c b/src/mainboard/via/epia-m700/acpi_tables.c
index b3d126b..ade3754 100644
--- a/src/mainboard/via/epia-m700/acpi_tables.c
+++ b/src/mainboard/via/epia-m700/acpi_tables.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/via/epia-m700/driving_clk_phase_data.c b/src/mainboard/via/epia-m700/driving_clk_phase_data.c
index 8d03fa8..83355a3 100644
--- a/src/mainboard/via/epia-m700/driving_clk_phase_data.c
+++ b/src/mainboard/via/epia-m700/driving_clk_phase_data.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "northbridge/via/vx800/driving_clk_phase_data.h"
diff --git a/src/mainboard/via/epia-m700/fadt.c b/src/mainboard/via/epia-m700/fadt.c
index 670daff..76a9203 100644
--- a/src/mainboard/via/epia-m700/fadt.c
+++ b/src/mainboard/via/epia-m700/fadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/via/epia-m700/get_dsdt b/src/mainboard/via/epia-m700/get_dsdt
index f537016..1a5028f 100755
--- a/src/mainboard/via/epia-m700/get_dsdt
+++ b/src/mainboard/via/epia-m700/get_dsdt
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Simple script to dump the factory ACPI DSDT and convert it to C.
diff --git a/src/mainboard/via/epia-m700/irq_tables.c b/src/mainboard/via/epia-m700/irq_tables.c
index 749828f..933e73e 100644
--- a/src/mainboard/via/epia-m700/irq_tables.c
+++ b/src/mainboard/via/epia-m700/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/via/epia-m700/romstage.c b/src/mainboard/via/epia-m700/romstage.c
index d20c366..4503b13 100644
--- a/src/mainboard/via/epia-m700/romstage.c
+++ b/src/mainboard/via/epia-m700/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/via/epia-m700/wakeup.c b/src/mainboard/via/epia-m700/wakeup.c
index 0dff940..662a825 100644
--- a/src/mainboard/via/epia-m700/wakeup.c
+++ b/src/mainboard/via/epia-m700/wakeup.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* FIXME This code should be dropped and instead the generic resume code
diff --git a/src/mainboard/via/epia-m700/wakeup.h b/src/mainboard/via/epia-m700/wakeup.h
index 634dcf2..32be668 100644
--- a/src/mainboard/via/epia-m700/wakeup.h
+++ b/src/mainboard/via/epia-m700/wakeup.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef WAKEUP_H
diff --git a/src/mainboard/via/pc2500e/cmos.layout b/src/mainboard/via/pc2500e/cmos.layout
index b756e00..1e3d3f5 100644
--- a/src/mainboard/via/pc2500e/cmos.layout
+++ b/src/mainboard/via/pc2500e/cmos.layout
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/via/pc2500e/irq_tables.c b/src/mainboard/via/pc2500e/irq_tables.c
index f24c4bf..1336ed9 100644
--- a/src/mainboard/via/pc2500e/irq_tables.c
+++ b/src/mainboard/via/pc2500e/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/via/pc2500e/mptable.c b/src/mainboard/via/pc2500e/mptable.c
index dcbfc92..4cf3a10 100644
--- a/src/mainboard/via/pc2500e/mptable.c
+++ b/src/mainboard/via/pc2500e/mptable.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/via/pc2500e/romstage.c b/src/mainboard/via/pc2500e/romstage.c
index 42f17ea..6af891c 100644
--- a/src/mainboard/via/pc2500e/romstage.c
+++ b/src/mainboard/via/pc2500e/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl b/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
index d3b713c..7a8dbf7 100644
--- a/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
+++ b/src/mainboard/via/vt8454c/acpi/irq-p2p-bridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (PICM, Package () {
diff --git a/src/mainboard/via/vt8454c/acpi/irq.asl b/src/mainboard/via/vt8454c/acpi/irq.asl
index 68ecb7f..b64bf56 100644
--- a/src/mainboard/via/vt8454c/acpi/irq.asl
+++ b/src/mainboard/via/vt8454c/acpi/irq.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (PICM, Package () {
diff --git a/src/mainboard/via/vt8454c/acpi_tables.c b/src/mainboard/via/vt8454c/acpi_tables.c
index aef9028..1838f28 100644
--- a/src/mainboard/via/vt8454c/acpi_tables.c
+++ b/src/mainboard/via/vt8454c/acpi_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/via/vt8454c/cmos.layout b/src/mainboard/via/vt8454c/cmos.layout
index 4f286ac..192fb2b 100644
--- a/src/mainboard/via/vt8454c/cmos.layout
+++ b/src/mainboard/via/vt8454c/cmos.layout
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 entries
diff --git a/src/mainboard/via/vt8454c/dsdt.asl b/src/mainboard/via/vt8454c/dsdt.asl
index 83ede96..75a03ce 100644
--- a/src/mainboard/via/vt8454c/dsdt.asl
+++ b/src/mainboard/via/vt8454c/dsdt.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 DefinitionBlock ("dsdt.aml", "DSDT", 1, "CX700 ", "COREBOOT", 0x00000001)
diff --git a/src/mainboard/via/vt8454c/fadt.c b/src/mainboard/via/vt8454c/fadt.c
index 878d4a4..eff7abc 100644
--- a/src/mainboard/via/vt8454c/fadt.c
+++ b/src/mainboard/via/vt8454c/fadt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/mainboard/via/vt8454c/irq_tables.c b/src/mainboard/via/vt8454c/irq_tables.c
index f4bfd21..688c0be 100644
--- a/src/mainboard/via/vt8454c/irq_tables.c
+++ b/src/mainboard/via/vt8454c/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/via/vt8454c/mptable.c b/src/mainboard/via/vt8454c/mptable.c
index 84e0cc7..ec28ccd 100644
--- a/src/mainboard/via/vt8454c/mptable.c
+++ b/src/mainboard/via/vt8454c/mptable.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/mainboard/via/vt8454c/romstage.c b/src/mainboard/via/vt8454c/romstage.c
index aed102b..4c6d987 100644
--- a/src/mainboard/via/vt8454c/romstage.c
+++ b/src/mainboard/via/vt8454c/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/winent/Kconfig b/src/mainboard/winent/Kconfig
index f7b0eda..3ab7084 100644
--- a/src/mainboard/winent/Kconfig
+++ b/src/mainboard/winent/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_WINENT
 
diff --git a/src/mainboard/winent/mb6047/dsdt.asl b/src/mainboard/winent/mb6047/dsdt.asl
index b180e61..0191258 100644
--- a/src/mainboard/winent/mb6047/dsdt.asl
+++ b/src/mainboard/winent/mb6047/dsdt.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/mainboard/winent/pl6064/irq_tables.c b/src/mainboard/winent/pl6064/irq_tables.c
index 7d96df7..70238d5 100644
--- a/src/mainboard/winent/pl6064/irq_tables.c
+++ b/src/mainboard/winent/pl6064/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/winent/pl6064/mainboard.c b/src/mainboard/winent/pl6064/mainboard.c
index 4ac09ac..a476af3 100644
--- a/src/mainboard/winent/pl6064/mainboard.c
+++ b/src/mainboard/winent/pl6064/mainboard.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/winent/pl6064/romstage.c b/src/mainboard/winent/pl6064/romstage.c
index ec875f0..3cc3f0e 100644
--- a/src/mainboard/winent/pl6064/romstage.c
+++ b/src/mainboard/winent/pl6064/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/mainboard/wyse/Kconfig b/src/mainboard/wyse/Kconfig
index e8fb90c..dc9bd40 100644
--- a/src/mainboard/wyse/Kconfig
+++ b/src/mainboard/wyse/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if VENDOR_WYSE
 
diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig
index fdb70be..40b1955 100644
--- a/src/mainboard/wyse/s50/Kconfig
+++ b/src/mainboard/wyse/s50/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 if BOARD_WYSE_S50
 
diff --git a/src/mainboard/wyse/s50/cmos.layout b/src/mainboard/wyse/s50/cmos.layout
index 6ab5766..b8d7368 100644
--- a/src/mainboard/wyse/s50/cmos.layout
+++ b/src/mainboard/wyse/s50/cmos.layout
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # -----------------------------------------------------------------
diff --git a/src/mainboard/wyse/s50/devicetree.cb b/src/mainboard/wyse/s50/devicetree.cb
index 5f0435d..f458c18 100644
--- a/src/mainboard/wyse/s50/devicetree.cb
+++ b/src/mainboard/wyse/s50/devicetree.cb
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 chip northbridge/amd/gx2
diff --git a/src/mainboard/wyse/s50/irq_tables.c b/src/mainboard/wyse/s50/irq_tables.c
index d431197..b16b284 100644
--- a/src/mainboard/wyse/s50/irq_tables.c
+++ b/src/mainboard/wyse/s50/irq_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/mainboard/wyse/s50/mainboard.c b/src/mainboard/wyse/s50/mainboard.c
index 24e6e06..c816c87 100644
--- a/src/mainboard/wyse/s50/mainboard.c
+++ b/src/mainboard/wyse/s50/mainboard.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/mainboard/wyse/s50/romstage.c b/src/mainboard/wyse/s50/romstage.c
index 16a4d58..787196c 100644
--- a/src/mainboard/wyse/s50/romstage.c
+++ b/src/mainboard/wyse/s50/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/amd/agesa/BiosCallOuts.h b/src/northbridge/amd/agesa/BiosCallOuts.h
index e763b8c..bb289a9 100644
--- a/src/northbridge/amd/agesa/BiosCallOuts.h
+++ b/src/northbridge/amd/agesa/BiosCallOuts.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CALLOUTS_AMD_AGESA_H
diff --git a/src/northbridge/amd/agesa/Kconfig b/src/northbridge/amd/agesa/Kconfig
index 481d628..4731abb 100644
--- a/src/northbridge/amd/agesa/Kconfig
+++ b/src/northbridge/amd/agesa/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config NORTHBRIDGE_AMD_AGESA
diff --git a/src/northbridge/amd/agesa/Makefile.inc b/src/northbridge/amd/agesa/Makefile.inc
index 284b6e2..daaab43 100644
--- a/src/northbridge/amd/agesa/Makefile.inc
+++ b/src/northbridge/amd/agesa/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_AMD_AGESA),y)
diff --git a/src/northbridge/amd/agesa/agesawrapper.c b/src/northbridge/amd/agesa/agesawrapper.c
index bfad605..f53fd10 100644
--- a/src/northbridge/amd/agesa/agesawrapper.c
+++ b/src/northbridge/amd/agesa/agesawrapper.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/amd/agesa/agesawrapper.h b/src/northbridge/amd/agesa/agesawrapper.h
index 7e58e79..965daa7 100644
--- a/src/northbridge/amd/agesa/agesawrapper.h
+++ b/src/northbridge/amd/agesa/agesawrapper.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AGESAWRAPPER_H_
diff --git a/src/northbridge/amd/agesa/common/Makefile.inc b/src/northbridge/amd/agesa/common/Makefile.inc
index 9fa7133..492eb57 100644
--- a/src/northbridge/amd/agesa/common/Makefile.inc
+++ b/src/northbridge/amd/agesa/common/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += ../../../../device/dram/ddr3.c
diff --git a/src/northbridge/amd/agesa/common/common.c b/src/northbridge/amd/agesa/common/common.c
index cc08ac1..6718373 100644
--- a/src/northbridge/amd/agesa/common/common.c
+++ b/src/northbridge/amd/agesa/common/common.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "AGESA.h"
diff --git a/src/northbridge/amd/agesa/common/common.h b/src/northbridge/amd/agesa/common/common.h
index a71efeb..3d63efb 100644
--- a/src/northbridge/amd/agesa/common/common.h
+++ b/src/northbridge/amd/agesa/common/common.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AGESA_COMMON_H_
diff --git a/src/northbridge/amd/agesa/def_callouts.c b/src/northbridge/amd/agesa/def_callouts.c
index c07c063..43eb870 100644
--- a/src/northbridge/amd/agesa/def_callouts.c
+++ b/src/northbridge/amd/agesa/def_callouts.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/northbridge/amd/agesa/dimmSpd.h b/src/northbridge/amd/agesa/dimmSpd.h
index 201ec03..9a2ced5 100644
--- a/src/northbridge/amd/agesa/dimmSpd.h
+++ b/src/northbridge/amd/agesa/dimmSpd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _DIMMSPD_H_
diff --git a/src/northbridge/amd/agesa/eventlog.c b/src/northbridge/amd/agesa/eventlog.c
index 014a803..b990edc 100644
--- a/src/northbridge/amd/agesa/eventlog.c
+++ b/src/northbridge/amd/agesa/eventlog.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family10/Kconfig b/src/northbridge/amd/agesa/family10/Kconfig
index 5a51b82..2909f1d 100644
--- a/src/northbridge/amd/agesa/family10/Kconfig
+++ b/src/northbridge/amd/agesa/family10/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY10
 	bool
diff --git a/src/northbridge/amd/agesa/family10/Makefile.inc b/src/northbridge/amd/agesa/family10/Makefile.inc
index c91ed81..791d76e 100644
--- a/src/northbridge/amd/agesa/family10/Makefile.inc
+++ b/src/northbridge/amd/agesa/family10/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ramstage-y += northbridge.c
diff --git a/src/northbridge/amd/agesa/family10/amdfam10.h b/src/northbridge/amd/agesa/family10/amdfam10.h
index 26b3c62..08b83df 100644
--- a/src/northbridge/amd/agesa/family10/amdfam10.h
+++ b/src/northbridge/amd/agesa/family10/amdfam10.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMDFAM10_H
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index 91b17b1..c4f9689 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family10/reset_test.h b/src/northbridge/amd/agesa/family10/reset_test.h
index acdda5a..449ad62 100644
--- a/src/northbridge/amd/agesa/family10/reset_test.h
+++ b/src/northbridge/amd/agesa/family10/reset_test.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * copy from src/northbridge/amd/amdfam10/reset_test.c
  */
diff --git a/src/northbridge/amd/agesa/family12/Kconfig b/src/northbridge/amd/agesa/family12/Kconfig
index 9095c97..2e1c15e 100644
--- a/src/northbridge/amd/agesa/family12/Kconfig
+++ b/src/northbridge/amd/agesa/family12/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY12
 	bool
diff --git a/src/northbridge/amd/agesa/family12/Makefile.inc b/src/northbridge/amd/agesa/family12/Makefile.inc
index ba63321..e0526b1 100644
--- a/src/northbridge/amd/agesa/family12/Makefile.inc
+++ b/src/northbridge/amd/agesa/family12/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/agesa/family12/amdfam12_conf.c b/src/northbridge/amd/agesa/family12/amdfam12_conf.c
index 069f28e..2a8ba14 100644
--- a/src/northbridge/amd/agesa/family12/amdfam12_conf.c
+++ b/src/northbridge/amd/agesa/family12/amdfam12_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index f1305b9..d88f295 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family14/Kconfig b/src/northbridge/amd/agesa/family14/Kconfig
index 4f574ed..bec9740 100644
--- a/src/northbridge/amd/agesa/family14/Kconfig
+++ b/src/northbridge/amd/agesa/family14/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY14
 	bool
diff --git a/src/northbridge/amd/agesa/family14/Makefile.inc b/src/northbridge/amd/agesa/family14/Makefile.inc
index ba63321..e0526b1 100644
--- a/src/northbridge/amd/agesa/family14/Makefile.inc
+++ b/src/northbridge/amd/agesa/family14/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
index ef51e7c..e345fad 100644
--- a/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family14/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/agesa/family14/amdfam14_conf.c b/src/northbridge/amd/agesa/family14/amdfam14_conf.c
index b016cac..5e92fa2 100644
--- a/src/northbridge/amd/agesa/family14/amdfam14_conf.c
+++ b/src/northbridge/amd/agesa/family14/amdfam14_conf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/agesa/family14/chip.h b/src/northbridge/amd/agesa/family14/chip.h
index 5babf45..672145a 100644
--- a/src/northbridge/amd/agesa/family14/chip.h
+++ b/src/northbridge/amd/agesa/family14/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_AGESA_CHIP_H_
diff --git a/src/northbridge/amd/agesa/family14/dimmSpd.c b/src/northbridge/amd/agesa/family14/dimmSpd.c
index ef48537..1fa47fa 100644
--- a/src/northbridge/amd/agesa/family14/dimmSpd.c
+++ b/src/northbridge/amd/agesa/family14/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 7a0294b..97888d7 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family14/pci_devs.h b/src/northbridge/amd/agesa/family14/pci_devs.h
index 344b1b4..ee53bc7 100644
--- a/src/northbridge/amd/agesa/family14/pci_devs.h
+++ b/src/northbridge/amd/agesa/family14/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_FAM14_PCI_DEVS_H_
diff --git a/src/northbridge/amd/agesa/family15/Kconfig b/src/northbridge/amd/agesa/family15/Kconfig
index 425df4b..2652f9d 100644
--- a/src/northbridge/amd/agesa/family15/Kconfig
+++ b/src/northbridge/amd/agesa/family15/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY15
 	bool
diff --git a/src/northbridge/amd/agesa/family15/Makefile.inc b/src/northbridge/amd/agesa/family15/Makefile.inc
index a83b4c3..df5429c 100644
--- a/src/northbridge/amd/agesa/family15/Makefile.inc
+++ b/src/northbridge/amd/agesa/family15/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/agesa/family15/chip.h b/src/northbridge/amd/agesa/family15/chip.h
index ce10bd6..a376453 100644
--- a/src/northbridge/amd/agesa/family15/chip.h
+++ b/src/northbridge/amd/agesa/family15/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_AGESA_CHIP_H_
diff --git a/src/northbridge/amd/agesa/family15/dimmSpd.c b/src/northbridge/amd/agesa/family15/dimmSpd.c
index a93f502..12d97a4 100644
--- a/src/northbridge/amd/agesa/family15/dimmSpd.c
+++ b/src/northbridge/amd/agesa/family15/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index d0e05fb..c4661a9 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family15rl/Kconfig b/src/northbridge/amd/agesa/family15rl/Kconfig
index b02c84b..64236ab 100644
--- a/src/northbridge/amd/agesa/family15rl/Kconfig
+++ b/src/northbridge/amd/agesa/family15rl/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY15_RL
 	bool
diff --git a/src/northbridge/amd/agesa/family15rl/Makefile.inc b/src/northbridge/amd/agesa/family15rl/Makefile.inc
index 65f0a3b..03912d6 100644
--- a/src/northbridge/amd/agesa/family15rl/Makefile.inc
+++ b/src/northbridge/amd/agesa/family15rl/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/agesa/family15rl/acpi/northbridge.asl b/src/northbridge/amd/agesa/family15rl/acpi/northbridge.asl
index 66f44ed..a0dd33f 100644
--- a/src/northbridge/amd/agesa/family15rl/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family15rl/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/agesa/family15rl/chip.h b/src/northbridge/amd/agesa/family15rl/chip.h
index d44576b..dd31b98 100644
--- a/src/northbridge/amd/agesa/family15rl/chip.h
+++ b/src/northbridge/amd/agesa/family15rl/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_AGESA_CHIP_H_
diff --git a/src/northbridge/amd/agesa/family15rl/dimmSpd.c b/src/northbridge/amd/agesa/family15rl/dimmSpd.c
index 98875a6..d140ade 100644
--- a/src/northbridge/amd/agesa/family15rl/dimmSpd.c
+++ b/src/northbridge/amd/agesa/family15rl/dimmSpd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/agesa/family15rl/iommu.c b/src/northbridge/amd/agesa/family15rl/iommu.c
index e70dfb2..dbd5ffa 100644
--- a/src/northbridge/amd/agesa/family15rl/iommu.c
+++ b/src/northbridge/amd/agesa/family15rl/iommu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/northbridge/amd/agesa/family15rl/northbridge.c b/src/northbridge/amd/agesa/family15rl/northbridge.c
index 62486b8..78b9b55 100644
--- a/src/northbridge/amd/agesa/family15rl/northbridge.c
+++ b/src/northbridge/amd/agesa/family15rl/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family15tn/Kconfig b/src/northbridge/amd/agesa/family15tn/Kconfig
index a7e7e0c..869e617 100644
--- a/src/northbridge/amd/agesa/family15tn/Kconfig
+++ b/src/northbridge/amd/agesa/family15tn/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
 	bool
diff --git a/src/northbridge/amd/agesa/family15tn/Makefile.inc b/src/northbridge/amd/agesa/family15tn/Makefile.inc
index 65f0a3b..03912d6 100644
--- a/src/northbridge/amd/agesa/family15tn/Makefile.inc
+++ b/src/northbridge/amd/agesa/family15tn/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
index 66f44ed..a0dd33f 100644
--- a/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family15tn/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/agesa/family15tn/chip.h b/src/northbridge/amd/agesa/family15tn/chip.h
index 4b339b7..21488b3 100644
--- a/src/northbridge/amd/agesa/family15tn/chip.h
+++ b/src/northbridge/amd/agesa/family15tn/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_AGESA_CHIP_H_
diff --git a/src/northbridge/amd/agesa/family15tn/dimmSpd.c b/src/northbridge/amd/agesa/family15tn/dimmSpd.c
index f14203b..e42bb41 100644
--- a/src/northbridge/amd/agesa/family15tn/dimmSpd.c
+++ b/src/northbridge/amd/agesa/family15tn/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/agesa/family15tn/iommu.c b/src/northbridge/amd/agesa/family15tn/iommu.c
index e70dfb2..dbd5ffa 100644
--- a/src/northbridge/amd/agesa/family15tn/iommu.c
+++ b/src/northbridge/amd/agesa/family15tn/iommu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index b043ccc..1a7c551 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family15tn/pci_devs.h b/src/northbridge/amd/agesa/family15tn/pci_devs.h
index c6ad4cf..3ce173b 100644
--- a/src/northbridge/amd/agesa/family15tn/pci_devs.h
+++ b/src/northbridge/amd/agesa/family15tn/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_FAM15TN_PCI_DEVS_H_
diff --git a/src/northbridge/amd/agesa/family16kb/Kconfig b/src/northbridge/amd/agesa/family16kb/Kconfig
index 761d3e3..0824a1c 100644
--- a/src/northbridge/amd/agesa/family16kb/Kconfig
+++ b/src/northbridge/amd/agesa/family16kb/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
 	bool
diff --git a/src/northbridge/amd/agesa/family16kb/Makefile.inc b/src/northbridge/amd/agesa/family16kb/Makefile.inc
index a83b4c3..df5429c 100644
--- a/src/northbridge/amd/agesa/family16kb/Makefile.inc
+++ b/src/northbridge/amd/agesa/family16kb/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
index 7a9960f..7c2fb0a 100644
--- a/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
+++ b/src/northbridge/amd/agesa/family16kb/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/agesa/family16kb/chip.h b/src/northbridge/amd/agesa/family16kb/chip.h
index 79bb738..d128d80 100644
--- a/src/northbridge/amd/agesa/family16kb/chip.h
+++ b/src/northbridge/amd/agesa/family16kb/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_AGESA_CHIP_H_
diff --git a/src/northbridge/amd/agesa/family16kb/dimmSpd.c b/src/northbridge/amd/agesa/family16kb/dimmSpd.c
index 2675ad0..f0ea3f6 100644
--- a/src/northbridge/amd/agesa/family16kb/dimmSpd.c
+++ b/src/northbridge/amd/agesa/family16kb/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index 275ed3d..d3e3965 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/agesa/family16kb/pci_devs.h b/src/northbridge/amd/agesa/family16kb/pci_devs.h
index 9642a2a..6fcc689 100644
--- a/src/northbridge/amd/agesa/family16kb/pci_devs.h
+++ b/src/northbridge/amd/agesa/family16kb/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_FAM16KB_PCI_DEVS_H_
diff --git a/src/northbridge/amd/agesa/oem_s3.c b/src/northbridge/amd/agesa/oem_s3.c
index f9ce4a7..deb6a28 100644
--- a/src/northbridge/amd/agesa/oem_s3.c
+++ b/src/northbridge/amd/agesa/oem_s3.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spi-generic.h>
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index 4d7147d..894a4ae 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_AMD_AMDFAM10
diff --git a/src/northbridge/amd/amdfam10/acpi.c b/src/northbridge/amd/amdfam10/acpi.c
index 4b86e96..eea4c1b 100644
--- a/src/northbridge/amd/amdfam10/acpi.c
+++ b/src/northbridge/amd/amdfam10/acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index a1e08a0..d3e91e0 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMDFAM10_H
diff --git a/src/northbridge/amd/amdfam10/amdfam10_util.asl b/src/northbridge/amd/amdfam10/amdfam10_util.asl
index d337754..8705f9e 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_util.asl
+++ b/src/northbridge/amd/amdfam10/amdfam10_util.asl
@@ -14,8 +14,7 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc.
+// along with this program.
 //
 
 //AMD FAM10 util for BUSB and res range
diff --git a/src/northbridge/amd/amdfam10/amdfam10_util.c b/src/northbridge/amd/amdfam10/amdfam10_util.c
index 423bb73..2ca18a4 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_util.c
+++ b/src/northbridge/amd/amdfam10/amdfam10_util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdfam10/chip.h b/src/northbridge/amd/amdfam10/chip.h
index 9b53354..9541a2a 100644
--- a/src/northbridge/amd/amdfam10/chip.h
+++ b/src/northbridge/amd/amdfam10/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_FAM10_CHIP_H_
diff --git a/src/northbridge/amd/amdfam10/debug.c b/src/northbridge/amd/amdfam10/debug.c
index 740153d..5026343 100644
--- a/src/northbridge/amd/amdfam10/debug.c
+++ b/src/northbridge/amd/amdfam10/debug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdfam10/early_ht.c b/src/northbridge/amd/amdfam10/early_ht.c
index 2f57b54..248c816 100644
--- a/src/northbridge/amd/amdfam10/early_ht.c
+++ b/src/northbridge/amd/amdfam10/early_ht.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // For SB HT chain only
diff --git a/src/northbridge/amd/amdfam10/get_pci1234.c b/src/northbridge/amd/amdfam10/get_pci1234.c
index 69c1e53..49459bf 100644
--- a/src/northbridge/amd/amdfam10/get_pci1234.c
+++ b/src/northbridge/amd/amdfam10/get_pci1234.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdfam10/ht_config.c b/src/northbridge/amd/amdfam10/ht_config.c
index 6eec534..d28790e 100644
--- a/src/northbridge/amd/amdfam10/ht_config.c
+++ b/src/northbridge/amd/amdfam10/ht_config.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/amd/amdfam10/ht_config.h b/src/northbridge/amd/amdfam10/ht_config.h
index 785f677..2a089aa 100644
--- a/src/northbridge/amd/amdfam10/ht_config.h
+++ b/src/northbridge/amd/amdfam10/ht_config.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct amdfam10_sysconf_t sys_info_conf_t;
diff --git a/src/northbridge/amd/amdfam10/misc_control.c b/src/northbridge/amd/amdfam10/misc_control.c
index e242e34..0c397df 100644
--- a/src/northbridge/amd/amdfam10/misc_control.c
+++ b/src/northbridge/amd/amdfam10/misc_control.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Turn off machine check triggers when reading
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index 6d91cbd..5d019bc 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/amdfam10/northbridge.h b/src/northbridge/amd/amdfam10/northbridge.h
index 3444090..97e60fa 100644
--- a/src/northbridge/amd/amdfam10/northbridge.h
+++ b/src/northbridge/amd/amdfam10/northbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_AMD_AMDFAM10_H
diff --git a/src/northbridge/amd/amdfam10/nums.h b/src/northbridge/amd/amdfam10/nums.h
index 6e1a31c..0d4172e 100644
--- a/src/northbridge/amd/amdfam10/nums.h
+++ b/src/northbridge/amd/amdfam10/nums.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMDFAM10_NUMS_H
diff --git a/src/northbridge/amd/amdfam10/pci.c b/src/northbridge/amd/amdfam10/pci.c
index c0637ce..0202762 100644
--- a/src/northbridge/amd/amdfam10/pci.c
+++ b/src/northbridge/amd/amdfam10/pci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdfam10/raminit.h b/src/northbridge/amd/amdfam10/raminit.h
index 41c662f..a6fade7 100644
--- a/src/northbridge/amd/amdfam10/raminit.h
+++ b/src/northbridge/amd/amdfam10/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/amd/amdfam10/raminit_amdmct.c b/src/northbridge/amd/amdfam10/raminit_amdmct.c
index a0d47f4..ef5cf7b 100644
--- a/src/northbridge/amd/amdfam10/raminit_amdmct.c
+++ b/src/northbridge/amd/amdfam10/raminit_amdmct.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c b/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c
index f42fd2f..360c941 100644
--- a/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c
+++ b/src/northbridge/amd/amdfam10/raminit_sysinfo_in_ram.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/northbridge/amd/amdfam10/reset_test.c b/src/northbridge/amd/amdfam10/reset_test.c
index 2f919ff..4439af8 100644
--- a/src/northbridge/amd/amdfam10/reset_test.c
+++ b/src/northbridge/amd/amdfam10/reset_test.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/amd/amdfam10/resourcemap.c b/src/northbridge/amd/amdfam10/resourcemap.c
index 4015124..54f40fd 100644
--- a/src/northbridge/amd/amdfam10/resourcemap.c
+++ b/src/northbridge/amd/amdfam10/resourcemap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void setup_default_resource_map(void)
diff --git a/src/northbridge/amd/amdfam10/setup_resource_map.c b/src/northbridge/amd/amdfam10/setup_resource_map.c
index 197b8cc..8e44377 100644
--- a/src/northbridge/amd/amdfam10/setup_resource_map.c
+++ b/src/northbridge/amd/amdfam10/setup_resource_map.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdfam10/thermal_mixin.asl b/src/northbridge/amd/amdfam10/thermal_mixin.asl
index 3bd7e40..6a5c6ab 100644
--- a/src/northbridge/amd/amdfam10/thermal_mixin.asl
+++ b/src/northbridge/amd/amdfam10/thermal_mixin.asl
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdfam10/util.c b/src/northbridge/amd/amdfam10/util.c
index 74e4412..35b22d4 100644
--- a/src/northbridge/amd/amdfam10/util.c
+++ b/src/northbridge/amd/amdfam10/util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdht/AsPsDefs.h b/src/northbridge/amd/amdht/AsPsDefs.h
index caeb9b4..b26a735 100644
--- a/src/northbridge/amd/amdht/AsPsDefs.h
+++ b/src/northbridge/amd/amdht/AsPsDefs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdht/AsPsNb.c b/src/northbridge/amd/amdht/AsPsNb.c
index 833180b..502319e 100644
--- a/src/northbridge/amd/amdht/AsPsNb.c
+++ b/src/northbridge/amd/amdht/AsPsNb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #undef FILECODE
diff --git a/src/northbridge/amd/amdht/AsPsNb.h b/src/northbridge/amd/amdht/AsPsNb.h
index 89c2bc9..6802438 100644
--- a/src/northbridge/amd/amdht/AsPsNb.h
+++ b/src/northbridge/amd/amdht/AsPsNb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdht/comlib.c b/src/northbridge/amd/amdht/comlib.c
index 7220724..b19ef2e 100644
--- a/src/northbridge/amd/amdht/comlib.c
+++ b/src/northbridge/amd/amdht/comlib.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #undef FILECODE
diff --git a/src/northbridge/amd/amdht/comlib.h b/src/northbridge/amd/amdht/comlib.h
index b9236f9..7610516 100644
--- a/src/northbridge/amd/amdht/comlib.h
+++ b/src/northbridge/amd/amdht/comlib.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef COMLIB_H
diff --git a/src/northbridge/amd/amdht/h3ffeat.h b/src/northbridge/amd/amdht/h3ffeat.h
index 5d9550b..3250ddf 100644
--- a/src/northbridge/amd/amdht/h3ffeat.h
+++ b/src/northbridge/amd/amdht/h3ffeat.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdht/h3finit.c b/src/northbridge/amd/amdht/h3finit.c
index 849f4a8..03b6841 100644
--- a/src/northbridge/amd/amdht/h3finit.c
+++ b/src/northbridge/amd/amdht/h3finit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdht/h3finit.h b/src/northbridge/amd/amdht/h3finit.h
index 58065b3..ee26c0c 100644
--- a/src/northbridge/amd/amdht/h3finit.h
+++ b/src/northbridge/amd/amdht/h3finit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef H3FINIT_H
diff --git a/src/northbridge/amd/amdht/h3gtopo.h b/src/northbridge/amd/amdht/h3gtopo.h
index c3e7e1f..4ccdfb6 100644
--- a/src/northbridge/amd/amdht/h3gtopo.h
+++ b/src/northbridge/amd/amdht/h3gtopo.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program * if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HTTOPO_H
diff --git a/src/northbridge/amd/amdht/h3ncmn.c b/src/northbridge/amd/amdht/h3ncmn.c
index 97f9db8..b5a65c3 100644
--- a/src/northbridge/amd/amdht/h3ncmn.c
+++ b/src/northbridge/amd/amdht/h3ncmn.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdht/h3ncmn.h b/src/northbridge/amd/amdht/h3ncmn.h
index 7f8f4d1..815ae5f 100644
--- a/src/northbridge/amd/amdht/h3ncmn.h
+++ b/src/northbridge/amd/amdht/h3ncmn.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef H3NCMN_H
diff --git a/src/northbridge/amd/amdht/ht_wrapper.c b/src/northbridge/amd/amdht/ht_wrapper.c
index 36fe60b..36749d9 100644
--- a/src/northbridge/amd/amdht/ht_wrapper.c
+++ b/src/northbridge/amd/amdht/ht_wrapper.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/msr.h>
diff --git a/src/northbridge/amd/amdht/porting.h b/src/northbridge/amd/amdht/porting.h
index f4141fa..03ad54b 100644
--- a/src/northbridge/amd/amdht/porting.h
+++ b/src/northbridge/amd/amdht/porting.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PORTING_H
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index 21d3c29..ff39fa7 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_AMD_AMDK8
diff --git a/src/northbridge/amd/amdk8/acpi.c b/src/northbridge/amd/amdk8/acpi.c
index ce49b90..b904d4b 100644
--- a/src/northbridge/amd/amdk8/acpi.c
+++ b/src/northbridge/amd/amdk8/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdk8/acpi.h b/src/northbridge/amd/amdk8/acpi.h
index b874dd4..880340e 100644
--- a/src/northbridge/amd/amdk8/acpi.h
+++ b/src/northbridge/amd/amdk8/acpi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMDK8_ACPI_H
diff --git a/src/northbridge/amd/amdk8/exit_from_self.c b/src/northbridge/amd/amdk8/exit_from_self.c
index 0ba7c06..3a43204 100644
--- a/src/northbridge/amd/amdk8/exit_from_self.c
+++ b/src/northbridge/amd/amdk8/exit_from_self.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "raminit.h"
diff --git a/src/northbridge/amd/amdk8/get_sblk_pci1234.c b/src/northbridge/amd/amdk8/get_sblk_pci1234.c
index 1b0f486..0f5745f 100644
--- a/src/northbridge/amd/amdk8/get_sblk_pci1234.c
+++ b/src/northbridge/amd/amdk8/get_sblk_pci1234.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c
index a116d76..90a29b5 100644
--- a/src/northbridge/amd/amdk8/raminit_f.c
+++ b/src/northbridge/amd/amdk8/raminit_f.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
 */
 
 #include <cpu/x86/cache.h>
diff --git a/src/northbridge/amd/amdk8/raminit_f_dqs.c b/src/northbridge/amd/amdk8/raminit_f_dqs.c
index 609cddf..8184c88 100644
--- a/src/northbridge/amd/amdk8/raminit_f_dqs.c
+++ b/src/northbridge/amd/amdk8/raminit_f_dqs.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
 */
 
 #include <arch/stages.h>
diff --git a/src/northbridge/amd/amdk8/thermal_mixin.asl b/src/northbridge/amd/amdk8/thermal_mixin.asl
index 1fc3311..d2e1870 100644
--- a/src/northbridge/amd/amdk8/thermal_mixin.asl
+++ b/src/northbridge/amd/amdk8/thermal_mixin.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdk8/util.c b/src/northbridge/amd/amdk8/util.c
index 1164255..2e5efed 100644
--- a/src/northbridge/amd/amdk8/util.c
+++ b/src/northbridge/amd/amdk8/util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdmct/amddefs.h b/src/northbridge/amd/amdmct/amddefs.h
index 117fea5..193412b 100644
--- a/src/northbridge/amd/amdmct/amddefs.h
+++ b/src/northbridge/amd/amdmct/amddefs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* FIXME: this file should be moved to include/cpu/amd/amddefs.h */
diff --git a/src/northbridge/amd/amdmct/mct/mct.h b/src/northbridge/amd/amdmct/mct/mct.h
index d399eea..a9ea6e3 100644
--- a/src/northbridge/amd/amdmct/mct/mct.h
+++ b/src/northbridge/amd/amdmct/mct/mct.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MCT_H
diff --git a/src/northbridge/amd/amdmct/mct/mct_d.c b/src/northbridge/amd/amdmct/mct/mct_d.c
index 3dec934..0a89b4c 100644
--- a/src/northbridge/amd/amdmct/mct/mct_d.c
+++ b/src/northbridge/amd/amdmct/mct/mct_d.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Description: Main memory controller system configuration for DDR 2 */
diff --git a/src/northbridge/amd/amdmct/mct/mct_d.h b/src/northbridge/amd/amdmct/mct/mct_d.h
index 132bdc9..5a0f068 100644
--- a/src/northbridge/amd/amdmct/mct/mct_d.h
+++ b/src/northbridge/amd/amdmct/mct/mct_d.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdmct/mct/mct_d_gcc.h b/src/northbridge/amd/amdmct/mct/mct_d_gcc.h
index 246aaf2..0bd0135 100644
--- a/src/northbridge/amd/amdmct/mct/mct_d_gcc.h
+++ b/src/northbridge/amd/amdmct/mct/mct_d_gcc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctardk3.c b/src/northbridge/amd/amdmct/mct/mctardk3.c
index a28a22d..12b0c34 100644
--- a/src/northbridge/amd/amdmct/mct/mctardk3.c
+++ b/src/northbridge/amd/amdmct/mct/mctardk3.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctardk4.c b/src/northbridge/amd/amdmct/mct/mctardk4.c
index 5d4d966..eddd0de 100644
--- a/src/northbridge/amd/amdmct/mct/mctardk4.c
+++ b/src/northbridge/amd/amdmct/mct/mctardk4.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctchi_d.c b/src/northbridge/amd/amdmct/mct/mctchi_d.c
index e10b352..96d6f19 100644
--- a/src/northbridge/amd/amdmct/mct/mctchi_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctchi_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctcsi_d.c b/src/northbridge/amd/amdmct/mct/mctcsi_d.c
index 7c4a499..e452ee3 100644
--- a/src/northbridge/amd/amdmct/mct/mctcsi_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctcsi_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctdqs_d.c b/src/northbridge/amd/amdmct/mct/mctdqs_d.c
index 0a25575..e9e832a 100644
--- a/src/northbridge/amd/amdmct/mct/mctdqs_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctdqs_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctecc_d.c b/src/northbridge/amd/amdmct/mct/mctecc_d.c
index a559495..c913cef 100644
--- a/src/northbridge/amd/amdmct/mct/mctecc_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctecc_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctgr.c b/src/northbridge/amd/amdmct/mct/mctgr.c
index 77be900..9a0c2f5 100644
--- a/src/northbridge/amd/amdmct/mct/mctgr.c
+++ b/src/northbridge/amd/amdmct/mct/mctgr.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mcthdi.c b/src/northbridge/amd/amdmct/mct/mcthdi.c
index 5be744e..fc5e4bb 100644
--- a/src/northbridge/amd/amdmct/mct/mcthdi.c
+++ b/src/northbridge/amd/amdmct/mct/mcthdi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctmtr_d.c b/src/northbridge/amd/amdmct/mct/mctmtr_d.c
index cea7f28..dbbcbee 100644
--- a/src/northbridge/amd/amdmct/mct/mctmtr_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctmtr_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctndi_d.c b/src/northbridge/amd/amdmct/mct/mctndi_d.c
index 21fed7a..488f6ce 100644
--- a/src/northbridge/amd/amdmct/mct/mctndi_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctndi_d.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctpro_d.c b/src/northbridge/amd/amdmct/mct/mctpro_d.c
index c332357..202a65f 100644
--- a/src/northbridge/amd/amdmct/mct/mctpro_d.c
+++ b/src/northbridge/amd/amdmct/mct/mctpro_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void EarlySampleSupport_D(void)
diff --git a/src/northbridge/amd/amdmct/mct/mctsrc.c b/src/northbridge/amd/amdmct/mct/mctsrc.c
index f2980a8..d46a85d 100644
--- a/src/northbridge/amd/amdmct/mct/mctsrc.c
+++ b/src/northbridge/amd/amdmct/mct/mctsrc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /******************************************************************************
diff --git a/src/northbridge/amd/amdmct/mct/mctsrc1p.c b/src/northbridge/amd/amdmct/mct/mctsrc1p.c
index 1424201..21125dc 100644
--- a/src/northbridge/amd/amdmct/mct/mctsrc1p.c
+++ b/src/northbridge/amd/amdmct/mct/mctsrc1p.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mctsrc2p.c b/src/northbridge/amd/amdmct/mct/mctsrc2p.c
index 99833cb..a538323 100644
--- a/src/northbridge/amd/amdmct/mct/mctsrc2p.c
+++ b/src/northbridge/amd/amdmct/mct/mctsrc2p.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct/mcttmrl.c b/src/northbridge/amd/amdmct/mct/mcttmrl.c
index 7a13603..513b181 100644
--- a/src/northbridge/amd/amdmct/mct/mcttmrl.c
+++ b/src/northbridge/amd/amdmct/mct/mcttmrl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
index 71a6be8..376c650 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Description: Main memory controller system configuration for DDR 3 */
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
index e2d7aa8..331880c 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h b/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h
index 60f98bc..309b77c 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mct_d_gcc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static inline void _WRMSR(u32 addr, u32 lo, u32 hi)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c b/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c
index 126642b..8bafbd0 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctardk5.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void Get_ChannelPS_Cfg0_D(u8 MAAdimms, u8 Speed, u8 MAAload,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctardk6.c b/src/northbridge/amd/amdmct/mct_ddr3/mctardk6.c
index ae1654c..0b9a17c 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctardk6.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctardk6.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The socket type F (1207), Fr2, G (1207) are not tested.
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c
index 5599140..a47cb97 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctchi_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void InterleaveChannels_D(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c
index f1fd7a5..7f71065 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctcsi_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Low swap bit vs bank size encoding (physical, not logical address bit)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
index 404727b..1dc90b2 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctdqs_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void CalcEccDQSPos_D(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
index 0c52791..6776f82 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctecc_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c b/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c
index 0112732..ff0b995 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcthdi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void mct_DramInit_Hw_D(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c b/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c
index 528c782..db952a1 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcthwl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void SetTargetFreq(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
index 3d625de..2002a3f 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctmtr_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "mct_d.h"
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
index 013a1b9..b80ffb8 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctndi_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void InterleaveNodes_D(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
index e53720d..bada24f 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctprob.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void mct_BeforeDQSTrainSamp(struct DCTStatStruc *pDCTstat)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
index da2f372..37e90b2 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctproc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mct_SetDramConfigMisc2_Cx & mct_SetDramConfigMisc2_Dx */
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
index bd8b7fb..cf80ddc 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctrci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static u32 mct_ControlRC(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
index 6de2f4e..3a4ec4a 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsdi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void mct_DramControlReg_Init_D(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
index 8e5c268..ee45968 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /******************************************************************************
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
index c009756..7a51b11 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc1p.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 u8 mct_checkNumberOfDqsRcvEn_1Pass(u8 pass)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc2p.c b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc2p.c
index b01889d..6911990 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctsrc2p.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctsrc2p.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 u8 mct_checkNumberOfDqsRcvEn_Pass(u8 pass)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
index ea5c8c7..1e5a217 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mcttmrl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
index cdeae49..da1307d 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mctwl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void FreqChgCtrlWrd(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
index 212a348..73e1131 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mhwlc_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
index 8b780a9..3069737 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static u32 mct_MR1Odt_RDimm(struct MCTStatStruc *pMCTstat,
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
index c92143c..c206a78 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/modtrdim.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains functions for odt setting on registered DDR3 dimms */
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
index 76a95e4..e7d1f58 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mport_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void AmdMemPCIRead(SBDFO loc, u32 *Value)
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
index 0466c77..ef7adab 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mutilc_d.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file contains functions for common utility functions */
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/mwlc_d.h b/src/northbridge/amd/amdmct/mct_ddr3/mwlc_d.h
index f846d87..f00ba43 100644
--- a/src/northbridge/amd/amdmct/mct_ddr3/mwlc_d.h
+++ b/src/northbridge/amd/amdmct/mct_ddr3/mwlc_d.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /* IBV defined Structure */ /* IBV Specific Options */
 #ifndef MWLC_D_H
diff --git a/src/northbridge/amd/amdmct/wrappers/mcti.h b/src/northbridge/amd/amdmct/wrappers/mcti.h
index 38e66e1..5e6a8c9 100644
--- a/src/northbridge/amd/amdmct/wrappers/mcti.h
+++ b/src/northbridge/amd/amdmct/wrappers/mcti.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/amd/amdmct/wrappers/mcti_d.c b/src/northbridge/amd/amdmct/wrappers/mcti_d.c
index ea32893..8cb0dc8 100644
--- a/src/northbridge/amd/amdmct/wrappers/mcti_d.c
+++ b/src/northbridge/amd/amdmct/wrappers/mcti_d.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Call-backs */
diff --git a/src/northbridge/amd/cimx/Kconfig b/src/northbridge/amd/cimx/Kconfig
index 73ef9f2..ecfe551 100644
--- a/src/northbridge/amd/cimx/Kconfig
+++ b/src/northbridge/amd/cimx/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config AMD_NB_CIMX
diff --git a/src/northbridge/amd/cimx/Makefile.inc b/src/northbridge/amd/cimx/Makefile.inc
index bd2a34a..075c8f6 100644
--- a/src/northbridge/amd/cimx/Makefile.inc
+++ b/src/northbridge/amd/cimx/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_AMD_NB_CIMX),y)
diff --git a/src/northbridge/amd/cimx/rd890/Kconfig b/src/northbridge/amd/cimx/rd890/Kconfig
index 7654d16..ed747cb 100644
--- a/src/northbridge/amd/cimx/rd890/Kconfig
+++ b/src/northbridge/amd/cimx/rd890/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config NORTHBRIDGE_AMD_CIMX_RD890
diff --git a/src/northbridge/amd/cimx/rd890/Makefile.inc b/src/northbridge/amd/cimx/rd890/Makefile.inc
index a864dd6..0f119e6 100644
--- a/src/northbridge/amd/cimx/rd890/Makefile.inc
+++ b/src/northbridge/amd/cimx/rd890/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 
diff --git a/src/northbridge/amd/cimx/rd890/NbPlatform.h b/src/northbridge/amd/cimx/rd890/NbPlatform.h
index 3bce9b6..77a0375 100644
--- a/src/northbridge/amd/cimx/rd890/NbPlatform.h
+++ b/src/northbridge/amd/cimx/rd890/NbPlatform.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_PLATFORM_H_
diff --git a/src/northbridge/amd/cimx/rd890/amd.h b/src/northbridge/amd/cimx/rd890/amd.h
index 5e69ac4..ce7af60 100644
--- a/src/northbridge/amd/cimx/rd890/amd.h
+++ b/src/northbridge/amd/cimx/rd890/amd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_H_
diff --git a/src/northbridge/amd/cimx/rd890/chip.h b/src/northbridge/amd/cimx/rd890/chip.h
index 08b293f..d2e9421 100644
--- a/src/northbridge/amd/cimx/rd890/chip.h
+++ b/src/northbridge/amd/cimx/rd890/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CIMX_RD890_CHIP_H_
diff --git a/src/northbridge/amd/cimx/rd890/early.c b/src/northbridge/amd/cimx/rd890/early.c
index d93ffb0..2934771 100644
--- a/src/northbridge/amd/cimx/rd890/early.c
+++ b/src/northbridge/amd/cimx/rd890/early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/amd/cimx/rd890/late.c b/src/northbridge/amd/cimx/rd890/late.c
index bc51543..209ab12 100644
--- a/src/northbridge/amd/cimx/rd890/late.c
+++ b/src/northbridge/amd/cimx/rd890/late.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/amd/cimx/rd890/nb_cimx.h b/src/northbridge/amd/cimx/rd890/nb_cimx.h
index 8eea49a..6d50520 100644
--- a/src/northbridge/amd/cimx/rd890/nb_cimx.h
+++ b/src/northbridge/amd/cimx/rd890/nb_cimx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NB_CIMX_H_
diff --git a/src/northbridge/amd/gx2/Kconfig b/src/northbridge/amd/gx2/Kconfig
index e6315aa..3995b01 100644
--- a/src/northbridge/amd/gx2/Kconfig
+++ b/src/northbridge/amd/gx2/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_AMD_GX2
diff --git a/src/northbridge/amd/gx2/grphinit.c b/src/northbridge/amd/gx2/grphinit.c
index 7568c29..41f1026 100644
--- a/src/northbridge/amd/gx2/grphinit.c
+++ b/src/northbridge/amd/gx2/grphinit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/amd/gx2/northbridge.c b/src/northbridge/amd/gx2/northbridge.c
index 8246aec..9b54339 100644
--- a/src/northbridge/amd/gx2/northbridge.c
+++ b/src/northbridge/amd/gx2/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/gx2/northbridgeinit.c b/src/northbridge/amd/gx2/northbridgeinit.c
index bc19645..d1dbaae 100644
--- a/src/northbridge/amd/gx2/northbridgeinit.c
+++ b/src/northbridge/amd/gx2/northbridgeinit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/gx2/pll_reset.c b/src/northbridge/amd/gx2/pll_reset.c
index 9d7bd05..f82f5d1 100644
--- a/src/northbridge/amd/gx2/pll_reset.c
+++ b/src/northbridge/amd/gx2/pll_reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/tsc.h>
diff --git a/src/northbridge/amd/gx2/raminit.c b/src/northbridge/amd/gx2/raminit.c
index 6f61afe..515c7e6 100644
--- a/src/northbridge/amd/gx2/raminit.c
+++ b/src/northbridge/amd/gx2/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/amd/gx2def.h>
diff --git a/src/northbridge/amd/lx/grphinit.c b/src/northbridge/amd/lx/grphinit.c
index 080d2db..4d32a5c 100644
--- a/src/northbridge/amd/lx/grphinit.c
+++ b/src/northbridge/amd/lx/grphinit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/amd/lx/northbridge.c b/src/northbridge/amd/lx/northbridge.c
index ddb8b1e..2fbef23 100644
--- a/src/northbridge/amd/lx/northbridge.c
+++ b/src/northbridge/amd/lx/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/lx/northbridge.h b/src/northbridge/amd/lx/northbridge.h
index 9812c89..666e0b3 100644
--- a/src/northbridge/amd/lx/northbridge.h
+++ b/src/northbridge/amd/lx/northbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_AMD_LX_H
diff --git a/src/northbridge/amd/lx/northbridgeinit.c b/src/northbridge/amd/lx/northbridgeinit.c
index 9927542..54ac952 100644
--- a/src/northbridge/amd/lx/northbridgeinit.c
+++ b/src/northbridge/amd/lx/northbridgeinit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/lx/pll_reset.c b/src/northbridge/amd/lx/pll_reset.c
index 9fe0c3d..6178fa6 100644
--- a/src/northbridge/amd/lx/pll_reset.c
+++ b/src/northbridge/amd/lx/pll_reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "northbridge.h"
diff --git a/src/northbridge/amd/lx/raminit.c b/src/northbridge/amd/lx/raminit.c
index a0371d6..ccefc64 100644
--- a/src/northbridge/amd/lx/raminit.c
+++ b/src/northbridge/amd/lx/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/lx/raminit.h b/src/northbridge/amd/lx/raminit.h
index 660dfcd..bd673a5 100644
--- a/src/northbridge/amd/lx/raminit.h
+++ b/src/northbridge/amd/lx/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/amd/pi/00630F01/Kconfig b/src/northbridge/amd/pi/00630F01/Kconfig
index 826caa2..bab34bc 100644
--- a/src/northbridge/amd/pi/00630F01/Kconfig
+++ b/src/northbridge/amd/pi/00630F01/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_PI_00630F01
 	bool
diff --git a/src/northbridge/amd/pi/00630F01/Makefile.inc b/src/northbridge/amd/pi/00630F01/Makefile.inc
index 65f0a3b..03912d6 100644
--- a/src/northbridge/amd/pi/00630F01/Makefile.inc
+++ b/src/northbridge/amd/pi/00630F01/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
index ce25eb8..812c0f7 100644
--- a/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00630F01/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/pi/00630F01/chip.h b/src/northbridge/amd/pi/00630F01/chip.h
index d651b1b..53d3d0f 100644
--- a/src/northbridge/amd/pi/00630F01/chip.h
+++ b/src/northbridge/amd/pi/00630F01/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AGESA_00630F01_CHIP_H_
diff --git a/src/northbridge/amd/pi/00630F01/dimmSpd.c b/src/northbridge/amd/pi/00630F01/dimmSpd.c
index 6c750ce..4819c1f 100644
--- a/src/northbridge/amd/pi/00630F01/dimmSpd.c
+++ b/src/northbridge/amd/pi/00630F01/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/pi/00630F01/iommu.c b/src/northbridge/amd/pi/00630F01/iommu.c
index ce26861..7515ef1 100644
--- a/src/northbridge/amd/pi/00630F01/iommu.c
+++ b/src/northbridge/amd/pi/00630F01/iommu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.c b/src/northbridge/amd/pi/00630F01/northbridge.c
index 06a3193..a147aed 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.c
+++ b/src/northbridge/amd/pi/00630F01/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/pi/00630F01/northbridge.h b/src/northbridge/amd/pi/00630F01/northbridge.h
index d431e9a..0701dc2 100644
--- a/src/northbridge/amd/pi/00630F01/northbridge.h
+++ b/src/northbridge/amd/pi/00630F01/northbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_AMD_AGESA_FAM15H_H
diff --git a/src/northbridge/amd/pi/00630F01/pci_devs.h b/src/northbridge/amd/pi/00630F01/pci_devs.h
index 8cc28c8..9dbb963 100644
--- a/src/northbridge/amd/pi/00630F01/pci_devs.h
+++ b/src/northbridge/amd/pi/00630F01/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_00630F01_PCI_DEVS_H_
diff --git a/src/northbridge/amd/pi/00660F01/Kconfig b/src/northbridge/amd/pi/00660F01/Kconfig
index 003e4b6..3b0e562 100644
--- a/src/northbridge/amd/pi/00660F01/Kconfig
+++ b/src/northbridge/amd/pi/00660F01/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_PI_00660F01
 	bool
diff --git a/src/northbridge/amd/pi/00660F01/Makefile.inc b/src/northbridge/amd/pi/00660F01/Makefile.inc
index 38c4260..1635238 100644
--- a/src/northbridge/amd/pi/00660F01/Makefile.inc
+++ b/src/northbridge/amd/pi/00660F01/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl
index 7a9960f..7c2fb0a 100644
--- a/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00660F01/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/pi/00660F01/chip.h b/src/northbridge/amd/pi/00660F01/chip.h
index 7566fd4..8074b2b 100644
--- a/src/northbridge/amd/pi/00660F01/chip.h
+++ b/src/northbridge/amd/pi/00660F01/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PI_FAM15CZ_CHIP_H_
diff --git a/src/northbridge/amd/pi/00660F01/dimmSpd.c b/src/northbridge/amd/pi/00660F01/dimmSpd.c
index 6996f83..cb19d25 100644
--- a/src/northbridge/amd/pi/00660F01/dimmSpd.c
+++ b/src/northbridge/amd/pi/00660F01/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.c b/src/northbridge/amd/pi/00660F01/northbridge.c
index c066266..c7f10e4 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.c
+++ b/src/northbridge/amd/pi/00660F01/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/pi/00660F01/northbridge.h b/src/northbridge/amd/pi/00660F01/northbridge.h
index 4d2a90f..e483e31 100644
--- a/src/northbridge/amd/pi/00660F01/northbridge.h
+++ b/src/northbridge/amd/pi/00660F01/northbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_AMD_AGESA_FAM16H_H
diff --git a/src/northbridge/amd/pi/00730F01/Kconfig b/src/northbridge/amd/pi/00730F01/Kconfig
index c587a92..30ce343 100644
--- a/src/northbridge/amd/pi/00730F01/Kconfig
+++ b/src/northbridge/amd/pi/00730F01/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 config NORTHBRIDGE_AMD_PI_00730F01
 	bool
diff --git a/src/northbridge/amd/pi/00730F01/Makefile.inc b/src/northbridge/amd/pi/00730F01/Makefile.inc
index a83b4c3..df5429c 100644
--- a/src/northbridge/amd/pi/00730F01/Makefile.inc
+++ b/src/northbridge/amd/pi/00730F01/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += dimmSpd.c
diff --git a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
index 7a9960f..7c2fb0a 100644
--- a/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
+++ b/src/northbridge/amd/pi/00730F01/acpi/northbridge.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Only need HID on Primary Bus */
diff --git a/src/northbridge/amd/pi/00730F01/chip.h b/src/northbridge/amd/pi/00730F01/chip.h
index 195f393..829198e 100644
--- a/src/northbridge/amd/pi/00730F01/chip.h
+++ b/src/northbridge/amd/pi/00730F01/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PI_00730F01_CHIP_H_
diff --git a/src/northbridge/amd/pi/00730F01/dimmSpd.c b/src/northbridge/amd/pi/00730F01/dimmSpd.c
index 65aa7fb..82d9b33 100644
--- a/src/northbridge/amd/pi/00730F01/dimmSpd.c
+++ b/src/northbridge/amd/pi/00730F01/dimmSpd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.c b/src/northbridge/amd/pi/00730F01/northbridge.c
index 24055eb..552ad28 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.c
+++ b/src/northbridge/amd/pi/00730F01/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/amd/pi/00730F01/northbridge.h b/src/northbridge/amd/pi/00730F01/northbridge.h
index 6b8f5fe..14594bc 100644
--- a/src/northbridge/amd/pi/00730F01/northbridge.h
+++ b/src/northbridge/amd/pi/00730F01/northbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_AMD_AGESA_FAM16H_H
diff --git a/src/northbridge/amd/pi/BiosCallOuts.h b/src/northbridge/amd/pi/BiosCallOuts.h
index 6864f28..eaeb741 100644
--- a/src/northbridge/amd/pi/BiosCallOuts.h
+++ b/src/northbridge/amd/pi/BiosCallOuts.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CALLOUTS_AMD_AGESA_H
diff --git a/src/northbridge/amd/pi/Kconfig b/src/northbridge/amd/pi/Kconfig
index 1f21b42..38f5303 100644
--- a/src/northbridge/amd/pi/Kconfig
+++ b/src/northbridge/amd/pi/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config NORTHBRIDGE_AMD_PI
diff --git a/src/northbridge/amd/pi/Makefile.inc b/src/northbridge/amd/pi/Makefile.inc
index ea92035..4093916 100644
--- a/src/northbridge/amd/pi/Makefile.inc
+++ b/src/northbridge/amd/pi/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_AMD_PI),y)
diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c
index 9bdf340..0fa6c7a 100644
--- a/src/northbridge/amd/pi/agesawrapper.c
+++ b/src/northbridge/amd/pi/agesawrapper.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <AGESA.h>
diff --git a/src/northbridge/amd/pi/agesawrapper.h b/src/northbridge/amd/pi/agesawrapper.h
index e59023f..fc377c3 100644
--- a/src/northbridge/amd/pi/agesawrapper.h
+++ b/src/northbridge/amd/pi/agesawrapper.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AGESAWRAPPER_H_
diff --git a/src/northbridge/amd/pi/agesawrapper_call.h b/src/northbridge/amd/pi/agesawrapper_call.h
index 876a298..1ad9c50 100644
--- a/src/northbridge/amd/pi/agesawrapper_call.h
+++ b/src/northbridge/amd/pi/agesawrapper_call.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AGESAWRAPPER_CALL_H_
diff --git a/src/northbridge/amd/pi/def_callouts.c b/src/northbridge/amd/pi/def_callouts.c
index 8a4472c..84ed278 100644
--- a/src/northbridge/amd/pi/def_callouts.c
+++ b/src/northbridge/amd/pi/def_callouts.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/northbridge/amd/pi/dimmSpd.h b/src/northbridge/amd/pi/dimmSpd.h
index 201ec03..9a2ced5 100644
--- a/src/northbridge/amd/pi/dimmSpd.h
+++ b/src/northbridge/amd/pi/dimmSpd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _DIMMSPD_H_
diff --git a/src/northbridge/dmp/vortex86ex/Kconfig b/src/northbridge/dmp/vortex86ex/Kconfig
index a30779e..29b0473 100644
--- a/src/northbridge/dmp/vortex86ex/Kconfig
+++ b/src/northbridge/dmp/vortex86ex/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_DMP_VORTEX86EX
diff --git a/src/northbridge/dmp/vortex86ex/Makefile.inc b/src/northbridge/dmp/vortex86ex/Makefile.inc
index 4f808a5..579fd56 100644
--- a/src/northbridge/dmp/vortex86ex/Makefile.inc
+++ b/src/northbridge/dmp/vortex86ex/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_DMP_VORTEX86EX),y)
diff --git a/src/northbridge/dmp/vortex86ex/chip.h b/src/northbridge/dmp/vortex86ex/chip.h
index 3e56aa5..8618e92 100644
--- a/src/northbridge/dmp/vortex86ex/chip.h
+++ b/src/northbridge/dmp/vortex86ex/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NORTHBRIDGE_DMP_VORTEX86EX
diff --git a/src/northbridge/dmp/vortex86ex/northbridge.c b/src/northbridge/dmp/vortex86ex/northbridge.c
index 59c0046..27d90a6 100644
--- a/src/northbridge/dmp/vortex86ex/northbridge.c
+++ b/src/northbridge/dmp/vortex86ex/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/dmp/vortex86ex/northbridge.h b/src/northbridge/dmp/vortex86ex/northbridge.h
index 6d9de0b..5c2c0b4 100644
--- a/src/northbridge/dmp/vortex86ex/northbridge.h
+++ b/src/northbridge/dmp/vortex86ex/northbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_H
diff --git a/src/northbridge/dmp/vortex86ex/raminit.c b/src/northbridge/dmp/vortex86ex/raminit.c
index b2c00d6..ceea9ed 100644
--- a/src/northbridge/dmp/vortex86ex/raminit.c
+++ b/src/northbridge/dmp/vortex86ex/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static u16 get_mask(u16 bit_width, u16 bit_offset)
diff --git a/src/northbridge/dmp/vortex86ex/xgi_oprom.c b/src/northbridge/dmp/vortex86ex/xgi_oprom.c
index 2945295..f86dae9 100644
--- a/src/northbridge/dmp/vortex86ex/xgi_oprom.c
+++ b/src/northbridge/dmp/vortex86ex/xgi_oprom.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /********************************************************************
diff --git a/src/northbridge/intel/e7501/e7501.h b/src/northbridge/intel/e7501/e7501.h
index 2456d41..b873934 100644
--- a/src/northbridge/intel/e7501/e7501.h
+++ b/src/northbridge/intel/e7501/e7501.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/intel/e7505/Kconfig b/src/northbridge/intel/e7505/Kconfig
index ad85b0f..c5f9676 100644
--- a/src/northbridge/intel/e7505/Kconfig
+++ b/src/northbridge/intel/e7505/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_E7505
diff --git a/src/northbridge/intel/e7505/e7505.h b/src/northbridge/intel/e7505/e7505.h
index 13e8b02..fe5d185 100644
--- a/src/northbridge/intel/e7505/e7505.h
+++ b/src/northbridge/intel/e7505/e7505.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig
index a85cde2..6014bc6 100644
--- a/src/northbridge/intel/gm45/Kconfig
+++ b/src/northbridge/intel/gm45/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_GM45
diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc
index 8bb083a..7f172e3 100644
--- a/src/northbridge/intel/gm45/Makefile.inc
+++ b/src/northbridge/intel/gm45/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_GM45),y)
diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c
index b1cb773..862015e 100644
--- a/src/northbridge/intel/gm45/acpi.c
+++ b/src/northbridge/intel/gm45/acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/gm45/acpi/gm45.asl b/src/northbridge/intel/gm45/acpi/gm45.asl
index 8885f0e..cdcd4ee 100644
--- a/src/northbridge/intel/gm45/acpi/gm45.asl
+++ b/src/northbridge/intel/gm45/acpi/gm45.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "hostbridge.asl"
diff --git a/src/northbridge/intel/gm45/acpi/hostbridge.asl b/src/northbridge/intel/gm45/acpi/hostbridge.asl
index cdcaa7f..b568efb 100644
--- a/src/northbridge/intel/gm45/acpi/hostbridge.asl
+++ b/src/northbridge/intel/gm45/acpi/hostbridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/ioapic.h>
diff --git a/src/northbridge/intel/gm45/acpi/peg.asl b/src/northbridge/intel/gm45/acpi/peg.asl
index b9dc3ec..0192388 100644
--- a/src/northbridge/intel/gm45/acpi/peg.asl
+++ b/src/northbridge/intel/gm45/acpi/peg.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PEGP)
diff --git a/src/northbridge/intel/gm45/chip.h b/src/northbridge/intel/gm45/chip.h
index 5429a11..3d96d9d 100644
--- a/src/northbridge/intel/gm45/chip.h
+++ b/src/northbridge/intel/gm45/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_GM45_CHIP_H
diff --git a/src/northbridge/intel/gm45/delay.c b/src/northbridge/intel/gm45/delay.c
index 1060dc3..6e15a37 100644
--- a/src/northbridge/intel/gm45/delay.c
+++ b/src/northbridge/intel/gm45/delay.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/delay.h b/src/northbridge/intel/gm45/delay.h
index c8ee9ce..16d63b9 100644
--- a/src/northbridge/intel/gm45/delay.h
+++ b/src/northbridge/intel/gm45/delay.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __NORTHBRIDGE_INTEL_GM45_DELAY_H__
diff --git a/src/northbridge/intel/gm45/early_init.c b/src/northbridge/intel/gm45/early_init.c
index 57977d8..2f0abe5 100644
--- a/src/northbridge/intel/gm45/early_init.c
+++ b/src/northbridge/intel/gm45/early_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/early_reset.c b/src/northbridge/intel/gm45/early_reset.c
index c00a8d5..436d0c0 100644
--- a/src/northbridge/intel/gm45/early_reset.c
+++ b/src/northbridge/intel/gm45/early_reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/gm45/gm45.h b/src/northbridge/intel/gm45/gm45.h
index cb946fc..685968b 100644
--- a/src/northbridge/intel/gm45/gm45.h
+++ b/src/northbridge/intel/gm45/gm45.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __NORTHBRIDGE_INTEL_GM45_GM45_H__
diff --git a/src/northbridge/intel/gm45/gma.c b/src/northbridge/intel/gm45/gma.c
index 3dd051c..8d02533 100644
--- a/src/northbridge/intel/gm45/gma.c
+++ b/src/northbridge/intel/gm45/gma.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/gm45/igd.c b/src/northbridge/intel/gm45/igd.c
index 4c4c948..adb8d22 100644
--- a/src/northbridge/intel/gm45/igd.c
+++ b/src/northbridge/intel/gm45/igd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/iommu.c b/src/northbridge/intel/gm45/iommu.c
index 05842b1..ce43c2e 100644
--- a/src/northbridge/intel/gm45/iommu.c
+++ b/src/northbridge/intel/gm45/iommu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/northbridge.c b/src/northbridge/intel/gm45/northbridge.c
index 9372e26..556be30 100644
--- a/src/northbridge/intel/gm45/northbridge.c
+++ b/src/northbridge/intel/gm45/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/gm45/pcie.c b/src/northbridge/intel/gm45/pcie.c
index 19adc54..5d10d00 100644
--- a/src/northbridge/intel/gm45/pcie.c
+++ b/src/northbridge/intel/gm45/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/pm.c b/src/northbridge/intel/gm45/pm.c
index 3024968..09151ff 100644
--- a/src/northbridge/intel/gm45/pm.c
+++ b/src/northbridge/intel/gm45/pm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/ram_calc.c b/src/northbridge/intel/gm45/ram_calc.c
index fa52e22..83fd38f 100644
--- a/src/northbridge/intel/gm45/ram_calc.c
+++ b/src/northbridge/intel/gm45/ram_calc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/northbridge/intel/gm45/raminit.c b/src/northbridge/intel/gm45/raminit.c
index 9c4fecd..f5a8965 100644
--- a/src/northbridge/intel/gm45/raminit.c
+++ b/src/northbridge/intel/gm45/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/raminit_rcomp_calibration.c b/src/northbridge/intel/gm45/raminit_rcomp_calibration.c
index de3cc99..07951d9 100644
--- a/src/northbridge/intel/gm45/raminit_rcomp_calibration.c
+++ b/src/northbridge/intel/gm45/raminit_rcomp_calibration.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/raminit_read_write_training.c b/src/northbridge/intel/gm45/raminit_read_write_training.c
index dab0542..65effd9 100644
--- a/src/northbridge/intel/gm45/raminit_read_write_training.c
+++ b/src/northbridge/intel/gm45/raminit_read_write_training.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c b/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c
index 80a61ac..e3ab42f 100644
--- a/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c
+++ b/src/northbridge/intel/gm45/raminit_receive_enable_calibration.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/gm45/thermal.c b/src/northbridge/intel/gm45/thermal.c
index 51a6ad8..408e1b8 100644
--- a/src/northbridge/intel/gm45/thermal.c
+++ b/src/northbridge/intel/gm45/thermal.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
index 37dbd2b..b44b508 100644
--- a/src/northbridge/intel/haswell/Kconfig
+++ b/src/northbridge/intel/haswell/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_HASWELL
diff --git a/src/northbridge/intel/haswell/Makefile.inc b/src/northbridge/intel/haswell/Makefile.inc
index 8d038da..367d9d8 100644
--- a/src/northbridge/intel/haswell/Makefile.inc
+++ b/src/northbridge/intel/haswell/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_HASWELL),y)
diff --git a/src/northbridge/intel/haswell/acpi.c b/src/northbridge/intel/haswell/acpi.c
index 92fe75e..f956a3e 100644
--- a/src/northbridge/intel/haswell/acpi.c
+++ b/src/northbridge/intel/haswell/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/haswell/acpi/haswell.asl b/src/northbridge/intel/haswell/acpi/haswell.asl
index 0d4f923..5654178 100644
--- a/src/northbridge/intel/haswell/acpi/haswell.asl
+++ b/src/northbridge/intel/haswell/acpi/haswell.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../haswell.h"
diff --git a/src/northbridge/intel/haswell/acpi/hostbridge.asl b/src/northbridge/intel/haswell/acpi/hostbridge.asl
index 8024a5a..cd47f22 100644
--- a/src/northbridge/intel/haswell/acpi/hostbridge.asl
+++ b/src/northbridge/intel/haswell/acpi/hostbridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/intel/haswell/chip.h b/src/northbridge/intel/haswell/chip.h
index 6ae3483..be15181 100644
--- a/src/northbridge/intel/haswell/chip.h
+++ b/src/northbridge/intel/haswell/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <drivers/intel/gma/i915.h>
diff --git a/src/northbridge/intel/haswell/early_init.c b/src/northbridge/intel/haswell/early_init.c
index b6eb204..5e66f95 100644
--- a/src/northbridge/intel/haswell/early_init.c
+++ b/src/northbridge/intel/haswell/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/haswell/finalize.c b/src/northbridge/intel/haswell/finalize.c
index c18dc9e..4f41a26 100644
--- a/src/northbridge/intel/haswell/finalize.c
+++ b/src/northbridge/intel/haswell/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/haswell/gma.c b/src/northbridge/intel/haswell/gma.c
index 3c50a17..48b2c53 100644
--- a/src/northbridge/intel/haswell/gma.c
+++ b/src/northbridge/intel/haswell/gma.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/haswell/gma.h b/src/northbridge/intel/haswell/gma.h
index 9cc2241..f01e884 100644
--- a/src/northbridge/intel/haswell/gma.h
+++ b/src/northbridge/intel/haswell/gma.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mailbox 0: header */
diff --git a/src/northbridge/intel/haswell/haswell.h b/src/northbridge/intel/haswell/haswell.h
index b00937f..838b19f 100644
--- a/src/northbridge/intel/haswell/haswell.h
+++ b/src/northbridge/intel/haswell/haswell.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __NORTHBRIDGE_INTEL_HASWELL_HASWELL_H__
diff --git a/src/northbridge/intel/haswell/minihd.c b/src/northbridge/intel/haswell/minihd.c
index bdfd56a..ba99ae1 100644
--- a/src/northbridge/intel/haswell/minihd.c
+++ b/src/northbridge/intel/haswell/minihd.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/haswell/mrccache.c b/src/northbridge/intel/haswell/mrccache.c
index bbc5e51..478539d 100644
--- a/src/northbridge/intel/haswell/mrccache.c
+++ b/src/northbridge/intel/haswell/mrccache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/haswell/northbridge.c b/src/northbridge/intel/haswell/northbridge.c
index cce008a..b1671ac 100644
--- a/src/northbridge/intel/haswell/northbridge.c
+++ b/src/northbridge/intel/haswell/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/haswell/ram_calc.c b/src/northbridge/intel/haswell/ram_calc.c
index 27d9806..963227f 100644
--- a/src/northbridge/intel/haswell/ram_calc.c
+++ b/src/northbridge/intel/haswell/ram_calc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/northbridge/intel/haswell/raminit.c b/src/northbridge/intel/haswell/raminit.c
index 86205ab..9e33401 100644
--- a/src/northbridge/intel/haswell/raminit.c
+++ b/src/northbridge/intel/haswell/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/haswell/raminit.h b/src/northbridge/intel/haswell/raminit.h
index e0b3918..3e8b9b6 100644
--- a/src/northbridge/intel/haswell/raminit.h
+++ b/src/northbridge/intel/haswell/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/haswell/report_platform.c b/src/northbridge/intel/haswell/report_platform.c
index 30e4e06..2253190 100644
--- a/src/northbridge/intel/haswell/report_platform.c
+++ b/src/northbridge/intel/haswell/report_platform.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i3100/chip.h b/src/northbridge/intel/i3100/chip.h
index 2d4c7a8..dcf7745 100644
--- a/src/northbridge/intel/i3100/chip.h
+++ b/src/northbridge/intel/i3100/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 struct northbridge_intel_i3100_config
diff --git a/src/northbridge/intel/i3100/ep80579.h b/src/northbridge/intel/i3100/ep80579.h
index 73679d8..8c0b722 100644
--- a/src/northbridge/intel/i3100/ep80579.h
+++ b/src/northbridge/intel/i3100/ep80579.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I3100_EP80579_H
diff --git a/src/northbridge/intel/i3100/i3100.h b/src/northbridge/intel/i3100/i3100.h
index aeb071b..f652d4b 100644
--- a/src/northbridge/intel/i3100/i3100.h
+++ b/src/northbridge/intel/i3100/i3100.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __I3100_H__
diff --git a/src/northbridge/intel/i3100/memory_initialized.c b/src/northbridge/intel/i3100/memory_initialized.c
index 315399f..04bbd3a 100644
--- a/src/northbridge/intel/i3100/memory_initialized.c
+++ b/src/northbridge/intel/i3100/memory_initialized.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "i3100.h"
diff --git a/src/northbridge/intel/i3100/northbridge.c b/src/northbridge/intel/i3100/northbridge.c
index 61ebd79..14009dd 100644
--- a/src/northbridge/intel/i3100/northbridge.c
+++ b/src/northbridge/intel/i3100/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/northbridge/intel/i3100/pciexp_porta.c b/src/northbridge/intel/i3100/pciexp_porta.c
index a4be7a6..2eb78f9 100644
--- a/src/northbridge/intel/i3100/pciexp_porta.c
+++ b/src/northbridge/intel/i3100/pciexp_porta.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/northbridge/intel/i3100/pciexp_porta_ep80579.c b/src/northbridge/intel/i3100/pciexp_porta_ep80579.c
index f7e3a6a..4e20a73 100644
--- a/src/northbridge/intel/i3100/pciexp_porta_ep80579.c
+++ b/src/northbridge/intel/i3100/pciexp_porta_ep80579.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/northbridge/intel/i3100/raminit.c b/src/northbridge/intel/i3100/raminit.c
index a8121b2..17503e1 100644
--- a/src/northbridge/intel/i3100/raminit.c
+++ b/src/northbridge/intel/i3100/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/northbridge/intel/i3100/raminit.h b/src/northbridge/intel/i3100/raminit.h
index b767f50..e357306 100644
--- a/src/northbridge/intel/i3100/raminit.h
+++ b/src/northbridge/intel/i3100/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This code is based on src/northbridge/intel/e7520/raminit.h */
diff --git a/src/northbridge/intel/i3100/raminit_ep80579.c b/src/northbridge/intel/i3100/raminit_ep80579.c
index ee8c4fd..66d6f37 100644
--- a/src/northbridge/intel/i3100/raminit_ep80579.c
+++ b/src/northbridge/intel/i3100/raminit_ep80579.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <lib.h>
diff --git a/src/northbridge/intel/i3100/raminit_ep80579.h b/src/northbridge/intel/i3100/raminit_ep80579.h
index 0366b70..c0880f5 100644
--- a/src/northbridge/intel/i3100/raminit_ep80579.h
+++ b/src/northbridge/intel/i3100/raminit_ep80579.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I3100_RAMINIT_EP80579_H
diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig
index 04e234c..1728bd4 100644
--- a/src/northbridge/intel/i440bx/Kconfig
+++ b/src/northbridge/intel/i440bx/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_I440BX
diff --git a/src/northbridge/intel/i440bx/Makefile.inc b/src/northbridge/intel/i440bx/Makefile.inc
index b0e61c1..cca3b48 100644
--- a/src/northbridge/intel/i440bx/Makefile.inc
+++ b/src/northbridge/intel/i440bx/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440BX),y)
diff --git a/src/northbridge/intel/i440bx/acpi/sb_pci0_crs.asl b/src/northbridge/intel/i440bx/acpi/sb_pci0_crs.asl
index 02ea222..b3ee8d1 100644
--- a/src/northbridge/intel/i440bx/acpi/sb_pci0_crs.asl
+++ b/src/northbridge/intel/i440bx/acpi/sb_pci0_crs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* i440bx Northbridge */
diff --git a/src/northbridge/intel/i440bx/i440bx.h b/src/northbridge/intel/i440bx/i440bx.h
index 5671d67..0d363f5 100644
--- a/src/northbridge/intel/i440bx/i440bx.h
+++ b/src/northbridge/intel/i440bx/i440bx.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/intel/i440bx/northbridge.h b/src/northbridge/intel/i440bx/northbridge.h
index 53739e5..390c4d9 100644
--- a/src/northbridge/intel/i440bx/northbridge.h
+++ b/src/northbridge/intel/i440bx/northbridge.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_440BX_H
diff --git a/src/northbridge/intel/i440bx/raminit.c b/src/northbridge/intel/i440bx/raminit.c
index b3a5adf..5d9b518 100644
--- a/src/northbridge/intel/i440bx/raminit.c
+++ b/src/northbridge/intel/i440bx/raminit.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/intel/i440bx/raminit.h b/src/northbridge/intel/i440bx/raminit.h
index 5a97ae5..6c0e7e6 100644
--- a/src/northbridge/intel/i440bx/raminit.h
+++ b/src/northbridge/intel/i440bx/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/i440lx/Kconfig b/src/northbridge/intel/i440lx/Kconfig
index b087774..16756a1 100644
--- a/src/northbridge/intel/i440lx/Kconfig
+++ b/src/northbridge/intel/i440lx/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_I440LX
diff --git a/src/northbridge/intel/i440lx/Makefile.inc b/src/northbridge/intel/i440lx/Makefile.inc
index 2e1e2ce..b0e7888 100644
--- a/src/northbridge/intel/i440lx/Makefile.inc
+++ b/src/northbridge/intel/i440lx/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I440LX),y)
diff --git a/src/northbridge/intel/i440lx/i440lx.h b/src/northbridge/intel/i440lx/i440lx.h
index a0cd746..1e8833d 100644
--- a/src/northbridge/intel/i440lx/i440lx.h
+++ b/src/northbridge/intel/i440lx/i440lx.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/intel/i440lx/northbridge.c b/src/northbridge/intel/i440lx/northbridge.c
index 5135d03..2348ae0 100644
--- a/src/northbridge/intel/i440lx/northbridge.c
+++ b/src/northbridge/intel/i440lx/northbridge.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i440lx/northbridge.h b/src/northbridge/intel/i440lx/northbridge.h
index 12bec8f..887f858 100644
--- a/src/northbridge/intel/i440lx/northbridge.h
+++ b/src/northbridge/intel/i440lx/northbridge.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_440LX_H
diff --git a/src/northbridge/intel/i440lx/raminit.c b/src/northbridge/intel/i440lx/raminit.c
index fc19d91..7e09f84 100644
--- a/src/northbridge/intel/i440lx/raminit.c
+++ b/src/northbridge/intel/i440lx/raminit.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/intel/i440lx/raminit.h b/src/northbridge/intel/i440lx/raminit.h
index 79457fd..d9ac430 100644
--- a/src/northbridge/intel/i440lx/raminit.h
+++ b/src/northbridge/intel/i440lx/raminit.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/i5000/Kconfig b/src/northbridge/intel/i5000/Kconfig
index ffeebdf..d237b60 100644
--- a/src/northbridge/intel/i5000/Kconfig
+++ b/src/northbridge/intel/i5000/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_I5000
diff --git a/src/northbridge/intel/i5000/Makefile.inc b/src/northbridge/intel/i5000/Makefile.inc
index 7265917..926a68d 100644
--- a/src/northbridge/intel/i5000/Makefile.inc
+++ b/src/northbridge/intel/i5000/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I5000),y)
diff --git a/src/northbridge/intel/i5000/northbridge.c b/src/northbridge/intel/i5000/northbridge.c
index f4fb3cf..93479f4 100644
--- a/src/northbridge/intel/i5000/northbridge.c
+++ b/src/northbridge/intel/i5000/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i5000/raminit.c b/src/northbridge/intel/i5000/raminit.c
index 1cdd9d1..8f88b73 100644
--- a/src/northbridge/intel/i5000/raminit.c
+++ b/src/northbridge/intel/i5000/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "raminit.h"
diff --git a/src/northbridge/intel/i5000/raminit.h b/src/northbridge/intel/i5000/raminit.h
index 0bf1bd7..379ca46 100644
--- a/src/northbridge/intel/i5000/raminit.h
+++ b/src/northbridge/intel/i5000/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_I5000_RAMINIT_H
diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig
index dc4c087..eae0cd2 100644
--- a/src/northbridge/intel/i82810/Kconfig
+++ b/src/northbridge/intel/i82810/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_I82810
diff --git a/src/northbridge/intel/i82810/Makefile.inc b/src/northbridge/intel/i82810/Makefile.inc
index 2ac62b1..b54ea95 100644
--- a/src/northbridge/intel/i82810/Makefile.inc
+++ b/src/northbridge/intel/i82810/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I82810),y)
diff --git a/src/northbridge/intel/i82810/i82810.h b/src/northbridge/intel/i82810/i82810.h
index 3d5d62a..8d131b0 100644
--- a/src/northbridge/intel/i82810/i82810.h
+++ b/src/northbridge/intel/i82810/i82810.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I82810_I82810_H
diff --git a/src/northbridge/intel/i82810/northbridge.c b/src/northbridge/intel/i82810/northbridge.c
index f9c062e..2314b74 100644
--- a/src/northbridge/intel/i82810/northbridge.c
+++ b/src/northbridge/intel/i82810/northbridge.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i82810/northbridge.h b/src/northbridge/intel/i82810/northbridge.h
index bd1497f..2965ac6 100644
--- a/src/northbridge/intel/i82810/northbridge.h
+++ b/src/northbridge/intel/i82810/northbridge.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I82810_NORTHBRIDGE_H
diff --git a/src/northbridge/intel/i82810/raminit.c b/src/northbridge/intel/i82810/raminit.c
index 9b80097..1eaff22 100644
--- a/src/northbridge/intel/i82810/raminit.c
+++ b/src/northbridge/intel/i82810/raminit.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/intel/i82810/raminit.h b/src/northbridge/intel/i82810/raminit.h
index 336a29f..ccd9f34 100644
--- a/src/northbridge/intel/i82810/raminit.h
+++ b/src/northbridge/intel/i82810/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I82810_RAMINIT_H
diff --git a/src/northbridge/intel/i82830/i82830.h b/src/northbridge/intel/i82830/i82830.h
index b36184f..d1a66d4 100644
--- a/src/northbridge/intel/i82830/i82830.h
+++ b/src/northbridge/intel/i82830/i82830.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define RRBAR   0x48 /* Register Range Base Address (0x00000000) */
diff --git a/src/northbridge/intel/i82830/memory_initialized.c b/src/northbridge/intel/i82830/memory_initialized.c
index 35a1e5c..e90b00b 100644
--- a/src/northbridge/intel/i82830/memory_initialized.c
+++ b/src/northbridge/intel/i82830/memory_initialized.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/intel/i82830/northbridge.c b/src/northbridge/intel/i82830/northbridge.c
index 2d80f56..1a8fe74 100644
--- a/src/northbridge/intel/i82830/northbridge.c
+++ b/src/northbridge/intel/i82830/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i82830/raminit.c b/src/northbridge/intel/i82830/raminit.c
index 92ee7ad..f164e59 100644
--- a/src/northbridge/intel/i82830/raminit.c
+++ b/src/northbridge/intel/i82830/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/northbridge/intel/i82830/raminit.h b/src/northbridge/intel/i82830/raminit.h
index a7b090d..bb70da8 100644
--- a/src/northbridge/intel/i82830/raminit.h
+++ b/src/northbridge/intel/i82830/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I82830_RAMINIT_H
diff --git a/src/northbridge/intel/i82830/smihandler.c b/src/northbridge/intel/i82830/smihandler.c
index b48149f..8cbe6a4 100644
--- a/src/northbridge/intel/i82830/smihandler.c
+++ b/src/northbridge/intel/i82830/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/i82830/vga.c b/src/northbridge/intel/i82830/vga.c
index 7a79d13..6a903a4 100644
--- a/src/northbridge/intel/i82830/vga.c
+++ b/src/northbridge/intel/i82830/vga.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i855/debug.c b/src/northbridge/intel/i855/debug.c
index 42ede6d..9a4b0fb 100644
--- a/src/northbridge/intel/i855/debug.c
+++ b/src/northbridge/intel/i855/debug.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/intel/i855/i855.h b/src/northbridge/intel/i855/i855.h
index 6ce061a..70b77dd 100644
--- a/src/northbridge/intel/i855/i855.h
+++ b/src/northbridge/intel/i855/i855.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Host-Hub Interface Bridge */
diff --git a/src/northbridge/intel/i855/northbridge.c b/src/northbridge/intel/i855/northbridge.c
index 5666069..b402fa7 100644
--- a/src/northbridge/intel/i855/northbridge.c
+++ b/src/northbridge/intel/i855/northbridge.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i855/raminit.c b/src/northbridge/intel/i855/raminit.c
index a43f5be..c1d93e6 100644
--- a/src/northbridge/intel/i855/raminit.c
+++ b/src/northbridge/intel/i855/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/northbridge/intel/i855/raminit.h b/src/northbridge/intel/i855/raminit.h
index 30cfa47..a2efb46 100644
--- a/src/northbridge/intel/i855/raminit.h
+++ b/src/northbridge/intel/i855/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I855_RAMINIT_H
diff --git a/src/northbridge/intel/i855/reset_test.c b/src/northbridge/intel/i855/reset_test.c
index 4e99f73..933a775 100644
--- a/src/northbridge/intel/i855/reset_test.c
+++ b/src/northbridge/intel/i855/reset_test.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define MCH_DRC 0x70
diff --git a/src/northbridge/intel/i945/Kconfig b/src/northbridge/intel/i945/Kconfig
index b17dda6..b191b97 100644
--- a/src/northbridge/intel/i945/Kconfig
+++ b/src/northbridge/intel/i945/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_I945
diff --git a/src/northbridge/intel/i945/Makefile.inc b/src/northbridge/intel/i945/Makefile.inc
index 4462b3b..dc15d8a 100644
--- a/src/northbridge/intel/i945/Makefile.inc
+++ b/src/northbridge/intel/i945/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_I945),y)
diff --git a/src/northbridge/intel/i945/acpi.c b/src/northbridge/intel/i945/acpi.c
index fcdf9cc..313d565 100644
--- a/src/northbridge/intel/i945/acpi.c
+++ b/src/northbridge/intel/i945/acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/i945/acpi/hostbridge.asl b/src/northbridge/intel/i945/acpi/hostbridge.asl
index b89ea00..636859f 100644
--- a/src/northbridge/intel/i945/acpi/hostbridge.asl
+++ b/src/northbridge/intel/i945/acpi/hostbridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/ioapic.h>
diff --git a/src/northbridge/intel/i945/acpi/i945.asl b/src/northbridge/intel/i945/acpi/i945.asl
index 2a4eb9f..70fe499 100644
--- a/src/northbridge/intel/i945/acpi/i945.asl
+++ b/src/northbridge/intel/i945/acpi/i945.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "hostbridge.asl"
diff --git a/src/northbridge/intel/i945/acpi/igd.asl b/src/northbridge/intel/i945/acpi/igd.asl
index 079d3ab..eb5e05d 100644
--- a/src/northbridge/intel/i945/acpi/igd.asl
+++ b/src/northbridge/intel/i945/acpi/igd.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (GFX0)
diff --git a/src/northbridge/intel/i945/acpi/peg.asl b/src/northbridge/intel/i945/acpi/peg.asl
index b9dc3ec..0192388 100644
--- a/src/northbridge/intel/i945/acpi/peg.asl
+++ b/src/northbridge/intel/i945/acpi/peg.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PEGP)
diff --git a/src/northbridge/intel/i945/debug.c b/src/northbridge/intel/i945/debug.c
index 41330c6..8cd01f3 100644
--- a/src/northbridge/intel/i945/debug.c
+++ b/src/northbridge/intel/i945/debug.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/intel/i945/early_init.c b/src/northbridge/intel/i945/early_init.c
index 3b86a9c..e5a1d3d 100644
--- a/src/northbridge/intel/i945/early_init.c
+++ b/src/northbridge/intel/i945/early_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/i945/errata.c b/src/northbridge/intel/i945/errata.c
index 2c5e5ce..977ca1d 100644
--- a/src/northbridge/intel/i945/errata.c
+++ b/src/northbridge/intel/i945/errata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 824e69e..208b766 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i945/i945.h b/src/northbridge/intel/i945/i945.h
index 8ccdd05..a86d254 100644
--- a/src/northbridge/intel/i945/i945.h
+++ b/src/northbridge/intel/i945/i945.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_I945_H
diff --git a/src/northbridge/intel/i945/northbridge.c b/src/northbridge/intel/i945/northbridge.c
index 067285b..3d36018 100644
--- a/src/northbridge/intel/i945/northbridge.c
+++ b/src/northbridge/intel/i945/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i945/ram_calc.c b/src/northbridge/intel/i945/ram_calc.c
index ab0360d..07e88da 100644
--- a/src/northbridge/intel/i945/ram_calc.c
+++ b/src/northbridge/intel/i945/ram_calc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c
index 7bd6240..0017329 100644
--- a/src/northbridge/intel/i945/raminit.c
+++ b/src/northbridge/intel/i945/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/i945/raminit.h b/src/northbridge/intel/i945/raminit.h
index 95ab184..494538b 100644
--- a/src/northbridge/intel/i945/raminit.h
+++ b/src/northbridge/intel/i945/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/i945/rcven.c b/src/northbridge/intel/i945/rcven.c
index d21a919..7ce17b2 100644
--- a/src/northbridge/intel/i945/rcven.c
+++ b/src/northbridge/intel/i945/rcven.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "raminit.h"
diff --git a/src/northbridge/intel/i945/udelay.c b/src/northbridge/intel/i945/udelay.c
index 38c2977..d180cb7 100644
--- a/src/northbridge/intel/i945/udelay.c
+++ b/src/northbridge/intel/i945/udelay.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/northbridge/intel/nehalem/Kconfig b/src/northbridge/intel/nehalem/Kconfig
index f115d97..871d627 100644
--- a/src/northbridge/intel/nehalem/Kconfig
+++ b/src/northbridge/intel/nehalem/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_NEHALEM
diff --git a/src/northbridge/intel/nehalem/Makefile.inc b/src/northbridge/intel/nehalem/Makefile.inc
index 63c49f2..f948254 100644
--- a/src/northbridge/intel/nehalem/Makefile.inc
+++ b/src/northbridge/intel/nehalem/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_NEHALEM),y)
diff --git a/src/northbridge/intel/nehalem/acpi.c b/src/northbridge/intel/nehalem/acpi.c
index 947177d..394a323 100644
--- a/src/northbridge/intel/nehalem/acpi.c
+++ b/src/northbridge/intel/nehalem/acpi.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/northbridge/intel/nehalem/acpi/hostbridge.asl b/src/northbridge/intel/nehalem/acpi/hostbridge.asl
index 0b6767e..f210112 100644
--- a/src/northbridge/intel/nehalem/acpi/hostbridge.asl
+++ b/src/northbridge/intel/nehalem/acpi/hostbridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/intel/nehalem/acpi/nehalem.asl b/src/northbridge/intel/nehalem/acpi/nehalem.asl
index bb9d78d..00e2109 100644
--- a/src/northbridge/intel/nehalem/acpi/nehalem.asl
+++ b/src/northbridge/intel/nehalem/acpi/nehalem.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../nehalem.h"
diff --git a/src/northbridge/intel/nehalem/chip.h b/src/northbridge/intel/nehalem/chip.h
index 12991c4..4372a93 100644
--- a/src/northbridge/intel/nehalem/chip.h
+++ b/src/northbridge/intel/nehalem/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <drivers/intel/gma/i915.h>
diff --git a/src/northbridge/intel/nehalem/early_init.c b/src/northbridge/intel/nehalem/early_init.c
index 8afccdb..f701675 100644
--- a/src/northbridge/intel/nehalem/early_init.c
+++ b/src/northbridge/intel/nehalem/early_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/nehalem/finalize.c b/src/northbridge/intel/nehalem/finalize.c
index d96667e..72c1214 100644
--- a/src/northbridge/intel/nehalem/finalize.c
+++ b/src/northbridge/intel/nehalem/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/nehalem/gma.c b/src/northbridge/intel/nehalem/gma.c
index c4e7731..c2a2fca 100644
--- a/src/northbridge/intel/nehalem/gma.c
+++ b/src/northbridge/intel/nehalem/gma.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/nehalem/gma.h b/src/northbridge/intel/nehalem/gma.h
index 2101efb..1db57f6 100644
--- a/src/northbridge/intel/nehalem/gma.h
+++ b/src/northbridge/intel/nehalem/gma.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __NORTHBRIDGE_INTEL_NEHALEM_GMA_H__
diff --git a/src/northbridge/intel/nehalem/nehalem.h b/src/northbridge/intel/nehalem/nehalem.h
index 28bc5c8..533797f 100644
--- a/src/northbridge/intel/nehalem/nehalem.h
+++ b/src/northbridge/intel/nehalem/nehalem.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __NORTHBRIDGE_INTEL_NEHALEM_NEHALEM_H__
diff --git a/src/northbridge/intel/nehalem/northbridge.c b/src/northbridge/intel/nehalem/northbridge.c
index a3c2eea..94e08bf 100644
--- a/src/northbridge/intel/nehalem/northbridge.c
+++ b/src/northbridge/intel/nehalem/northbridge.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/nehalem/ram_calc.c b/src/northbridge/intel/nehalem/ram_calc.c
index 4d986f9..7b8dd1b 100644
--- a/src/northbridge/intel/nehalem/ram_calc.c
+++ b/src/northbridge/intel/nehalem/ram_calc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/northbridge/intel/nehalem/raminit.c b/src/northbridge/intel/nehalem/raminit.c
index c41310a..7d358ef 100644
--- a/src/northbridge/intel/nehalem/raminit.c
+++ b/src/northbridge/intel/nehalem/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Please don't remove this. It's needed it to do debugging
diff --git a/src/northbridge/intel/nehalem/raminit.h b/src/northbridge/intel/nehalem/raminit.h
index d003de2..c59a183 100644
--- a/src/northbridge/intel/nehalem/raminit.h
+++ b/src/northbridge/intel/nehalem/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/nehalem/raminit_tables.c b/src/northbridge/intel/nehalem/raminit_tables.c
index 7b4bfb9..2fe4e3c 100644
--- a/src/northbridge/intel/nehalem/raminit_tables.c
+++ b/src/northbridge/intel/nehalem/raminit_tables.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* [CHANNEL][EXT_REVISON][LANE][2*SLOT+RANK][CLOCK_SPEED] */
diff --git a/src/northbridge/intel/sandybridge/Kconfig b/src/northbridge/intel/sandybridge/Kconfig
index cbca042..6b38c23 100644
--- a/src/northbridge/intel/sandybridge/Kconfig
+++ b/src/northbridge/intel/sandybridge/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config NORTHBRIDGE_INTEL_SANDYBRIDGE_MRC
diff --git a/src/northbridge/intel/sandybridge/Makefile.inc b/src/northbridge/intel/sandybridge/Makefile.inc
index 49c0712..e4ef142 100644
--- a/src/northbridge/intel/sandybridge/Makefile.inc
+++ b/src/northbridge/intel/sandybridge/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_SANDYBRIDGE_MRC)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE)$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE_MRC),y)
diff --git a/src/northbridge/intel/sandybridge/acpi.c b/src/northbridge/intel/sandybridge/acpi.c
index 57ca366..8891036 100644
--- a/src/northbridge/intel/sandybridge/acpi.c
+++ b/src/northbridge/intel/sandybridge/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/sandybridge/acpi/hostbridge.asl b/src/northbridge/intel/sandybridge/acpi/hostbridge.asl
index 0e97664..6543232 100644
--- a/src/northbridge/intel/sandybridge/acpi/hostbridge.asl
+++ b/src/northbridge/intel/sandybridge/acpi/hostbridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
index 5aafcc1..a5f7f1f 100644
--- a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
+++ b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "../sandybridge.h"
diff --git a/src/northbridge/intel/sandybridge/chip.h b/src/northbridge/intel/sandybridge/chip.h
index 1f51eb3..900aaf3 100644
--- a/src/northbridge/intel/sandybridge/chip.h
+++ b/src/northbridge/intel/sandybridge/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <drivers/intel/gma/i915.h>
diff --git a/src/northbridge/intel/sandybridge/early_init.c b/src/northbridge/intel/sandybridge/early_init.c
index 7b60ec7..b704c1d 100644
--- a/src/northbridge/intel/sandybridge/early_init.c
+++ b/src/northbridge/intel/sandybridge/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/sandybridge/finalize.c b/src/northbridge/intel/sandybridge/finalize.c
index d63f1f0..a304474 100644
--- a/src/northbridge/intel/sandybridge/finalize.c
+++ b/src/northbridge/intel/sandybridge/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/sandybridge/gma.c b/src/northbridge/intel/sandybridge/gma.c
index d1779db..c0ff503 100644
--- a/src/northbridge/intel/sandybridge/gma.c
+++ b/src/northbridge/intel/sandybridge/gma.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/sandybridge/gma.h b/src/northbridge/intel/sandybridge/gma.h
index d8e19e4..686c8e2 100644
--- a/src/northbridge/intel/sandybridge/gma.h
+++ b/src/northbridge/intel/sandybridge/gma.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* mailbox 0: header */
diff --git a/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c
index c37959e..b86a93a 100644
--- a/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c
+++ b/src/northbridge/intel/sandybridge/gma_ivybridge_lvds.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
index cd48174..f35c7fd 100644
--- a/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
+++ b/src/northbridge/intel/sandybridge/gma_sandybridge_lvds.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/intel/sandybridge/mrccache.c b/src/northbridge/intel/sandybridge/mrccache.c
index 2086427..fa1f2d8 100644
--- a/src/northbridge/intel/sandybridge/mrccache.c
+++ b/src/northbridge/intel/sandybridge/mrccache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/sandybridge/northbridge.c b/src/northbridge/intel/sandybridge/northbridge.c
index 76f03f3..15320f3 100644
--- a/src/northbridge/intel/sandybridge/northbridge.c
+++ b/src/northbridge/intel/sandybridge/northbridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/sandybridge/ram_calc.c b/src/northbridge/intel/sandybridge/ram_calc.c
index 70e978c..9ce6178 100644
--- a/src/northbridge/intel/sandybridge/ram_calc.c
+++ b/src/northbridge/intel/sandybridge/ram_calc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/northbridge/intel/sandybridge/raminit.c b/src/northbridge/intel/sandybridge/raminit.c
index 76f62a6..e64db93 100644
--- a/src/northbridge/intel/sandybridge/raminit.c
+++ b/src/northbridge/intel/sandybridge/raminit.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/sandybridge/raminit.h b/src/northbridge/intel/sandybridge/raminit.h
index 0b202ae..4695e31 100644
--- a/src/northbridge/intel/sandybridge/raminit.h
+++ b/src/northbridge/intel/sandybridge/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c
index 1f6b75c..b1c3678 100644
--- a/src/northbridge/intel/sandybridge/raminit_mrc.c
+++ b/src/northbridge/intel/sandybridge/raminit_mrc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/sandybridge/raminit_native.h b/src/northbridge/intel/sandybridge/raminit_native.h
index 797e2f6..264d22c 100644
--- a/src/northbridge/intel/sandybridge/raminit_native.h
+++ b/src/northbridge/intel/sandybridge/raminit_native.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/sandybridge/report_platform.c b/src/northbridge/intel/sandybridge/report_platform.c
index 05b968f..fee2b1f 100644
--- a/src/northbridge/intel/sandybridge/report_platform.c
+++ b/src/northbridge/intel/sandybridge/report_platform.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/sandybridge/romstage.c b/src/northbridge/intel/sandybridge/romstage.c
index a18c480..4780d95 100644
--- a/src/northbridge/intel/sandybridge/romstage.c
+++ b/src/northbridge/intel/sandybridge/romstage.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h
index 6f8fcfc..cadf699 100644
--- a/src/northbridge/intel/sandybridge/sandybridge.h
+++ b/src/northbridge/intel/sandybridge/sandybridge.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __NORTHBRIDGE_INTEL_SANDYBRIDGE_SANDYBRIDGE_H__
diff --git a/src/northbridge/intel/sandybridge/udelay.c b/src/northbridge/intel/sandybridge/udelay.c
index 7c98380..8952510 100644
--- a/src/northbridge/intel/sandybridge/udelay.c
+++ b/src/northbridge/intel/sandybridge/udelay.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/northbridge/intel/sch/Kconfig b/src/northbridge/intel/sch/Kconfig
index cf96232..a09290e 100644
--- a/src/northbridge/intel/sch/Kconfig
+++ b/src/northbridge/intel/sch/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config NORTHBRIDGE_INTEL_SCH
diff --git a/src/northbridge/intel/sch/Makefile.inc b/src/northbridge/intel/sch/Makefile.inc
index 9fef5a0..a448906 100644
--- a/src/northbridge/intel/sch/Makefile.inc
+++ b/src/northbridge/intel/sch/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_NORTHBRIDGE_INTEL_SCH),y)
diff --git a/src/northbridge/intel/sch/acpi.c b/src/northbridge/intel/sch/acpi.c
index 7f3c07e..cec0a28 100644
--- a/src/northbridge/intel/sch/acpi.c
+++ b/src/northbridge/intel/sch/acpi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/intel/sch/acpi/hostbridge.asl b/src/northbridge/intel/sch/acpi/hostbridge.asl
index cbb17e4..8b8edf8 100644
--- a/src/northbridge/intel/sch/acpi/hostbridge.asl
+++ b/src/northbridge/intel/sch/acpi/hostbridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/ioapic.h>
diff --git a/src/northbridge/intel/sch/acpi/igd.asl b/src/northbridge/intel/sch/acpi/igd.asl
index dfb567b..597541a 100644
--- a/src/northbridge/intel/sch/acpi/igd.asl
+++ b/src/northbridge/intel/sch/acpi/igd.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (GFX0)
diff --git a/src/northbridge/intel/sch/acpi/peg.asl b/src/northbridge/intel/sch/acpi/peg.asl
index b9dc3ec..0192388 100644
--- a/src/northbridge/intel/sch/acpi/peg.asl
+++ b/src/northbridge/intel/sch/acpi/peg.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PEGP)
diff --git a/src/northbridge/intel/sch/acpi/sch.asl b/src/northbridge/intel/sch/acpi/sch.asl
index 162232f..e4b9723 100644
--- a/src/northbridge/intel/sch/acpi/sch.asl
+++ b/src/northbridge/intel/sch/acpi/sch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "hostbridge.asl"
diff --git a/src/northbridge/intel/sch/chip.h b/src/northbridge/intel/sch/chip.h
index 33df6c5..40dc3d8 100644
--- a/src/northbridge/intel/sch/chip.h
+++ b/src/northbridge/intel/sch/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_INTEL_SCH_CHIP_H
diff --git a/src/northbridge/intel/sch/early_init.c b/src/northbridge/intel/sch/early_init.c
index d9b6cfb..bc850f6 100644
--- a/src/northbridge/intel/sch/early_init.c
+++ b/src/northbridge/intel/sch/early_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "sch.h"
diff --git a/src/northbridge/intel/sch/gma.c b/src/northbridge/intel/sch/gma.c
index 5786f1e..21606ad 100644
--- a/src/northbridge/intel/sch/gma.c
+++ b/src/northbridge/intel/sch/gma.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/sch/northbridge.c b/src/northbridge/intel/sch/northbridge.c
index 085517e..54a58c6 100644
--- a/src/northbridge/intel/sch/northbridge.c
+++ b/src/northbridge/intel/sch/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/intel/sch/nvs.h b/src/northbridge/intel/sch/nvs.h
index 34c434b..49210a8 100644
--- a/src/northbridge/intel/sch/nvs.h
+++ b/src/northbridge/intel/sch/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/northbridge/intel/sch/port_access.c b/src/northbridge/intel/sch/port_access.c
index 7ae0b63..1db35e2 100644
--- a/src/northbridge/intel/sch/port_access.c
+++ b/src/northbridge/intel/sch/port_access.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/northbridge/intel/sch/raminit.c b/src/northbridge/intel/sch/raminit.c
index a5c18a5..824bafd 100644
--- a/src/northbridge/intel/sch/raminit.c
+++ b/src/northbridge/intel/sch/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/northbridge/intel/sch/raminit.h b/src/northbridge/intel/sch/raminit.h
index a2bf910..9757bed 100644
--- a/src/northbridge/intel/sch/raminit.h
+++ b/src/northbridge/intel/sch/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/intel/sch/sch.h b/src/northbridge/intel/sch/sch.h
index 022f62a..62d600e 100644
--- a/src/northbridge/intel/sch/sch.h
+++ b/src/northbridge/intel/sch/sch.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SCH_PULSBO_H__
diff --git a/src/northbridge/rdc/r8610/Makefile.inc b/src/northbridge/rdc/r8610/Makefile.inc
index 0e1fb9d..5334ed6 100644
--- a/src/northbridge/rdc/r8610/Makefile.inc
+++ b/src/northbridge/rdc/r8610/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_RDC_R8610),y)
diff --git a/src/northbridge/rdc/r8610/northbridge.c b/src/northbridge/rdc/r8610/northbridge.c
index f6a2ebd..562adb8 100644
--- a/src/northbridge/rdc/r8610/northbridge.c
+++ b/src/northbridge/rdc/r8610/northbridge.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc
index efc36c4..1510cac 100644
--- a/src/northbridge/via/cn700/Makefile.inc
+++ b/src/northbridge/via/cn700/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_VIA_CN700),y)
diff --git a/src/northbridge/via/cn700/agp.c b/src/northbridge/via/cn700/agp.c
index 067cc95..2f3374a 100644
--- a/src/northbridge/via/cn700/agp.c
+++ b/src/northbridge/via/cn700/agp.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/cn700/cn700.h b/src/northbridge/via/cn700/cn700.h
index c9fd33b..32e299b 100644
--- a/src/northbridge/via/cn700/cn700.h
+++ b/src/northbridge/via/cn700/cn700.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* VGA stuff */
diff --git a/src/northbridge/via/cn700/northbridge.c b/src/northbridge/via/cn700/northbridge.c
index db79fc1..e77f898 100644
--- a/src/northbridge/via/cn700/northbridge.c
+++ b/src/northbridge/via/cn700/northbridge.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/cn700/northbridge.h b/src/northbridge/via/cn700/northbridge.h
index fb0e9bb..3307544 100644
--- a/src/northbridge/via/cn700/northbridge.h
+++ b/src/northbridge/via/cn700/northbridge.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_VIA_CN700_H
diff --git a/src/northbridge/via/cn700/raminit.c b/src/northbridge/via/cn700/raminit.c
index dee697f..9d71b7c 100644
--- a/src/northbridge/via/cn700/raminit.c
+++ b/src/northbridge/via/cn700/raminit.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/via/cn700/raminit.h b/src/northbridge/via/cn700/raminit.h
index 72df384..593afcf 100644
--- a/src/northbridge/via/cn700/raminit.h
+++ b/src/northbridge/via/cn700/raminit.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/via/cn700/vga.c b/src/northbridge/via/cn700/vga.c
index 5230888..fce610d 100644
--- a/src/northbridge/via/cn700/vga.c
+++ b/src/northbridge/via/cn700/vga.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index f9fdd9a..8308afd 100644
--- a/src/northbridge/via/cx700/Makefile.inc
+++ b/src/northbridge/via/cx700/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_VIA_CX700),y)
diff --git a/src/northbridge/via/cx700/agp.c b/src/northbridge/via/cx700/agp.c
index 89257b2..64c956c 100644
--- a/src/northbridge/via/cx700/agp.c
+++ b/src/northbridge/via/cx700/agp.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/cx700/early_serial.c b/src/northbridge/via/cx700/early_serial.c
index 74dea2d..03a33e6 100644
--- a/src/northbridge/via/cx700/early_serial.c
+++ b/src/northbridge/via/cx700/early_serial.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/via/cx700/early_smbus.c b/src/northbridge/via/cx700/early_smbus.c
index 4a26ebe..53e4a2b 100644
--- a/src/northbridge/via/cx700/early_smbus.c
+++ b/src/northbridge/via/cx700/early_smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // other bioses use this, too:
diff --git a/src/northbridge/via/cx700/lpc.c b/src/northbridge/via/cx700/lpc.c
index 483f19e..caeae4b 100644
--- a/src/northbridge/via/cx700/lpc.c
+++ b/src/northbridge/via/cx700/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c
index ab9a8af..a0f22f1 100644
--- a/src/northbridge/via/cx700/northbridge.c
+++ b/src/northbridge/via/cx700/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c
index 66c7c17..77dfaa7 100644
--- a/src/northbridge/via/cx700/raminit.c
+++ b/src/northbridge/via/cx700/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/northbridge/via/cx700/raminit.h b/src/northbridge/via/cx700/raminit.h
index fd8219b..c3ac833 100644
--- a/src/northbridge/via/cx700/raminit.h
+++ b/src/northbridge/via/cx700/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/via/cx700/registers.h b/src/northbridge/via/cx700/registers.h
index 35ff560..7527856 100644
--- a/src/northbridge/via/cx700/registers.h
+++ b/src/northbridge/via/cx700/registers.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* CX700 has 48 bytes of scratch registers in D0F4 starting at Reg. 0xd0 */
diff --git a/src/northbridge/via/cx700/reset.c b/src/northbridge/via/cx700/reset.c
index 763c6fc..aa0c453 100644
--- a/src/northbridge/via/cx700/reset.c
+++ b/src/northbridge/via/cx700/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/via/cx700/sata.c b/src/northbridge/via/cx700/sata.c
index f84c430..dbadf25 100644
--- a/src/northbridge/via/cx700/sata.c
+++ b/src/northbridge/via/cx700/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/cx700/usb.c b/src/northbridge/via/cx700/usb.c
index 0478c57..ba8cffe 100644
--- a/src/northbridge/via/cx700/usb.c
+++ b/src/northbridge/via/cx700/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c
index 86bd790..ddd5471 100644
--- a/src/northbridge/via/cx700/vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index d3c4c7b..64e202d 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_NORTHBRIDGE_VIA_VX800),y)
diff --git a/src/northbridge/via/vx800/clk_ctrl.c b/src/northbridge/via/vx800/clk_ctrl.c
index 0f7207e..087ee8d 100644
--- a/src/northbridge/via/vx800/clk_ctrl.c
+++ b/src/northbridge/via/vx800/clk_ctrl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void DutyCycleCtrl(DRAM_SYS_ATTR *DramAttr)
diff --git a/src/northbridge/via/vx800/detection.c b/src/northbridge/via/vx800/detection.c
index ec5aa83..d6d087e 100644
--- a/src/northbridge/via/vx800/detection.c
+++ b/src/northbridge/via/vx800/detection.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* FIXME this should go away */
diff --git a/src/northbridge/via/vx800/dev_init.c b/src/northbridge/via/vx800/dev_init.c
index 34dccbe..0b702cf 100644
--- a/src/northbridge/via/vx800/dev_init.c
+++ b/src/northbridge/via/vx800/dev_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void DRAMSetVRNum(DRAM_SYS_ATTR *DramAttr, u8 PhyRank /* physical rank */,
diff --git a/src/northbridge/via/vx800/dqs_search.c b/src/northbridge/via/vx800/dqs_search.c
index 9cf2bac..c10a6ac 100644
--- a/src/northbridge/via/vx800/dqs_search.c
+++ b/src/northbridge/via/vx800/dqs_search.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void SetDQSOutputCHA(DRAM_SYS_ATTR * DramAttr);
diff --git a/src/northbridge/via/vx800/dram_init.c b/src/northbridge/via/vx800/dram_init.c
index 8469774..401adcc 100644
--- a/src/northbridge/via/vx800/dram_init.c
+++ b/src/northbridge/via/vx800/dram_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 CB_STATUS DDR2_DRAM_INIT(void)
diff --git a/src/northbridge/via/vx800/dram_init.h b/src/northbridge/via/vx800/dram_init.h
index 8998cb2..f354d1d 100644
--- a/src/northbridge/via/vx800/dram_init.h
+++ b/src/northbridge/via/vx800/dram_init.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DRAMINIT_H_
diff --git a/src/northbridge/via/vx800/dram_util.c b/src/northbridge/via/vx800/dram_util.c
index 13e4e2d..d02559d 100644
--- a/src/northbridge/via/vx800/dram_util.c
+++ b/src/northbridge/via/vx800/dram_util.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void WaitMicroSec(UINTN MicroSeconds)
diff --git a/src/northbridge/via/vx800/dram_util.h b/src/northbridge/via/vx800/dram_util.h
index dca4f85..3acbd9a 100644
--- a/src/northbridge/via/vx800/dram_util.h
+++ b/src/northbridge/via/vx800/dram_util.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __DRAM_UTIL_H__
diff --git a/src/northbridge/via/vx800/drdy_bl.c b/src/northbridge/via/vx800/drdy_bl.c
index e91c4b9..c5fddc6 100644
--- a/src/northbridge/via/vx800/drdy_bl.c
+++ b/src/northbridge/via/vx800/drdy_bl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Set P6IF DRDY Timing
diff --git a/src/northbridge/via/vx800/driving_clk_phase_data.h b/src/northbridge/via/vx800/driving_clk_phase_data.h
index 0cbe976..c575213 100644
--- a/src/northbridge/via/vx800/driving_clk_phase_data.h
+++ b/src/northbridge/via/vx800/driving_clk_phase_data.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DRIVINGCLKPHASEDATA_H
diff --git a/src/northbridge/via/vx800/driving_setting.c b/src/northbridge/via/vx800/driving_setting.c
index 46becac..4a7ed02 100644
--- a/src/northbridge/via/vx800/driving_setting.c
+++ b/src/northbridge/via/vx800/driving_setting.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/via/vx800/early_serial.c b/src/northbridge/via/vx800/early_serial.c
index 3fa559d..6b8dd69 100644
--- a/src/northbridge/via/vx800/early_serial.c
+++ b/src/northbridge/via/vx800/early_serial.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
 */
 
 /*
diff --git a/src/northbridge/via/vx800/early_smbus.c b/src/northbridge/via/vx800/early_smbus.c
index a6ecec6..3abcd65 100644
--- a/src/northbridge/via/vx800/early_smbus.c
+++ b/src/northbridge/via/vx800/early_smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_ids.h>
diff --git a/src/northbridge/via/vx800/final_setting.c b/src/northbridge/via/vx800/final_setting.c
index a859b48..1eb94e1 100644
--- a/src/northbridge/via/vx800/final_setting.c
+++ b/src/northbridge/via/vx800/final_setting.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static const u8 RefreshCounter[7][2] = {
diff --git a/src/northbridge/via/vx800/freq_setting.c b/src/northbridge/via/vx800/freq_setting.c
index ee6b505..919e995 100644
--- a/src/northbridge/via/vx800/freq_setting.c
+++ b/src/northbridge/via/vx800/freq_setting.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void CalcCLAndFreq(DRAM_SYS_ATTR * DramAttr);
diff --git a/src/northbridge/via/vx800/ide.c b/src/northbridge/via/vx800/ide.c
index b3027ab..c0e3780 100644
--- a/src/northbridge/via/vx800/ide.c
+++ b/src/northbridge/via/vx800/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/northbridge/via/vx800/lpc.c b/src/northbridge/via/vx800/lpc.c
index be39acd..de95e17 100644
--- a/src/northbridge/via/vx800/lpc.c
+++ b/src/northbridge/via/vx800/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 520d6b0..2de8f82 100644
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/northbridge/via/vx800/pci_rawops.h b/src/northbridge/via/vx800/pci_rawops.h
index 35145c9..68ce03e 100644
--- a/src/northbridge/via/vx800/pci_rawops.h
+++ b/src/northbridge/via/vx800/pci_rawops.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef NORTHBRIDGE_VIA_VX800_PCI_RAWOPS_H
diff --git a/src/northbridge/via/vx800/raminit.c b/src/northbridge/via/vx800/raminit.c
index 3c0bde8..cbb3fca 100644
--- a/src/northbridge/via/vx800/raminit.c
+++ b/src/northbridge/via/vx800/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <spd.h>
diff --git a/src/northbridge/via/vx800/raminit.h b/src/northbridge/via/vx800/raminit.h
index d246e1d..40f9f5a 100644
--- a/src/northbridge/via/vx800/raminit.h
+++ b/src/northbridge/via/vx800/raminit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RAMINIT_H
diff --git a/src/northbridge/via/vx800/rank_map.c b/src/northbridge/via/vx800/rank_map.c
index 9952a6a..2ac09d6 100644
--- a/src/northbridge/via/vx800/rank_map.c
+++ b/src/northbridge/via/vx800/rank_map.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void DRAMClearEndingAddress(DRAM_SYS_ATTR * DramAttr);
diff --git a/src/northbridge/via/vx800/romstrap.inc b/src/northbridge/via/vx800/romstrap.inc
index 0151f93..cac1dd1 100644
--- a/src/northbridge/via/vx800/romstrap.inc
+++ b/src/northbridge/via/vx800/romstrap.inc
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file constructs the ROM strap table for K8T890 and K8M890 */
diff --git a/src/northbridge/via/vx800/romstrap.ld b/src/northbridge/via/vx800/romstrap.ld
index a3d6a77..3768175 100644
--- a/src/northbridge/via/vx800/romstrap.ld
+++ b/src/northbridge/via/vx800/romstrap.ld
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 SECTIONS {
diff --git a/src/northbridge/via/vx800/timing_setting.c b/src/northbridge/via/vx800/timing_setting.c
index 23bdf8b..4031374 100644
--- a/src/northbridge/via/vx800/timing_setting.c
+++ b/src/northbridge/via/vx800/timing_setting.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
  /*
diff --git a/src/northbridge/via/vx800/translator_ddr2_init.c b/src/northbridge/via/vx800/translator_ddr2_init.c
index 2f863f0..a6a5e55 100644
--- a/src/northbridge/via/vx800/translator_ddr2_init.c
+++ b/src/northbridge/via/vx800/translator_ddr2_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define CB_SUCCESS		0x0
diff --git a/src/northbridge/via/vx800/uma_ram_setting.c b/src/northbridge/via/vx800/uma_ram_setting.c
index 5c12973..8e7064b 100644
--- a/src/northbridge/via/vx800/uma_ram_setting.c
+++ b/src/northbridge/via/vx800/uma_ram_setting.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "pci_rawops.h"
diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c
index af76f60..c517b96 100644
--- a/src/northbridge/via/vx800/vga.c
+++ b/src/northbridge/via/vx800/vga.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: Some of the VGA control registers are located on the memory controller.
diff --git a/src/northbridge/via/vx800/vx800.h b/src/northbridge/via/vx800/vx800.h
index 503c50b..716f0ca 100644
--- a/src/northbridge/via/vx800/vx800.h
+++ b/src/northbridge/via/vx800/vx800.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef VX800_H
diff --git a/src/northbridge/via/vx900/romstrap.inc b/src/northbridge/via/vx900/romstrap.inc
index 598ec45..8e9f6f3 100644
--- a/src/northbridge/via/vx900/romstrap.inc
+++ b/src/northbridge/via/vx900/romstrap.inc
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* As extracted from the manufacturer's ROM, the romstrap table looks like:
diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig
index 75df786..b5cb4d8 100644
--- a/src/soc/broadcom/cygnus/Kconfig
+++ b/src/soc/broadcom/cygnus/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOC_BROADCOM_CYGNUS
diff --git a/src/soc/broadcom/cygnus/Makefile.inc b/src/soc/broadcom/cygnus/Makefile.inc
index 8bad15f..d3c1e3e 100644
--- a/src/soc/broadcom/cygnus/Makefile.inc
+++ b/src/soc/broadcom/cygnus/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOC_BROADCOM_CYGNUS),y)
diff --git a/src/soc/broadcom/cygnus/bootblock.c b/src/soc/broadcom/cygnus/bootblock.c
index 59eeb24..cdbd3c5 100644
--- a/src/soc/broadcom/cygnus/bootblock.c
+++ b/src/soc/broadcom/cygnus/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/broadcom/cygnus/cbmem.c b/src/soc/broadcom/cygnus/cbmem.c
index 68b6f8d..84516ed 100644
--- a/src/soc/broadcom/cygnus/cbmem.c
+++ b/src/soc/broadcom/cygnus/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/broadcom/cygnus/hw_init.c b/src/soc/broadcom/cygnus/hw_init.c
index 36b5dbf..eacea9f 100644
--- a/src/soc/broadcom/cygnus/hw_init.c
+++ b/src/soc/broadcom/cygnus/hw_init.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/broadcom/cygnus/i2c.c b/src/soc/broadcom/cygnus/i2c.c
index d5f6d3f..cad0e62 100644
--- a/src/soc/broadcom/cygnus/i2c.c
+++ b/src/soc/broadcom/cygnus/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/broadcom/cygnus/include/soc/addressmap.h b/src/soc/broadcom/cygnus/include/soc/addressmap.h
index 266f3a6..3deaca7 100644
--- a/src/soc/broadcom/cygnus/include/soc/addressmap.h
+++ b/src/soc/broadcom/cygnus/include/soc/addressmap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_BROADCOM_CYGNUS_ADDRESSMAP_H__
diff --git a/src/soc/broadcom/cygnus/include/soc/cygnus.h b/src/soc/broadcom/cygnus/include/soc/cygnus.h
index d447c75..d524e7e 100644
--- a/src/soc/broadcom/cygnus/include/soc/cygnus.h
+++ b/src/soc/broadcom/cygnus/include/soc/cygnus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_BROADCOM_CYGNUS_H__
diff --git a/src/soc/broadcom/cygnus/include/soc/hw_init.h b/src/soc/broadcom/cygnus/include/soc/hw_init.h
index 8200671..a287f30 100644
--- a/src/soc/broadcom/cygnus/include/soc/hw_init.h
+++ b/src/soc/broadcom/cygnus/include/soc/hw_init.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_BROADCOM_CYGNUS_HW_INIT_H__
diff --git a/src/soc/broadcom/cygnus/include/soc/i2c.h b/src/soc/broadcom/cygnus/include/soc/i2c.h
index d48bd1a..9a5a5f3 100644
--- a/src/soc/broadcom/cygnus/include/soc/i2c.h
+++ b/src/soc/broadcom/cygnus/include/soc/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_BROADCOM_CYGNUS_I2C_H__
diff --git a/src/soc/broadcom/cygnus/include/soc/memlayout.ld b/src/soc/broadcom/cygnus/include/soc/memlayout.ld
index 237ffc6..a78fa1a 100644
--- a/src/soc/broadcom/cygnus/include/soc/memlayout.ld
+++ b/src/soc/broadcom/cygnus/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/broadcom/cygnus/include/soc/ns16550.h b/src/soc/broadcom/cygnus/include/soc/ns16550.h
index 601c444..eb63e4b 100644
--- a/src/soc/broadcom/cygnus/include/soc/ns16550.h
+++ b/src/soc/broadcom/cygnus/include/soc/ns16550.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/broadcom/cygnus/include/soc/sdram.h b/src/soc/broadcom/cygnus/include/soc/sdram.h
index 46630ce..cf0d413 100644
--- a/src/soc/broadcom/cygnus/include/soc/sdram.h
+++ b/src/soc/broadcom/cygnus/include/soc/sdram.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_BROADCOM_CYGNUS_SDRAM_H__
diff --git a/src/soc/broadcom/cygnus/include/soc/tz.h b/src/soc/broadcom/cygnus/include/soc/tz.h
index aa98cf4..b2a701d 100644
--- a/src/soc/broadcom/cygnus/include/soc/tz.h
+++ b/src/soc/broadcom/cygnus/include/soc/tz.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_BROADCOM_CYGNUS_TZ_H__
diff --git a/src/soc/broadcom/cygnus/ns16550.c b/src/soc/broadcom/cygnus/ns16550.c
index ab354c2..81238bc 100644
--- a/src/soc/broadcom/cygnus/ns16550.c
+++ b/src/soc/broadcom/cygnus/ns16550.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/broadcom/cygnus/romstage.c b/src/soc/broadcom/cygnus/romstage.c
index f56cec9..410239b 100644
--- a/src/soc/broadcom/cygnus/romstage.c
+++ b/src/soc/broadcom/cygnus/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/broadcom/cygnus/sdram.c b/src/soc/broadcom/cygnus/sdram.c
index 995eda3..dc08cd9 100644
--- a/src/soc/broadcom/cygnus/sdram.c
+++ b/src/soc/broadcom/cygnus/sdram.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <symbols.h>
diff --git a/src/soc/broadcom/cygnus/soc.c b/src/soc/broadcom/cygnus/soc.c
index f9d049f..02d1687 100644
--- a/src/soc/broadcom/cygnus/soc.c
+++ b/src/soc/broadcom/cygnus/soc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/soc/broadcom/cygnus/spi.c b/src/soc/broadcom/cygnus/spi.c
index dd5b9ee..80da23e 100644
--- a/src/soc/broadcom/cygnus/spi.c
+++ b/src/soc/broadcom/cygnus/spi.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/broadcom/cygnus/timer.c b/src/soc/broadcom/cygnus/timer.c
index 692b8f6..af7427e 100644
--- a/src/soc/broadcom/cygnus/timer.c
+++ b/src/soc/broadcom/cygnus/timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/broadcom/cygnus/tz.c b/src/soc/broadcom/cygnus/tz.c
index 8813287..0b7a73f 100644
--- a/src/soc/broadcom/cygnus/tz.c
+++ b/src/soc/broadcom/cygnus/tz.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/imgtec/pistachio/Kconfig b/src/soc/imgtec/pistachio/Kconfig
index 7c0f12e..616a597 100644
--- a/src/soc/imgtec/pistachio/Kconfig
+++ b/src/soc/imgtec/pistachio/Kconfig
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config CPU_IMGTEC_PISTACHIO
diff --git a/src/soc/imgtec/pistachio/Makefile.inc b/src/soc/imgtec/pistachio/Makefile.inc
index 7f06db5..db3be60 100644
--- a/src/soc/imgtec/pistachio/Makefile.inc
+++ b/src/soc/imgtec/pistachio/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_CPU_IMGTEC_PISTACHIO),y)
diff --git a/src/soc/imgtec/pistachio/bootblock.c b/src/soc/imgtec/pistachio/bootblock.c
index f16c1bf..88a2f73 100644
--- a/src/soc/imgtec/pistachio/bootblock.c
+++ b/src/soc/imgtec/pistachio/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/imgtec/pistachio/cbmem.c b/src/soc/imgtec/pistachio/cbmem.c
index 72aa373..c0b2b38 100644
--- a/src/soc/imgtec/pistachio/cbmem.c
+++ b/src/soc/imgtec/pistachio/cbmem.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/imgtec/pistachio/clocks.c b/src/soc/imgtec/pistachio/clocks.c
index a2e5b2b..1198079 100644
--- a/src/soc/imgtec/pistachio/clocks.c
+++ b/src/soc/imgtec/pistachio/clocks.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/imgtec/pistachio/ddr2_init.c b/src/soc/imgtec/pistachio/ddr2_init.c
index ce10ab5..0b3d8db 100644
--- a/src/soc/imgtec/pistachio/ddr2_init.c
+++ b/src/soc/imgtec/pistachio/ddr2_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/imgtec/pistachio/ddr3_init.c b/src/soc/imgtec/pistachio/ddr3_init.c
index 3570c11..8ad6dc9 100644
--- a/src/soc/imgtec/pistachio/ddr3_init.c
+++ b/src/soc/imgtec/pistachio/ddr3_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/imgtec/pistachio/include/soc/gpio.h b/src/soc/imgtec/pistachio/include/soc/gpio.h
index 2633711..06928e1 100644
--- a/src/soc/imgtec/pistachio/include/soc/gpio.h
+++ b/src/soc/imgtec/pistachio/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_IMGTECH_PISTACHIO_GPIO_H__
diff --git a/src/soc/imgtec/pistachio/include/soc/memlayout.ld b/src/soc/imgtec/pistachio/include/soc/memlayout.ld
index 59e3017..05b0c38 100644
--- a/src/soc/imgtec/pistachio/include/soc/memlayout.ld
+++ b/src/soc/imgtec/pistachio/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/imgtec/pistachio/monotonic_timer.c b/src/soc/imgtec/pistachio/monotonic_timer.c
index 0d74ae5..d05fe16 100644
--- a/src/soc/imgtec/pistachio/monotonic_timer.c
+++ b/src/soc/imgtec/pistachio/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/imgtec/pistachio/romstage.c b/src/soc/imgtec/pistachio/romstage.c
index 9467d87..57dd168 100644
--- a/src/soc/imgtec/pistachio/romstage.c
+++ b/src/soc/imgtec/pistachio/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/imgtec/pistachio/soc.c b/src/soc/imgtec/pistachio/soc.c
index c824f14..1d07472 100644
--- a/src/soc/imgtec/pistachio/soc.c
+++ b/src/soc/imgtec/pistachio/soc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/imgtec/pistachio/uart.c b/src/soc/imgtec/pistachio/uart.c
index 1eb12fc..99f6df7 100644
--- a/src/soc/imgtec/pistachio/uart.c
+++ b/src/soc/imgtec/pistachio/uart.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c
index e3444b6..e718f9f 100644
--- a/src/soc/intel/baytrail/acpi.c
+++ b/src/soc/intel/baytrail/acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/baytrail/acpi/cpu.asl b/src/soc/intel/baytrail/acpi/cpu.asl
index 85b2014..f311ba1 100644
--- a/src/soc/intel/baytrail/acpi/cpu.asl
+++ b/src/soc/intel/baytrail/acpi/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/soc/intel/baytrail/acpi/device_nvs.asl b/src/soc/intel/baytrail/acpi/device_nvs.asl
index 1bb7d95..24d5ab7 100644
--- a/src/soc/intel/baytrail/acpi/device_nvs.asl
+++ b/src/soc/intel/baytrail/acpi/device_nvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Device Enabled in ACPI Mode */
diff --git a/src/soc/intel/baytrail/acpi/globalnvs.asl b/src/soc/intel/baytrail/acpi/globalnvs.asl
index 410f5c5..0e06008 100644
--- a/src/soc/intel/baytrail/acpi/globalnvs.asl
+++ b/src/soc/intel/baytrail/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/soc/intel/baytrail/acpi/gpio.asl b/src/soc/intel/baytrail/acpi/gpio.asl
index abe5890..66a9e43 100644
--- a/src/soc/intel/baytrail/acpi/gpio.asl
+++ b/src/soc/intel/baytrail/acpi/gpio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/baytrail/acpi/irq_helper.h b/src/soc/intel/baytrail/acpi/irq_helper.h
index e6ae34a..3ad21d7 100644
--- a/src/soc/intel/baytrail/acpi/irq_helper.h
+++ b/src/soc/intel/baytrail/acpi/irq_helper.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #undef PCI_DEV_PIRQ_ROUTES
diff --git a/src/soc/intel/baytrail/acpi/irqlinks.asl b/src/soc/intel/baytrail/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/soc/intel/baytrail/acpi/irqlinks.asl
+++ b/src/soc/intel/baytrail/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/soc/intel/baytrail/acpi/irqroute.asl b/src/soc/intel/baytrail/acpi/irqroute.asl
index 3a0abe4..dd13b3b 100644
--- a/src/soc/intel/baytrail/acpi/irqroute.asl
+++ b/src/soc/intel/baytrail/acpi/irqroute.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // PCI Interrupt Routing
diff --git a/src/soc/intel/baytrail/acpi/lpc.asl b/src/soc/intel/baytrail/acpi/lpc.asl
index 8d48ed4..56fc2c3 100644
--- a/src/soc/intel/baytrail/acpi/lpc.asl
+++ b/src/soc/intel/baytrail/acpi/lpc.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/soc/intel/baytrail/acpi/lpe.asl b/src/soc/intel/baytrail/acpi/lpe.asl
index 57fa465..cbfe44e 100644
--- a/src/soc/intel/baytrail/acpi/lpe.asl
+++ b/src/soc/intel/baytrail/acpi/lpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LPEA)
diff --git a/src/soc/intel/baytrail/acpi/lpss.asl b/src/soc/intel/baytrail/acpi/lpss.asl
index 2591aa1..0b98ab8 100644
--- a/src/soc/intel/baytrail/acpi/lpss.asl
+++ b/src/soc/intel/baytrail/acpi/lpss.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (SDM1)
diff --git a/src/soc/intel/baytrail/acpi/pcie.asl b/src/soc/intel/baytrail/acpi/pcie.asl
index c3f70cc..8348293 100644
--- a/src/soc/intel/baytrail/acpi/pcie.asl
+++ b/src/soc/intel/baytrail/acpi/pcie.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel SOC PCIe support */
diff --git a/src/soc/intel/baytrail/acpi/platform.asl b/src/soc/intel/baytrail/acpi/platform.asl
index 6c27ec3..ba94d05 100644
--- a/src/soc/intel/baytrail/acpi/platform.asl
+++ b/src/soc/intel/baytrail/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/soc/intel/baytrail/acpi/scc.asl b/src/soc/intel/baytrail/acpi/scc.asl
index 3bf3f39f..c798767 100644
--- a/src/soc/intel/baytrail/acpi/scc.asl
+++ b/src/soc/intel/baytrail/acpi/scc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (EMMC)
diff --git a/src/soc/intel/baytrail/acpi/sleepstates.asl b/src/soc/intel/baytrail/acpi/sleepstates.asl
index fef196e..1640951 100644
--- a/src/soc/intel/baytrail/acpi/sleepstates.asl
+++ b/src/soc/intel/baytrail/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/soc/intel/baytrail/acpi/southcluster.asl b/src/soc/intel/baytrail/acpi/southcluster.asl
index a985f15..2ecc2a9 100644
--- a/src/soc/intel/baytrail/acpi/southcluster.asl
+++ b/src/soc/intel/baytrail/acpi/southcluster.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/baytrail/acpi/xhci.asl b/src/soc/intel/baytrail/acpi/xhci.asl
index 77a1ba7..eaf28a6 100644
--- a/src/soc/intel/baytrail/acpi/xhci.asl
+++ b/src/soc/intel/baytrail/acpi/xhci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (XHCI)
diff --git a/src/soc/intel/baytrail/bootblock/bootblock.c b/src/soc/intel/baytrail/bootblock/bootblock.c
index 6d31add..110d992 100644
--- a/src/soc/intel/baytrail/bootblock/bootblock.c
+++ b/src/soc/intel/baytrail/bootblock/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/chip.c b/src/soc/intel/baytrail/chip.c
index ecacd5f..780e617 100644
--- a/src/soc/intel/baytrail/chip.c
+++ b/src/soc/intel/baytrail/chip.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/baytrail/chip.h b/src/soc/intel/baytrail/chip.h
index ffcf54c..87cbd4e 100644
--- a/src/soc/intel/baytrail/chip.h
+++ b/src/soc/intel/baytrail/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The devicetree parser expects chip.h to reside directly in the path
diff --git a/src/soc/intel/baytrail/cpu.c b/src/soc/intel/baytrail/cpu.c
index 6b84c59..ef20e0a 100644
--- a/src/soc/intel/baytrail/cpu.c
+++ b/src/soc/intel/baytrail/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/soc/intel/baytrail/dptf.c b/src/soc/intel/baytrail/dptf.c
index 79a000d..60a7a1f 100644
--- a/src/soc/intel/baytrail/dptf.c
+++ b/src/soc/intel/baytrail/dptf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/ehci.c b/src/soc/intel/baytrail/ehci.c
index fce1ba7..7284b4e 100644
--- a/src/soc/intel/baytrail/ehci.c
+++ b/src/soc/intel/baytrail/ehci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/baytrail/elog.c b/src/soc/intel/baytrail/elog.c
index 4fa92f7..5a4e07a 100644
--- a/src/soc/intel/baytrail/elog.c
+++ b/src/soc/intel/baytrail/elog.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/emmc.c b/src/soc/intel/baytrail/emmc.c
index 3c65de3..5ad8cf2 100644
--- a/src/soc/intel/baytrail/emmc.c
+++ b/src/soc/intel/baytrail/emmc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/gfx.c b/src/soc/intel/baytrail/gfx.c
index bf38d2e..b711038 100644
--- a/src/soc/intel/baytrail/gfx.c
+++ b/src/soc/intel/baytrail/gfx.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/gpio.c b/src/soc/intel/baytrail/gpio.c
index 0c32917..75ae490 100644
--- a/src/soc/intel/baytrail/gpio.c
+++ b/src/soc/intel/baytrail/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci.h>
diff --git a/src/soc/intel/baytrail/hda.c b/src/soc/intel/baytrail/hda.c
index f20386f..10f4b0b 100644
--- a/src/soc/intel/baytrail/hda.c
+++ b/src/soc/intel/baytrail/hda.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <console/console.h>
diff --git a/src/soc/intel/baytrail/include/soc/acpi.h b/src/soc/intel/baytrail/include/soc/acpi.h
index fb88d12..d7c82cc 100644
--- a/src/soc/intel/baytrail/include/soc/acpi.h
+++ b/src/soc/intel/baytrail/include/soc/acpi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_ACPI_H_
diff --git a/src/soc/intel/baytrail/include/soc/device_nvs.h b/src/soc/intel/baytrail/include/soc/device_nvs.h
index 719c0f3..bec8c2f 100644
--- a/src/soc/intel/baytrail/include/soc/device_nvs.h
+++ b/src/soc/intel/baytrail/include/soc/device_nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_DEVICE_NVS_H_
diff --git a/src/soc/intel/baytrail/include/soc/ehci.h b/src/soc/intel/baytrail/include/soc/ehci.h
index 444e8ce..0c1b369 100644
--- a/src/soc/intel/baytrail/include/soc/ehci.h
+++ b/src/soc/intel/baytrail/include/soc/ehci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BAYTRAIL_EHCI_H
diff --git a/src/soc/intel/baytrail/include/soc/gfx.h b/src/soc/intel/baytrail/include/soc/gfx.h
index 3b66870..96fcea4 100644
--- a/src/soc/intel/baytrail/include/soc/gfx.h
+++ b/src/soc/intel/baytrail/include/soc/gfx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_GFX_H_
diff --git a/src/soc/intel/baytrail/include/soc/gpio.h b/src/soc/intel/baytrail/include/soc/gpio.h
index fb0b5d2..9c72564 100644
--- a/src/soc/intel/baytrail/include/soc/gpio.h
+++ b/src/soc/intel/baytrail/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_GPIO_H_
diff --git a/src/soc/intel/baytrail/include/soc/iomap.h b/src/soc/intel/baytrail/include/soc/iomap.h
index 5c5e9ab..5aa66b7 100644
--- a/src/soc/intel/baytrail/include/soc/iomap.h
+++ b/src/soc/intel/baytrail/include/soc/iomap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_IOMAP_H_
diff --git a/src/soc/intel/baytrail/include/soc/iosf.h b/src/soc/intel/baytrail/include/soc/iosf.h
index bf67294..90e39b1 100644
--- a/src/soc/intel/baytrail/include/soc/iosf.h
+++ b/src/soc/intel/baytrail/include/soc/iosf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_IOSF_H_
diff --git a/src/soc/intel/baytrail/include/soc/irq.h b/src/soc/intel/baytrail/include/soc/irq.h
index 4f9f059..ba28d1c 100644
--- a/src/soc/intel/baytrail/include/soc/irq.h
+++ b/src/soc/intel/baytrail/include/soc/irq.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_IRQ_H_
diff --git a/src/soc/intel/baytrail/include/soc/lpc.h b/src/soc/intel/baytrail/include/soc/lpc.h
index 7247080..da6a636 100644
--- a/src/soc/intel/baytrail/include/soc/lpc.h
+++ b/src/soc/intel/baytrail/include/soc/lpc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_LPC_H_
diff --git a/src/soc/intel/baytrail/include/soc/msr.h b/src/soc/intel/baytrail/include/soc/msr.h
index 668eebf..2e1bf3a 100644
--- a/src/soc/intel/baytrail/include/soc/msr.h
+++ b/src/soc/intel/baytrail/include/soc/msr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_MSR_H_
diff --git a/src/soc/intel/baytrail/include/soc/nvs.h b/src/soc/intel/baytrail/include/soc/nvs.h
index 8227a6f..3d319a2 100644
--- a/src/soc/intel/baytrail/include/soc/nvs.h
+++ b/src/soc/intel/baytrail/include/soc/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_NVS_H_
diff --git a/src/soc/intel/baytrail/include/soc/pattrs.h b/src/soc/intel/baytrail/include/soc/pattrs.h
index 852de40..f6e0f68 100644
--- a/src/soc/intel/baytrail/include/soc/pattrs.h
+++ b/src/soc/intel/baytrail/include/soc/pattrs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PATTRS_H_
diff --git a/src/soc/intel/baytrail/include/soc/pci_devs.h b/src/soc/intel/baytrail/include/soc/pci_devs.h
index bb75f34..fa21ab5 100644
--- a/src/soc/intel/baytrail/include/soc/pci_devs.h
+++ b/src/soc/intel/baytrail/include/soc/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_PCI_DEVS_H_
diff --git a/src/soc/intel/baytrail/include/soc/pcie.h b/src/soc/intel/baytrail/include/soc/pcie.h
index dd0b90d..d3f1b5d 100644
--- a/src/soc/intel/baytrail/include/soc/pcie.h
+++ b/src/soc/intel/baytrail/include/soc/pcie.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_PCIE_H_
diff --git a/src/soc/intel/baytrail/include/soc/pmc.h b/src/soc/intel/baytrail/include/soc/pmc.h
index e5ae617..c37f670 100644
--- a/src/soc/intel/baytrail/include/soc/pmc.h
+++ b/src/soc/intel/baytrail/include/soc/pmc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_PMC_H_
diff --git a/src/soc/intel/baytrail/include/soc/ramstage.h b/src/soc/intel/baytrail/include/soc/ramstage.h
index fc2b614..cf43bc0 100644
--- a/src/soc/intel/baytrail/include/soc/ramstage.h
+++ b/src/soc/intel/baytrail/include/soc/ramstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_RAMSTAGE_H_
diff --git a/src/soc/intel/baytrail/include/soc/reset.h b/src/soc/intel/baytrail/include/soc/reset.h
index 23569d1..810465f 100644
--- a/src/soc/intel/baytrail/include/soc/reset.h
+++ b/src/soc/intel/baytrail/include/soc/reset.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_RESET_H_
diff --git a/src/soc/intel/baytrail/include/soc/romstage.h b/src/soc/intel/baytrail/include/soc/romstage.h
index 4e0256a..95ec5fb 100644
--- a/src/soc/intel/baytrail/include/soc/romstage.h
+++ b/src/soc/intel/baytrail/include/soc/romstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_ROMSTAGE_H_
diff --git a/src/soc/intel/baytrail/include/soc/sata.h b/src/soc/intel/baytrail/include/soc/sata.h
index 8bd73c6..ac21f5e 100644
--- a/src/soc/intel/baytrail/include/soc/sata.h
+++ b/src/soc/intel/baytrail/include/soc/sata.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BAYTRAIL_SATA_H
diff --git a/src/soc/intel/baytrail/include/soc/smm.h b/src/soc/intel/baytrail/include/soc/smm.h
index 63ac983..2679488 100644
--- a/src/soc/intel/baytrail/include/soc/smm.h
+++ b/src/soc/intel/baytrail/include/soc/smm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_SMM_H_
diff --git a/src/soc/intel/baytrail/include/soc/spi.h b/src/soc/intel/baytrail/include/soc/spi.h
index 60df280..6489778 100644
--- a/src/soc/intel/baytrail/include/soc/spi.h
+++ b/src/soc/intel/baytrail/include/soc/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_SPI_H_
diff --git a/src/soc/intel/baytrail/include/soc/xhci.h b/src/soc/intel/baytrail/include/soc/xhci.h
index 4399a16..d4bef0c 100644
--- a/src/soc/intel/baytrail/include/soc/xhci.h
+++ b/src/soc/intel/baytrail/include/soc/xhci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BAYTRAIL_XHCI_H
diff --git a/src/soc/intel/baytrail/iosf.c b/src/soc/intel/baytrail/iosf.c
index f1ac606..da5a249 100644
--- a/src/soc/intel/baytrail/iosf.c
+++ b/src/soc/intel/baytrail/iosf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/lpe.c b/src/soc/intel/baytrail/lpe.c
index fdac299..ce6c2e0 100644
--- a/src/soc/intel/baytrail/lpe.c
+++ b/src/soc/intel/baytrail/lpe.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/lpss.c b/src/soc/intel/baytrail/lpss.c
index e70c090..93a1fde 100644
--- a/src/soc/intel/baytrail/lpss.c
+++ b/src/soc/intel/baytrail/lpss.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/memmap.c b/src/soc/intel/baytrail/memmap.c
index 110dc45..14f907a 100644
--- a/src/soc/intel/baytrail/memmap.c
+++ b/src/soc/intel/baytrail/memmap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/northcluster.c b/src/soc/intel/baytrail/northcluster.c
index 4b2da15..cb9c38f 100644
--- a/src/soc/intel/baytrail/northcluster.c
+++ b/src/soc/intel/baytrail/northcluster.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/baytrail/pcie.c b/src/soc/intel/baytrail/pcie.c
index 4a050fa..2191b85 100644
--- a/src/soc/intel/baytrail/pcie.c
+++ b/src/soc/intel/baytrail/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/baytrail/perf_power.c b/src/soc/intel/baytrail/perf_power.c
index 336ba3f..555b867 100644
--- a/src/soc/intel/baytrail/perf_power.c
+++ b/src/soc/intel/baytrail/perf_power.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/pmutil.c b/src/soc/intel/baytrail/pmutil.c
index b305af5..461d938 100644
--- a/src/soc/intel/baytrail/pmutil.c
+++ b/src/soc/intel/baytrail/pmutil.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/ramstage.c b/src/soc/intel/baytrail/ramstage.c
index 95288b4..d29d46f 100644
--- a/src/soc/intel/baytrail/ramstage.c
+++ b/src/soc/intel/baytrail/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/baytrail/refcode.c b/src/soc/intel/baytrail/refcode.c
index 971ce60..308aeb0 100644
--- a/src/soc/intel/baytrail/refcode.c
+++ b/src/soc/intel/baytrail/refcode.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/soc/intel/baytrail/reset.c b/src/soc/intel/baytrail/reset.c
index 7fa65ff..7b84f4c 100644
--- a/src/soc/intel/baytrail/reset.c
+++ b/src/soc/intel/baytrail/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/romstage/cache_as_ram.inc b/src/soc/intel/baytrail/romstage/cache_as_ram.inc
index 583ec58..831c163 100644
--- a/src/soc/intel/baytrail/romstage/cache_as_ram.inc
+++ b/src/soc/intel/baytrail/romstage/cache_as_ram.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/baytrail/romstage/early_spi.c b/src/soc/intel/baytrail/romstage/early_spi.c
index 773a4a2..fa75c45 100644
--- a/src/soc/intel/baytrail/romstage/early_spi.c
+++ b/src/soc/intel/baytrail/romstage/early_spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/romstage/gfx.c b/src/soc/intel/baytrail/romstage/gfx.c
index 434bc9c..0a08883 100644
--- a/src/soc/intel/baytrail/romstage/gfx.c
+++ b/src/soc/intel/baytrail/romstage/gfx.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/romstage/pmc.c b/src/soc/intel/baytrail/romstage/pmc.c
index ae627a6..02309a5 100644
--- a/src/soc/intel/baytrail/romstage/pmc.c
+++ b/src/soc/intel/baytrail/romstage/pmc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/baytrail/romstage/raminit.c b/src/soc/intel/baytrail/romstage/raminit.c
index d4f1711..032fd65 100644
--- a/src/soc/intel/baytrail/romstage/raminit.c
+++ b/src/soc/intel/baytrail/romstage/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index c7f66bb..1e9fcee 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/baytrail/romstage/uart.c b/src/soc/intel/baytrail/romstage/uart.c
index 3677608..93c592e 100644
--- a/src/soc/intel/baytrail/romstage/uart.c
+++ b/src/soc/intel/baytrail/romstage/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/sata.c b/src/soc/intel/baytrail/sata.c
index 6906b7f..d571f29 100644
--- a/src/soc/intel/baytrail/sata.c
+++ b/src/soc/intel/baytrail/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/scc.c b/src/soc/intel/baytrail/scc.c
index c9aca51..513a103 100644
--- a/src/soc/intel/baytrail/scc.c
+++ b/src/soc/intel/baytrail/scc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/intel/baytrail/sd.c b/src/soc/intel/baytrail/sd.c
index d3e28a8..d518e75 100644
--- a/src/soc/intel/baytrail/sd.c
+++ b/src/soc/intel/baytrail/sd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/baytrail/smihandler.c b/src/soc/intel/baytrail/smihandler.c
index b8eaa6d..16b3e32 100644
--- a/src/soc/intel/baytrail/smihandler.c
+++ b/src/soc/intel/baytrail/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/smm.c b/src/soc/intel/baytrail/smm.c
index e75bfb2..39fee04 100644
--- a/src/soc/intel/baytrail/smm.c
+++ b/src/soc/intel/baytrail/smm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/soc/intel/baytrail/southcluster.c b/src/soc/intel/baytrail/southcluster.c
index ce387c8..ff5ca8c 100644
--- a/src/soc/intel/baytrail/southcluster.c
+++ b/src/soc/intel/baytrail/southcluster.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/spi.c b/src/soc/intel/baytrail/spi.c
index a630a91..529fea2 100644
--- a/src/soc/intel/baytrail/spi.c
+++ b/src/soc/intel/baytrail/spi.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is derived from the flashrom project. */
diff --git a/src/soc/intel/baytrail/stage_cache.c b/src/soc/intel/baytrail/stage_cache.c
index 47d756c..d1c3985 100644
--- a/src/soc/intel/baytrail/stage_cache.c
+++ b/src/soc/intel/baytrail/stage_cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/intel/baytrail/tsc_freq.c b/src/soc/intel/baytrail/tsc_freq.c
index e5129d8..c552796 100644
--- a/src/soc/intel/baytrail/tsc_freq.c
+++ b/src/soc/intel/baytrail/tsc_freq.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/baytrail/xhci.c b/src/soc/intel/baytrail/xhci.c
index 69399ef..64aef80 100644
--- a/src/soc/intel/baytrail/xhci.c
+++ b/src/soc/intel/baytrail/xhci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/braswell/acpi.c b/src/soc/intel/braswell/acpi.c
index b8be3c6..668d6d1 100644
--- a/src/soc/intel/braswell/acpi.c
+++ b/src/soc/intel/braswell/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/braswell/acpi/cpu.asl b/src/soc/intel/braswell/acpi/cpu.asl
index c9cb83b..7e13fec 100644
--- a/src/soc/intel/braswell/acpi/cpu.asl
+++ b/src/soc/intel/braswell/acpi/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/soc/intel/braswell/acpi/device_nvs.asl b/src/soc/intel/braswell/acpi/device_nvs.asl
index 19e4368..cd3de8f 100644
--- a/src/soc/intel/braswell/acpi/device_nvs.asl
+++ b/src/soc/intel/braswell/acpi/device_nvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Device Enabled in ACPI Mode */
diff --git a/src/soc/intel/braswell/acpi/dptf/cpu.asl b/src/soc/intel/braswell/acpi/dptf/cpu.asl
index 3e51c29..7078fb4 100644
--- a/src/soc/intel/braswell/acpi/dptf/cpu.asl
+++ b/src/soc/intel/braswell/acpi/dptf/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DPTF_CPU_PASSIVE
diff --git a/src/soc/intel/braswell/acpi/globalnvs.asl b/src/soc/intel/braswell/acpi/globalnvs.asl
index f37bf45..d44d4c9 100644
--- a/src/soc/intel/braswell/acpi/globalnvs.asl
+++ b/src/soc/intel/braswell/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/soc/intel/braswell/acpi/gpio.asl b/src/soc/intel/braswell/acpi/gpio.asl
index 4f1114f..f5890da 100644
--- a/src/soc/intel/braswell/acpi/gpio.asl
+++ b/src/soc/intel/braswell/acpi/gpio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/braswell/acpi/irq_helper.h b/src/soc/intel/braswell/acpi/irq_helper.h
index e6ae34a..3ad21d7 100644
--- a/src/soc/intel/braswell/acpi/irq_helper.h
+++ b/src/soc/intel/braswell/acpi/irq_helper.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #undef PCI_DEV_PIRQ_ROUTES
diff --git a/src/soc/intel/braswell/acpi/irqlinks.asl b/src/soc/intel/braswell/acpi/irqlinks.asl
index cb45e13..1168408 100644
--- a/src/soc/intel/braswell/acpi/irqlinks.asl
+++ b/src/soc/intel/braswell/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/soc/intel/braswell/acpi/irqroute.asl b/src/soc/intel/braswell/acpi/irqroute.asl
index 32c12ba..fe9671b 100644
--- a/src/soc/intel/braswell/acpi/irqroute.asl
+++ b/src/soc/intel/braswell/acpi/irqroute.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PCI Interrupt Routing */
diff --git a/src/soc/intel/braswell/acpi/lpc.asl b/src/soc/intel/braswell/acpi/lpc.asl
index 7fa48df..fc73ca6 100644
--- a/src/soc/intel/braswell/acpi/lpc.asl
+++ b/src/soc/intel/braswell/acpi/lpc.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel LPC Bus Device  - 0:1f.0 */
diff --git a/src/soc/intel/braswell/acpi/lpe.asl b/src/soc/intel/braswell/acpi/lpe.asl
index 001e63d..d93e314 100644
--- a/src/soc/intel/braswell/acpi/lpe.asl
+++ b/src/soc/intel/braswell/acpi/lpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LPEA)
diff --git a/src/soc/intel/braswell/acpi/lpss.asl b/src/soc/intel/braswell/acpi/lpss.asl
index ed1ba99..a0effaf 100644
--- a/src/soc/intel/braswell/acpi/lpss.asl
+++ b/src/soc/intel/braswell/acpi/lpss.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (SDM1)
diff --git a/src/soc/intel/braswell/acpi/platform.asl b/src/soc/intel/braswell/acpi/platform.asl
index 6f5e662..90e5cf4 100644
--- a/src/soc/intel/braswell/acpi/platform.asl
+++ b/src/soc/intel/braswell/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Enable ACPI _SWS methods */
diff --git a/src/soc/intel/braswell/acpi/scc.asl b/src/soc/intel/braswell/acpi/scc.asl
index 3034d25..3b81c01 100644
--- a/src/soc/intel/braswell/acpi/scc.asl
+++ b/src/soc/intel/braswell/acpi/scc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (EMMC)
diff --git a/src/soc/intel/braswell/acpi/sleepstates.asl b/src/soc/intel/braswell/acpi/sleepstates.asl
index 8da76b9..7499ef9 100644
--- a/src/soc/intel/braswell/acpi/sleepstates.asl
+++ b/src/soc/intel/braswell/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/soc/intel/braswell/acpi/southcluster.asl b/src/soc/intel/braswell/acpi/southcluster.asl
index 25e0bd8..919b075 100644
--- a/src/soc/intel/braswell/acpi/southcluster.asl
+++ b/src/soc/intel/braswell/acpi/southcluster.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/braswell/acpi/xhci.asl b/src/soc/intel/braswell/acpi/xhci.asl
index 77a1ba7..eaf28a6 100644
--- a/src/soc/intel/braswell/acpi/xhci.asl
+++ b/src/soc/intel/braswell/acpi/xhci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (XHCI)
diff --git a/src/soc/intel/braswell/bootblock/bootblock.c b/src/soc/intel/braswell/bootblock/bootblock.c
index f98f694..d2aea6d 100644
--- a/src/soc/intel/braswell/bootblock/bootblock.c
+++ b/src/soc/intel/braswell/bootblock/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/chip.c b/src/soc/intel/braswell/chip.c
index 822ee78..21874f7 100644
--- a/src/soc/intel/braswell/chip.c
+++ b/src/soc/intel/braswell/chip.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <chip.h>
diff --git a/src/soc/intel/braswell/chip.h b/src/soc/intel/braswell/chip.h
index e415dfd..cc5c3a8 100644
--- a/src/soc/intel/braswell/chip.h
+++ b/src/soc/intel/braswell/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/intel/braswell/cpu.c b/src/soc/intel/braswell/cpu.c
index 2ab8725..d47e2f8 100644
--- a/src/soc/intel/braswell/cpu.c
+++ b/src/soc/intel/braswell/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/braswell/elog.c b/src/soc/intel/braswell/elog.c
index 1626d0f..ba9359b 100644
--- a/src/soc/intel/braswell/elog.c
+++ b/src/soc/intel/braswell/elog.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/emmc.c b/src/soc/intel/braswell/emmc.c
index 7420205..576bd0a 100644
--- a/src/soc/intel/braswell/emmc.c
+++ b/src/soc/intel/braswell/emmc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/braswell/gfx.c b/src/soc/intel/braswell/gfx.c
index 703746d..2edac02 100644
--- a/src/soc/intel/braswell/gfx.c
+++ b/src/soc/intel/braswell/gfx.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "chip.h"
diff --git a/src/soc/intel/braswell/gpio.c b/src/soc/intel/braswell/gpio.c
index 637a4da..ef0126c 100755
--- a/src/soc/intel/braswell/gpio.c
+++ b/src/soc/intel/braswell/gpio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/intel/braswell/gpio_support.c b/src/soc/intel/braswell/gpio_support.c
index 7be1914..ae59d04 100644
--- a/src/soc/intel/braswell/gpio_support.c
+++ b/src/soc/intel/braswell/gpio_support.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/braswell/hda.c b/src/soc/intel/braswell/hda.c
index 31593fd..6836461 100644
--- a/src/soc/intel/braswell/hda.c
+++ b/src/soc/intel/braswell/hda.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <console/console.h>
diff --git a/src/soc/intel/braswell/include/soc/acpi.h b/src/soc/intel/braswell/include/soc/acpi.h
index d54ff66..fe18fdb 100644
--- a/src/soc/intel/braswell/include/soc/acpi.h
+++ b/src/soc/intel/braswell/include/soc/acpi.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_ACPI_H_
diff --git a/src/soc/intel/braswell/include/soc/device_nvs.h b/src/soc/intel/braswell/include/soc/device_nvs.h
index 18aaf7a..db37634 100644
--- a/src/soc/intel/braswell/include/soc/device_nvs.h
+++ b/src/soc/intel/braswell/include/soc/device_nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_DEVICE_NVS_H_
diff --git a/src/soc/intel/braswell/include/soc/ehci.h b/src/soc/intel/braswell/include/soc/ehci.h
index 22337bf..ac63ab0 100644
--- a/src/soc/intel/braswell/include/soc/ehci.h
+++ b/src/soc/intel/braswell/include/soc/ehci.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_EHCI_H_
diff --git a/src/soc/intel/braswell/include/soc/gfx.h b/src/soc/intel/braswell/include/soc/gfx.h
index 743a89a..4c3c4f9 100644
--- a/src/soc/intel/braswell/include/soc/gfx.h
+++ b/src/soc/intel/braswell/include/soc/gfx.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_GFX_H_
diff --git a/src/soc/intel/braswell/include/soc/gpio.h b/src/soc/intel/braswell/include/soc/gpio.h
index 3cc5cf0..8150744 100644
--- a/src/soc/intel/braswell/include/soc/gpio.h
+++ b/src/soc/intel/braswell/include/soc/gpio.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_GPIO_H_
diff --git a/src/soc/intel/braswell/include/soc/hda.h b/src/soc/intel/braswell/include/soc/hda.h
index 11fd404..a1f0512 100644
--- a/src/soc/intel/braswell/include/soc/hda.h
+++ b/src/soc/intel/braswell/include/soc/hda.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_HDA_H_
diff --git a/src/soc/intel/braswell/include/soc/iomap.h b/src/soc/intel/braswell/include/soc/iomap.h
index c4775ea..7776666 100644
--- a/src/soc/intel/braswell/include/soc/iomap.h
+++ b/src/soc/intel/braswell/include/soc/iomap.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_IOMAP_H_
diff --git a/src/soc/intel/braswell/include/soc/iosf.h b/src/soc/intel/braswell/include/soc/iosf.h
index cf56a05..98b6e74 100644
--- a/src/soc/intel/braswell/include/soc/iosf.h
+++ b/src/soc/intel/braswell/include/soc/iosf.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_IOSF_H_
diff --git a/src/soc/intel/braswell/include/soc/irq.h b/src/soc/intel/braswell/include/soc/irq.h
index 3367873..0e15976 100644
--- a/src/soc/intel/braswell/include/soc/irq.h
+++ b/src/soc/intel/braswell/include/soc/irq.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_IRQ_H_
diff --git a/src/soc/intel/braswell/include/soc/lpc.h b/src/soc/intel/braswell/include/soc/lpc.h
index 032cf9a..362d68e 100644
--- a/src/soc/intel/braswell/include/soc/lpc.h
+++ b/src/soc/intel/braswell/include/soc/lpc.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_LPC_H_
diff --git a/src/soc/intel/braswell/include/soc/msr.h b/src/soc/intel/braswell/include/soc/msr.h
index 7426629..6a29c7e 100644
--- a/src/soc/intel/braswell/include/soc/msr.h
+++ b/src/soc/intel/braswell/include/soc/msr.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_MSR_H_
diff --git a/src/soc/intel/braswell/include/soc/nvs.h b/src/soc/intel/braswell/include/soc/nvs.h
index 23bd719..5fbe6e3 100644
--- a/src/soc/intel/braswell/include/soc/nvs.h
+++ b/src/soc/intel/braswell/include/soc/nvs.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_NVS_H_
diff --git a/src/soc/intel/braswell/include/soc/pattrs.h b/src/soc/intel/braswell/include/soc/pattrs.h
index 6328dfe..e5efa7b 100644
--- a/src/soc/intel/braswell/include/soc/pattrs.h
+++ b/src/soc/intel/braswell/include/soc/pattrs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PATTRS_H_
diff --git a/src/soc/intel/braswell/include/soc/pci_devs.h b/src/soc/intel/braswell/include/soc/pci_devs.h
index 5594675..4fb3642 100644
--- a/src/soc/intel/braswell/include/soc/pci_devs.h
+++ b/src/soc/intel/braswell/include/soc/pci_devs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PCI_DEVS_H_
diff --git a/src/soc/intel/braswell/include/soc/pcie.h b/src/soc/intel/braswell/include/soc/pcie.h
index 9307d9b..cfbfb6d 100644
--- a/src/soc/intel/braswell/include/soc/pcie.h
+++ b/src/soc/intel/braswell/include/soc/pcie.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PCIE_H_
diff --git a/src/soc/intel/braswell/include/soc/pei_wrapper.h b/src/soc/intel/braswell/include/soc/pei_wrapper.h
index 59f2bb3..aa68fd8 100644
--- a/src/soc/intel/braswell/include/soc/pei_wrapper.h
+++ b/src/soc/intel/braswell/include/soc/pei_wrapper.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PEI_WRAPPER_H_
diff --git a/src/soc/intel/braswell/include/soc/pm.h b/src/soc/intel/braswell/include/soc/pm.h
index ca06819..e7c70c5 100644
--- a/src/soc/intel/braswell/include/soc/pm.h
+++ b/src/soc/intel/braswell/include/soc/pm.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PM_H_
diff --git a/src/soc/intel/braswell/include/soc/ramstage.h b/src/soc/intel/braswell/include/soc/ramstage.h
index f171243..1268677 100644
--- a/src/soc/intel/braswell/include/soc/ramstage.h
+++ b/src/soc/intel/braswell/include/soc/ramstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_RAMSTAGE_H_
diff --git a/src/soc/intel/braswell/include/soc/romstage.h b/src/soc/intel/braswell/include/soc/romstage.h
index 0f24f71..459a5e6 100644
--- a/src/soc/intel/braswell/include/soc/romstage.h
+++ b/src/soc/intel/braswell/include/soc/romstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_ROMSTAGE_H_
diff --git a/src/soc/intel/braswell/include/soc/sata.h b/src/soc/intel/braswell/include/soc/sata.h
index aca8901..c1013b2 100644
--- a/src/soc/intel/braswell/include/soc/sata.h
+++ b/src/soc/intel/braswell/include/soc/sata.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SATA_H_
diff --git a/src/soc/intel/braswell/include/soc/smm.h b/src/soc/intel/braswell/include/soc/smm.h
index fb38e86..59a1f85 100644
--- a/src/soc/intel/braswell/include/soc/smm.h
+++ b/src/soc/intel/braswell/include/soc/smm.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SMM_H_
diff --git a/src/soc/intel/braswell/include/soc/spi.h b/src/soc/intel/braswell/include/soc/spi.h
index f8354ec..fc936be 100644
--- a/src/soc/intel/braswell/include/soc/spi.h
+++ b/src/soc/intel/braswell/include/soc/spi.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SPI_H_
diff --git a/src/soc/intel/braswell/include/soc/xhci.h b/src/soc/intel/braswell/include/soc/xhci.h
index 0563757..6d7543f 100644
--- a/src/soc/intel/braswell/include/soc/xhci.h
+++ b/src/soc/intel/braswell/include/soc/xhci.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_XHCI_H
diff --git a/src/soc/intel/braswell/iosf.c b/src/soc/intel/braswell/iosf.c
index 98495db..3b3b6f3 100644
--- a/src/soc/intel/braswell/iosf.c
+++ b/src/soc/intel/braswell/iosf.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/lpc_init.c b/src/soc/intel/braswell/lpc_init.c
index 91816e7..62b4d83 100644
--- a/src/soc/intel/braswell/lpc_init.c
+++ b/src/soc/intel/braswell/lpc_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/gpio.h>
diff --git a/src/soc/intel/braswell/lpe.c b/src/soc/intel/braswell/lpe.c
index fa4b695..ba40bd5 100644
--- a/src/soc/intel/braswell/lpe.c
+++ b/src/soc/intel/braswell/lpe.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/lpss.c b/src/soc/intel/braswell/lpss.c
index f580fbf..b6296ec 100644
--- a/src/soc/intel/braswell/lpss.c
+++ b/src/soc/intel/braswell/lpss.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/braswell/memmap.c b/src/soc/intel/braswell/memmap.c
index 52bba3e..11af44b 100644
--- a/src/soc/intel/braswell/memmap.c
+++ b/src/soc/intel/braswell/memmap.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/northcluster.c b/src/soc/intel/braswell/northcluster.c
index 390e050..5f9ae8f 100644
--- a/src/soc/intel/braswell/northcluster.c
+++ b/src/soc/intel/braswell/northcluster.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/braswell/pcie.c b/src/soc/intel/braswell/pcie.c
index 608d724..a9b8225 100644
--- a/src/soc/intel/braswell/pcie.c
+++ b/src/soc/intel/braswell/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "chip.h"
diff --git a/src/soc/intel/braswell/pmutil.c b/src/soc/intel/braswell/pmutil.c
index fe5be64..2467990 100644
--- a/src/soc/intel/braswell/pmutil.c
+++ b/src/soc/intel/braswell/pmutil.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/ramstage.c b/src/soc/intel/braswell/ramstage.c
index 2454c6b..6edddfd 100644
--- a/src/soc/intel/braswell/ramstage.c
+++ b/src/soc/intel/braswell/ramstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/braswell/romstage/early_spi.c b/src/soc/intel/braswell/romstage/early_spi.c
index 31be1e9..7dde2e3 100644
--- a/src/soc/intel/braswell/romstage/early_spi.c
+++ b/src/soc/intel/braswell/romstage/early_spi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/romstage/pmc.c b/src/soc/intel/braswell/romstage/pmc.c
index 68031f6..bce140b 100644
--- a/src/soc/intel/braswell/romstage/pmc.c
+++ b/src/soc/intel/braswell/romstage/pmc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/romstage/romstage.c b/src/soc/intel/braswell/romstage/romstage.c
index 0b1eab5..00e4fdc 100644
--- a/src/soc/intel/braswell/romstage/romstage.c
+++ b/src/soc/intel/braswell/romstage/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/intel/braswell/sata.c b/src/soc/intel/braswell/sata.c
index 00b651e..7e39680 100644
--- a/src/soc/intel/braswell/sata.c
+++ b/src/soc/intel/braswell/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/scc.c b/src/soc/intel/braswell/scc.c
index b562865..948bfdb 100644
--- a/src/soc/intel/braswell/scc.c
+++ b/src/soc/intel/braswell/scc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/intel/braswell/sd.c b/src/soc/intel/braswell/sd.c
index 1fb7e9f..3a51158 100644
--- a/src/soc/intel/braswell/sd.c
+++ b/src/soc/intel/braswell/sd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/smihandler.c b/src/soc/intel/braswell/smihandler.c
index 576e118..9310e10 100644
--- a/src/soc/intel/braswell/smihandler.c
+++ b/src/soc/intel/braswell/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/hlt.h>
diff --git a/src/soc/intel/braswell/smm.c b/src/soc/intel/braswell/smm.c
index 876ec36..54508df 100644
--- a/src/soc/intel/braswell/smm.c
+++ b/src/soc/intel/braswell/smm.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/southcluster.c b/src/soc/intel/braswell/southcluster.c
index a3877d6..799b555 100644
--- a/src/soc/intel/braswell/southcluster.c
+++ b/src/soc/intel/braswell/southcluster.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/braswell/spi.c b/src/soc/intel/braswell/spi.c
index 6e85d56..21b7600 100644
--- a/src/soc/intel/braswell/spi.c
+++ b/src/soc/intel/braswell/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is derived from the flashrom project. */
diff --git a/src/soc/intel/braswell/spi_loading.c b/src/soc/intel/braswell/spi_loading.c
index 4130045..4a54056 100644
--- a/src/soc/intel/braswell/spi_loading.c
+++ b/src/soc/intel/braswell/spi_loading.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/intel/braswell/tsc_freq.c b/src/soc/intel/braswell/tsc_freq.c
index 34e610f..879c60a 100644
--- a/src/soc/intel/braswell/tsc_freq.c
+++ b/src/soc/intel/braswell/tsc_freq.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/msr.h>
diff --git a/src/soc/intel/broadwell/acpi.c b/src/soc/intel/broadwell/acpi.c
index 34a576d..0a52d32 100644
--- a/src/soc/intel/broadwell/acpi.c
+++ b/src/soc/intel/broadwell/acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/broadwell/acpi/adsp.asl b/src/soc/intel/broadwell/acpi/adsp.asl
index 966f7d3..32e1d66 100644
--- a/src/soc/intel/broadwell/acpi/adsp.asl
+++ b/src/soc/intel/broadwell/acpi/adsp.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (ADSP)
diff --git a/src/soc/intel/broadwell/acpi/cpu.asl b/src/soc/intel/broadwell/acpi/cpu.asl
index 62127ef..d73f02f 100644
--- a/src/soc/intel/broadwell/acpi/cpu.asl
+++ b/src/soc/intel/broadwell/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/soc/intel/broadwell/acpi/ctdp.asl b/src/soc/intel/broadwell/acpi/ctdp.asl
index 0e9ca0b..18a49c6 100644
--- a/src/soc/intel/broadwell/acpi/ctdp.asl
+++ b/src/soc/intel/broadwell/acpi/ctdp.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB.PCI0.MCHC)
diff --git a/src/soc/intel/broadwell/acpi/device_nvs.asl b/src/soc/intel/broadwell/acpi/device_nvs.asl
index a814ba8..82cc294 100644
--- a/src/soc/intel/broadwell/acpi/device_nvs.asl
+++ b/src/soc/intel/broadwell/acpi/device_nvs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Device Enabled in ACPI Mode */
diff --git a/src/soc/intel/broadwell/acpi/ehci.asl b/src/soc/intel/broadwell/acpi/ehci.asl
index 86f61ee..aac7708 100644
--- a/src/soc/intel/broadwell/acpi/ehci.asl
+++ b/src/soc/intel/broadwell/acpi/ehci.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // EHCI Controller 0:1d.0
diff --git a/src/soc/intel/broadwell/acpi/globalnvs.asl b/src/soc/intel/broadwell/acpi/globalnvs.asl
index 5538945..78425aa 100644
--- a/src/soc/intel/broadwell/acpi/globalnvs.asl
+++ b/src/soc/intel/broadwell/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/soc/intel/broadwell/acpi/gpio.asl b/src/soc/intel/broadwell/acpi/gpio.asl
index 3f3d236..f245f6f 100644
--- a/src/soc/intel/broadwell/acpi/gpio.asl
+++ b/src/soc/intel/broadwell/acpi/gpio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (GPIO)
diff --git a/src/soc/intel/broadwell/acpi/hda.asl b/src/soc/intel/broadwell/acpi/hda.asl
index 07e37d7..7ee66ff 100644
--- a/src/soc/intel/broadwell/acpi/hda.asl
+++ b/src/soc/intel/broadwell/acpi/hda.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel PCH HDA */
diff --git a/src/soc/intel/broadwell/acpi/irqlinks.asl b/src/soc/intel/broadwell/acpi/irqlinks.asl
index 92b1801..67e8faa 100644
--- a/src/soc/intel/broadwell/acpi/irqlinks.asl
+++ b/src/soc/intel/broadwell/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/soc/intel/broadwell/acpi/lpc.asl b/src/soc/intel/broadwell/acpi/lpc.asl
index 02320aa..ddd530b 100644
--- a/src/soc/intel/broadwell/acpi/lpc.asl
+++ b/src/soc/intel/broadwell/acpi/lpc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/soc/intel/broadwell/acpi/pch.asl b/src/soc/intel/broadwell/acpi/pch.asl
index 1d838f5..a20ff2c 100644
--- a/src/soc/intel/broadwell/acpi/pch.asl
+++ b/src/soc/intel/broadwell/acpi/pch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/acpi/pci_irqs.asl b/src/soc/intel/broadwell/acpi/pci_irqs.asl
index ed28bab..c9b2f44 100644
--- a/src/soc/intel/broadwell/acpi/pci_irqs.asl
+++ b/src/soc/intel/broadwell/acpi/pci_irqs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Method(_PRT)
diff --git a/src/soc/intel/broadwell/acpi/pcie.asl b/src/soc/intel/broadwell/acpi/pcie.asl
index 14abd2c..3d1828c 100644
--- a/src/soc/intel/broadwell/acpi/pcie.asl
+++ b/src/soc/intel/broadwell/acpi/pcie.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel PCH PCIe support */
diff --git a/src/soc/intel/broadwell/acpi/pcie_port.asl b/src/soc/intel/broadwell/acpi/pcie_port.asl
index f2b5dd7..a6397ce 100644
--- a/src/soc/intel/broadwell/acpi/pcie_port.asl
+++ b/src/soc/intel/broadwell/acpi/pcie_port.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Included in each PCIe Root Port device */
diff --git a/src/soc/intel/broadwell/acpi/platform.asl b/src/soc/intel/broadwell/acpi/platform.asl
index c00edeb..8cc5db7 100644
--- a/src/soc/intel/broadwell/acpi/platform.asl
+++ b/src/soc/intel/broadwell/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Enable ACPI _SWS methods */
diff --git a/src/soc/intel/broadwell/acpi/sata.asl b/src/soc/intel/broadwell/acpi/sata.asl
index 9328102..eca1626 100644
--- a/src/soc/intel/broadwell/acpi/sata.asl
+++ b/src/soc/intel/broadwell/acpi/sata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SATA Controller 0:1f.2
diff --git a/src/soc/intel/broadwell/acpi/serialio.asl b/src/soc/intel/broadwell/acpi/serialio.asl
index 6325b59..22492dd 100644
--- a/src/soc/intel/broadwell/acpi/serialio.asl
+++ b/src/soc/intel/broadwell/acpi/serialio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel Serial IO Devices in ACPI Mode
diff --git a/src/soc/intel/broadwell/acpi/sleepstates.asl b/src/soc/intel/broadwell/acpi/sleepstates.asl
index 5aa3215..8ee89d1 100644
--- a/src/soc/intel/broadwell/acpi/sleepstates.asl
+++ b/src/soc/intel/broadwell/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (\_S0, Package () { 0x0, 0x0, 0x0, 0x0 })
diff --git a/src/soc/intel/broadwell/acpi/smbus.asl b/src/soc/intel/broadwell/acpi/smbus.asl
index b16d129..19c1555 100644
--- a/src/soc/intel/broadwell/acpi/smbus.asl
+++ b/src/soc/intel/broadwell/acpi/smbus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/soc/intel/broadwell/acpi/systemagent.asl b/src/soc/intel/broadwell/acpi/systemagent.asl
index 850eaf0..a56bb1d 100644
--- a/src/soc/intel/broadwell/acpi/systemagent.asl
+++ b/src/soc/intel/broadwell/acpi/systemagent.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/broadwell/acpi/xhci.asl b/src/soc/intel/broadwell/acpi/xhci.asl
index b373ce7..cbe64d1 100644
--- a/src/soc/intel/broadwell/acpi/xhci.asl
+++ b/src/soc/intel/broadwell/acpi/xhci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // XHCI Controller 0:14.0
diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/adsp.c
index ae8dc73..832b946 100644
--- a/src/soc/intel/broadwell/adsp.c
+++ b/src/soc/intel/broadwell/adsp.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/intel/broadwell/bootblock/cpu.c b/src/soc/intel/broadwell/bootblock/cpu.c
index 83bd873..5ef4ca6 100644
--- a/src/soc/intel/broadwell/bootblock/cpu.c
+++ b/src/soc/intel/broadwell/bootblock/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/broadwell/bootblock/pch.c b/src/soc/intel/broadwell/bootblock/pch.c
index 7c23de5..4edda98 100644
--- a/src/soc/intel/broadwell/bootblock/pch.c
+++ b/src/soc/intel/broadwell/bootblock/pch.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/bootblock/systemagent.c b/src/soc/intel/broadwell/bootblock/systemagent.c
index 3606ca9..29113fe 100644
--- a/src/soc/intel/broadwell/bootblock/systemagent.c
+++ b/src/soc/intel/broadwell/bootblock/systemagent.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/chip.c b/src/soc/intel/broadwell/chip.c
index b411545..7c5db2e 100644
--- a/src/soc/intel/broadwell/chip.c
+++ b/src/soc/intel/broadwell/chip.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/chip.h b/src/soc/intel/broadwell/chip.h
index b35f8d7..206d546 100644
--- a/src/soc/intel/broadwell/chip.h
+++ b/src/soc/intel/broadwell/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_INTEL_BROADWELL_CHIP_H_
diff --git a/src/soc/intel/broadwell/cpu.c b/src/soc/intel/broadwell/cpu.c
index f3ab30a..c883f96 100644
--- a/src/soc/intel/broadwell/cpu.c
+++ b/src/soc/intel/broadwell/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/cpu_info.c b/src/soc/intel/broadwell/cpu_info.c
index e385ab2..24d5cba 100644
--- a/src/soc/intel/broadwell/cpu_info.c
+++ b/src/soc/intel/broadwell/cpu_info.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/ehci.c
index d22fcae..ff27bdf 100644
--- a/src/soc/intel/broadwell/ehci.c
+++ b/src/soc/intel/broadwell/ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/elog.c b/src/soc/intel/broadwell/elog.c
index 4c827f8..acbad61 100644
--- a/src/soc/intel/broadwell/elog.c
+++ b/src/soc/intel/broadwell/elog.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/soc/intel/broadwell/finalize.c b/src/soc/intel/broadwell/finalize.c
index fd0d8f3..023bb0a 100644
--- a/src/soc/intel/broadwell/finalize.c
+++ b/src/soc/intel/broadwell/finalize.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/gpio.c b/src/soc/intel/broadwell/gpio.c
index 6c34bad..44ca4e8 100644
--- a/src/soc/intel/broadwell/gpio.c
+++ b/src/soc/intel/broadwell/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/broadwell/hda.c b/src/soc/intel/broadwell/hda.c
index 43321b7..35d4647 100644
--- a/src/soc/intel/broadwell/hda.c
+++ b/src/soc/intel/broadwell/hda.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c
index 987d56c..d9a40b4 100644
--- a/src/soc/intel/broadwell/igd.c
+++ b/src/soc/intel/broadwell/igd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/broadwell/include/soc/acpi.h b/src/soc/intel/broadwell/include/soc/acpi.h
index 4e361d1..15f96bd 100644
--- a/src/soc/intel/broadwell/include/soc/acpi.h
+++ b/src/soc/intel/broadwell/include/soc/acpi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_ACPI_H_
diff --git a/src/soc/intel/broadwell/include/soc/adsp.h b/src/soc/intel/broadwell/include/soc/adsp.h
index 969c44c..a4a1f1b 100644
--- a/src/soc/intel/broadwell/include/soc/adsp.h
+++ b/src/soc/intel/broadwell/include/soc/adsp.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_ADSP_H_
diff --git a/src/soc/intel/broadwell/include/soc/cpu.h b/src/soc/intel/broadwell/include/soc/cpu.h
index 2791938..95f2908 100644
--- a/src/soc/intel/broadwell/include/soc/cpu.h
+++ b/src/soc/intel/broadwell/include/soc/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_CPU_H_
diff --git a/src/soc/intel/broadwell/include/soc/device_nvs.h b/src/soc/intel/broadwell/include/soc/device_nvs.h
index 943d89d..5849583 100644
--- a/src/soc/intel/broadwell/include/soc/device_nvs.h
+++ b/src/soc/intel/broadwell/include/soc/device_nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_DEVICE_NVS_H_
diff --git a/src/soc/intel/broadwell/include/soc/ehci.h b/src/soc/intel/broadwell/include/soc/ehci.h
index 2b5380c..8296c80 100644
--- a/src/soc/intel/broadwell/include/soc/ehci.h
+++ b/src/soc/intel/broadwell/include/soc/ehci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_EHCI_H_
diff --git a/src/soc/intel/broadwell/include/soc/gpio.h b/src/soc/intel/broadwell/include/soc/gpio.h
index dcfa9e9..a0c48db 100644
--- a/src/soc/intel/broadwell/include/soc/gpio.h
+++ b/src/soc/intel/broadwell/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_GPIO_H_
diff --git a/src/soc/intel/broadwell/include/soc/iobp.h b/src/soc/intel/broadwell/include/soc/iobp.h
index ea0e0c3..d38bf34 100644
--- a/src/soc/intel/broadwell/include/soc/iobp.h
+++ b/src/soc/intel/broadwell/include/soc/iobp.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_IOBP_H_
diff --git a/src/soc/intel/broadwell/include/soc/iomap.h b/src/soc/intel/broadwell/include/soc/iomap.h
index 54767ad..e943ebd 100644
--- a/src/soc/intel/broadwell/include/soc/iomap.h
+++ b/src/soc/intel/broadwell/include/soc/iomap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_IOMAP_H_
diff --git a/src/soc/intel/broadwell/include/soc/lpc.h b/src/soc/intel/broadwell/include/soc/lpc.h
index e232004..9c65ea3 100644
--- a/src/soc/intel/broadwell/include/soc/lpc.h
+++ b/src/soc/intel/broadwell/include/soc/lpc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_LPC_H_
diff --git a/src/soc/intel/broadwell/include/soc/me.h b/src/soc/intel/broadwell/include/soc/me.h
index 9a69d22..1052461 100644
--- a/src/soc/intel/broadwell/include/soc/me.h
+++ b/src/soc/intel/broadwell/include/soc/me.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_ME_H_
diff --git a/src/soc/intel/broadwell/include/soc/msr.h b/src/soc/intel/broadwell/include/soc/msr.h
index 914a11f..e8d9b41 100644
--- a/src/soc/intel/broadwell/include/soc/msr.h
+++ b/src/soc/intel/broadwell/include/soc/msr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_MSR_H_
diff --git a/src/soc/intel/broadwell/include/soc/nvs.h b/src/soc/intel/broadwell/include/soc/nvs.h
index cf21935..9a8e8fc 100644
--- a/src/soc/intel/broadwell/include/soc/nvs.h
+++ b/src/soc/intel/broadwell/include/soc/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_NVS_H_
diff --git a/src/soc/intel/broadwell/include/soc/pch.h b/src/soc/intel/broadwell/include/soc/pch.h
index 433afd6..d5f5cdc 100644
--- a/src/soc/intel/broadwell/include/soc/pch.h
+++ b/src/soc/intel/broadwell/include/soc/pch.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_PCH_H_
diff --git a/src/soc/intel/broadwell/include/soc/pci_devs.h b/src/soc/intel/broadwell/include/soc/pci_devs.h
index a72572d..13642b8 100644
--- a/src/soc/intel/broadwell/include/soc/pci_devs.h
+++ b/src/soc/intel/broadwell/include/soc/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_PCI_DEVS_H_
diff --git a/src/soc/intel/broadwell/include/soc/pei_wrapper.h b/src/soc/intel/broadwell/include/soc/pei_wrapper.h
index 7aadf28..5a65246 100644
--- a/src/soc/intel/broadwell/include/soc/pei_wrapper.h
+++ b/src/soc/intel/broadwell/include/soc/pei_wrapper.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_PEI_WRAPPER_H_
diff --git a/src/soc/intel/broadwell/include/soc/pm.h b/src/soc/intel/broadwell/include/soc/pm.h
index 99c57b8..7e76038 100644
--- a/src/soc/intel/broadwell/include/soc/pm.h
+++ b/src/soc/intel/broadwell/include/soc/pm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_PM_H_
diff --git a/src/soc/intel/broadwell/include/soc/ramstage.h b/src/soc/intel/broadwell/include/soc/ramstage.h
index 7d27418..f6bdf27 100644
--- a/src/soc/intel/broadwell/include/soc/ramstage.h
+++ b/src/soc/intel/broadwell/include/soc/ramstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_RAMSTAGE_H_
diff --git a/src/soc/intel/broadwell/include/soc/rcba.h b/src/soc/intel/broadwell/include/soc/rcba.h
index c2c7583..cfb1eb1 100644
--- a/src/soc/intel/broadwell/include/soc/rcba.h
+++ b/src/soc/intel/broadwell/include/soc/rcba.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_RCBA_H_
diff --git a/src/soc/intel/broadwell/include/soc/reset.h b/src/soc/intel/broadwell/include/soc/reset.h
index e068812..dbb0e93 100644
--- a/src/soc/intel/broadwell/include/soc/reset.h
+++ b/src/soc/intel/broadwell/include/soc/reset.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_RESET_H_
diff --git a/src/soc/intel/broadwell/include/soc/romstage.h b/src/soc/intel/broadwell/include/soc/romstage.h
index f78abc6..bb3f855 100644
--- a/src/soc/intel/broadwell/include/soc/romstage.h
+++ b/src/soc/intel/broadwell/include/soc/romstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_ROMSTAGE_H_
diff --git a/src/soc/intel/broadwell/include/soc/sata.h b/src/soc/intel/broadwell/include/soc/sata.h
index a0ebd0b..aef9494 100644
--- a/src/soc/intel/broadwell/include/soc/sata.h
+++ b/src/soc/intel/broadwell/include/soc/sata.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_SATA_H_
diff --git a/src/soc/intel/broadwell/include/soc/serialio.h b/src/soc/intel/broadwell/include/soc/serialio.h
index aff6f65..422ff51 100644
--- a/src/soc/intel/broadwell/include/soc/serialio.h
+++ b/src/soc/intel/broadwell/include/soc/serialio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_SERIALIO_H_
diff --git a/src/soc/intel/broadwell/include/soc/smbus.h b/src/soc/intel/broadwell/include/soc/smbus.h
index 8ee6149..f2093ba 100644
--- a/src/soc/intel/broadwell/include/soc/smbus.h
+++ b/src/soc/intel/broadwell/include/soc/smbus.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_SMBUS_H_
diff --git a/src/soc/intel/broadwell/include/soc/smm.h b/src/soc/intel/broadwell/include/soc/smm.h
index 73597c9..6fdf323 100644
--- a/src/soc/intel/broadwell/include/soc/smm.h
+++ b/src/soc/intel/broadwell/include/soc/smm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_SMM_H_
diff --git a/src/soc/intel/broadwell/include/soc/spi.h b/src/soc/intel/broadwell/include/soc/spi.h
index 2f887b1..e29c97c 100644
--- a/src/soc/intel/broadwell/include/soc/spi.h
+++ b/src/soc/intel/broadwell/include/soc/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_SPI_H_
diff --git a/src/soc/intel/broadwell/include/soc/systemagent.h b/src/soc/intel/broadwell/include/soc/systemagent.h
index 61dece2..3588d0c 100644
--- a/src/soc/intel/broadwell/include/soc/systemagent.h
+++ b/src/soc/intel/broadwell/include/soc/systemagent.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_SYSTEMAGENT_H_
diff --git a/src/soc/intel/broadwell/include/soc/xhci.h b/src/soc/intel/broadwell/include/soc/xhci.h
index bf4a048..24e7191 100644
--- a/src/soc/intel/broadwell/include/soc/xhci.h
+++ b/src/soc/intel/broadwell/include/soc/xhci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BROADWELL_XHCI_H_
diff --git a/src/soc/intel/broadwell/iobp.c b/src/soc/intel/broadwell/iobp.c
index 9b903cd..0f8f23b 100644
--- a/src/soc/intel/broadwell/iobp.c
+++ b/src/soc/intel/broadwell/iobp.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/lpc.c
index 253dc93..b633864 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/me.c
index 8cd605f..1f04f9f 100644
--- a/src/soc/intel/broadwell/me.c
+++ b/src/soc/intel/broadwell/me.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/intel/broadwell/me_status.c b/src/soc/intel/broadwell/me_status.c
index f957da7..2f43bce 100644
--- a/src/soc/intel/broadwell/me_status.c
+++ b/src/soc/intel/broadwell/me_status.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/memmap.c b/src/soc/intel/broadwell/memmap.c
index 69e541e..ae4a1c7 100644
--- a/src/soc/intel/broadwell/memmap.c
+++ b/src/soc/intel/broadwell/memmap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/minihd.c b/src/soc/intel/broadwell/minihd.c
index 3518bde..78a99bf 100644
--- a/src/soc/intel/broadwell/minihd.c
+++ b/src/soc/intel/broadwell/minihd.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/monotonic_timer.c b/src/soc/intel/broadwell/monotonic_timer.c
index 6fe61b2..297f042 100644
--- a/src/soc/intel/broadwell/monotonic_timer.c
+++ b/src/soc/intel/broadwell/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/broadwell/pch.c b/src/soc/intel/broadwell/pch.c
index 97c8407..8350df9 100644
--- a/src/soc/intel/broadwell/pch.c
+++ b/src/soc/intel/broadwell/pch.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/pcie.c b/src/soc/intel/broadwell/pcie.c
index b791720..9838b1c 100644
--- a/src/soc/intel/broadwell/pcie.c
+++ b/src/soc/intel/broadwell/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/pei_data.c b/src/soc/intel/broadwell/pei_data.c
index ea99111..3531af0 100644
--- a/src/soc/intel/broadwell/pei_data.c
+++ b/src/soc/intel/broadwell/pei_data.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pmutil.c
index fa5392c..c9e98d4 100644
--- a/src/soc/intel/broadwell/pmutil.c
+++ b/src/soc/intel/broadwell/pmutil.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/intel/broadwell/ramstage.c b/src/soc/intel/broadwell/ramstage.c
index c8fb6ed..ed0ecb9 100644
--- a/src/soc/intel/broadwell/ramstage.c
+++ b/src/soc/intel/broadwell/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c
index 949b416..8fe9b7d 100644
--- a/src/soc/intel/broadwell/refcode.c
+++ b/src/soc/intel/broadwell/refcode.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/soc/intel/broadwell/reset.c b/src/soc/intel/broadwell/reset.c
index 13b71a9..61edef8 100644
--- a/src/soc/intel/broadwell/reset.c
+++ b/src/soc/intel/broadwell/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/romstage/cache_as_ram.inc b/src/soc/intel/broadwell/romstage/cache_as_ram.inc
index 3f1b12a..431356c 100644
--- a/src/soc/intel/broadwell/romstage/cache_as_ram.inc
+++ b/src/soc/intel/broadwell/romstage/cache_as_ram.inc
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cpu/x86/mtrr.h>
diff --git a/src/soc/intel/broadwell/romstage/cpu.c b/src/soc/intel/broadwell/romstage/cpu.c
index dfc7f22..fe646aa 100644
--- a/src/soc/intel/broadwell/romstage/cpu.c
+++ b/src/soc/intel/broadwell/romstage/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/broadwell/romstage/pch.c b/src/soc/intel/broadwell/romstage/pch.c
index 1e45bbf..99c8832 100644
--- a/src/soc/intel/broadwell/romstage/pch.c
+++ b/src/soc/intel/broadwell/romstage/pch.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/romstage/power_state.c b/src/soc/intel/broadwell/romstage/power_state.c
index defa014..ac40aed 100644
--- a/src/soc/intel/broadwell/romstage/power_state.c
+++ b/src/soc/intel/broadwell/romstage/power_state.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/early_variables.h>
diff --git a/src/soc/intel/broadwell/romstage/raminit.c b/src/soc/intel/broadwell/romstage/raminit.c
index 82c88cb..26d4389 100644
--- a/src/soc/intel/broadwell/romstage/raminit.c
+++ b/src/soc/intel/broadwell/romstage/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cbfs.h>
diff --git a/src/soc/intel/broadwell/romstage/report_platform.c b/src/soc/intel/broadwell/romstage/report_platform.c
index 83eb900..ef81b8d 100644
--- a/src/soc/intel/broadwell/romstage/report_platform.c
+++ b/src/soc/intel/broadwell/romstage/report_platform.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/broadwell/romstage/romstage.c b/src/soc/intel/broadwell/romstage/romstage.c
index 5b6d0b3..f27ffac 100644
--- a/src/soc/intel/broadwell/romstage/romstage.c
+++ b/src/soc/intel/broadwell/romstage/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/broadwell/romstage/smbus.c b/src/soc/intel/broadwell/romstage/smbus.c
index eb0967c..a1c346c 100644
--- a/src/soc/intel/broadwell/romstage/smbus.c
+++ b/src/soc/intel/broadwell/romstage/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/romstage/spi.c b/src/soc/intel/broadwell/romstage/spi.c
index 12f6935..c41b5f0 100644
--- a/src/soc/intel/broadwell/romstage/spi.c
+++ b/src/soc/intel/broadwell/romstage/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/romstage/stack.c b/src/soc/intel/broadwell/romstage/stack.c
index ed8e9c3..c547b80 100644
--- a/src/soc/intel/broadwell/romstage/stack.c
+++ b/src/soc/intel/broadwell/romstage/stack.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/broadwell/romstage/systemagent.c b/src/soc/intel/broadwell/romstage/systemagent.c
index 215120a..6af74f0 100644
--- a/src/soc/intel/broadwell/romstage/systemagent.c
+++ b/src/soc/intel/broadwell/romstage/systemagent.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/soc/intel/broadwell/romstage/uart.c b/src/soc/intel/broadwell/romstage/uart.c
index 6a6d6ca..c1a39e3 100644
--- a/src/soc/intel/broadwell/romstage/uart.c
+++ b/src/soc/intel/broadwell/romstage/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/early_variables.h>
diff --git a/src/soc/intel/broadwell/sata.c b/src/soc/intel/broadwell/sata.c
index e9610cf..6373d95 100644
--- a/src/soc/intel/broadwell/sata.c
+++ b/src/soc/intel/broadwell/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/serialio.c b/src/soc/intel/broadwell/serialio.c
index 06d8128..029e37e 100644
--- a/src/soc/intel/broadwell/serialio.c
+++ b/src/soc/intel/broadwell/serialio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/smbus.c
index 5660a41..5977722 100644
--- a/src/soc/intel/broadwell/smbus.c
+++ b/src/soc/intel/broadwell/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/smbus_common.c b/src/soc/intel/broadwell/smbus_common.c
index 8d8e5ce..5fabde0 100644
--- a/src/soc/intel/broadwell/smbus_common.c
+++ b/src/soc/intel/broadwell/smbus_common.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/smi.c
index 3cf6e0f..c154ec0 100644
--- a/src/soc/intel/broadwell/smi.c
+++ b/src/soc/intel/broadwell/smi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/smihandler.c
index be1b95f..caca024 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/intel/broadwell/smmrelocate.c b/src/soc/intel/broadwell/smmrelocate.c
index f4525da..0ecc2f6 100644
--- a/src/soc/intel/broadwell/smmrelocate.c
+++ b/src/soc/intel/broadwell/smmrelocate.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/soc/intel/broadwell/spi.c b/src/soc/intel/broadwell/spi.c
index 64d58a3..2243d1b 100644
--- a/src/soc/intel/broadwell/spi.c
+++ b/src/soc/intel/broadwell/spi.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is derived from the flashrom project. */
diff --git a/src/soc/intel/broadwell/stage_cache.c b/src/soc/intel/broadwell/stage_cache.c
index 90e79a6..7fbadf1 100644
--- a/src/soc/intel/broadwell/stage_cache.c
+++ b/src/soc/intel/broadwell/stage_cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/intel/broadwell/systemagent.c b/src/soc/intel/broadwell/systemagent.c
index e746e5e..3d92d4a 100644
--- a/src/soc/intel/broadwell/systemagent.c
+++ b/src/soc/intel/broadwell/systemagent.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/broadwell/tsc_freq.c b/src/soc/intel/broadwell/tsc_freq.c
index 41d1be3..31033c3 100644
--- a/src/soc/intel/broadwell/tsc_freq.c
+++ b/src/soc/intel/broadwell/tsc_freq.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/broadwell/usbdebug.c b/src/soc/intel/broadwell/usbdebug.c
index dcd8761..b9b71de 100644
--- a/src/soc/intel/broadwell/usbdebug.c
+++ b/src/soc/intel/broadwell/usbdebug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/xhci.c
index a7f81ff..a2cb121 100644
--- a/src/soc/intel/broadwell/xhci.c
+++ b/src/soc/intel/broadwell/xhci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/common/acpi.h b/src/soc/intel/common/acpi.h
index 8ee81a6..ff2330f 100644
--- a/src/soc/intel/common/acpi.h
+++ b/src/soc/intel/common/acpi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_COMMON_ACPI_H_
diff --git a/src/soc/intel/common/acpi/acpi_wake_source.asl b/src/soc/intel/common/acpi/acpi_wake_source.asl
index 30e70d9..a111c50 100644
--- a/src/soc/intel/common/acpi/acpi_wake_source.asl
+++ b/src/soc/intel/common/acpi/acpi_wake_source.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/soc/intel/common/acpi_wake_source.c b/src/soc/intel/common/acpi_wake_source.c
index 43d6b03..e501e27 100644
--- a/src/soc/intel/common/acpi_wake_source.c
+++ b/src/soc/intel/common/acpi_wake_source.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/common/fsp_ramstage.c b/src/soc/intel/common/fsp_ramstage.c
index a1b677a..f3128aa 100644
--- a/src/soc/intel/common/fsp_ramstage.c
+++ b/src/soc/intel/common/fsp_ramstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/common/gma.h b/src/soc/intel/common/gma.h
index 03ecedb..b0d57a2 100644
--- a/src/soc/intel/common/gma.h
+++ b/src/soc/intel/common/gma.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _GMA_H_
diff --git a/src/soc/intel/common/hda_verb.c b/src/soc/intel/common/hda_verb.c
index ecd6c81..f4a455a 100644
--- a/src/soc/intel/common/hda_verb.c
+++ b/src/soc/intel/common/hda_verb.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/common/hda_verb.h b/src/soc/intel/common/hda_verb.h
index ef261ae..0f43406 100644
--- a/src/soc/intel/common/hda_verb.h
+++ b/src/soc/intel/common/hda_verb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMON_HDA_VERB_H_
diff --git a/src/soc/intel/common/memmap.h b/src/soc/intel/common/memmap.h
index 3d51539..239cd03 100644
--- a/src/soc/intel/common/memmap.h
+++ b/src/soc/intel/common/memmap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMON_MEMMAP_H_
diff --git a/src/soc/intel/common/mrc_cache.c b/src/soc/intel/common/mrc_cache.c
index e5e6b6a..0a6f5e5 100644
--- a/src/soc/intel/common/mrc_cache.c
+++ b/src/soc/intel/common/mrc_cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/soc/intel/common/mrc_cache.h b/src/soc/intel/common/mrc_cache.h
index 7b7e3b2..4922110 100644
--- a/src/soc/intel/common/mrc_cache.h
+++ b/src/soc/intel/common/mrc_cache.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMON_MRC_CACHE_H_
diff --git a/src/soc/intel/common/nvm.c b/src/soc/intel/common/nvm.c
index 7b7ae06..12c0115 100644
--- a/src/soc/intel/common/nvm.c
+++ b/src/soc/intel/common/nvm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/common/nvm.h b/src/soc/intel/common/nvm.h
index 5022bfc..de20c63 100644
--- a/src/soc/intel/common/nvm.h
+++ b/src/soc/intel/common/nvm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMON_NVM_H_
diff --git a/src/soc/intel/common/raminit.c b/src/soc/intel/common/raminit.c
index 0779c55..45c6ff5 100644
--- a/src/soc/intel/common/raminit.c
+++ b/src/soc/intel/common/raminit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/intel/common/ramstage.h b/src/soc/intel/common/ramstage.h
index d6cb895..d00170c 100644
--- a/src/soc/intel/common/ramstage.h
+++ b/src/soc/intel/common/ramstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_COMMON_RAMSTAGE_H_
diff --git a/src/soc/intel/common/reset.c b/src/soc/intel/common/reset.c
index 0a40045..7d0a9d9 100644
--- a/src/soc/intel/common/reset.c
+++ b/src/soc/intel/common/reset.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/hlt.h>
diff --git a/src/soc/intel/common/romstage.c b/src/soc/intel/common/romstage.c
index 6fc569c..9695707 100644
--- a/src/soc/intel/common/romstage.c
+++ b/src/soc/intel/common/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/common/romstage.h b/src/soc/intel/common/romstage.h
index 272679f..67f14c2 100644
--- a/src/soc/intel/common/romstage.h
+++ b/src/soc/intel/common/romstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMON_ROMSTAGE_H_
diff --git a/src/soc/intel/common/stack.c b/src/soc/intel/common/stack.c
index 45e61f9..2ea6c08 100644
--- a/src/soc/intel/common/stack.c
+++ b/src/soc/intel/common/stack.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/intel/common/stack.h b/src/soc/intel/common/stack.h
index f5333a7..84f817f 100644
--- a/src/soc/intel/common/stack.h
+++ b/src/soc/intel/common/stack.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _COMMON_STACK_H_
diff --git a/src/soc/intel/common/stage_cache.c b/src/soc/intel/common/stage_cache.c
index 5bb83c9..bc3bb7c 100644
--- a/src/soc/intel/common/stage_cache.c
+++ b/src/soc/intel/common/stage_cache.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/common/util.c b/src/soc/intel/common/util.c
index a6adfaf..7236b9a 100644
--- a/src/soc/intel/common/util.c
+++ b/src/soc/intel/common/util.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/common/util.h b/src/soc/intel/common/util.h
index de5e0a0..916a2b3 100644
--- a/src/soc/intel/common/util.h
+++ b/src/soc/intel/common/util.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_COMMON_UTIL_H_
diff --git a/src/soc/intel/common/vbt.c b/src/soc/intel/common/vbt.c
index 3aba7c7..a1b9a0d 100644
--- a/src/soc/intel/common/vbt.c
+++ b/src/soc/intel/common/vbt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/soc/intel/fsp_baytrail/Kconfig b/src/soc/intel/fsp_baytrail/Kconfig
index d9114fc..5712e8e 100644
--- a/src/soc/intel/fsp_baytrail/Kconfig
+++ b/src/soc/intel/fsp_baytrail/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOC_INTEL_FSP_BAYTRAIL
diff --git a/src/soc/intel/fsp_baytrail/Makefile.inc b/src/soc/intel/fsp_baytrail/Makefile.inc
index 7370830..1cb284d 100644
--- a/src/soc/intel/fsp_baytrail/Makefile.inc
+++ b/src/soc/intel/fsp_baytrail/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ifeq ($(CONFIG_SOC_INTEL_FSP_BAYTRAIL),y)
diff --git a/src/soc/intel/fsp_baytrail/acpi.c b/src/soc/intel/fsp_baytrail/acpi.c
index ed607b3..5efa376 100644
--- a/src/soc/intel/fsp_baytrail/acpi.c
+++ b/src/soc/intel/fsp_baytrail/acpi.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/soc/intel/fsp_baytrail/acpi/cpu.asl b/src/soc/intel/fsp_baytrail/acpi/cpu.asl
index 85b2014..f311ba1 100644
--- a/src/soc/intel/fsp_baytrail/acpi/cpu.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/soc/intel/fsp_baytrail/acpi/device_nvs.asl b/src/soc/intel/fsp_baytrail/acpi/device_nvs.asl
index 1bb7d95..24d5ab7 100644
--- a/src/soc/intel/fsp_baytrail/acpi/device_nvs.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/device_nvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Device Enabled in ACPI Mode */
diff --git a/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl b/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl
index fef0a73..7ff4df0 100644
--- a/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/soc/intel/fsp_baytrail/acpi/gpio.asl b/src/soc/intel/fsp_baytrail/acpi/gpio.asl
index 9bcb105..a869813 100644
--- a/src/soc/intel/fsp_baytrail/acpi/gpio.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/gpio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/intel/fsp_baytrail/baytrail/iomap.h>
diff --git a/src/soc/intel/fsp_baytrail/acpi/irq_helper.h b/src/soc/intel/fsp_baytrail/acpi/irq_helper.h
index 10e3327..9f53ba5 100644
--- a/src/soc/intel/fsp_baytrail/acpi/irq_helper.h
+++ b/src/soc/intel/fsp_baytrail/acpi/irq_helper.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/intel/fsp_baytrail/acpi/irqlinks.asl b/src/soc/intel/fsp_baytrail/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/soc/intel/fsp_baytrail/acpi/irqlinks.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/soc/intel/fsp_baytrail/acpi/irqroute.asl b/src/soc/intel/fsp_baytrail/acpi/irqroute.asl
index aa9b5de..487d986 100644
--- a/src/soc/intel/fsp_baytrail/acpi/irqroute.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/irqroute.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // PCI Interrupt Routing
diff --git a/src/soc/intel/fsp_baytrail/acpi/lpc.asl b/src/soc/intel/fsp_baytrail/acpi/lpc.asl
index 8d48ed4..56fc2c3 100644
--- a/src/soc/intel/fsp_baytrail/acpi/lpc.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/lpc.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/soc/intel/fsp_baytrail/acpi/lpe.asl b/src/soc/intel/fsp_baytrail/acpi/lpe.asl
index 383862c..e90ce2f 100644
--- a/src/soc/intel/fsp_baytrail/acpi/lpe.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/lpe.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LPEA)
diff --git a/src/soc/intel/fsp_baytrail/acpi/lpss.asl b/src/soc/intel/fsp_baytrail/acpi/lpss.asl
index 2591aa1..0b98ab8 100644
--- a/src/soc/intel/fsp_baytrail/acpi/lpss.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/lpss.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (SDM1)
diff --git a/src/soc/intel/fsp_baytrail/acpi/platform.asl b/src/soc/intel/fsp_baytrail/acpi/platform.asl
index 24ddc91..9202029 100644
--- a/src/soc/intel/fsp_baytrail/acpi/platform.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/soc/intel/fsp_baytrail/acpi/scc.asl b/src/soc/intel/fsp_baytrail/acpi/scc.asl
index 3bf3f39f..c798767 100644
--- a/src/soc/intel/fsp_baytrail/acpi/scc.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/scc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (EMMC)
diff --git a/src/soc/intel/fsp_baytrail/acpi/sleepstates.asl b/src/soc/intel/fsp_baytrail/acpi/sleepstates.asl
index bebe047..a540a13 100644
--- a/src/soc/intel/fsp_baytrail/acpi/sleepstates.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/soc/intel/fsp_baytrail/acpi/southcluster.asl b/src/soc/intel/fsp_baytrail/acpi/southcluster.asl
index bd56948..ab11d58 100644
--- a/src/soc/intel/fsp_baytrail/acpi/southcluster.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/southcluster.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/intel/fsp_baytrail/baytrail/iomap.h>
diff --git a/src/soc/intel/fsp_baytrail/acpi/usb.asl b/src/soc/intel/fsp_baytrail/acpi/usb.asl
index b2beadc..fc02072 100644
--- a/src/soc/intel/fsp_baytrail/acpi/usb.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Baytrail USB support */
diff --git a/src/soc/intel/fsp_baytrail/acpi/xhci.asl b/src/soc/intel/fsp_baytrail/acpi/xhci.asl
index 77a1ba7..eaf28a6 100644
--- a/src/soc/intel/fsp_baytrail/acpi/xhci.asl
+++ b/src/soc/intel/fsp_baytrail/acpi/xhci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (XHCI)
diff --git a/src/soc/intel/fsp_baytrail/baytrail/acpi.h b/src/soc/intel/fsp_baytrail/baytrail/acpi.h
index 0cd978d..f6d3233 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/acpi.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/acpi.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_ACPI_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/baytrail.h b/src/soc/intel/fsp_baytrail/baytrail/baytrail.h
index 78b7171..5ba5316 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/baytrail.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/baytrail.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_INTEL_FSP_BAYTRAIL_BAYTRAIL_H__
diff --git a/src/soc/intel/fsp_baytrail/baytrail/device_nvs.h b/src/soc/intel/fsp_baytrail/baytrail/device_nvs.h
index eb94406..4f32506 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/device_nvs.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/device_nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_DEVICE_NVS_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/ehci.h b/src/soc/intel/fsp_baytrail/baytrail/ehci.h
index 444e8ce..0c1b369 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/ehci.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/ehci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BAYTRAIL_EHCI_H
diff --git a/src/soc/intel/fsp_baytrail/baytrail/gfx.h b/src/soc/intel/fsp_baytrail/baytrail/gfx.h
index 20f34d3..b26bd1f 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/gfx.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/gfx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_GFX_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/gpio.h b/src/soc/intel/fsp_baytrail/baytrail/gpio.h
index 200c7f8..7915c8b 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/gpio.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_GPIO_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/i2c.h b/src/soc/intel/fsp_baytrail/baytrail/i2c.h
index a8c0bff..9ae0cd0 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/i2c.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_INTEL_FSP_BAYTRAIL_I2C_H__
diff --git a/src/soc/intel/fsp_baytrail/baytrail/iomap.h b/src/soc/intel/fsp_baytrail/baytrail/iomap.h
index 5c5e9ab..5aa66b7 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/iomap.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/iomap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_IOMAP_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/iosf.h b/src/soc/intel/fsp_baytrail/baytrail/iosf.h
index da8e3d0..4f90244 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/iosf.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/iosf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_IOSF_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/irq.h b/src/soc/intel/fsp_baytrail/baytrail/irq.h
index 5d0cb5f..cbb4e61 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/irq.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/irq.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_IRQ_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/lpc.h b/src/soc/intel/fsp_baytrail/baytrail/lpc.h
index a5a2143..88b82b9 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/lpc.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/lpc.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_LPC_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/msr.h b/src/soc/intel/fsp_baytrail/baytrail/msr.h
index b1adb3c..a2a54ec 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/msr.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/msr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_MSR_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/nvm.h b/src/soc/intel/fsp_baytrail/baytrail/nvm.h
index 8092a1f..343120d 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/nvm.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/nvm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _NVM_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/nvs.h b/src/soc/intel/fsp_baytrail/baytrail/nvs.h
index ff6af49..1c67fff 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/nvs.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_NVS_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/pattrs.h b/src/soc/intel/fsp_baytrail/baytrail/pattrs.h
index 852de40..f6e0f68 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/pattrs.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/pattrs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PATTRS_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/pci_devs.h b/src/soc/intel/fsp_baytrail/baytrail/pci_devs.h
index 6f7769b..b5f2e1c 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/pci_devs.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/pci_devs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_PCI_DEVS_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/pcie.h b/src/soc/intel/fsp_baytrail/baytrail/pcie.h
index 0c295e0..fe229f9 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/pcie.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/pcie.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_PCIE_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/pmc.h b/src/soc/intel/fsp_baytrail/baytrail/pmc.h
index 5b2acbd..d43f73c 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/pmc.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/pmc.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_PMC_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/ramstage.h b/src/soc/intel/fsp_baytrail/baytrail/ramstage.h
index 4542727..fb1590a 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/ramstage.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/ramstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_RAMSTAGE_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/reset.h b/src/soc/intel/fsp_baytrail/baytrail/reset.h
index 23569d1..810465f 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/reset.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/reset.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_RESET_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/romstage.h b/src/soc/intel/fsp_baytrail/baytrail/romstage.h
index c783768..614f19b 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/romstage.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/romstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_ROMSTAGE_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/smm.h b/src/soc/intel/fsp_baytrail/baytrail/smm.h
index 432eadd..a01b70c 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/smm.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/smm.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_SMM_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/spi.h b/src/soc/intel/fsp_baytrail/baytrail/spi.h
index f7f5911..75d1c40 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/spi.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _BAYTRAIL_SPI_H_
diff --git a/src/soc/intel/fsp_baytrail/baytrail/xhci.h b/src/soc/intel/fsp_baytrail/baytrail/xhci.h
index 4399a16..d4bef0c 100644
--- a/src/soc/intel/fsp_baytrail/baytrail/xhci.h
+++ b/src/soc/intel/fsp_baytrail/baytrail/xhci.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BAYTRAIL_XHCI_H
diff --git a/src/soc/intel/fsp_baytrail/bootblock/bootblock.c b/src/soc/intel/fsp_baytrail/bootblock/bootblock.c
index 50d321b..98922ad 100644
--- a/src/soc/intel/fsp_baytrail/bootblock/bootblock.c
+++ b/src/soc/intel/fsp_baytrail/bootblock/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/chip.c b/src/soc/intel/fsp_baytrail/chip.c
index 6ed4a04..54269d6 100644
--- a/src/soc/intel/fsp_baytrail/chip.c
+++ b/src/soc/intel/fsp_baytrail/chip.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/fsp_baytrail/chip.h b/src/soc/intel/fsp_baytrail/chip.h
index b69054d..db967ec 100755
--- a/src/soc/intel/fsp_baytrail/chip.h
+++ b/src/soc/intel/fsp_baytrail/chip.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _FSP_BAYTRAIL_CHIP_H_
diff --git a/src/soc/intel/fsp_baytrail/cpu.c b/src/soc/intel/fsp_baytrail/cpu.c
index c7ee582..9c22d73 100644
--- a/src/soc/intel/fsp_baytrail/cpu.c
+++ b/src/soc/intel/fsp_baytrail/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/soc/intel/fsp_baytrail/fsp/Kconfig b/src/soc/intel/fsp_baytrail/fsp/Kconfig
index ee32c33..aecba3d 100644
--- a/src/soc/intel/fsp_baytrail/fsp/Kconfig
+++ b/src/soc/intel/fsp_baytrail/fsp/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config BAYTRAIL_FSP_SPECIFIC_OPTIONS
diff --git a/src/soc/intel/fsp_baytrail/fsp/Makefile.inc b/src/soc/intel/fsp_baytrail/fsp/Makefile.inc
index 2825703..d09e153 100644
--- a/src/soc/intel/fsp_baytrail/fsp/Makefile.inc
+++ b/src/soc/intel/fsp_baytrail/fsp/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ramstage-y += chipset_fsp_util.c
diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
index ad85c5b..35ea26a 100755
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.h b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.h
index 3b9dad1..be167a0 100644
--- a/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.h
+++ b/src/soc/intel/fsp_baytrail/fsp/chipset_fsp_util.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CHIPSET_FSP_UTIL_H
diff --git a/src/soc/intel/fsp_baytrail/gpio.c b/src/soc/intel/fsp_baytrail/gpio.c
index 95cc913..9f74c54 100644
--- a/src/soc/intel/fsp_baytrail/gpio.c
+++ b/src/soc/intel/fsp_baytrail/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci.h>
diff --git a/src/soc/intel/fsp_baytrail/i2c.c b/src/soc/intel/fsp_baytrail/i2c.c
index be51249..375a698 100644
--- a/src/soc/intel/fsp_baytrail/i2c.c
+++ b/src/soc/intel/fsp_baytrail/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci.h>
diff --git a/src/soc/intel/fsp_baytrail/iosf.c b/src/soc/intel/fsp_baytrail/iosf.c
index 6364827..a7b22e0 100644
--- a/src/soc/intel/fsp_baytrail/iosf.c
+++ b/src/soc/intel/fsp_baytrail/iosf.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/memmap.c b/src/soc/intel/fsp_baytrail/memmap.c
index a60f0ad..e27354f 100644
--- a/src/soc/intel/fsp_baytrail/memmap.c
+++ b/src/soc/intel/fsp_baytrail/memmap.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/northcluster.c b/src/soc/intel/fsp_baytrail/northcluster.c
index 17874c8..fd43977 100644
--- a/src/soc/intel/fsp_baytrail/northcluster.c
+++ b/src/soc/intel/fsp_baytrail/northcluster.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/fsp_baytrail/nvm.c b/src/soc/intel/fsp_baytrail/nvm.c
index 32cd92d..653c878 100644
--- a/src/soc/intel/fsp_baytrail/nvm.c
+++ b/src/soc/intel/fsp_baytrail/nvm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/fsp_baytrail/pmutil.c b/src/soc/intel/fsp_baytrail/pmutil.c
index 9a905a7..997fb0e 100644
--- a/src/soc/intel/fsp_baytrail/pmutil.c
+++ b/src/soc/intel/fsp_baytrail/pmutil.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/fsp_baytrail/ramstage.c b/src/soc/intel/fsp_baytrail/ramstage.c
index 429039e..b49985a 100644
--- a/src/soc/intel/fsp_baytrail/ramstage.c
+++ b/src/soc/intel/fsp_baytrail/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/fsp_baytrail/reset.c b/src/soc/intel/fsp_baytrail/reset.c
index 42c2de9..a32ae65 100644
--- a/src/soc/intel/fsp_baytrail/reset.c
+++ b/src/soc/intel/fsp_baytrail/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/romstage/Makefile.inc b/src/soc/intel/fsp_baytrail/romstage/Makefile.inc
index 766865a..5e36e74 100644
--- a/src/soc/intel/fsp_baytrail/romstage/Makefile.inc
+++ b/src/soc/intel/fsp_baytrail/romstage/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-y += romstage.c
diff --git a/src/soc/intel/fsp_baytrail/romstage/pmc.c b/src/soc/intel/fsp_baytrail/romstage/pmc.c
index 081a27d..83422f5 100644
--- a/src/soc/intel/fsp_baytrail/romstage/pmc.c
+++ b/src/soc/intel/fsp_baytrail/romstage/pmc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/fsp_baytrail/romstage/report_platform.c b/src/soc/intel/fsp_baytrail/romstage/report_platform.c
index 9e76f40..8fb3261 100644
--- a/src/soc/intel/fsp_baytrail/romstage/report_platform.c
+++ b/src/soc/intel/fsp_baytrail/romstage/report_platform.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/fsp_baytrail/romstage/romstage.c b/src/soc/intel/fsp_baytrail/romstage/romstage.c
index b5384fa..22ce974 100644
--- a/src/soc/intel/fsp_baytrail/romstage/romstage.c
+++ b/src/soc/intel/fsp_baytrail/romstage/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/fsp_baytrail/romstage/uart.c b/src/soc/intel/fsp_baytrail/romstage/uart.c
index b3c99f9..a76c129 100644
--- a/src/soc/intel/fsp_baytrail/romstage/uart.c
+++ b/src/soc/intel/fsp_baytrail/romstage/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/fsp_baytrail/smihandler.c b/src/soc/intel/fsp_baytrail/smihandler.c
index 3d9f173..2a44de5 100644
--- a/src/soc/intel/fsp_baytrail/smihandler.c
+++ b/src/soc/intel/fsp_baytrail/smihandler.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/fsp_baytrail/smm.c b/src/soc/intel/fsp_baytrail/smm.c
index 08b0675..aba9fe4 100644
--- a/src/soc/intel/fsp_baytrail/smm.c
+++ b/src/soc/intel/fsp_baytrail/smm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/soc/intel/fsp_baytrail/southcluster.c b/src/soc/intel/fsp_baytrail/southcluster.c
index ac80478..19c7035 100644
--- a/src/soc/intel/fsp_baytrail/southcluster.c
+++ b/src/soc/intel/fsp_baytrail/southcluster.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/fsp_baytrail/spi.c b/src/soc/intel/fsp_baytrail/spi.c
index 9129444..319e998 100644
--- a/src/soc/intel/fsp_baytrail/spi.c
+++ b/src/soc/intel/fsp_baytrail/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is derived from the flashrom project. */
diff --git a/src/soc/intel/fsp_baytrail/tsc_freq.c b/src/soc/intel/fsp_baytrail/tsc_freq.c
index 5e2958e..0406028 100644
--- a/src/soc/intel/fsp_baytrail/tsc_freq.c
+++ b/src/soc/intel/fsp_baytrail/tsc_freq.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/skylake/acpi.c b/src/soc/intel/skylake/acpi.c
index 471fd17..9f4326e 100644
--- a/src/soc/intel/skylake/acpi.c
+++ b/src/soc/intel/skylake/acpi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/skylake/acpi/cpu.asl b/src/soc/intel/skylake/acpi/cpu.asl
index 62127ef..d73f02f 100644
--- a/src/soc/intel/skylake/acpi/cpu.asl
+++ b/src/soc/intel/skylake/acpi/cpu.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* These devices are created at runtime */
diff --git a/src/soc/intel/skylake/acpi/dptf/charger.asl b/src/soc/intel/skylake/acpi/dptf/charger.asl
index bcf5963..213f3fe 100644
--- a/src/soc/intel/skylake/acpi/dptf/charger.asl
+++ b/src/soc/intel/skylake/acpi/dptf/charger.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (TCHG)
diff --git a/src/soc/intel/skylake/acpi/dptf/cpu.asl b/src/soc/intel/skylake/acpi/dptf/cpu.asl
index 872ef1a..2772686 100644
--- a/src/soc/intel/skylake/acpi/dptf/cpu.asl
+++ b/src/soc/intel/skylake/acpi/dptf/cpu.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef DPTF_CPU_PASSIVE
diff --git a/src/soc/intel/skylake/acpi/dptf/dptf.asl b/src/soc/intel/skylake/acpi/dptf/dptf.asl
index 7a8a8c7..a12b134 100644
--- a/src/soc/intel/skylake/acpi/dptf/dptf.asl
+++ b/src/soc/intel/skylake/acpi/dptf/dptf.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (DPTF)
diff --git a/src/soc/intel/skylake/acpi/dptf/thermal.asl b/src/soc/intel/skylake/acpi/dptf/thermal.asl
index 99c10da..848cfa9 100644
--- a/src/soc/intel/skylake/acpi/dptf/thermal.asl
+++ b/src/soc/intel/skylake/acpi/dptf/thermal.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Thermal Threshold Event Handler */
diff --git a/src/soc/intel/skylake/acpi/globalnvs.asl b/src/soc/intel/skylake/acpi/globalnvs.asl
index 31711d1..99bc68f 100644
--- a/src/soc/intel/skylake/acpi/globalnvs.asl
+++ b/src/soc/intel/skylake/acpi/globalnvs.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/soc/intel/skylake/acpi/gpio.asl b/src/soc/intel/skylake/acpi/gpio.asl
index fed25c3..ba5e228 100644
--- a/src/soc/intel/skylake/acpi/gpio.asl
+++ b/src/soc/intel/skylake/acpi/gpio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (GPIO)
diff --git a/src/soc/intel/skylake/acpi/irqlinks.asl b/src/soc/intel/skylake/acpi/irqlinks.asl
index 3c74257..b53c7ea 100644
--- a/src/soc/intel/skylake/acpi/irqlinks.asl
+++ b/src/soc/intel/skylake/acpi/irqlinks.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/intel/skylake/acpi/lpc.asl b/src/soc/intel/skylake/acpi/lpc.asl
index c841311..9de6f82 100644
--- a/src/soc/intel/skylake/acpi/lpc.asl
+++ b/src/soc/intel/skylake/acpi/lpc.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LPCB)
diff --git a/src/soc/intel/skylake/acpi/pch.asl b/src/soc/intel/skylake/acpi/pch.asl
index 951b97a..6c6d024 100644
--- a/src/soc/intel/skylake/acpi/pch.asl
+++ b/src/soc/intel/skylake/acpi/pch.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/skylake/acpi/pci_irqs.asl b/src/soc/intel/skylake/acpi/pci_irqs.asl
index 3bf5f3e..20ceef9 100644
--- a/src/soc/intel/skylake/acpi/pci_irqs.asl
+++ b/src/soc/intel/skylake/acpi/pci_irqs.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (PICP, Package () {
diff --git a/src/soc/intel/skylake/acpi/pcie.asl b/src/soc/intel/skylake/acpi/pcie.asl
index 52b07da..82b2164 100644
--- a/src/soc/intel/skylake/acpi/pcie.asl
+++ b/src/soc/intel/skylake/acpi/pcie.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel PCH PCIe support */
diff --git a/src/soc/intel/skylake/acpi/pcr.asl b/src/soc/intel/skylake/acpi/pcr.asl
index a6fb46e..825a037 100644
--- a/src/soc/intel/skylake/acpi/pcr.asl
+++ b/src/soc/intel/skylake/acpi/pcr.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/intel/skylake/acpi/platform.asl b/src/soc/intel/skylake/acpi/platform.asl
index 24df241..d29fa5b 100644
--- a/src/soc/intel/skylake/acpi/platform.asl
+++ b/src/soc/intel/skylake/acpi/platform.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Enable ACPI _SWS methods */
diff --git a/src/soc/intel/skylake/acpi/pmc.asl b/src/soc/intel/skylake/acpi/pmc.asl
index 2d826f6..24a0b11 100644
--- a/src/soc/intel/skylake/acpi/pmc.asl
+++ b/src/soc/intel/skylake/acpi/pmc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (PMC)
diff --git a/src/soc/intel/skylake/acpi/scs.asl b/src/soc/intel/skylake/acpi/scs.asl
index 4eb9683..f5106cc 100644
--- a/src/soc/intel/skylake/acpi/scs.asl
+++ b/src/soc/intel/skylake/acpi/scs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Storage Controllers */
diff --git a/src/soc/intel/skylake/acpi/serialio.asl b/src/soc/intel/skylake/acpi/serialio.asl
index da38891..afaa9c7 100644
--- a/src/soc/intel/skylake/acpi/serialio.asl
+++ b/src/soc/intel/skylake/acpi/serialio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Serial IO Devices */
diff --git a/src/soc/intel/skylake/acpi/sleepstates.asl b/src/soc/intel/skylake/acpi/sleepstates.asl
index dda7d14..2d32d21 100644
--- a/src/soc/intel/skylake/acpi/sleepstates.asl
+++ b/src/soc/intel/skylake/acpi/sleepstates.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name (\_S0, Package () { 0x0, 0x0, 0x0, 0x0 })
diff --git a/src/soc/intel/skylake/acpi/smbus.asl b/src/soc/intel/skylake/acpi/smbus.asl
index 31a5114..fa1afb6 100644
--- a/src/soc/intel/skylake/acpi/smbus.asl
+++ b/src/soc/intel/skylake/acpi/smbus.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/soc/intel/skylake/acpi/systemagent.asl b/src/soc/intel/skylake/acpi/systemagent.asl
index dd19fa1..f24af91 100644
--- a/src/soc/intel/skylake/acpi/systemagent.asl
+++ b/src/soc/intel/skylake/acpi/systemagent.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/iomap.h>
diff --git a/src/soc/intel/skylake/acpi/xhci.asl b/src/soc/intel/skylake/acpi/xhci.asl
index 5e49087..9f783e0 100644
--- a/src/soc/intel/skylake/acpi/xhci.asl
+++ b/src/soc/intel/skylake/acpi/xhci.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* XHCI Controller 0:14.0 */
diff --git a/src/soc/intel/skylake/bootblock/cpu.c b/src/soc/intel/skylake/bootblock/cpu.c
index 3a29972..050b15e 100644
--- a/src/soc/intel/skylake/bootblock/cpu.c
+++ b/src/soc/intel/skylake/bootblock/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c
index 9f256e3..3770461 100644
--- a/src/soc/intel/skylake/bootblock/pch.c
+++ b/src/soc/intel/skylake/bootblock/pch.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <soc/iomap.h>
diff --git a/src/soc/intel/skylake/bootblock/systemagent.c b/src/soc/intel/skylake/bootblock/systemagent.c
index 6f029f0..7b4a43b 100644
--- a/src/soc/intel/skylake/bootblock/systemagent.c
+++ b/src/soc/intel/skylake/bootblock/systemagent.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/chip.c b/src/soc/intel/skylake/chip.c
index fd959b2..5f6ffce 100644
--- a/src/soc/intel/skylake/chip.c
+++ b/src/soc/intel/skylake/chip.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/skylake/chip.h b/src/soc/intel/skylake/chip.h
index 95f9502..0d01f34 100644
--- a/src/soc/intel/skylake/chip.h
+++ b/src/soc/intel/skylake/chip.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/intel/skylake/cpu.c b/src/soc/intel/skylake/cpu.c
index 0cc9bca..456a05e 100644
--- a/src/soc/intel/skylake/cpu.c
+++ b/src/soc/intel/skylake/cpu.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/skylake/cpu_info.c b/src/soc/intel/skylake/cpu_info.c
index f3fd0bd..9a24627 100644
--- a/src/soc/intel/skylake/cpu_info.c
+++ b/src/soc/intel/skylake/cpu_info.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/skylake/elog.c b/src/soc/intel/skylake/elog.c
index 45f7b71..9e571ba 100644
--- a/src/soc/intel/skylake/elog.c
+++ b/src/soc/intel/skylake/elog.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/soc/intel/skylake/finalize.c b/src/soc/intel/skylake/finalize.c
index bec8676..de34ae8 100644
--- a/src/soc/intel/skylake/finalize.c
+++ b/src/soc/intel/skylake/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/flash_controller.c b/src/soc/intel/skylake/flash_controller.c
index 897956b..3958775 100644
--- a/src/soc/intel/skylake/flash_controller.c
+++ b/src/soc/intel/skylake/flash_controller.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is derived from the flashrom project. */
diff --git a/src/soc/intel/skylake/igd.c b/src/soc/intel/skylake/igd.c
index 5422217..0585452 100644
--- a/src/soc/intel/skylake/igd.c
+++ b/src/soc/intel/skylake/igd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/soc/intel/skylake/include/soc/acpi.h b/src/soc/intel/skylake/include/soc/acpi.h
index 7418fe0..2f2d65d 100644
--- a/src/soc/intel/skylake/include/soc/acpi.h
+++ b/src/soc/intel/skylake/include/soc/acpi.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_ACPI_H_
diff --git a/src/soc/intel/skylake/include/soc/cpu.h b/src/soc/intel/skylake/include/soc/cpu.h
index 8d5c2a0..102c88e 100644
--- a/src/soc/intel/skylake/include/soc/cpu.h
+++ b/src/soc/intel/skylake/include/soc/cpu.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_CPU_H_
diff --git a/src/soc/intel/skylake/include/soc/device_nvs.h b/src/soc/intel/skylake/include/soc/device_nvs.h
index 822c976..8255882 100644
--- a/src/soc/intel/skylake/include/soc/device_nvs.h
+++ b/src/soc/intel/skylake/include/soc/device_nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_DEVICE_NVS_H_
diff --git a/src/soc/intel/skylake/include/soc/flash_controller.h b/src/soc/intel/skylake/include/soc/flash_controller.h
index 91693e3..feec1c6 100644
--- a/src/soc/intel/skylake/include/soc/flash_controller.h
+++ b/src/soc/intel/skylake/include/soc/flash_controller.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.,
+ * along with this program.,
  */
 
 #ifndef _SOC_FLASH_CONTROLLER__H_
diff --git a/src/soc/intel/skylake/include/soc/gpe.h b/src/soc/intel/skylake/include/soc/gpe.h
index d8cc1a1..e888882 100644
--- a/src/soc/intel/skylake/include/soc/gpe.h
+++ b/src/soc/intel/skylake/include/soc/gpe.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_GPE_H_
diff --git a/src/soc/intel/skylake/include/soc/gpio.h b/src/soc/intel/skylake/include/soc/gpio.h
index 84d2a70..22e8b8b 100644
--- a/src/soc/intel/skylake/include/soc/gpio.h
+++ b/src/soc/intel/skylake/include/soc/gpio.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_GPIO_H_
diff --git a/src/soc/intel/skylake/include/soc/gpio_defs.h b/src/soc/intel/skylake/include/soc/gpio_defs.h
index 8b8a1c0..b68874a 100644
--- a/src/soc/intel/skylake/include/soc/gpio_defs.h
+++ b/src/soc/intel/skylake/include/soc/gpio_defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_GPIO_DEFS_H_
diff --git a/src/soc/intel/skylake/include/soc/iomap.h b/src/soc/intel/skylake/include/soc/iomap.h
index 7dea6ae..b14b7f2 100644
--- a/src/soc/intel/skylake/include/soc/iomap.h
+++ b/src/soc/intel/skylake/include/soc/iomap.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_IOMAP_H_
diff --git a/src/soc/intel/skylake/include/soc/lpc.h b/src/soc/intel/skylake/include/soc/lpc.h
index 4e826d7..882df8d 100644
--- a/src/soc/intel/skylake/include/soc/lpc.h
+++ b/src/soc/intel/skylake/include/soc/lpc.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_LPC_H_
diff --git a/src/soc/intel/skylake/include/soc/msr.h b/src/soc/intel/skylake/include/soc/msr.h
index 4239b36..fa3db19 100644
--- a/src/soc/intel/skylake/include/soc/msr.h
+++ b/src/soc/intel/skylake/include/soc/msr.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_MSR_H_
diff --git a/src/soc/intel/skylake/include/soc/nvs.h b/src/soc/intel/skylake/include/soc/nvs.h
index 20530f1..9bda1df 100644
--- a/src/soc/intel/skylake/include/soc/nvs.h
+++ b/src/soc/intel/skylake/include/soc/nvs.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_NVS_H_
diff --git a/src/soc/intel/skylake/include/soc/pch.h b/src/soc/intel/skylake/include/soc/pch.h
index 4b67e99..9c037ba 100644
--- a/src/soc/intel/skylake/include/soc/pch.h
+++ b/src/soc/intel/skylake/include/soc/pch.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PCH_H_
diff --git a/src/soc/intel/skylake/include/soc/pci_devs.h b/src/soc/intel/skylake/include/soc/pci_devs.h
index 240bd4a..b3d9a58 100644
--- a/src/soc/intel/skylake/include/soc/pci_devs.h
+++ b/src/soc/intel/skylake/include/soc/pci_devs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PCI_DEVS_H_
diff --git a/src/soc/intel/skylake/include/soc/pei_wrapper.h b/src/soc/intel/skylake/include/soc/pei_wrapper.h
index 7f48722..dbcf3ff 100644
--- a/src/soc/intel/skylake/include/soc/pei_wrapper.h
+++ b/src/soc/intel/skylake/include/soc/pei_wrapper.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PEI_WRAPPER_H_
diff --git a/src/soc/intel/skylake/include/soc/pm.h b/src/soc/intel/skylake/include/soc/pm.h
index 3daa320..8251ba0 100644
--- a/src/soc/intel/skylake/include/soc/pm.h
+++ b/src/soc/intel/skylake/include/soc/pm.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_PM_H_
diff --git a/src/soc/intel/skylake/include/soc/ramstage.h b/src/soc/intel/skylake/include/soc/ramstage.h
index fb06b33..fb840e2 100644
--- a/src/soc/intel/skylake/include/soc/ramstage.h
+++ b/src/soc/intel/skylake/include/soc/ramstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_RAMSTAGE_H_
diff --git a/src/soc/intel/skylake/include/soc/romstage.h b/src/soc/intel/skylake/include/soc/romstage.h
index a88de66..e2e3da2 100644
--- a/src/soc/intel/skylake/include/soc/romstage.h
+++ b/src/soc/intel/skylake/include/soc/romstage.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_ROMSTAGE_H_
diff --git a/src/soc/intel/skylake/include/soc/smbus.h b/src/soc/intel/skylake/include/soc/smbus.h
index c081cdf..5c0289f 100644
--- a/src/soc/intel/skylake/include/soc/smbus.h
+++ b/src/soc/intel/skylake/include/soc/smbus.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SMBUS_H_
diff --git a/src/soc/intel/skylake/include/soc/smm.h b/src/soc/intel/skylake/include/soc/smm.h
index 212a444..ccc800f 100644
--- a/src/soc/intel/skylake/include/soc/smm.h
+++ b/src/soc/intel/skylake/include/soc/smm.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SMM_H_
diff --git a/src/soc/intel/skylake/include/soc/spi.h b/src/soc/intel/skylake/include/soc/spi.h
index cf55e9d..95ee760 100644
--- a/src/soc/intel/skylake/include/soc/spi.h
+++ b/src/soc/intel/skylake/include/soc/spi.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SPI_H_
diff --git a/src/soc/intel/skylake/include/soc/systemagent.h b/src/soc/intel/skylake/include/soc/systemagent.h
index 19d7528..5810158 100644
--- a/src/soc/intel/skylake/include/soc/systemagent.h
+++ b/src/soc/intel/skylake/include/soc/systemagent.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_SYSTEMAGENT_H_
diff --git a/src/soc/intel/skylake/include/soc/xhci.h b/src/soc/intel/skylake/include/soc/xhci.h
index 8830ede..05be3c9 100644
--- a/src/soc/intel/skylake/include/soc/xhci.h
+++ b/src/soc/intel/skylake/include/soc/xhci.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOC_XHCI_H_
diff --git a/src/soc/intel/skylake/lpc.c b/src/soc/intel/skylake/lpc.c
index 861b5ba..bfe9255 100644
--- a/src/soc/intel/skylake/lpc.c
+++ b/src/soc/intel/skylake/lpc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpigen.h>
diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c
index 0dc46a9..9621dbc 100644
--- a/src/soc/intel/skylake/memmap.c
+++ b/src/soc/intel/skylake/memmap.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/monotonic_timer.c b/src/soc/intel/skylake/monotonic_timer.c
index 55430ef..2fa2ca5 100644
--- a/src/soc/intel/skylake/monotonic_timer.c
+++ b/src/soc/intel/skylake/monotonic_timer.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/skylake/pch.c b/src/soc/intel/skylake/pch.c
index beaa7bc..1997105 100644
--- a/src/soc/intel/skylake/pch.c
+++ b/src/soc/intel/skylake/pch.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/skylake/pcie.c b/src/soc/intel/skylake/pcie.c
index dbe119a..f92c85a 100644
--- a/src/soc/intel/skylake/pcie.c
+++ b/src/soc/intel/skylake/pcie.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <chip.h>
diff --git a/src/soc/intel/skylake/pei_data.c b/src/soc/intel/skylake/pei_data.c
index caee078..3522a99 100644
--- a/src/soc/intel/skylake/pei_data.c
+++ b/src/soc/intel/skylake/pei_data.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <chip.h>
diff --git a/src/soc/intel/skylake/pmutil.c b/src/soc/intel/skylake/pmutil.c
index b048c99..290f39e 100644
--- a/src/soc/intel/skylake/pmutil.c
+++ b/src/soc/intel/skylake/pmutil.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/intel/skylake/ramstage.c b/src/soc/intel/skylake/ramstage.c
index 3646843..3199a54 100644
--- a/src/soc/intel/skylake/ramstage.c
+++ b/src/soc/intel/skylake/ramstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/ramstage.h>
diff --git a/src/soc/intel/skylake/romstage/cpu.c b/src/soc/intel/skylake/romstage/cpu.c
index ba472a9..c517a3b 100644
--- a/src/soc/intel/skylake/romstage/cpu.c
+++ b/src/soc/intel/skylake/romstage/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/skylake/romstage/pch.c b/src/soc/intel/skylake/romstage/pch.c
index 9ca83b3..ce10732 100644
--- a/src/soc/intel/skylake/romstage/pch.c
+++ b/src/soc/intel/skylake/romstage/pch.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/romstage/power_state.c b/src/soc/intel/skylake/romstage/power_state.c
index 68a11a4..59467d8 100644
--- a/src/soc/intel/skylake/romstage/power_state.c
+++ b/src/soc/intel/skylake/romstage/power_state.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/early_variables.h>
diff --git a/src/soc/intel/skylake/romstage/report_platform.c b/src/soc/intel/skylake/romstage/report_platform.c
index fe1a785..3f4286d 100644
--- a/src/soc/intel/skylake/romstage/report_platform.c
+++ b/src/soc/intel/skylake/romstage/report_platform.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/intel/skylake/romstage/romstage.c b/src/soc/intel/skylake/romstage/romstage.c
index b21eb8a..469dd07 100644
--- a/src/soc/intel/skylake/romstage/romstage.c
+++ b/src/soc/intel/skylake/romstage/romstage.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/skylake/romstage/smbus.c b/src/soc/intel/skylake/romstage/smbus.c
index b72255f..f5e736d 100644
--- a/src/soc/intel/skylake/romstage/smbus.c
+++ b/src/soc/intel/skylake/romstage/smbus.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/romstage/spi.c b/src/soc/intel/skylake/romstage/spi.c
index 41a144b..c18c8cf 100644
--- a/src/soc/intel/skylake/romstage/spi.c
+++ b/src/soc/intel/skylake/romstage/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/flash_controller.h>
diff --git a/src/soc/intel/skylake/romstage/systemagent.c b/src/soc/intel/skylake/romstage/systemagent.c
index 36f6871..ab5b3fc 100644
--- a/src/soc/intel/skylake/romstage/systemagent.c
+++ b/src/soc/intel/skylake/romstage/systemagent.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/soc/intel/skylake/romstage/uart.c b/src/soc/intel/skylake/romstage/uart.c
index d0d5ada..44b7f69 100644
--- a/src/soc/intel/skylake/romstage/uart.c
+++ b/src/soc/intel/skylake/romstage/uart.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/smbus.c b/src/soc/intel/skylake/smbus.c
index 872b16b..8cf3113 100644
--- a/src/soc/intel/skylake/smbus.c
+++ b/src/soc/intel/skylake/smbus.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/smbus_common.c b/src/soc/intel/skylake/smbus_common.c
index fea9d80..50e9d84 100644
--- a/src/soc/intel/skylake/smbus_common.c
+++ b/src/soc/intel/skylake/smbus_common.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/intel/skylake/smi.c b/src/soc/intel/skylake/smi.c
index c474e02..3a1d21b 100644
--- a/src/soc/intel/skylake/smi.c
+++ b/src/soc/intel/skylake/smi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/soc/intel/skylake/smihandler.c b/src/soc/intel/skylake/smihandler.c
index fa5ef04..f79bb64 100644
--- a/src/soc/intel/skylake/smihandler.c
+++ b/src/soc/intel/skylake/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/intel/skylake/smmrelocate.c b/src/soc/intel/skylake/smmrelocate.c
index 4b6f1c4..23e5783 100644
--- a/src/soc/intel/skylake/smmrelocate.c
+++ b/src/soc/intel/skylake/smmrelocate.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/soc/intel/skylake/systemagent.c b/src/soc/intel/skylake/systemagent.c
index 1fe3304..37e847c 100644
--- a/src/soc/intel/skylake/systemagent.c
+++ b/src/soc/intel/skylake/systemagent.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/intel/skylake/tsc_freq.c b/src/soc/intel/skylake/tsc_freq.c
index 5990d27..eca95e7 100644
--- a/src/soc/intel/skylake/tsc_freq.c
+++ b/src/soc/intel/skylake/tsc_freq.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/soc/intel/skylake/uart.c b/src/soc/intel/skylake/uart.c
index c93f5c0..1959ef1 100644
--- a/src/soc/intel/skylake/uart.c
+++ b/src/soc/intel/skylake/uart.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/soc/intel/skylake/uart_debug.c b/src/soc/intel/skylake/uart_debug.c
index 0328507..6094766 100644
--- a/src/soc/intel/skylake/uart_debug.c
+++ b/src/soc/intel/skylake/uart_debug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/intel/skylake/xhci.c b/src/soc/intel/skylake/xhci.c
index 2757397..3387fc6 100644
--- a/src/soc/intel/skylake/xhci.c
+++ b/src/soc/intel/skylake/xhci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index 45a2abb..b439269 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOC_MARVELL_BG4CD
diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc
index ded1917..2f33798 100644
--- a/src/soc/marvell/bg4cd/Makefile.inc
+++ b/src/soc/marvell/bg4cd/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOC_MARVELL_BG4CD),y)
diff --git a/src/soc/marvell/bg4cd/bootblock.c b/src/soc/marvell/bg4cd/bootblock.c
index 79b9d3f..ec05f5d 100644
--- a/src/soc/marvell/bg4cd/bootblock.c
+++ b/src/soc/marvell/bg4cd/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/marvell/bg4cd/cbmem.c b/src/soc/marvell/bg4cd/cbmem.c
index 9d0766e..b6ff2d3 100644
--- a/src/soc/marvell/bg4cd/cbmem.c
+++ b/src/soc/marvell/bg4cd/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/marvell/bg4cd/i2c.c b/src/soc/marvell/bg4cd/i2c.c
index 7603367..8d2fccb 100644
--- a/src/soc/marvell/bg4cd/i2c.c
+++ b/src/soc/marvell/bg4cd/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/i2c.h>
diff --git a/src/soc/marvell/bg4cd/include/soc/i2c.h b/src/soc/marvell/bg4cd/include/soc/i2c.h
index fcae571..ea024e9 100644
--- a/src/soc/marvell/bg4cd/include/soc/i2c.h
+++ b/src/soc/marvell/bg4cd/include/soc/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_MARVELL_BG4CD_I2C_H__
diff --git a/src/soc/marvell/bg4cd/include/soc/memlayout.ld b/src/soc/marvell/bg4cd/include/soc/memlayout.ld
index 45835e2..549fcbb 100644
--- a/src/soc/marvell/bg4cd/include/soc/memlayout.ld
+++ b/src/soc/marvell/bg4cd/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/marvell/bg4cd/include/soc/sdram.h b/src/soc/marvell/bg4cd/include/soc/sdram.h
index 6e4c434..04d40ae 100644
--- a/src/soc/marvell/bg4cd/include/soc/sdram.h
+++ b/src/soc/marvell/bg4cd/include/soc/sdram.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_MARVELL_BG4CD_SDRAM_H__
diff --git a/src/soc/marvell/bg4cd/monotonic_timer.c b/src/soc/marvell/bg4cd/monotonic_timer.c
index fc72e10..59b1edf 100644
--- a/src/soc/marvell/bg4cd/monotonic_timer.c
+++ b/src/soc/marvell/bg4cd/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/marvell/bg4cd/sdram.c b/src/soc/marvell/bg4cd/sdram.c
index 22bbd25..321d9bf 100644
--- a/src/soc/marvell/bg4cd/sdram.c
+++ b/src/soc/marvell/bg4cd/sdram.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <soc/sdram.h>
diff --git a/src/soc/marvell/bg4cd/spi.c b/src/soc/marvell/bg4cd/spi.c
index 98aa516..b21f164 100644
--- a/src/soc/marvell/bg4cd/spi.c
+++ b/src/soc/marvell/bg4cd/spi.c
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/nvidia/tegra/apbmisc.c b/src/soc/nvidia/tegra/apbmisc.c
index 0701c60..eda555d 100644
--- a/src/soc/nvidia/tegra/apbmisc.c
+++ b/src/soc/nvidia/tegra/apbmisc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra/apbmisc.h b/src/soc/nvidia/tegra/apbmisc.h
index 3a26e41..121d0dd 100644
--- a/src/soc/nvidia/tegra/apbmisc.h
+++ b/src/soc/nvidia/tegra/apbmisc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_APBMISC_H__
diff --git a/src/soc/nvidia/tegra/dc.h b/src/soc/nvidia/tegra/dc.h
index 9b30841..5c0fe3f 100644
--- a/src/soc/nvidia/tegra/dc.h
+++ b/src/soc/nvidia/tegra/dc.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_DC_H
diff --git a/src/soc/nvidia/tegra/gpio.c b/src/soc/nvidia/tegra/gpio.c
index af263a2..86394ed 100644
--- a/src/soc/nvidia/tegra/gpio.c
+++ b/src/soc/nvidia/tegra/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra/gpio.h b/src/soc/nvidia/tegra/gpio.h
index 728a597..66feb8d 100644
--- a/src/soc/nvidia/tegra/gpio.h
+++ b/src/soc/nvidia/tegra/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_GPIO_H__
diff --git a/src/soc/nvidia/tegra/i2c.c b/src/soc/nvidia/tegra/i2c.c
index 3d9b90a..de2cb09 100644
--- a/src/soc/nvidia/tegra/i2c.c
+++ b/src/soc/nvidia/tegra/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra/i2c.h b/src/soc/nvidia/tegra/i2c.h
index fcf6134..77d3568 100644
--- a/src/soc/nvidia/tegra/i2c.h
+++ b/src/soc/nvidia/tegra/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_I2C_H__
diff --git a/src/soc/nvidia/tegra/pingroup.c b/src/soc/nvidia/tegra/pingroup.c
index d093549..b0b6bf6 100644
--- a/src/soc/nvidia/tegra/pingroup.c
+++ b/src/soc/nvidia/tegra/pingroup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra/pingroup.h b/src/soc/nvidia/tegra/pingroup.h
index f501ce2..8a3f308 100644
--- a/src/soc/nvidia/tegra/pingroup.h
+++ b/src/soc/nvidia/tegra/pingroup.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_PINGROUP_H__
diff --git a/src/soc/nvidia/tegra/pinmux.c b/src/soc/nvidia/tegra/pinmux.c
index 49ad762..3a9421a 100644
--- a/src/soc/nvidia/tegra/pinmux.c
+++ b/src/soc/nvidia/tegra/pinmux.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra/pinmux.h b/src/soc/nvidia/tegra/pinmux.h
index 5e6de67..746203a 100644
--- a/src/soc/nvidia/tegra/pinmux.h
+++ b/src/soc/nvidia/tegra/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_PINMUX_H__
diff --git a/src/soc/nvidia/tegra/pwm.h b/src/soc/nvidia/tegra/pwm.h
index bb26689..0a53882 100644
--- a/src/soc/nvidia/tegra/pwm.h
+++ b/src/soc/nvidia/tegra/pwm.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_PWM_H
diff --git a/src/soc/nvidia/tegra/software_i2c.c b/src/soc/nvidia/tegra/software_i2c.c
index 79c7da1..edb3ca9 100644
--- a/src/soc/nvidia/tegra/software_i2c.c
+++ b/src/soc/nvidia/tegra/software_i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/i2c.h>
diff --git a/src/soc/nvidia/tegra/types.h b/src/soc/nvidia/tegra/types.h
index 07a635f..3c00314 100644
--- a/src/soc/nvidia/tegra/types.h
+++ b/src/soc/nvidia/tegra/types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __TEGRA_MISC_TYPES_H__
diff --git a/src/soc/nvidia/tegra/usb.c b/src/soc/nvidia/tegra/usb.c
index e6de538..340a773 100644
--- a/src/soc/nvidia/tegra/usb.c
+++ b/src/soc/nvidia/tegra/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/nvidia/tegra/usb.h b/src/soc/nvidia/tegra/usb.h
index f04b304..33afc8c 100644
--- a/src/soc/nvidia/tegra/usb.h
+++ b/src/soc/nvidia/tegra/usb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA_USB_H__
diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c
index 9d0ad76..2895484 100644
--- a/src/soc/nvidia/tegra124/bootblock.c
+++ b/src/soc/nvidia/tegra124/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/nvidia/tegra124/bootblock_asm.S b/src/soc/nvidia/tegra124/bootblock_asm.S
index 1450907..b98b9bb 100644
--- a/src/soc/nvidia/tegra124/bootblock_asm.S
+++ b/src/soc/nvidia/tegra124/bootblock_asm.S
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/soc/nvidia/tegra124/cache.c b/src/soc/nvidia/tegra124/cache.c
index 11de096..1942705 100644
--- a/src/soc/nvidia/tegra124/cache.c
+++ b/src/soc/nvidia/tegra124/cache.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/nvidia/tegra124/cbmem.c b/src/soc/nvidia/tegra124/cbmem.c
index 542871c..d0ce9a5 100644
--- a/src/soc/nvidia/tegra124/cbmem.c
+++ b/src/soc/nvidia/tegra124/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/nvidia/tegra124/chip.h b/src/soc/nvidia/tegra124/chip.h
index 7db177f..395affc 100644
--- a/src/soc/nvidia/tegra124/chip.h
+++ b/src/soc/nvidia/tegra124/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_CHIP_H__
diff --git a/src/soc/nvidia/tegra124/display.c b/src/soc/nvidia/tegra124/display.c
index e07debc..6ccdceb 100644
--- a/src/soc/nvidia/tegra124/display.c
+++ b/src/soc/nvidia/tegra124/display.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra124/i2c.c b/src/soc/nvidia/tegra124/i2c.c
index 92ed678..ed1cd3b 100644
--- a/src/soc/nvidia/tegra124/i2c.c
+++ b/src/soc/nvidia/tegra124/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/soc/nvidia/tegra124/include/soc/cache.h b/src/soc/nvidia/tegra124/include/soc/cache.h
index 2d59fee..27ff894 100644
--- a/src/soc/nvidia/tegra124/include/soc/cache.h
+++ b/src/soc/nvidia/tegra124/include/soc/cache.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void configure_l2_cache(void);
diff --git a/src/soc/nvidia/tegra124/include/soc/early_configs.h b/src/soc/nvidia/tegra124/include/soc/early_configs.h
index 2ebde1e..a24434b 100644
--- a/src/soc/nvidia/tegra124/include/soc/early_configs.h
+++ b/src/soc/nvidia/tegra124/include/soc/early_configs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void early_mainboard_init(void);
diff --git a/src/soc/nvidia/tegra124/include/soc/gpio.h b/src/soc/nvidia/tegra124/include/soc/gpio.h
index b35bc15..056f744 100644
--- a/src/soc/nvidia/tegra124/include/soc/gpio.h
+++ b/src/soc/nvidia/tegra124/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_GPIO_H__
diff --git a/src/soc/nvidia/tegra124/include/soc/maincpu.h b/src/soc/nvidia/tegra124/include/soc/maincpu.h
index 922ad56..097ccf4 100644
--- a/src/soc/nvidia/tegra124/include/soc/maincpu.h
+++ b/src/soc/nvidia/tegra124/include/soc/maincpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_MAINCPU_H__
diff --git a/src/soc/nvidia/tegra124/include/soc/memlayout.ld b/src/soc/nvidia/tegra124/include/soc/memlayout.ld
index 561833d..4e0d3bb 100644
--- a/src/soc/nvidia/tegra124/include/soc/memlayout.ld
+++ b/src/soc/nvidia/tegra124/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/nvidia/tegra124/include/soc/pingroup.h b/src/soc/nvidia/tegra124/include/soc/pingroup.h
index 62824f1..4ccaf56 100644
--- a/src/soc/nvidia/tegra124/include/soc/pingroup.h
+++ b/src/soc/nvidia/tegra124/include/soc/pingroup.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_PINGROUP_H__
diff --git a/src/soc/nvidia/tegra124/include/soc/pinmux.h b/src/soc/nvidia/tegra124/include/soc/pinmux.h
index 50f176b..e3e8131 100644
--- a/src/soc/nvidia/tegra124/include/soc/pinmux.h
+++ b/src/soc/nvidia/tegra124/include/soc/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_PINMUX_H__
diff --git a/src/soc/nvidia/tegra124/include/soc/power.h b/src/soc/nvidia/tegra124/include/soc/power.h
index 14cdc5b..7d930cc 100644
--- a/src/soc/nvidia/tegra124/include/soc/power.h
+++ b/src/soc/nvidia/tegra124/include/soc/power.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_POWER_H__
diff --git a/src/soc/nvidia/tegra124/include/soc/sdram.h b/src/soc/nvidia/tegra124/include/soc/sdram.h
index 136355b..3fc8ed2 100644
--- a/src/soc/nvidia/tegra124/include/soc/sdram.h
+++ b/src/soc/nvidia/tegra124/include/soc/sdram.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_SDRAM_H__
diff --git a/src/soc/nvidia/tegra124/include/soc/sysctr.h b/src/soc/nvidia/tegra124/include/soc/sysctr.h
index 61282ee..2e1e1d7 100644
--- a/src/soc/nvidia/tegra124/include/soc/sysctr.h
+++ b/src/soc/nvidia/tegra124/include/soc/sysctr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA124_SYSCTR_H__
diff --git a/src/soc/nvidia/tegra124/lp0/Makefile b/src/soc/nvidia/tegra124/lp0/Makefile
index 9dfe4b4..830e0b5 100644
--- a/src/soc/nvidia/tegra124/lp0/Makefile
+++ b/src/soc/nvidia/tegra124/lp0/Makefile
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.ld b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.ld
index 26cacbd..aa16d72 100644
--- a/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.ld
+++ b/src/soc/nvidia/tegra124/lp0/tegra_lp0_resume.ld
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/soc/nvidia/tegra124/monotonic_timer.c b/src/soc/nvidia/tegra124/monotonic_timer.c
index 121de2c..04861a4 100644
--- a/src/soc/nvidia/tegra124/monotonic_timer.c
+++ b/src/soc/nvidia/tegra124/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra124/power.c b/src/soc/nvidia/tegra124/power.c
index cf9e695..6f4ee38 100644
--- a/src/soc/nvidia/tegra124/power.c
+++ b/src/soc/nvidia/tegra124/power.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra124/sdram.c b/src/soc/nvidia/tegra124/sdram.c
index 56e53c6..30d16a5 100644
--- a/src/soc/nvidia/tegra124/sdram.c
+++ b/src/soc/nvidia/tegra124/sdram.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra124/soc.c b/src/soc/nvidia/tegra124/soc.c
index c38232d..cebb21a 100644
--- a/src/soc/nvidia/tegra124/soc.c
+++ b/src/soc/nvidia/tegra124/soc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra124/spi.c b/src/soc/nvidia/tegra124/spi.c
index 7cc74c2..43b0dc8 100644
--- a/src/soc/nvidia/tegra124/spi.c
+++ b/src/soc/nvidia/tegra124/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/nvidia/tegra124/uart.c b/src/soc/nvidia/tegra124/uart.c
index ebbf3ad..6ecd1ef 100644
--- a/src/soc/nvidia/tegra124/uart.c
+++ b/src/soc/nvidia/tegra124/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra124/verstage.c b/src/soc/nvidia/tegra124/verstage.c
index e2092e4..16d7226 100644
--- a/src/soc/nvidia/tegra124/verstage.c
+++ b/src/soc/nvidia/tegra124/verstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/nvidia/tegra132/32bit_reset.S b/src/soc/nvidia/tegra132/32bit_reset.S
index 3af4c5d..95e84ff 100644
--- a/src/soc/nvidia/tegra132/32bit_reset.S
+++ b/src/soc/nvidia/tegra132/32bit_reset.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/soc/nvidia/tegra132/addressmap.c b/src/soc/nvidia/tegra132/addressmap.c
index fbbd099..9f1f416 100644
--- a/src/soc/nvidia/tegra132/addressmap.c
+++ b/src/soc/nvidia/tegra132/addressmap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/nvidia/tegra132/bootblock.c b/src/soc/nvidia/tegra132/bootblock.c
index 29a15d9..b0058dc 100644
--- a/src/soc/nvidia/tegra132/bootblock.c
+++ b/src/soc/nvidia/tegra132/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/soc/nvidia/tegra132/bootblock_asm.S b/src/soc/nvidia/tegra132/bootblock_asm.S
index 766a1b8..e607b42 100644
--- a/src/soc/nvidia/tegra132/bootblock_asm.S
+++ b/src/soc/nvidia/tegra132/bootblock_asm.S
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/soc/nvidia/tegra132/cbmem.c b/src/soc/nvidia/tegra132/cbmem.c
index 08d43b8..a6ec5a3 100644
--- a/src/soc/nvidia/tegra132/cbmem.c
+++ b/src/soc/nvidia/tegra132/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/nvidia/tegra132/ccplex.c b/src/soc/nvidia/tegra132/ccplex.c
index b003ec1..7cdddaa 100644
--- a/src/soc/nvidia/tegra132/ccplex.c
+++ b/src/soc/nvidia/tegra132/ccplex.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/chip.h b/src/soc/nvidia/tegra132/chip.h
index 675e794..d903819 100644
--- a/src/soc/nvidia/tegra132/chip.h
+++ b/src/soc/nvidia/tegra132/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_CHIP_H__
diff --git a/src/soc/nvidia/tegra132/cpu.c b/src/soc/nvidia/tegra132/cpu.c
index e1c96f6..4110fa9 100644
--- a/src/soc/nvidia/tegra132/cpu.c
+++ b/src/soc/nvidia/tegra132/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/cpu_lib.S b/src/soc/nvidia/tegra132/cpu_lib.S
index abfffb1..4aae85b 100644
--- a/src/soc/nvidia/tegra132/cpu_lib.S
+++ b/src/soc/nvidia/tegra132/cpu_lib.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/nvidia/tegra132/dc.c b/src/soc/nvidia/tegra132/dc.c
index 9e9b4b3..ba82981 100644
--- a/src/soc/nvidia/tegra132/dc.c
+++ b/src/soc/nvidia/tegra132/dc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/dsi.c b/src/soc/nvidia/tegra132/dsi.c
index 7ca9172..5eda722 100644
--- a/src/soc/nvidia/tegra132/dsi.c
+++ b/src/soc/nvidia/tegra132/dsi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/flow_ctrl.c b/src/soc/nvidia/tegra132/flow_ctrl.c
index 2a14ec7..28c6f73 100644
--- a/src/soc/nvidia/tegra132/flow_ctrl.c
+++ b/src/soc/nvidia/tegra132/flow_ctrl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/funitcfg.c b/src/soc/nvidia/tegra132/funitcfg.c
index 75d099a..fdd0fba 100644
--- a/src/soc/nvidia/tegra132/funitcfg.c
+++ b/src/soc/nvidia/tegra132/funitcfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/gic.c b/src/soc/nvidia/tegra132/gic.c
index c8c09fb..1a97d69 100644
--- a/src/soc/nvidia/tegra132/gic.c
+++ b/src/soc/nvidia/tegra132/gic.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gic.h>
diff --git a/src/soc/nvidia/tegra132/i2c.c b/src/soc/nvidia/tegra132/i2c.c
index 04a0c00..0686963 100644
--- a/src/soc/nvidia/tegra132/i2c.c
+++ b/src/soc/nvidia/tegra132/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/soc/nvidia/tegra132/i2c6.c b/src/soc/nvidia/tegra132/i2c6.c
index b4857a3..5d296b6 100644
--- a/src/soc/nvidia/tegra132/i2c6.c
+++ b/src/soc/nvidia/tegra132/i2c6.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/nvidia/tegra132/include/soc/ccplex.h b/src/soc/nvidia/tegra132/include/soc/ccplex.h
index b8bded6..ea51463 100644
--- a/src/soc/nvidia/tegra132/include/soc/ccplex.h
+++ b/src/soc/nvidia/tegra132/include/soc/ccplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_CCPLEX_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/cpu.h b/src/soc/nvidia/tegra132/include/soc/cpu.h
index c2c308b..4ce9e7f 100644
--- a/src/soc/nvidia/tegra132/include/soc/cpu.h
+++ b/src/soc/nvidia/tegra132/include/soc/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_CPU_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/flow_ctrl.h b/src/soc/nvidia/tegra132/include/soc/flow_ctrl.h
index 94ee430..859db4e 100644
--- a/src/soc/nvidia/tegra132/include/soc/flow_ctrl.h
+++ b/src/soc/nvidia/tegra132/include/soc/flow_ctrl.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _TEGRA132_FLOW_CTRL_H_
diff --git a/src/soc/nvidia/tegra132/include/soc/funitcfg.h b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
index 7a13e0b..304b0a7 100644
--- a/src/soc/nvidia/tegra132/include/soc/funitcfg.h
+++ b/src/soc/nvidia/tegra132/include/soc/funitcfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_FUNIT_CFG_H
diff --git a/src/soc/nvidia/tegra132/include/soc/gpio.h b/src/soc/nvidia/tegra132/include/soc/gpio.h
index 0c703ba..af58baa 100644
--- a/src/soc/nvidia/tegra132/include/soc/gpio.h
+++ b/src/soc/nvidia/tegra132/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_GPIO_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/id.h b/src/soc/nvidia/tegra132/include/soc/id.h
index a3cc947e..48f367f 100644
--- a/src/soc/nvidia/tegra132/include/soc/id.h
+++ b/src/soc/nvidia/tegra132/include/soc/id.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_INCLUDE_SOC_ID_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/maincpu.h b/src/soc/nvidia/tegra132/include/soc/maincpu.h
index 5acbd26..abf70ef 100644
--- a/src/soc/nvidia/tegra132/include/soc/maincpu.h
+++ b/src/soc/nvidia/tegra132/include/soc/maincpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_MAINCPU_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout.ld b/src/soc/nvidia/tegra132/include/soc/memlayout.ld
index 007444d..b3fcfa2 100644
--- a/src/soc/nvidia/tegra132/include/soc/memlayout.ld
+++ b/src/soc/nvidia/tegra132/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld
index 552b443..5f3486c 100644
--- a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld
+++ b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/nvidia/tegra132/include/soc/mipi-phy.h b/src/soc/nvidia/tegra132/include/soc/mipi-phy.h
index eb81719..8d99f5c 100644
--- a/src/soc/nvidia/tegra132/include/soc/mipi-phy.h
+++ b/src/soc/nvidia/tegra132/include/soc/mipi-phy.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _TEGRA_MIPI_PHY_H
 #define _TEGRA_MIPI_PHY_H
diff --git a/src/soc/nvidia/tegra132/include/soc/mipi_display.h b/src/soc/nvidia/tegra132/include/soc/mipi_display.h
index 2e2e453..91053b6 100644
--- a/src/soc/nvidia/tegra132/include/soc/mipi_display.h
+++ b/src/soc/nvidia/tegra132/include/soc/mipi_display.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * Defines for Mobile Industry Processor Interface (MIPI(R))
diff --git a/src/soc/nvidia/tegra132/include/soc/mipi_dsi.h b/src/soc/nvidia/tegra132/include/soc/mipi_dsi.h
index f0bc80c..26c8481 100644
--- a/src/soc/nvidia/tegra132/include/soc/mipi_dsi.h
+++ b/src/soc/nvidia/tegra132/include/soc/mipi_dsi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * MIPI DSI Bus
diff --git a/src/soc/nvidia/tegra132/include/soc/mmu_operations.h b/src/soc/nvidia/tegra132/include/soc/mmu_operations.h
index b095c78..6824c56 100644
--- a/src/soc/nvidia/tegra132/include/soc/mmu_operations.h
+++ b/src/soc/nvidia/tegra132/include/soc/mmu_operations.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_MMU_OPERATIONS_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/padconfig.h b/src/soc/nvidia/tegra132/include/soc/padconfig.h
index 132c76e..b18f4a3 100644
--- a/src/soc/nvidia/tegra132/include/soc/padconfig.h
+++ b/src/soc/nvidia/tegra132/include/soc/padconfig.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_PAD_CFG_H
diff --git a/src/soc/nvidia/tegra132/include/soc/pinmux.h b/src/soc/nvidia/tegra132/include/soc/pinmux.h
index 949127c..a6b9727 100644
--- a/src/soc/nvidia/tegra132/include/soc/pinmux.h
+++ b/src/soc/nvidia/tegra132/include/soc/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_PINMUX_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/power.h b/src/soc/nvidia/tegra132/include/soc/power.h
index 7a1452c..057453a 100644
--- a/src/soc/nvidia/tegra132/include/soc/power.h
+++ b/src/soc/nvidia/tegra132/include/soc/power.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_POWER_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/romstage.h b/src/soc/nvidia/tegra132/include/soc/romstage.h
index 60887a9..fe9119f 100644
--- a/src/soc/nvidia/tegra132/include/soc/romstage.h
+++ b/src/soc/nvidia/tegra132/include/soc/romstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_SOC_ROMSTAGE_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/sdram.h b/src/soc/nvidia/tegra132/include/soc/sdram.h
index 6ff4a20..b047ba7 100644
--- a/src/soc/nvidia/tegra132/include/soc/sdram.h
+++ b/src/soc/nvidia/tegra132/include/soc/sdram.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_SDRAM_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/sdram_configs.h b/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
index 5e834da..c59a172 100644
--- a/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
+++ b/src/soc/nvidia/tegra132/include/soc/sdram_configs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_SDRAM_CONFIGS_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/sysctr.h b/src/soc/nvidia/tegra132/include/soc/sysctr.h
index 1413832..c6c76c6 100644
--- a/src/soc/nvidia/tegra132/include/soc/sysctr.h
+++ b/src/soc/nvidia/tegra132/include/soc/sysctr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_SYSCTR_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/tegra_dsi.h b/src/soc/nvidia/tegra132/include/soc/tegra_dsi.h
index 57cd1e4..9ee943f 100644
--- a/src/soc/nvidia/tegra132/include/soc/tegra_dsi.h
+++ b/src/soc/nvidia/tegra132/include/soc/tegra_dsi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef __TEGRA_DSI_H__
 #define __TEGRA_DSI_H__
diff --git a/src/soc/nvidia/tegra132/include/soc/verstage.h b/src/soc/nvidia/tegra132/include/soc/verstage.h
index d54a111..fdfd624 100644
--- a/src/soc/nvidia/tegra132/include/soc/verstage.h
+++ b/src/soc/nvidia/tegra132/include/soc/verstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__
diff --git a/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.c b/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.c
index 09384b9..9dd6436 100644
--- a/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.c
+++ b/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.h b/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.h
index 8fc4897..def743c 100644
--- a/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.h
+++ b/src/soc/nvidia/tegra132/jdi_25x18_display/panel-jdi-lpm102a188a.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _PANEL_JDI_LPM102A188A_H_
 #define _PANEL_JDI_LPM102A188A_H_
diff --git a/src/soc/nvidia/tegra132/lp0/Makefile b/src/soc/nvidia/tegra132/lp0/Makefile
index 9dfe4b4..830e0b5 100644
--- a/src/soc/nvidia/tegra132/lp0/Makefile
+++ b/src/soc/nvidia/tegra132/lp0/Makefile
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/soc/nvidia/tegra132/lp0/tegra_lp0_resume.ld b/src/soc/nvidia/tegra132/lp0/tegra_lp0_resume.ld
index 26cacbd..aa16d72 100644
--- a/src/soc/nvidia/tegra132/lp0/tegra_lp0_resume.ld
+++ b/src/soc/nvidia/tegra132/lp0/tegra_lp0_resume.ld
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/soc/nvidia/tegra132/mipi-phy.c b/src/soc/nvidia/tegra132/mipi-phy.c
index fc9d9de..7ef6f6e 100644
--- a/src/soc/nvidia/tegra132/mipi-phy.c
+++ b/src/soc/nvidia/tegra132/mipi-phy.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/mipi.c b/src/soc/nvidia/tegra132/mipi.c
index 96816c8..f2b22d3 100644
--- a/src/soc/nvidia/tegra132/mipi.c
+++ b/src/soc/nvidia/tegra132/mipi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/mipi_dsi.c b/src/soc/nvidia/tegra132/mipi_dsi.c
index 5e4cf55..b28fc21 100644
--- a/src/soc/nvidia/tegra132/mipi_dsi.c
+++ b/src/soc/nvidia/tegra132/mipi_dsi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * MIPI DSI Bus
diff --git a/src/soc/nvidia/tegra132/mmu_operations.c b/src/soc/nvidia/tegra132/mmu_operations.c
index 5c6ae19..aa8c5bf 100644
--- a/src/soc/nvidia/tegra132/mmu_operations.c
+++ b/src/soc/nvidia/tegra132/mmu_operations.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/mmu.h>
diff --git a/src/soc/nvidia/tegra132/monotonic_timer.c b/src/soc/nvidia/tegra132/monotonic_timer.c
index 560a7a5..bbff28d 100644
--- a/src/soc/nvidia/tegra132/monotonic_timer.c
+++ b/src/soc/nvidia/tegra132/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/padconfig.c b/src/soc/nvidia/tegra132/padconfig.c
index ab93454..53e8848 100644
--- a/src/soc/nvidia/tegra132/padconfig.c
+++ b/src/soc/nvidia/tegra132/padconfig.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/power.c b/src/soc/nvidia/tegra132/power.c
index 35d6841..9e4a98a 100644
--- a/src/soc/nvidia/tegra132/power.c
+++ b/src/soc/nvidia/tegra132/power.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/psci.c b/src/soc/nvidia/tegra132/psci.c
index df7f927..b1fbb49 100644
--- a/src/soc/nvidia/tegra132/psci.c
+++ b/src/soc/nvidia/tegra132/psci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/nvidia/tegra132/ramstage.c b/src/soc/nvidia/tegra132/ramstage.c
index 1915d38..192b22c 100644
--- a/src/soc/nvidia/tegra132/ramstage.c
+++ b/src/soc/nvidia/tegra132/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/stages.h>
diff --git a/src/soc/nvidia/tegra132/reset.c b/src/soc/nvidia/tegra132/reset.c
index dee2786..98a30aa 100644
--- a/src/soc/nvidia/tegra132/reset.c
+++ b/src/soc/nvidia/tegra132/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/soc/nvidia/tegra132/romstage.c b/src/soc/nvidia/tegra132/romstage.c
index ae295c0..283e939 100644
--- a/src/soc/nvidia/tegra132/romstage.c
+++ b/src/soc/nvidia/tegra132/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/soc/nvidia/tegra132/romstage_asm.S b/src/soc/nvidia/tegra132/romstage_asm.S
index 350934d..01be600 100644
--- a/src/soc/nvidia/tegra132/romstage_asm.S
+++ b/src/soc/nvidia/tegra132/romstage_asm.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/soc/nvidia/tegra132/sdram.c b/src/soc/nvidia/tegra132/sdram.c
index 50e6731..9b8099f 100644
--- a/src/soc/nvidia/tegra132/sdram.c
+++ b/src/soc/nvidia/tegra132/sdram.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/secmon.c b/src/soc/nvidia/tegra132/secmon.c
index 66ebed2..b6f1df6 100644
--- a/src/soc/nvidia/tegra132/secmon.c
+++ b/src/soc/nvidia/tegra132/secmon.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/secmon.h>
diff --git a/src/soc/nvidia/tegra132/soc.c b/src/soc/nvidia/tegra132/soc.c
index a65f36d..da29138 100644
--- a/src/soc/nvidia/tegra132/soc.c
+++ b/src/soc/nvidia/tegra132/soc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra132/spi.c b/src/soc/nvidia/tegra132/spi.c
index efe4334..b045220 100644
--- a/src/soc/nvidia/tegra132/spi.c
+++ b/src/soc/nvidia/tegra132/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/nvidia/tegra132/stack.S b/src/soc/nvidia/tegra132/stack.S
index 5a48d0e..a030d3c 100644
--- a/src/soc/nvidia/tegra132/stack.S
+++ b/src/soc/nvidia/tegra132/stack.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Macro to initialize stack, perform seeding if required and finally call the
diff --git a/src/soc/nvidia/tegra132/uart.c b/src/soc/nvidia/tegra132/uart.c
index a3628f0..7a32d79 100644
--- a/src/soc/nvidia/tegra132/uart.c
+++ b/src/soc/nvidia/tegra132/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/addressmap.c b/src/soc/nvidia/tegra210/addressmap.c
index d177323..ed7ed4b 100644
--- a/src/soc/nvidia/tegra210/addressmap.c
+++ b/src/soc/nvidia/tegra210/addressmap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/nvidia/tegra210/ape.c b/src/soc/nvidia/tegra210/ape.c
index b46c11a..f67bfd1 100644
--- a/src/soc/nvidia/tegra210/ape.c
+++ b/src/soc/nvidia/tegra210/ape.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/nvidia/tegra210/arm_tf.c b/src/soc/nvidia/tegra210/arm_tf.c
index c6aeeef..96b0d43 100644
--- a/src/soc/nvidia/tegra210/arm_tf.c
+++ b/src/soc/nvidia/tegra210/arm_tf.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/nvidia/tegra210/bootblock.c b/src/soc/nvidia/tegra210/bootblock.c
index 0469320..26b024a 100644
--- a/src/soc/nvidia/tegra210/bootblock.c
+++ b/src/soc/nvidia/tegra210/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/soc/nvidia/tegra210/bootblock_asm.S b/src/soc/nvidia/tegra210/bootblock_asm.S
index 766a1b8..e607b42 100644
--- a/src/soc/nvidia/tegra210/bootblock_asm.S
+++ b/src/soc/nvidia/tegra210/bootblock_asm.S
@@ -24,8 +24,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/soc/nvidia/tegra210/cbmem.c b/src/soc/nvidia/tegra210/cbmem.c
index c161a36..0e69e51 100644
--- a/src/soc/nvidia/tegra210/cbmem.c
+++ b/src/soc/nvidia/tegra210/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/nvidia/tegra210/ccplex.c b/src/soc/nvidia/tegra210/ccplex.c
index a3c6722..6260071 100644
--- a/src/soc/nvidia/tegra210/ccplex.c
+++ b/src/soc/nvidia/tegra210/ccplex.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/chip.h b/src/soc/nvidia/tegra210/chip.h
index efce901..5d100ec 100644
--- a/src/soc/nvidia/tegra210/chip.h
+++ b/src/soc/nvidia/tegra210/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_CHIP_H__
diff --git a/src/soc/nvidia/tegra210/cpu.c b/src/soc/nvidia/tegra210/cpu.c
index 6e51a8c..ce2f6d7 100644
--- a/src/soc/nvidia/tegra210/cpu.c
+++ b/src/soc/nvidia/tegra210/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/cpu_lib.S b/src/soc/nvidia/tegra210/cpu_lib.S
index abfffb1..4aae85b 100644
--- a/src/soc/nvidia/tegra210/cpu_lib.S
+++ b/src/soc/nvidia/tegra210/cpu_lib.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/nvidia/tegra210/dc.c b/src/soc/nvidia/tegra210/dc.c
index f3beece..b8c043a 100644
--- a/src/soc/nvidia/tegra210/dc.c
+++ b/src/soc/nvidia/tegra210/dc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/dsi.c b/src/soc/nvidia/tegra210/dsi.c
index 3d0b850..434700e 100644
--- a/src/soc/nvidia/tegra210/dsi.c
+++ b/src/soc/nvidia/tegra210/dsi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/flow_ctrl.c b/src/soc/nvidia/tegra210/flow_ctrl.c
index 825274d..2c8277a 100644
--- a/src/soc/nvidia/tegra210/flow_ctrl.c
+++ b/src/soc/nvidia/tegra210/flow_ctrl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/funitcfg.c b/src/soc/nvidia/tegra210/funitcfg.c
index 96b1204..78e4e31 100644
--- a/src/soc/nvidia/tegra210/funitcfg.c
+++ b/src/soc/nvidia/tegra210/funitcfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/gic.c b/src/soc/nvidia/tegra210/gic.c
index c8c09fb..1a97d69 100644
--- a/src/soc/nvidia/tegra210/gic.c
+++ b/src/soc/nvidia/tegra210/gic.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <gic.h>
diff --git a/src/soc/nvidia/tegra210/i2c.c b/src/soc/nvidia/tegra210/i2c.c
index 04a0c00..0686963 100644
--- a/src/soc/nvidia/tegra210/i2c.c
+++ b/src/soc/nvidia/tegra210/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <soc/addressmap.h>
diff --git a/src/soc/nvidia/tegra210/i2c6.c b/src/soc/nvidia/tegra210/i2c6.c
index 9213057..4527d5a 100644
--- a/src/soc/nvidia/tegra210/i2c6.c
+++ b/src/soc/nvidia/tegra210/i2c6.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/ccplex.h b/src/soc/nvidia/tegra210/include/soc/ccplex.h
index d1aaa8b..1463ac5 100644
--- a/src/soc/nvidia/tegra210/include/soc/ccplex.h
+++ b/src/soc/nvidia/tegra210/include/soc/ccplex.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_CCPLEX_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/cpu.h b/src/soc/nvidia/tegra210/include/soc/cpu.h
index f6ae137..2096c9d 100644
--- a/src/soc/nvidia/tegra210/include/soc/cpu.h
+++ b/src/soc/nvidia/tegra210/include/soc/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_CPU_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/flow_ctrl.h b/src/soc/nvidia/tegra210/include/soc/flow_ctrl.h
index 47d68b0..8e950cb 100644
--- a/src/soc/nvidia/tegra210/include/soc/flow_ctrl.h
+++ b/src/soc/nvidia/tegra210/include/soc/flow_ctrl.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _TEGRA210_FLOW_CTRL_H_
diff --git a/src/soc/nvidia/tegra210/include/soc/funitcfg.h b/src/soc/nvidia/tegra210/include/soc/funitcfg.h
index d51b13f..c8c6acd 100644
--- a/src/soc/nvidia/tegra210/include/soc/funitcfg.h
+++ b/src/soc/nvidia/tegra210/include/soc/funitcfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_FUNIT_CFG_H
diff --git a/src/soc/nvidia/tegra210/include/soc/gpio.h b/src/soc/nvidia/tegra210/include/soc/gpio.h
index f4c236a..ef76332 100644
--- a/src/soc/nvidia/tegra210/include/soc/gpio.h
+++ b/src/soc/nvidia/tegra210/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_GPIO_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/id.h b/src/soc/nvidia/tegra210/include/soc/id.h
index 5090a31..408ae5d 100644
--- a/src/soc/nvidia/tegra210/include/soc/id.h
+++ b/src/soc/nvidia/tegra210/include/soc/id.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_INCLUDE_SOC_ID_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/maincpu.h b/src/soc/nvidia/tegra210/include/soc/maincpu.h
index 813caba..91b0deb 100644
--- a/src/soc/nvidia/tegra210/include/soc/maincpu.h
+++ b/src/soc/nvidia/tegra210/include/soc/maincpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_MAINCPU_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/memlayout.ld b/src/soc/nvidia/tegra210/include/soc/memlayout.ld
index 526fbbe..4dc4aed 100644
--- a/src/soc/nvidia/tegra210/include/soc/memlayout.ld
+++ b/src/soc/nvidia/tegra210/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/memlayout_vboot2.ld b/src/soc/nvidia/tegra210/include/soc/memlayout_vboot2.ld
index dee6798..e86cea2 100644
--- a/src/soc/nvidia/tegra210/include/soc/memlayout_vboot2.ld
+++ b/src/soc/nvidia/tegra210/include/soc/memlayout_vboot2.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/nvidia/tegra210/include/soc/mipi-phy.h b/src/soc/nvidia/tegra210/include/soc/mipi-phy.h
index eb81719..8d99f5c 100644
--- a/src/soc/nvidia/tegra210/include/soc/mipi-phy.h
+++ b/src/soc/nvidia/tegra210/include/soc/mipi-phy.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _TEGRA_MIPI_PHY_H
 #define _TEGRA_MIPI_PHY_H
diff --git a/src/soc/nvidia/tegra210/include/soc/mipi_display.h b/src/soc/nvidia/tegra210/include/soc/mipi_display.h
index 2e2e453..91053b6 100644
--- a/src/soc/nvidia/tegra210/include/soc/mipi_display.h
+++ b/src/soc/nvidia/tegra210/include/soc/mipi_display.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * Defines for Mobile Industry Processor Interface (MIPI(R))
diff --git a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
index 2d1e8b1..4b52114 100644
--- a/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
+++ b/src/soc/nvidia/tegra210/include/soc/mipi_dsi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * MIPI DSI Bus
diff --git a/src/soc/nvidia/tegra210/include/soc/mmu_operations.h b/src/soc/nvidia/tegra210/include/soc/mmu_operations.h
index a6e42aa..00140a4 100644
--- a/src/soc/nvidia/tegra210/include/soc/mmu_operations.h
+++ b/src/soc/nvidia/tegra210/include/soc/mmu_operations.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_MMU_OPERATIONS_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/mtc.h b/src/soc/nvidia/tegra210/include/soc/mtc.h
index c9f19cb..f719635 100644
--- a/src/soc/nvidia/tegra210/include/soc/mtc.h
+++ b/src/soc/nvidia/tegra210/include/soc/mtc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_MTC_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/padconfig.h b/src/soc/nvidia/tegra210/include/soc/padconfig.h
index 01cd72a..3ef55c0 100644
--- a/src/soc/nvidia/tegra210/include/soc/padconfig.h
+++ b/src/soc/nvidia/tegra210/include/soc/padconfig.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_PAD_CFG_H
diff --git a/src/soc/nvidia/tegra210/include/soc/pinmux.h b/src/soc/nvidia/tegra210/include/soc/pinmux.h
index 3520cdb..44ce711 100644
--- a/src/soc/nvidia/tegra210/include/soc/pinmux.h
+++ b/src/soc/nvidia/tegra210/include/soc/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_PINMUX_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/power.h b/src/soc/nvidia/tegra210/include/soc/power.h
index c406096..4073011 100644
--- a/src/soc/nvidia/tegra210/include/soc/power.h
+++ b/src/soc/nvidia/tegra210/include/soc/power.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_POWER_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/romstage.h b/src/soc/nvidia/tegra210/include/soc/romstage.h
index d4ab982..799c755 100644
--- a/src/soc/nvidia/tegra210/include/soc/romstage.h
+++ b/src/soc/nvidia/tegra210/include/soc/romstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_SOC_ROMSTAGE_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/sdram.h b/src/soc/nvidia/tegra210/include/soc/sdram.h
index a8dec82..b422ac9 100644
--- a/src/soc/nvidia/tegra210/include/soc/sdram.h
+++ b/src/soc/nvidia/tegra210/include/soc/sdram.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_SDRAM_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/sdram_configs.h b/src/soc/nvidia/tegra210/include/soc/sdram_configs.h
index 905ff9c..b4ad0c8 100644
--- a/src/soc/nvidia/tegra210/include/soc/sdram_configs.h
+++ b/src/soc/nvidia/tegra210/include/soc/sdram_configs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_SDRAM_CONFIGS_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/sysctr.h b/src/soc/nvidia/tegra210/include/soc/sysctr.h
index e5a894c..2942adf 100644
--- a/src/soc/nvidia/tegra210/include/soc/sysctr.h
+++ b/src/soc/nvidia/tegra210/include/soc/sysctr.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_SYSCTR_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h b/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h
index 058e26f..f20c532 100644
--- a/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h
+++ b/src/soc/nvidia/tegra210/include/soc/tegra_dsi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef __TEGRA_DSI_H__
 #define __TEGRA_DSI_H__
diff --git a/src/soc/nvidia/tegra210/include/soc/verstage.h b/src/soc/nvidia/tegra210/include/soc/verstage.h
index d6564c9..4481ea1 100644
--- a/src/soc/nvidia/tegra210/include/soc/verstage.h
+++ b/src/soc/nvidia/tegra210/include/soc/verstage.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_NVIDIA_TEGRA210_SOC_VERSTAGE_H__
diff --git a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
index 2149ca9..318b9b0 100644
--- a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
+++ b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.h b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.h
index b345971..6394e90 100644
--- a/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.h
+++ b/src/soc/nvidia/tegra210/jdi_25x18_display/panel-jdi-lpm102a188a.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef _PANEL_JDI_LPM102A188A_H_
 #define _PANEL_JDI_LPM102A188A_H_
diff --git a/src/soc/nvidia/tegra210/lp0/Makefile b/src/soc/nvidia/tegra210/lp0/Makefile
index 9dfe4b4..830e0b5 100644
--- a/src/soc/nvidia/tegra210/lp0/Makefile
+++ b/src/soc/nvidia/tegra210/lp0/Makefile
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 ################################################################################
 
diff --git a/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.ld b/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.ld
index 26cacbd..aa16d72 100644
--- a/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.ld
+++ b/src/soc/nvidia/tegra210/lp0/tegra_lp0_resume.ld
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* We use ELF as output format. So that we can debug the code in some form. */
diff --git a/src/soc/nvidia/tegra210/mipi-phy.c b/src/soc/nvidia/tegra210/mipi-phy.c
index fc9d9de..7ef6f6e 100644
--- a/src/soc/nvidia/tegra210/mipi-phy.c
+++ b/src/soc/nvidia/tegra210/mipi-phy.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/mipi.c b/src/soc/nvidia/tegra210/mipi.c
index 0035308..5d0dcce 100644
--- a/src/soc/nvidia/tegra210/mipi.c
+++ b/src/soc/nvidia/tegra210/mipi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <console/console.h>
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/mipi_dsi.c b/src/soc/nvidia/tegra210/mipi_dsi.c
index 5e4cf55..b28fc21 100644
--- a/src/soc/nvidia/tegra210/mipi_dsi.c
+++ b/src/soc/nvidia/tegra210/mipi_dsi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 /*
  * MIPI DSI Bus
diff --git a/src/soc/nvidia/tegra210/mmu_operations.c b/src/soc/nvidia/tegra210/mmu_operations.c
index 5578933..8b7f6c7 100644
--- a/src/soc/nvidia/tegra210/mmu_operations.c
+++ b/src/soc/nvidia/tegra210/mmu_operations.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/mmu.h>
diff --git a/src/soc/nvidia/tegra210/monotonic_timer.c b/src/soc/nvidia/tegra210/monotonic_timer.c
index 560a7a5..bbff28d 100644
--- a/src/soc/nvidia/tegra210/monotonic_timer.c
+++ b/src/soc/nvidia/tegra210/monotonic_timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/mtc.c b/src/soc/nvidia/tegra210/mtc.c
index b402a14..f361631 100644
--- a/src/soc/nvidia/tegra210/mtc.c
+++ b/src/soc/nvidia/tegra210/mtc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/soc/nvidia/tegra210/padconfig.c b/src/soc/nvidia/tegra210/padconfig.c
index ab93454..53e8848 100644
--- a/src/soc/nvidia/tegra210/padconfig.c
+++ b/src/soc/nvidia/tegra210/padconfig.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/power.c b/src/soc/nvidia/tegra210/power.c
index 7802a65..4e31e5d 100644
--- a/src/soc/nvidia/tegra210/power.c
+++ b/src/soc/nvidia/tegra210/power.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/psci.c b/src/soc/nvidia/tegra210/psci.c
index 25a899e..bebe70f 100644
--- a/src/soc/nvidia/tegra210/psci.c
+++ b/src/soc/nvidia/tegra210/psci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/nvidia/tegra210/ramstage.c b/src/soc/nvidia/tegra210/ramstage.c
index f37c817..a9866a3 100644
--- a/src/soc/nvidia/tegra210/ramstage.c
+++ b/src/soc/nvidia/tegra210/ramstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/clock.h>
diff --git a/src/soc/nvidia/tegra210/reset.c b/src/soc/nvidia/tegra210/reset.c
index dee2786..98a30aa 100644
--- a/src/soc/nvidia/tegra210/reset.c
+++ b/src/soc/nvidia/tegra210/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/soc/nvidia/tegra210/romstage.c b/src/soc/nvidia/tegra210/romstage.c
index 16ba778..42ba912 100644
--- a/src/soc/nvidia/tegra210/romstage.c
+++ b/src/soc/nvidia/tegra210/romstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/soc/nvidia/tegra210/romstage_asm.S b/src/soc/nvidia/tegra210/romstage_asm.S
index 350934d..01be600 100644
--- a/src/soc/nvidia/tegra210/romstage_asm.S
+++ b/src/soc/nvidia/tegra210/romstage_asm.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/soc/nvidia/tegra210/secmon.c b/src/soc/nvidia/tegra210/secmon.c
index c093607..5850ba9 100644
--- a/src/soc/nvidia/tegra210/secmon.c
+++ b/src/soc/nvidia/tegra210/secmon.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/secmon.h>
diff --git a/src/soc/nvidia/tegra210/soc.c b/src/soc/nvidia/tegra210/soc.c
index 981b09c..73b2487 100644
--- a/src/soc/nvidia/tegra210/soc.c
+++ b/src/soc/nvidia/tegra210/soc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/nvidia/tegra210/spi.c b/src/soc/nvidia/tegra210/spi.c
index 5946ef0..95df54e 100644
--- a/src/soc/nvidia/tegra210/spi.c
+++ b/src/soc/nvidia/tegra210/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/nvidia/tegra210/stack.S b/src/soc/nvidia/tegra210/stack.S
index 5a48d0e..a030d3c 100644
--- a/src/soc/nvidia/tegra210/stack.S
+++ b/src/soc/nvidia/tegra210/stack.S
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Macro to initialize stack, perform seeding if required and finally call the
diff --git a/src/soc/nvidia/tegra210/stage_entry.S b/src/soc/nvidia/tegra210/stage_entry.S
index 66d8741..8578156 100644
--- a/src/soc/nvidia/tegra210/stage_entry.S
+++ b/src/soc/nvidia/tegra210/stage_entry.S
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/asm.h>
diff --git a/src/soc/nvidia/tegra210/uart.c b/src/soc/nvidia/tegra210/uart.c
index 773bc89..031ab8d 100644
--- a/src/soc/nvidia/tegra210/uart.c
+++ b/src/soc/nvidia/tegra210/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc
index 83b5e06..0054efc 100644
--- a/src/soc/qualcomm/ipq806x/Makefile.inc
+++ b/src/soc/qualcomm/ipq806x/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOC_QC_IPQ806X),y)
diff --git a/src/soc/qualcomm/ipq806x/blobs_init.c b/src/soc/qualcomm/ipq806x/blobs_init.c
index 2821677..6f1b6bd 100644
--- a/src/soc/qualcomm/ipq806x/blobs_init.c
+++ b/src/soc/qualcomm/ipq806x/blobs_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/qualcomm/ipq806x/cbmem.c b/src/soc/qualcomm/ipq806x/cbmem.c
index 14f1a0a..a943e35 100644
--- a/src/soc/qualcomm/ipq806x/cbmem.c
+++ b/src/soc/qualcomm/ipq806x/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld
index ad0977a..b532643 100644
--- a/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld
+++ b/src/soc/qualcomm/ipq806x/include/soc/memlayout.ld
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/qualcomm/ipq806x/include/soc/soc_services.h b/src/soc/qualcomm/ipq806x/include/soc/soc_services.h
index f995968..c48bb1e 100644
--- a/src/soc/qualcomm/ipq806x/include/soc/soc_services.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/soc_services.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_QUALCOMM_IPQ806X_INCLUDE_SOC_SOC_SERVICES_H__
diff --git a/src/soc/qualcomm/ipq806x/include/soc/usb.h b/src/soc/qualcomm/ipq806x/include/soc/usb.h
index 7bd6656..1ee579e 100644
--- a/src/soc/qualcomm/ipq806x/include/soc/usb.h
+++ b/src/soc/qualcomm/ipq806x/include/soc/usb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _IPQ806X_USB_H_
diff --git a/src/soc/qualcomm/ipq806x/mbn_header.h b/src/soc/qualcomm/ipq806x/mbn_header.h
index a58242b..78d3d91 100644
--- a/src/soc/qualcomm/ipq806x/mbn_header.h
+++ b/src/soc/qualcomm/ipq806x/mbn_header.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_QUALCOMM_IPQ806X_MBN_HEADER_H__
diff --git a/src/soc/qualcomm/ipq806x/soc.c b/src/soc/qualcomm/ipq806x/soc.c
index 8ca0f97..3c4c2e1 100644
--- a/src/soc/qualcomm/ipq806x/soc.c
+++ b/src/soc/qualcomm/ipq806x/soc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/qualcomm/ipq806x/usb.c b/src/soc/qualcomm/ipq806x/usb.c
index b48f5e2..115d94d 100644
--- a/src/soc/qualcomm/ipq806x/usb.c
+++ b/src/soc/qualcomm/ipq806x/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index bc484e3..befb8b3 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOC_ROCKCHIP_RK3288
diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 830ae1e..f457296 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOC_ROCKCHIP_RK3288),y)
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 4377652..e909bb5 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/rockchip/rk3288/cbmem.c b/src/soc/rockchip/rk3288/cbmem.c
index ccf4b7b..61d00da 100644
--- a/src/soc/rockchip/rk3288/cbmem.c
+++ b/src/soc/rockchip/rk3288/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/rockchip/rk3288/chip.h b/src/soc/rockchip/rk3288/chip.h
index 2c4390a..cc3d577 100644
--- a/src/soc/rockchip/rk3288/chip.h
+++ b/src/soc/rockchip/rk3288/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_CHIP_H__
diff --git a/src/soc/rockchip/rk3288/clock.c b/src/soc/rockchip/rk3288/clock.c
index 31901e7..b86084b 100644
--- a/src/soc/rockchip/rk3288/clock.c
+++ b/src/soc/rockchip/rk3288/clock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/crypto.c b/src/soc/rockchip/rk3288/crypto.c
index b8a1380..d88fc2a 100644
--- a/src/soc/rockchip/rk3288/crypto.c
+++ b/src/soc/rockchip/rk3288/crypto.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/display.c b/src/soc/rockchip/rk3288/display.c
index 02526a4..282df06 100644
--- a/src/soc/rockchip/rk3288/display.c
+++ b/src/soc/rockchip/rk3288/display.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/rockchip/rk3288/edp.c b/src/soc/rockchip/rk3288/edp.c
index 0ca4ac3..82ccf9c 100644
--- a/src/soc/rockchip/rk3288/edp.c
+++ b/src/soc/rockchip/rk3288/edp.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/gpio.c b/src/soc/rockchip/rk3288/gpio.c
index 479276f..afcba6b 100644
--- a/src/soc/rockchip/rk3288/gpio.c
+++ b/src/soc/rockchip/rk3288/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/i2c.c b/src/soc/rockchip/rk3288/i2c.c
index 28dee1f..387b1ba 100644
--- a/src/soc/rockchip/rk3288/i2c.c
+++ b/src/soc/rockchip/rk3288/i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/include/soc/addressmap.h b/src/soc/rockchip/rk3288/include/soc/addressmap.h
index a098a18..cc1d902 100644
--- a/src/soc/rockchip/rk3288/include/soc/addressmap.h
+++ b/src/soc/rockchip/rk3288/include/soc/addressmap.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_ADDRESSMAP_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/clock.h b/src/soc/rockchip/rk3288/include/soc/clock.h
index 3fccecb..a63f002 100644
--- a/src/soc/rockchip/rk3288/include/soc/clock.h
+++ b/src/soc/rockchip/rk3288/include/soc/clock.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_CLOCK_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/display.h b/src/soc/rockchip/rk3288/include/soc/display.h
index 9cd9053..98a15fa 100644
--- a/src/soc/rockchip/rk3288/include/soc/display.h
+++ b/src/soc/rockchip/rk3288/include/soc/display.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_DISPLAY_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/edp.h b/src/soc/rockchip/rk3288/include/soc/edp.h
index f4c2c08..aa2101d 100644
--- a/src/soc/rockchip/rk3288/include/soc/edp.h
+++ b/src/soc/rockchip/rk3288/include/soc/edp.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __RK32_DP_H
diff --git a/src/soc/rockchip/rk3288/include/soc/gpio.h b/src/soc/rockchip/rk3288/include/soc/gpio.h
index 923c2b3..9930c78 100644
--- a/src/soc/rockchip/rk3288/include/soc/gpio.h
+++ b/src/soc/rockchip/rk3288/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_GPIO_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/grf.h b/src/soc/rockchip/rk3288/include/soc/grf.h
index 78bca9e..fa7d93a 100644
--- a/src/soc/rockchip/rk3288/include/soc/grf.h
+++ b/src/soc/rockchip/rk3288/include/soc/grf.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_GRF_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/i2c.h b/src/soc/rockchip/rk3288/include/soc/i2c.h
index 2e0d5c5..ddecf21 100644
--- a/src/soc/rockchip/rk3288/include/soc/i2c.h
+++ b/src/soc/rockchip/rk3288/include/soc/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_I2C_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/memlayout.ld b/src/soc/rockchip/rk3288/include/soc/memlayout.ld
index b96923e..36ecd85 100644
--- a/src/soc/rockchip/rk3288/include/soc/memlayout.ld
+++ b/src/soc/rockchip/rk3288/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/rockchip/rk3288/include/soc/pmu.h b/src/soc/rockchip/rk3288/include/soc/pmu.h
index 11f6599..5f1b6a0 100644
--- a/src/soc/rockchip/rk3288/include/soc/pmu.h
+++ b/src/soc/rockchip/rk3288/include/soc/pmu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_PMU_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/pwm.h b/src/soc/rockchip/rk3288/include/soc/pwm.h
index 0240556..f4a2015 100644
--- a/src/soc/rockchip/rk3288/include/soc/pwm.h
+++ b/src/soc/rockchip/rk3288/include/soc/pwm.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_PWM_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/rk808.h b/src/soc/rockchip/rk3288/include/soc/rk808.h
index 6ab50fb..43379a0 100644
--- a/src/soc/rockchip/rk3288/include/soc/rk808.h
+++ b/src/soc/rockchip/rk3288/include/soc/rk808.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_PMIC_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/sdram.h b/src/soc/rockchip/rk3288/include/soc/sdram.h
index 276e7aa..4ccb065 100644
--- a/src/soc/rockchip/rk3288/include/soc/sdram.h
+++ b/src/soc/rockchip/rk3288/include/soc/sdram.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_SDRAM_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/soc.h b/src/soc/rockchip/rk3288/include/soc/soc.h
index 5fb1e8d..be6f819 100644
--- a/src/soc/rockchip/rk3288/include/soc/soc.h
+++ b/src/soc/rockchip/rk3288/include/soc/soc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_CPU_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/spi.h b/src/soc/rockchip/rk3288/include/soc/spi.h
index 3bd8bf6..80a22d3 100644
--- a/src/soc/rockchip/rk3288/include/soc/spi.h
+++ b/src/soc/rockchip/rk3288/include/soc/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_SPI_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/timer.h b/src/soc/rockchip/rk3288/include/soc/timer.h
index 6ef31fd..f232be9 100644
--- a/src/soc/rockchip/rk3288/include/soc/timer.h
+++ b/src/soc/rockchip/rk3288/include/soc/timer.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_TIMER_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/tsadc.h b/src/soc/rockchip/rk3288/include/soc/tsadc.h
index 5d8a523..ce246d6 100644
--- a/src/soc/rockchip/rk3288/include/soc/tsadc.h
+++ b/src/soc/rockchip/rk3288/include/soc/tsadc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SOC_ROCKCHIP_RK3288_TSADC_H__
diff --git a/src/soc/rockchip/rk3288/include/soc/vop.h b/src/soc/rockchip/rk3288/include/soc/vop.h
index 6df4c60..388b322 100644
--- a/src/soc/rockchip/rk3288/include/soc/vop.h
+++ b/src/soc/rockchip/rk3288/include/soc/vop.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _RK3288_LCD_H_
diff --git a/src/soc/rockchip/rk3288/pwm.c b/src/soc/rockchip/rk3288/pwm.c
index 2510cd7..3872049 100644
--- a/src/soc/rockchip/rk3288/pwm.c
+++ b/src/soc/rockchip/rk3288/pwm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/rk808.c b/src/soc/rockchip/rk3288/rk808.c
index 477e5d9..8724a7f 100644
--- a/src/soc/rockchip/rk3288/rk808.c
+++ b/src/soc/rockchip/rk3288/rk808.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/rockchip/rk3288/sdram.c b/src/soc/rockchip/rk3288/sdram.c
index ad1dfed..085fecd 100644
--- a/src/soc/rockchip/rk3288/sdram.c
+++ b/src/soc/rockchip/rk3288/sdram.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <arch/io.h>
 #include <console/console.h>
diff --git a/src/soc/rockchip/rk3288/soc.c b/src/soc/rockchip/rk3288/soc.c
index a9484b4..b865c61 100644
--- a/src/soc/rockchip/rk3288/soc.c
+++ b/src/soc/rockchip/rk3288/soc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/rockchip/rk3288/software_i2c.c b/src/soc/rockchip/rk3288/software_i2c.c
index 3651923..5465b9d 100644
--- a/src/soc/rockchip/rk3288/software_i2c.c
+++ b/src/soc/rockchip/rk3288/software_i2c.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/spi.c b/src/soc/rockchip/rk3288/spi.c
index fc75851..70702b7 100644
--- a/src/soc/rockchip/rk3288/spi.c
+++ b/src/soc/rockchip/rk3288/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/timer.c b/src/soc/rockchip/rk3288/timer.c
index a6dfe26..582da50 100644
--- a/src/soc/rockchip/rk3288/timer.c
+++ b/src/soc/rockchip/rk3288/timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/tsadc.c b/src/soc/rockchip/rk3288/tsadc.c
index 8461e3e..8522cc1 100644
--- a/src/soc/rockchip/rk3288/tsadc.c
+++ b/src/soc/rockchip/rk3288/tsadc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/uart.c b/src/soc/rockchip/rk3288/uart.c
index 136643f..581b41b 100644
--- a/src/soc/rockchip/rk3288/uart.c
+++ b/src/soc/rockchip/rk3288/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/rockchip/rk3288/vop.c b/src/soc/rockchip/rk3288/vop.c
index 784c6c7..c55f0bc 100644
--- a/src/soc/rockchip/rk3288/vop.c
+++ b/src/soc/rockchip/rk3288/vop.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/alternate_cbfs.c b/src/soc/samsung/exynos5250/alternate_cbfs.c
index cb69921..038ec2c 100644
--- a/src/soc/samsung/exynos5250/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5250/alternate_cbfs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/samsung/exynos5250/bootblock.c b/src/soc/samsung/exynos5250/bootblock.c
index ef03d714..744fe1c 100644
--- a/src/soc/samsung/exynos5250/bootblock.c
+++ b/src/soc/samsung/exynos5250/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootblock_common.h>
diff --git a/src/soc/samsung/exynos5250/cbmem.c b/src/soc/samsung/exynos5250/cbmem.c
index 6f7967a..989add1 100644
--- a/src/soc/samsung/exynos5250/cbmem.c
+++ b/src/soc/samsung/exynos5250/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/soc/samsung/exynos5250/chip.h b/src/soc/samsung/exynos5250/chip.h
index bfc3afe..a328c60 100644
--- a/src/soc/samsung/exynos5250/chip.h
+++ b/src/soc/samsung/exynos5250/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_H
diff --git a/src/soc/samsung/exynos5250/clock.c b/src/soc/samsung/exynos5250/clock.c
index 7ca867a..2aa5ea5 100644
--- a/src/soc/samsung/exynos5250/clock.c
+++ b/src/soc/samsung/exynos5250/clock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/clock_init.c b/src/soc/samsung/exynos5250/clock_init.c
index 0733957..518b4e6 100644
--- a/src/soc/samsung/exynos5250/clock_init.c
+++ b/src/soc/samsung/exynos5250/clock_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Clock setup for SMDK5250 board based on EXYNOS5 */
diff --git a/src/soc/samsung/exynos5250/cpu.c b/src/soc/samsung/exynos5250/cpu.c
index acf29ba..e665669 100644
--- a/src/soc/samsung/exynos5250/cpu.c
+++ b/src/soc/samsung/exynos5250/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/samsung/exynos5250/dmc_common.c b/src/soc/samsung/exynos5250/dmc_common.c
index 4323d4a..b67c381 100644
--- a/src/soc/samsung/exynos5250/dmc_common.c
+++ b/src/soc/samsung/exynos5250/dmc_common.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Mem setup common file for different types of DDR present on SMDK5250 boards.
diff --git a/src/soc/samsung/exynos5250/dmc_init_ddr3.c b/src/soc/samsung/exynos5250/dmc_init_ddr3.c
index 8a800b0..ab3efff 100644
--- a/src/soc/samsung/exynos5250/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5250/dmc_init_ddr3.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* DDR3 mem setup file for SMDK5250 board based on EXYNOS5 */
diff --git a/src/soc/samsung/exynos5250/dp-reg.c b/src/soc/samsung/exynos5250/dp-reg.c
index 3e65992..9aa0640 100644
--- a/src/soc/samsung/exynos5250/dp-reg.c
+++ b/src/soc/samsung/exynos5250/dp-reg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Samsung DP (Display port) register interface driver. */
diff --git a/src/soc/samsung/exynos5250/fb.c b/src/soc/samsung/exynos5250/fb.c
index 0a722c0..cd8b7fb 100644
--- a/src/soc/samsung/exynos5250/fb.c
+++ b/src/soc/samsung/exynos5250/fb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* LCD driver for Exynos */
diff --git a/src/soc/samsung/exynos5250/gpio.c b/src/soc/samsung/exynos5250/gpio.c
index 7e57a47..1dc33fc 100644
--- a/src/soc/samsung/exynos5250/gpio.c
+++ b/src/soc/samsung/exynos5250/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/samsung/exynos5250/i2c.c b/src/soc/samsung/exynos5250/i2c.c
index 624c145..6aa11ad 100644
--- a/src/soc/samsung/exynos5250/i2c.c
+++ b/src/soc/samsung/exynos5250/i2c.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h b/src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h
index df5cf21..eafd93c 100644
--- a/src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h
+++ b/src/soc/samsung/exynos5250/include/soc/alternate_cbfs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_ALTERNATE_CBFS_H
diff --git a/src/soc/samsung/exynos5250/include/soc/clk.h b/src/soc/samsung/exynos5250/include/soc/clk.h
index 9e76baa..b579421 100644
--- a/src/soc/samsung/exynos5250/include/soc/clk.h
+++ b/src/soc/samsung/exynos5250/include/soc/clk.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_CLK_H
diff --git a/src/soc/samsung/exynos5250/include/soc/cpu.h b/src/soc/samsung/exynos5250/include/soc/cpu.h
index 0343cb6..2ff57b3 100644
--- a/src/soc/samsung/exynos5250/include/soc/cpu.h
+++ b/src/soc/samsung/exynos5250/include/soc/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_CPU_H
diff --git a/src/soc/samsung/exynos5250/include/soc/dmc.h b/src/soc/samsung/exynos5250/include/soc/dmc.h
index 0b4849f..5fd99dc 100644
--- a/src/soc/samsung/exynos5250/include/soc/dmc.h
+++ b/src/soc/samsung/exynos5250/include/soc/dmc.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_DMC_H
diff --git a/src/soc/samsung/exynos5250/include/soc/dp-core.h b/src/soc/samsung/exynos5250/include/soc/dp-core.h
index 84d20bf..9d20ba0 100644
--- a/src/soc/samsung/exynos5250/include/soc/dp-core.h
+++ b/src/soc/samsung/exynos5250/include/soc/dp-core.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Header file for Samsung DP (Display Port) interface driver. */
diff --git a/src/soc/samsung/exynos5250/include/soc/dp.h b/src/soc/samsung/exynos5250/include/soc/dp.h
index e6a3298..8c6f4b5 100644
--- a/src/soc/samsung/exynos5250/include/soc/dp.h
+++ b/src/soc/samsung/exynos5250/include/soc/dp.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 DP */
diff --git a/src/soc/samsung/exynos5250/include/soc/dsim.h b/src/soc/samsung/exynos5250/include/soc/dsim.h
index 43f15d3..93ddcaf 100644
--- a/src/soc/samsung/exynos5250/include/soc/dsim.h
+++ b/src/soc/samsung/exynos5250/include/soc/dsim.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 MIPI-DSIM */
diff --git a/src/soc/samsung/exynos5250/include/soc/fimd.h b/src/soc/samsung/exynos5250/include/soc/fimd.h
index 556bcd9..e7c2455 100644
--- a/src/soc/samsung/exynos5250/include/soc/fimd.h
+++ b/src/soc/samsung/exynos5250/include/soc/fimd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 FIMD */
diff --git a/src/soc/samsung/exynos5250/include/soc/gpio.h b/src/soc/samsung/exynos5250/include/soc/gpio.h
index 6aa4354..9b64cdb 100644
--- a/src/soc/samsung/exynos5250/include/soc/gpio.h
+++ b/src/soc/samsung/exynos5250/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_GPIO_H
diff --git a/src/soc/samsung/exynos5250/include/soc/i2c.h b/src/soc/samsung/exynos5250/include/soc/i2c.h
index d559a08..45885e7 100644
--- a/src/soc/samsung/exynos5250/include/soc/i2c.h
+++ b/src/soc/samsung/exynos5250/include/soc/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_I2C_H
diff --git a/src/soc/samsung/exynos5250/include/soc/i2s-regs.h b/src/soc/samsung/exynos5250/include/soc/i2s-regs.h
index d122738..0997fcb 100644
--- a/src/soc/samsung/exynos5250/include/soc/i2s-regs.h
+++ b/src/soc/samsung/exynos5250/include/soc/i2s-regs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Taken from the kernel code */
diff --git a/src/soc/samsung/exynos5250/include/soc/memlayout.ld b/src/soc/samsung/exynos5250/include/soc/memlayout.ld
index 4469078..fb94c2c 100644
--- a/src/soc/samsung/exynos5250/include/soc/memlayout.ld
+++ b/src/soc/samsung/exynos5250/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/samsung/exynos5250/include/soc/periph.h b/src/soc/samsung/exynos5250/include/soc/periph.h
index f6a5a38..6a45e39 100644
--- a/src/soc/samsung/exynos5250/include/soc/periph.h
+++ b/src/soc/samsung/exynos5250/include/soc/periph.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_PERIPH_H
diff --git a/src/soc/samsung/exynos5250/include/soc/pinmux.h b/src/soc/samsung/exynos5250/include/soc/pinmux.h
index 34a8aa5..b277fdb 100644
--- a/src/soc/samsung/exynos5250/include/soc/pinmux.h
+++ b/src/soc/samsung/exynos5250/include/soc/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_PINMUX_H
diff --git a/src/soc/samsung/exynos5250/include/soc/power.h b/src/soc/samsung/exynos5250/include/soc/power.h
index 503d628..36f26b5 100644
--- a/src/soc/samsung/exynos5250/include/soc/power.h
+++ b/src/soc/samsung/exynos5250/include/soc/power.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 PMU */
diff --git a/src/soc/samsung/exynos5250/include/soc/setup.h b/src/soc/samsung/exynos5250/include/soc/setup.h
index 289745b..66e1d0e 100644
--- a/src/soc/samsung/exynos5250/include/soc/setup.h
+++ b/src/soc/samsung/exynos5250/include/soc/setup.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Machine Specific Values for SMDK5250 board based on Exynos5 */
diff --git a/src/soc/samsung/exynos5250/include/soc/spi.h b/src/soc/samsung/exynos5250/include/soc/spi.h
index 298db1a..a202aee 100644
--- a/src/soc/samsung/exynos5250/include/soc/spi.h
+++ b/src/soc/samsung/exynos5250/include/soc/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_SPI_H
diff --git a/src/soc/samsung/exynos5250/include/soc/sysreg.h b/src/soc/samsung/exynos5250/include/soc/sysreg.h
index c60d0cf..33f233d 100644
--- a/src/soc/samsung/exynos5250/include/soc/sysreg.h
+++ b/src/soc/samsung/exynos5250/include/soc/sysreg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 sysreg */
diff --git a/src/soc/samsung/exynos5250/include/soc/tmu.h b/src/soc/samsung/exynos5250/include/soc/tmu.h
index 6489b6b..5a5ecf8 100644
--- a/src/soc/samsung/exynos5250/include/soc/tmu.h
+++ b/src/soc/samsung/exynos5250/include/soc/tmu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* EXYNOS - Thermal Management Unit */
diff --git a/src/soc/samsung/exynos5250/include/soc/trustzone.h b/src/soc/samsung/exynos5250/include/soc/trustzone.h
index 6d27da3..f188433 100644
--- a/src/soc/samsung/exynos5250/include/soc/trustzone.h
+++ b/src/soc/samsung/exynos5250/include/soc/trustzone.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_TRUSTZONE_H
diff --git a/src/soc/samsung/exynos5250/include/soc/uart.h b/src/soc/samsung/exynos5250/include/soc/uart.h
index fca70bd..d647ca0 100644
--- a/src/soc/samsung/exynos5250/include/soc/uart.h
+++ b/src/soc/samsung/exynos5250/include/soc/uart.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_UART_H
diff --git a/src/soc/samsung/exynos5250/include/soc/usb.h b/src/soc/samsung/exynos5250/include/soc/usb.h
index 972f47d..04000ca 100644
--- a/src/soc/samsung/exynos5250/include/soc/usb.h
+++ b/src/soc/samsung/exynos5250/include/soc/usb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_USB_H
diff --git a/src/soc/samsung/exynos5250/include/soc/wakeup.h b/src/soc/samsung/exynos5250/include/soc/wakeup.h
index 4b1f08b..0e7ee30 100644
--- a/src/soc/samsung/exynos5250/include/soc/wakeup.h
+++ b/src/soc/samsung/exynos5250/include/soc/wakeup.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5250_WAKEUP_H
diff --git a/src/soc/samsung/exynos5250/pinmux.c b/src/soc/samsung/exynos5250/pinmux.c
index 55c83e5..3c982c8 100644
--- a/src/soc/samsung/exynos5250/pinmux.c
+++ b/src/soc/samsung/exynos5250/pinmux.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/samsung/exynos5250/power.c b/src/soc/samsung/exynos5250/power.c
index aa43a9c..e1fba3e 100644
--- a/src/soc/samsung/exynos5250/power.c
+++ b/src/soc/samsung/exynos5250/power.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Power setup code for EXYNOS5 */
diff --git a/src/soc/samsung/exynos5250/spi.c b/src/soc/samsung/exynos5250/spi.c
index adf31e4..6a0854e 100644
--- a/src/soc/samsung/exynos5250/spi.c
+++ b/src/soc/samsung/exynos5250/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/timer.c b/src/soc/samsung/exynos5250/timer.c
index c8827ef..597e033 100644
--- a/src/soc/samsung/exynos5250/timer.c
+++ b/src/soc/samsung/exynos5250/timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/tmu.c b/src/soc/samsung/exynos5250/tmu.c
index 35aa00d..7415ab2 100644
--- a/src/soc/samsung/exynos5250/tmu.c
+++ b/src/soc/samsung/exynos5250/tmu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* EXYNOS - Thermal Management Unit */
diff --git a/src/soc/samsung/exynos5250/trustzone.c b/src/soc/samsung/exynos5250/trustzone.c
index d636dfc..5a78e01 100644
--- a/src/soc/samsung/exynos5250/trustzone.c
+++ b/src/soc/samsung/exynos5250/trustzone.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/uart.c b/src/soc/samsung/exynos5250/uart.c
index 26e083b..330ac01 100644
--- a/src/soc/samsung/exynos5250/uart.c
+++ b/src/soc/samsung/exynos5250/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/usb.c b/src/soc/samsung/exynos5250/usb.c
index eabe682..acd45fd 100644
--- a/src/soc/samsung/exynos5250/usb.c
+++ b/src/soc/samsung/exynos5250/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5250/wakeup.c b/src/soc/samsung/exynos5250/wakeup.c
index a0a3fd4..9921f0a 100644
--- a/src/soc/samsung/exynos5250/wakeup.c
+++ b/src/soc/samsung/exynos5250/wakeup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/soc/samsung/exynos5420/alternate_cbfs.c b/src/soc/samsung/exynos5420/alternate_cbfs.c
index f3e7504..cf79f45 100644
--- a/src/soc/samsung/exynos5420/alternate_cbfs.c
+++ b/src/soc/samsung/exynos5420/alternate_cbfs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/soc/samsung/exynos5420/bootblock.c b/src/soc/samsung/exynos5420/bootblock.c
index 3730c6e..df51419 100644
--- a/src/soc/samsung/exynos5420/bootblock.c
+++ b/src/soc/samsung/exynos5420/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/samsung/exynos5420/cbmem.c b/src/soc/samsung/exynos5420/cbmem.c
index 6f5aca1..cdfe0d3 100644
--- a/src/soc/samsung/exynos5420/cbmem.c
+++ b/src/soc/samsung/exynos5420/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/soc/samsung/exynos5420/chip.h b/src/soc/samsung/exynos5420/chip.h
index a43711d..9ff7502 100644
--- a/src/soc/samsung/exynos5420/chip.h
+++ b/src/soc/samsung/exynos5420/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_H
diff --git a/src/soc/samsung/exynos5420/clock.c b/src/soc/samsung/exynos5420/clock.c
index 6e1420c..911697f 100644
--- a/src/soc/samsung/exynos5420/clock.c
+++ b/src/soc/samsung/exynos5420/clock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/clock_init.c b/src/soc/samsung/exynos5420/clock_init.c
index b91cc3c..3325994 100644
--- a/src/soc/samsung/exynos5420/clock_init.c
+++ b/src/soc/samsung/exynos5420/clock_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Clock setup for SMDK5420 board based on EXYNOS5 */
diff --git a/src/soc/samsung/exynos5420/cpu.c b/src/soc/samsung/exynos5420/cpu.c
index 0d479b2..5b8bfe7 100644
--- a/src/soc/samsung/exynos5420/cpu.c
+++ b/src/soc/samsung/exynos5420/cpu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/samsung/exynos5420/dmc_common.c b/src/soc/samsung/exynos5420/dmc_common.c
index 3fe8fb1..b0f1a84 100644
--- a/src/soc/samsung/exynos5420/dmc_common.c
+++ b/src/soc/samsung/exynos5420/dmc_common.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Mem setup common file for different types of DDR present on SMDK5420 boards.
diff --git a/src/soc/samsung/exynos5420/dmc_init_ddr3.c b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
index 7f3d55f..4cf6ce6 100644
--- a/src/soc/samsung/exynos5420/dmc_init_ddr3.c
+++ b/src/soc/samsung/exynos5420/dmc_init_ddr3.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/dp.c b/src/soc/samsung/exynos5420/dp.c
index cdad2c3..980ad9f 100644
--- a/src/soc/samsung/exynos5420/dp.c
+++ b/src/soc/samsung/exynos5420/dp.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/dp_lowlevel.c b/src/soc/samsung/exynos5420/dp_lowlevel.c
index be8cbcd..76955e0 100644
--- a/src/soc/samsung/exynos5420/dp_lowlevel.c
+++ b/src/soc/samsung/exynos5420/dp_lowlevel.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/fimd.c b/src/soc/samsung/exynos5420/fimd.c
index 4a8826a..acca8ce 100644
--- a/src/soc/samsung/exynos5420/fimd.c
+++ b/src/soc/samsung/exynos5420/fimd.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/gpio.c b/src/soc/samsung/exynos5420/gpio.c
index 7918bc6..a7a1666 100644
--- a/src/soc/samsung/exynos5420/gpio.c
+++ b/src/soc/samsung/exynos5420/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/samsung/exynos5420/i2c.c b/src/soc/samsung/exynos5420/i2c.c
index a2acd02..4f4f09d 100644
--- a/src/soc/samsung/exynos5420/i2c.c
+++ b/src/soc/samsung/exynos5420/i2c.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h b/src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h
index eedea41..82b5111 100644
--- a/src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h
+++ b/src/soc/samsung/exynos5420/include/soc/alternate_cbfs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_ALTERNATE_CBFS_H
diff --git a/src/soc/samsung/exynos5420/include/soc/clk.h b/src/soc/samsung/exynos5420/include/soc/clk.h
index 48585f6..b67f5f7 100644
--- a/src/soc/samsung/exynos5420/include/soc/clk.h
+++ b/src/soc/samsung/exynos5420/include/soc/clk.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_CLK_H
diff --git a/src/soc/samsung/exynos5420/include/soc/cpu.h b/src/soc/samsung/exynos5420/include/soc/cpu.h
index 806436b..a741865 100644
--- a/src/soc/samsung/exynos5420/include/soc/cpu.h
+++ b/src/soc/samsung/exynos5420/include/soc/cpu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_CPU_H
diff --git a/src/soc/samsung/exynos5420/include/soc/dmc.h b/src/soc/samsung/exynos5420/include/soc/dmc.h
index 7dc3214..1bca574 100644
--- a/src/soc/samsung/exynos5420/include/soc/dmc.h
+++ b/src/soc/samsung/exynos5420/include/soc/dmc.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_DMC_H
diff --git a/src/soc/samsung/exynos5420/include/soc/dp.h b/src/soc/samsung/exynos5420/include/soc/dp.h
index ccec6dd..fe61037 100644
--- a/src/soc/samsung/exynos5420/include/soc/dp.h
+++ b/src/soc/samsung/exynos5420/include/soc/dp.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 DP */
diff --git a/src/soc/samsung/exynos5420/include/soc/dsim.h b/src/soc/samsung/exynos5420/include/soc/dsim.h
index b0a62da..4404ab3 100644
--- a/src/soc/samsung/exynos5420/include/soc/dsim.h
+++ b/src/soc/samsung/exynos5420/include/soc/dsim.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 MIPI-DSIM */
diff --git a/src/soc/samsung/exynos5420/include/soc/fimd.h b/src/soc/samsung/exynos5420/include/soc/fimd.h
index af9a364..b653f7f 100644
--- a/src/soc/samsung/exynos5420/include/soc/fimd.h
+++ b/src/soc/samsung/exynos5420/include/soc/fimd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 FIMD */
diff --git a/src/soc/samsung/exynos5420/include/soc/gpio.h b/src/soc/samsung/exynos5420/include/soc/gpio.h
index a71e298..4daf872 100644
--- a/src/soc/samsung/exynos5420/include/soc/gpio.h
+++ b/src/soc/samsung/exynos5420/include/soc/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_GPIO_H
diff --git a/src/soc/samsung/exynos5420/include/soc/i2c.h b/src/soc/samsung/exynos5420/include/soc/i2c.h
index b4eb978..3ae69f9 100644
--- a/src/soc/samsung/exynos5420/include/soc/i2c.h
+++ b/src/soc/samsung/exynos5420/include/soc/i2c.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_I2C_H
diff --git a/src/soc/samsung/exynos5420/include/soc/i2s-regs.h b/src/soc/samsung/exynos5420/include/soc/i2s-regs.h
index ed8c790..cf7cbdd 100644
--- a/src/soc/samsung/exynos5420/include/soc/i2s-regs.h
+++ b/src/soc/samsung/exynos5420/include/soc/i2s-regs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Taken from the kernel code */
diff --git a/src/soc/samsung/exynos5420/include/soc/memlayout.ld b/src/soc/samsung/exynos5420/include/soc/memlayout.ld
index 00583d0..aec6b30 100644
--- a/src/soc/samsung/exynos5420/include/soc/memlayout.ld
+++ b/src/soc/samsung/exynos5420/include/soc/memlayout.ld
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <memlayout.h>
diff --git a/src/soc/samsung/exynos5420/include/soc/periph.h b/src/soc/samsung/exynos5420/include/soc/periph.h
index dcc9143..ccd927c 100644
--- a/src/soc/samsung/exynos5420/include/soc/periph.h
+++ b/src/soc/samsung/exynos5420/include/soc/periph.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_PERIPH_H
diff --git a/src/soc/samsung/exynos5420/include/soc/pinmux.h b/src/soc/samsung/exynos5420/include/soc/pinmux.h
index a3607a1..7a16a75 100644
--- a/src/soc/samsung/exynos5420/include/soc/pinmux.h
+++ b/src/soc/samsung/exynos5420/include/soc/pinmux.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_PINMUX_H
diff --git a/src/soc/samsung/exynos5420/include/soc/power.h b/src/soc/samsung/exynos5420/include/soc/power.h
index b259bc4..f76ff46 100644
--- a/src/soc/samsung/exynos5420/include/soc/power.h
+++ b/src/soc/samsung/exynos5420/include/soc/power.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 PMU */
diff --git a/src/soc/samsung/exynos5420/include/soc/setup.h b/src/soc/samsung/exynos5420/include/soc/setup.h
index 80ac4ec..fe281ec 100644
--- a/src/soc/samsung/exynos5420/include/soc/setup.h
+++ b/src/soc/samsung/exynos5420/include/soc/setup.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Machine Specific Values for SMDK5420 board based on Exynos5 */
diff --git a/src/soc/samsung/exynos5420/include/soc/spi.h b/src/soc/samsung/exynos5420/include/soc/spi.h
index 77d5ffc..f0fac24 100644
--- a/src/soc/samsung/exynos5420/include/soc/spi.h
+++ b/src/soc/samsung/exynos5420/include/soc/spi.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_SPI_H
diff --git a/src/soc/samsung/exynos5420/include/soc/sysreg.h b/src/soc/samsung/exynos5420/include/soc/sysreg.h
index d57033b..9af2033 100644
--- a/src/soc/samsung/exynos5420/include/soc/sysreg.h
+++ b/src/soc/samsung/exynos5420/include/soc/sysreg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Register map for Exynos5 sysreg */
diff --git a/src/soc/samsung/exynos5420/include/soc/tmu.h b/src/soc/samsung/exynos5420/include/soc/tmu.h
index 8394a88..6d54d36 100644
--- a/src/soc/samsung/exynos5420/include/soc/tmu.h
+++ b/src/soc/samsung/exynos5420/include/soc/tmu.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* EXYNOS - Thermal Management Unit */
diff --git a/src/soc/samsung/exynos5420/include/soc/trustzone.h b/src/soc/samsung/exynos5420/include/soc/trustzone.h
index d0315a7..691f66a 100644
--- a/src/soc/samsung/exynos5420/include/soc/trustzone.h
+++ b/src/soc/samsung/exynos5420/include/soc/trustzone.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_TRUSTZONE_H
diff --git a/src/soc/samsung/exynos5420/include/soc/uart.h b/src/soc/samsung/exynos5420/include/soc/uart.h
index 0cb78f0..ce34133 100644
--- a/src/soc/samsung/exynos5420/include/soc/uart.h
+++ b/src/soc/samsung/exynos5420/include/soc/uart.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_UART_H
diff --git a/src/soc/samsung/exynos5420/include/soc/usb.h b/src/soc/samsung/exynos5420/include/soc/usb.h
index 72ccfd7..1ca2be1 100644
--- a/src/soc/samsung/exynos5420/include/soc/usb.h
+++ b/src/soc/samsung/exynos5420/include/soc/usb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_USB_H
diff --git a/src/soc/samsung/exynos5420/include/soc/wakeup.h b/src/soc/samsung/exynos5420/include/soc/wakeup.h
index affb605..1e2e7d9 100644
--- a/src/soc/samsung/exynos5420/include/soc/wakeup.h
+++ b/src/soc/samsung/exynos5420/include/soc/wakeup.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CPU_SAMSUNG_EXYNOS5420_WAKEUP_H
diff --git a/src/soc/samsung/exynos5420/pinmux.c b/src/soc/samsung/exynos5420/pinmux.c
index f54b70d..17d9cd1 100644
--- a/src/soc/samsung/exynos5420/pinmux.c
+++ b/src/soc/samsung/exynos5420/pinmux.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assert.h>
diff --git a/src/soc/samsung/exynos5420/power.c b/src/soc/samsung/exynos5420/power.c
index aa43a9c..e1fba3e 100644
--- a/src/soc/samsung/exynos5420/power.c
+++ b/src/soc/samsung/exynos5420/power.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Power setup code for EXYNOS5 */
diff --git a/src/soc/samsung/exynos5420/smp.c b/src/soc/samsung/exynos5420/smp.c
index db6aa92..a0732a9 100644
--- a/src/soc/samsung/exynos5420/smp.c
+++ b/src/soc/samsung/exynos5420/smp.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cpu.h>
diff --git a/src/soc/samsung/exynos5420/spi.c b/src/soc/samsung/exynos5420/spi.c
index 2edc337..30d8516 100644
--- a/src/soc/samsung/exynos5420/spi.c
+++ b/src/soc/samsung/exynos5420/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/timer.c b/src/soc/samsung/exynos5420/timer.c
index c8827ef..597e033 100644
--- a/src/soc/samsung/exynos5420/timer.c
+++ b/src/soc/samsung/exynos5420/timer.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/tmu.c b/src/soc/samsung/exynos5420/tmu.c
index 54629e9..4d828d8 100644
--- a/src/soc/samsung/exynos5420/tmu.c
+++ b/src/soc/samsung/exynos5420/tmu.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* EXYNOS - Thermal Management Unit */
diff --git a/src/soc/samsung/exynos5420/trustzone.c b/src/soc/samsung/exynos5420/trustzone.c
index 6ade3e4..dc5c9cd 100644
--- a/src/soc/samsung/exynos5420/trustzone.c
+++ b/src/soc/samsung/exynos5420/trustzone.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/uart.c b/src/soc/samsung/exynos5420/uart.c
index eaca022..4421b16 100644
--- a/src/soc/samsung/exynos5420/uart.c
+++ b/src/soc/samsung/exynos5420/uart.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/usb.c b/src/soc/samsung/exynos5420/usb.c
index 916fffc..ab9f4bb 100644
--- a/src/soc/samsung/exynos5420/usb.c
+++ b/src/soc/samsung/exynos5420/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/soc/samsung/exynos5420/wakeup.c b/src/soc/samsung/exynos5420/wakeup.c
index c427c5d..88ff413 100644
--- a/src/soc/samsung/exynos5420/wakeup.c
+++ b/src/soc/samsung/exynos5420/wakeup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/cache.h>
diff --git a/src/soc/ucb/riscv/cbmem.c b/src/soc/ucb/riscv/cbmem.c
index d3d68a7..f99c69d 100644
--- a/src/soc/ucb/riscv/cbmem.c
+++ b/src/soc/ucb/riscv/cbmem.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/southbridge/amd/agesa/Kconfig b/src/southbridge/amd/agesa/Kconfig
index 98f2c74..c735b51 100644
--- a/src/southbridge/amd/agesa/Kconfig
+++ b/src/southbridge/amd/agesa/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 source src/southbridge/amd/agesa/hudson/Kconfig
diff --git a/src/southbridge/amd/agesa/Makefile.inc b/src/southbridge/amd/agesa/Makefile.inc
index 4a09eff..49dd23b 100644
--- a/src/southbridge/amd/agesa/Makefile.inc
+++ b/src/southbridge/amd/agesa/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_AGESA_HUDSON) += hudson
diff --git a/src/southbridge/amd/agesa/hudson/Kconfig b/src/southbridge/amd/agesa/hudson/Kconfig
index 610e1fd..45c31b5 100644
--- a/src/southbridge/amd/agesa/hudson/Kconfig
+++ b/src/southbridge/amd/agesa/hudson/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/southbridge/amd/agesa/hudson/acpi/audio.asl b/src/southbridge/amd/agesa/hudson/acpi/audio.asl
index 8caf1aa..0fee21c 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/audio.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(AZHD) {	/* 0:14.2 - HD Audio */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/fch.asl b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
index 6006e67..17e421d 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/fch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* South Bridge */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/lpc.asl b/src/southbridge/amd/agesa/hudson/acpi/lpc.asl
index 35b4d9d..8227a3f 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/lpc.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/lpc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* 0:14.3 - LPC */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl
index 1b41337..fe7439f 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/pci_int.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* PCIe Configuration Space for CONFIG_MMCONF_BUS_NUMBER busses */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/pcie.asl b/src/southbridge/amd/agesa/hudson/acpi/pcie.asl
index dbf4ccb..22a1282 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/pcie.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/pcie.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* PCI IRQ mapping registers, C00h-C01h. */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/sleepstates.asl b/src/southbridge/amd/agesa/hudson/acpi/sleepstates.asl
index c5e3038..22299bf 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/sleepstates.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Supported sleep states: */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/smbus.asl b/src/southbridge/amd/agesa/hudson/acpi/smbus.asl
index 744ff46..b7cd85e 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/smbus.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/smbus.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMBus Support */
diff --git a/src/southbridge/amd/agesa/hudson/acpi/usb.asl b/src/southbridge/amd/agesa/hudson/acpi/usb.asl
index 45e2b07..95af0da 100644
--- a/src/southbridge/amd/agesa/hudson/acpi/usb.asl
+++ b/src/southbridge/amd/agesa/hudson/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* 0:12.0 - OHCI */
diff --git a/src/southbridge/amd/agesa/hudson/agesawrapper.c b/src/southbridge/amd/agesa/hudson/agesawrapper.c
index b98d7b4..b0ae1fe 100644
--- a/src/southbridge/amd/agesa/hudson/agesawrapper.c
+++ b/src/southbridge/amd/agesa/hudson/agesawrapper.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/agesa/hudson/amd_pci_int_defs.h b/src/southbridge/amd/agesa/hudson/amd_pci_int_defs.h
index 1a56f18..b1a61d5 100644
--- a/src/southbridge/amd/agesa/hudson/amd_pci_int_defs.h
+++ b/src/southbridge/amd/agesa/hudson/amd_pci_int_defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_DEFS_H
diff --git a/src/southbridge/amd/agesa/hudson/amd_pci_int_types.h b/src/southbridge/amd/agesa/hudson/amd_pci_int_types.h
index 5174de6..ff6d992 100644
--- a/src/southbridge/amd/agesa/hudson/amd_pci_int_types.h
+++ b/src/southbridge/amd/agesa/hudson/amd_pci_int_types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_TYPES_H
diff --git a/src/southbridge/amd/agesa/hudson/bootblock.c b/src/southbridge/amd/agesa/hudson/bootblock.c
index 2e76b08..1dcbadf 100644
--- a/src/southbridge/amd/agesa/hudson/bootblock.c
+++ b/src/southbridge/amd/agesa/hudson/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/agesa/hudson/chip.h b/src/southbridge/amd/agesa/hudson/chip.h
index fa73ebc..36f8015 100644
--- a/src/southbridge/amd/agesa/hudson/chip.h
+++ b/src/southbridge/amd/agesa/hudson/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_CHIP_H
diff --git a/src/southbridge/amd/agesa/hudson/early_setup.c b/src/southbridge/amd/agesa/hudson/early_setup.c
index 6694fbe..b15e8e2 100644
--- a/src/southbridge/amd/agesa/hudson/early_setup.c
+++ b/src/southbridge/amd/agesa/hudson/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _HUDSON_EARLY_SETUP_C_
diff --git a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
index c699831..34ea3b8 100644
--- a/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/agesa/hudson/enable_usbdebug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/agesa/hudson/fadt.c b/src/southbridge/amd/agesa/hudson/fadt.c
index cef10b1..bf6ef35 100644
--- a/src/southbridge/amd/agesa/hudson/fadt.c
+++ b/src/southbridge/amd/agesa/hudson/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/agesa/hudson/hda.c b/src/southbridge/amd/agesa/hudson/hda.c
index 3002dc5..f79e9a0 100644
--- a/src/southbridge/amd/agesa/hudson/hda.c
+++ b/src/southbridge/amd/agesa/hudson/hda.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/hudson.c b/src/southbridge/amd/agesa/hudson/hudson.c
index cafd6c6..1a219b2 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.c
+++ b/src/southbridge/amd/agesa/hudson/hudson.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/hudson.h b/src/southbridge/amd/agesa/hudson/hudson.h
index 1e29422..93d1d2e 100644
--- a/src/southbridge/amd/agesa/hudson/hudson.h
+++ b/src/southbridge/amd/agesa/hudson/hudson.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_H
diff --git a/src/southbridge/amd/agesa/hudson/ide.c b/src/southbridge/amd/agesa/hudson/ide.c
index a8455dd..4db3405 100644
--- a/src/southbridge/amd/agesa/hudson/ide.c
+++ b/src/southbridge/amd/agesa/hudson/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/imc.c b/src/southbridge/amd/agesa/hudson/imc.c
index ff49a80..5b12f2a 100644
--- a/src/southbridge/amd/agesa/hudson/imc.c
+++ b/src/southbridge/amd/agesa/hudson/imc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "imc.h"
diff --git a/src/southbridge/amd/agesa/hudson/imc.h b/src/southbridge/amd/agesa/hudson/imc.h
index 3420675..690f7b4 100644
--- a/src/southbridge/amd/agesa/hudson/imc.h
+++ b/src/southbridge/amd/agesa/hudson/imc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_IMC_H
diff --git a/src/southbridge/amd/agesa/hudson/lpc.c b/src/southbridge/amd/agesa/hudson/lpc.c
index c727fa9..e418f81 100644
--- a/src/southbridge/amd/agesa/hudson/lpc.c
+++ b/src/southbridge/amd/agesa/hudson/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/pci.c b/src/southbridge/amd/agesa/hudson/pci.c
index ce6039b..ed65ff4 100644
--- a/src/southbridge/amd/agesa/hudson/pci.c
+++ b/src/southbridge/amd/agesa/hudson/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/pci_devs.h b/src/southbridge/amd/agesa/hudson/pci_devs.h
index e34f249..33dad64 100644
--- a/src/southbridge/amd/agesa/hudson/pci_devs.h
+++ b/src/southbridge/amd/agesa/hudson/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AGESA_HUDSON_PCI_DEVS_H_
diff --git a/src/southbridge/amd/agesa/hudson/pcie.c b/src/southbridge/amd/agesa/hudson/pcie.c
index 1de1947..18aa638 100644
--- a/src/southbridge/amd/agesa/hudson/pcie.c
+++ b/src/southbridge/amd/agesa/hudson/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/ramtop.c b/src/southbridge/amd/agesa/hudson/ramtop.c
index d89a920..b6df583 100644
--- a/src/southbridge/amd/agesa/hudson/ramtop.c
+++ b/src/southbridge/amd/agesa/hudson/ramtop.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/agesa/hudson/reset.c b/src/southbridge/amd/agesa/hudson/reset.c
index f8850b1..03e3068 100644
--- a/src/southbridge/amd/agesa/hudson/reset.c
+++ b/src/southbridge/amd/agesa/hudson/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/agesa/hudson/resume.c b/src/southbridge/amd/agesa/hudson/resume.c
index 74a9ff8..8e3777b 100644
--- a/src/southbridge/amd/agesa/hudson/resume.c
+++ b/src/southbridge/amd/agesa/hudson/resume.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <Proc/Fch/FchPlatform.h>
diff --git a/src/southbridge/amd/agesa/hudson/sata.c b/src/southbridge/amd/agesa/hudson/sata.c
index 00c2a07..706cb38 100644
--- a/src/southbridge/amd/agesa/hudson/sata.c
+++ b/src/southbridge/amd/agesa/hudson/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/sd.c b/src/southbridge/amd/agesa/hudson/sd.c
index 765153b..43ebed7 100644
--- a/src/southbridge/amd/agesa/hudson/sd.c
+++ b/src/southbridge/amd/agesa/hudson/sd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/amd/agesa/hudson/sm.c b/src/southbridge/amd/agesa/hudson/sm.c
index 09fbf8b..4e9006a 100644
--- a/src/southbridge/amd/agesa/hudson/sm.c
+++ b/src/southbridge/amd/agesa/hudson/sm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/agesa/hudson/smbus.c b/src/southbridge/amd/agesa/hudson/smbus.c
index 3f19139..d31904d 100644
--- a/src/southbridge/amd/agesa/hudson/smbus.c
+++ b/src/southbridge/amd/agesa/hudson/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _HUDSON_SMBUS_C_
diff --git a/src/southbridge/amd/agesa/hudson/smbus.h b/src/southbridge/amd/agesa/hudson/smbus.h
index bf43104..f143488 100644
--- a/src/southbridge/amd/agesa/hudson/smbus.h
+++ b/src/southbridge/amd/agesa/hudson/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_SMBUS_H
diff --git a/src/southbridge/amd/agesa/hudson/smbus_spd.c b/src/southbridge/amd/agesa/hudson/smbus_spd.c
index d1956c7..76811cb 100644
--- a/src/southbridge/amd/agesa/hudson/smbus_spd.c
+++ b/src/southbridge/amd/agesa/hudson/smbus_spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/southbridge/amd/agesa/hudson/spi.c b/src/southbridge/amd/agesa/hudson/spi.c
index 95fffb8..5c8ed12 100644
--- a/src/southbridge/amd/agesa/hudson/spi.c
+++ b/src/southbridge/amd/agesa/hudson/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/southbridge/amd/agesa/hudson/usb.c b/src/southbridge/amd/agesa/hudson/usb.c
index 6438be1..5699b23 100644
--- a/src/southbridge/amd/agesa/hudson/usb.c
+++ b/src/southbridge/amd/agesa/hudson/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/amd8111/Kconfig b/src/southbridge/amd/amd8111/Kconfig
index 8f60986..37105e5 100644
--- a/src/southbridge/amd/amd8111/Kconfig
+++ b/src/southbridge/amd/amd8111/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/southbridge/amd/amd8111/bootblock.c b/src/southbridge/amd/amd8111/bootblock.c
index c8423fd..6bce538 100644
--- a/src/southbridge/amd/amd8111/bootblock.c
+++ b/src/southbridge/amd/amd8111/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/amd8131/Kconfig b/src/southbridge/amd/amd8131/Kconfig
index f3418dc..9b44109 100644
--- a/src/southbridge/amd/amd8131/Kconfig
+++ b/src/southbridge/amd/amd8131/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/southbridge/amd/amd8132/bridge.c b/src/southbridge/amd/amd8132/bridge.c
index 027a085..43191c1 100644
--- a/src/southbridge/amd/amd8132/bridge.c
+++ b/src/southbridge/amd/amd8132/bridge.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/amd8151/agp3.c b/src/southbridge/amd/amd8151/agp3.c
index bff5d75..71950e3 100644
--- a/src/southbridge/amd/amd8151/agp3.c
+++ b/src/southbridge/amd/amd8151/agp3.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/cimx/Kconfig b/src/southbridge/amd/cimx/Kconfig
index 645c842..cdd662c 100644
--- a/src/southbridge/amd/cimx/Kconfig
+++ b/src/southbridge/amd/cimx/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 config AMD_SB_CIMX
diff --git a/src/southbridge/amd/cimx/Makefile.inc b/src/southbridge/amd/cimx/Makefile.inc
index 65608bf..fc0816d 100644
--- a/src/southbridge/amd/cimx/Makefile.inc
+++ b/src/southbridge/amd/cimx/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_CIMX_SB700) += sb700
diff --git a/src/southbridge/amd/cimx/cimx_util.c b/src/southbridge/amd/cimx/cimx_util.c
index 19ef224..3f1eef5 100644
--- a/src/southbridge/amd/cimx/cimx_util.c
+++ b/src/southbridge/amd/cimx/cimx_util.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/cimx/cimx_util.h b/src/southbridge/amd/cimx/cimx_util.h
index 0950d13..b6f6022 100644
--- a/src/southbridge/amd/cimx/cimx_util.h
+++ b/src/southbridge/amd/cimx/cimx_util.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CIMX_UTIL_H
diff --git a/src/southbridge/amd/cimx/sb700/Amd.h b/src/southbridge/amd/cimx/sb700/Amd.h
index 9f44c31..bb1ca29 100644
--- a/src/southbridge/amd/cimx/sb700/Amd.h
+++ b/src/southbridge/amd/cimx/sb700/Amd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_H_
diff --git a/src/southbridge/amd/cimx/sb700/AmdSbLib.h b/src/southbridge/amd/cimx/sb700/AmdSbLib.h
index c1b61d5..62c5852 100644
--- a/src/southbridge/amd/cimx/sb700/AmdSbLib.h
+++ b/src/southbridge/amd/cimx/sb700/AmdSbLib.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_SB_LIB_H_
diff --git a/src/southbridge/amd/cimx/sb700/Kconfig b/src/southbridge/amd/cimx/sb700/Kconfig
index e0bffab..b554dfb 100644
--- a/src/southbridge/amd/cimx/sb700/Kconfig
+++ b/src/southbridge/amd/cimx/sb700/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_CIMX_SB700
diff --git a/src/southbridge/amd/cimx/sb700/Makefile.inc b/src/southbridge/amd/cimx/sb700/Makefile.inc
index 34035b0..6c44209 100644
--- a/src/southbridge/amd/cimx/sb700/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb700/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 
diff --git a/src/southbridge/amd/cimx/sb700/Platform.h b/src/southbridge/amd/cimx/sb700/Platform.h
index d6f099d..e53e1e2 100644
--- a/src/southbridge/amd/cimx/sb700/Platform.h
+++ b/src/southbridge/amd/cimx/sb700/Platform.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _AMD_SB_CIMx_PLATFORM_H_
diff --git a/src/southbridge/amd/cimx/sb700/amd_pci_int_defs.h b/src/southbridge/amd/cimx/sb700/amd_pci_int_defs.h
index f3c6a57..b139b63 100644
--- a/src/southbridge/amd/cimx/sb700/amd_pci_int_defs.h
+++ b/src/southbridge/amd/cimx/sb700/amd_pci_int_defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_DEFS_H
diff --git a/src/southbridge/amd/cimx/sb700/amd_pci_int_types.h b/src/southbridge/amd/cimx/sb700/amd_pci_int_types.h
index 0e199db..8f8b289 100644
--- a/src/southbridge/amd/cimx/sb700/amd_pci_int_types.h
+++ b/src/southbridge/amd/cimx/sb700/amd_pci_int_types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_TYPES_H
diff --git a/src/southbridge/amd/cimx/sb700/bootblock.c b/src/southbridge/amd/cimx/sb700/bootblock.c
index ea8ff2b..ca05e83 100644
--- a/src/southbridge/amd/cimx/sb700/bootblock.c
+++ b/src/southbridge/amd/cimx/sb700/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb700/chip.h b/src/southbridge/amd/cimx/sb700/chip.h
index 505cbc2..9c927bf 100644
--- a/src/southbridge/amd/cimx/sb700/chip.h
+++ b/src/southbridge/amd/cimx/sb700/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CIMX_SB700_CHIP_H_
diff --git a/src/southbridge/amd/cimx/sb700/early.c b/src/southbridge/amd/cimx/sb700/early.c
index 4371f67..e3163fe 100644
--- a/src/southbridge/amd/cimx/sb700/early.c
+++ b/src/southbridge/amd/cimx/sb700/early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/cimx/sb700/late.c b/src/southbridge/amd/cimx/sb700/late.c
index cd36fac..bf39cf8 100644
--- a/src/southbridge/amd/cimx/sb700/late.c
+++ b/src/southbridge/amd/cimx/sb700/late.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb700/lpc.c b/src/southbridge/amd/cimx/sb700/lpc.c
index 9803fb7..3f89fce 100644
--- a/src/southbridge/amd/cimx/sb700/lpc.c
+++ b/src/southbridge/amd/cimx/sb700/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci.h>
diff --git a/src/southbridge/amd/cimx/sb700/lpc.h b/src/southbridge/amd/cimx/sb700/lpc.h
index ddb0c88..747032d 100644
--- a/src/southbridge/amd/cimx/sb700/lpc.h
+++ b/src/southbridge/amd/cimx/sb700/lpc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB700_LPC_H_
diff --git a/src/southbridge/amd/cimx/sb700/reset.c b/src/southbridge/amd/cimx/sb700/reset.c
index 0eed8fa..16e2c9c 100644
--- a/src/southbridge/amd/cimx/sb700/reset.c
+++ b/src/southbridge/amd/cimx/sb700/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/cimx/sb700/sb_cimx.h b/src/southbridge/amd/cimx/sb700/sb_cimx.h
index d5c33dd..1b0baf9 100644
--- a/src/southbridge/amd/cimx/sb700/sb_cimx.h
+++ b/src/southbridge/amd/cimx/sb700/sb_cimx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb700/smbus.c b/src/southbridge/amd/cimx/sb700/smbus.c
index 51a1211..1370cb4 100644
--- a/src/southbridge/amd/cimx/sb700/smbus.c
+++ b/src/southbridge/amd/cimx/sb700/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb700/smbus.h b/src/southbridge/amd/cimx/sb700/smbus.h
index d55152a..e4f5cac 100644
--- a/src/southbridge/amd/cimx/sb700/smbus.h
+++ b/src/southbridge/amd/cimx/sb700/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB700_SMBUS_H_
diff --git a/src/southbridge/amd/cimx/sb700/smbus_spd.c b/src/southbridge/amd/cimx/sb700/smbus_spd.c
index 34bffb6..d4d1a2f 100644
--- a/src/southbridge/amd/cimx/sb700/smbus_spd.c
+++ b/src/southbridge/amd/cimx/sb700/smbus_spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <device/pci_def.h>
 #include <device/device.h>
diff --git a/src/southbridge/amd/cimx/sb700/smbus_spd.h b/src/southbridge/amd/cimx/sb700/smbus_spd.h
index f638791..c2cf218 100644
--- a/src/southbridge/amd/cimx/sb700/smbus_spd.h
+++ b/src/southbridge/amd/cimx/sb700/smbus_spd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SMBUS_SPD_H_
diff --git a/src/southbridge/amd/cimx/sb800/Amd.h b/src/southbridge/amd/cimx/sb800/Amd.h
index 5c716e7..8a14ee8 100644
--- a/src/southbridge/amd/cimx/sb800/Amd.h
+++ b/src/southbridge/amd/cimx/sb800/Amd.h
@@ -25,8 +25,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ***************************************************************************
  *
  */
diff --git a/src/southbridge/amd/cimx/sb800/AmdSbLib.h b/src/southbridge/amd/cimx/sb800/AmdSbLib.h
index e45005b..a144d43 100644
--- a/src/southbridge/amd/cimx/sb800/AmdSbLib.h
+++ b/src/southbridge/amd/cimx/sb800/AmdSbLib.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ***************************************************************************
  *
  */
diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig
index 4bbdb4a..9ff6607 100644
--- a/src/southbridge/amd/cimx/sb800/Kconfig
+++ b/src/southbridge/amd/cimx/sb800/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/southbridge/amd/cimx/sb800/Makefile.inc b/src/southbridge/amd/cimx/sb800/Makefile.inc
index 91e1382..e677508 100644
--- a/src/southbridge/amd/cimx/sb800/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb800/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 
diff --git a/src/southbridge/amd/cimx/sb800/SBPLATFORM.h b/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
index e9fb2f3..8729707 100644
--- a/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
+++ b/src/southbridge/amd/cimx/sb800/SBPLATFORM.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ***************************************************************************
  *
  */
diff --git a/src/southbridge/amd/cimx/sb800/acpi/audio.asl b/src/southbridge/amd/cimx/sb800/acpi/audio.asl
index b552d1d..e61a6e6 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/audio.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(AZHD) {
diff --git a/src/southbridge/amd/cimx/sb800/acpi/fch.asl b/src/southbridge/amd/cimx/sb800/acpi/fch.asl
index 86dbe2c..a31398c 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/fch.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/fch.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* South Bridge */
diff --git a/src/southbridge/amd/cimx/sb800/acpi/lpc.asl b/src/southbridge/amd/cimx/sb800/acpi/lpc.asl
index b0763a5..6ef3657 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/lpc.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/lpc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(LIBR) {
diff --git a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl
index 7343be9..4b5e342 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/pcie.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/pcie.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope(\) {
diff --git a/src/southbridge/amd/cimx/sb800/acpi/sleepstates.asl b/src/southbridge/amd/cimx/sb800/acpi/sleepstates.asl
index bf29ee2..ed84807 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/sleepstates.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Supported sleep states: */
diff --git a/src/southbridge/amd/cimx/sb800/acpi/smbus.asl b/src/southbridge/amd/cimx/sb800/acpi/smbus.asl
index 346d7d7..a78f28c 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/smbus.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/smbus.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMBUS Support */
diff --git a/src/southbridge/amd/cimx/sb800/acpi/usb.asl b/src/southbridge/amd/cimx/sb800/acpi/usb.asl
index 7193f78..7a47804 100644
--- a/src/southbridge/amd/cimx/sb800/acpi/usb.asl
+++ b/src/southbridge/amd/cimx/sb800/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(UOH1) {
diff --git a/src/southbridge/amd/cimx/sb800/amd_pci_int_defs.h b/src/southbridge/amd/cimx/sb800/amd_pci_int_defs.h
index 85f07e4..c832ae3 100644
--- a/src/southbridge/amd/cimx/sb800/amd_pci_int_defs.h
+++ b/src/southbridge/amd/cimx/sb800/amd_pci_int_defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_DEFS_H
diff --git a/src/southbridge/amd/cimx/sb800/amd_pci_int_types.h b/src/southbridge/amd/cimx/sb800/amd_pci_int_types.h
index cb9a578..178799a 100644
--- a/src/southbridge/amd/cimx/sb800/amd_pci_int_types.h
+++ b/src/southbridge/amd/cimx/sb800/amd_pci_int_types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_TYPES_H
diff --git a/src/southbridge/amd/cimx/sb800/bootblock.c b/src/southbridge/amd/cimx/sb800/bootblock.c
index 9fc36ac..21bb9e0 100644
--- a/src/southbridge/amd/cimx/sb800/bootblock.c
+++ b/src/southbridge/amd/cimx/sb800/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/amd/cimx/sb800/cfg.c b/src/southbridge/amd/cimx/sb800/cfg.c
index 9a3ca3a..d155f53 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.c
+++ b/src/southbridge/amd/cimx/sb800/cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/cimx/sb800/cfg.h b/src/southbridge/amd/cimx/sb800/cfg.h
index b7d7fd8..73adffd 100644
--- a/src/southbridge/amd/cimx/sb800/cfg.h
+++ b/src/southbridge/amd/cimx/sb800/cfg.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb800/chip.h b/src/southbridge/amd/cimx/sb800/chip.h
index e87c854..eed8c97 100644
--- a/src/southbridge/amd/cimx/sb800/chip.h
+++ b/src/southbridge/amd/cimx/sb800/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CIMX_SB800_CHIP_H_
diff --git a/src/southbridge/amd/cimx/sb800/early.c b/src/southbridge/amd/cimx/sb800/early.c
index 92346b4..f07c6ef 100644
--- a/src/southbridge/amd/cimx/sb800/early.c
+++ b/src/southbridge/amd/cimx/sb800/early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/cimx/sb800/fadt.c b/src/southbridge/amd/cimx/sb800/fadt.c
index 7a60c03..d898c44 100644
--- a/src/southbridge/amd/cimx/sb800/fadt.c
+++ b/src/southbridge/amd/cimx/sb800/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb800/fan.c b/src/southbridge/amd/cimx/sb800/fan.c
index af43ebd..3556739 100644
--- a/src/southbridge/amd/cimx/sb800/fan.c
+++ b/src/southbridge/amd/cimx/sb800/fan.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <southbridge/amd/cimx/cimx_util.h>
diff --git a/src/southbridge/amd/cimx/sb800/fan.h b/src/southbridge/amd/cimx/sb800/fan.h
index 95946a3..b2846a4 100644
--- a/src/southbridge/amd/cimx/sb800/fan.h
+++ b/src/southbridge/amd/cimx/sb800/fan.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB800_FAN_H_
diff --git a/src/southbridge/amd/cimx/sb800/late.c b/src/southbridge/amd/cimx/sb800/late.c
index cf7fb1c..97a07e9 100644
--- a/src/southbridge/amd/cimx/sb800/late.c
+++ b/src/southbridge/amd/cimx/sb800/late.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb800/lpc.c b/src/southbridge/amd/cimx/sb800/lpc.c
index 6eebb89..c7c55cb 100644
--- a/src/southbridge/amd/cimx/sb800/lpc.c
+++ b/src/southbridge/amd/cimx/sb800/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/cimx/sb800/lpc.h b/src/southbridge/amd/cimx/sb800/lpc.h
index e8f9bcd..041c55d 100644
--- a/src/southbridge/amd/cimx/sb800/lpc.h
+++ b/src/southbridge/amd/cimx/sb800/lpc.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB800_LPC_H_
diff --git a/src/southbridge/amd/cimx/sb800/pci_devs.h b/src/southbridge/amd/cimx/sb800/pci_devs.h
index bd8398e..17fe08c 100644
--- a/src/southbridge/amd/cimx/sb800/pci_devs.h
+++ b/src/southbridge/amd/cimx/sb800/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CIMX_SB00_PCI_DEVS_H_
diff --git a/src/southbridge/amd/cimx/sb800/ramtop.c b/src/southbridge/amd/cimx/sb800/ramtop.c
index 81cdec1..199056f 100644
--- a/src/southbridge/amd/cimx/sb800/ramtop.c
+++ b/src/southbridge/amd/cimx/sb800/ramtop.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/cimx/sb800/reset.c b/src/southbridge/amd/cimx/sb800/reset.c
index 0eed8fa..16e2c9c 100644
--- a/src/southbridge/amd/cimx/sb800/reset.c
+++ b/src/southbridge/amd/cimx/sb800/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/cimx/sb800/sb_cimx.h b/src/southbridge/amd/cimx/sb800/sb_cimx.h
index a6135bc..fda7711 100644
--- a/src/southbridge/amd/cimx/sb800/sb_cimx.h
+++ b/src/southbridge/amd/cimx/sb800/sb_cimx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb800/smbus.c b/src/southbridge/amd/cimx/sb800/smbus.c
index 1f6ef49..b86e0e1 100644
--- a/src/southbridge/amd/cimx/sb800/smbus.c
+++ b/src/southbridge/amd/cimx/sb800/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb800/smbus.h b/src/southbridge/amd/cimx/sb800/smbus.h
index 8a0cbba..02af49a 100644
--- a/src/southbridge/amd/cimx/sb800/smbus.h
+++ b/src/southbridge/amd/cimx/sb800/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB800_SMBUS_H_
diff --git a/src/southbridge/amd/cimx/sb800/smbus_spd.c b/src/southbridge/amd/cimx/sb800/smbus_spd.c
index 1e458bd..c747881 100644
--- a/src/southbridge/amd/cimx/sb800/smbus_spd.c
+++ b/src/southbridge/amd/cimx/sb800/smbus_spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/southbridge/amd/cimx/sb800/smbus_spd.h b/src/southbridge/amd/cimx/sb800/smbus_spd.h
index a9bddc7..54fe2a3 100644
--- a/src/southbridge/amd/cimx/sb800/smbus_spd.h
+++ b/src/southbridge/amd/cimx/sb800/smbus_spd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SMBUS_SPD_H_
diff --git a/src/southbridge/amd/cimx/sb800/spi.c b/src/southbridge/amd/cimx/sb800/spi.c
index 694a3b7..45d3a9f 100644
--- a/src/southbridge/amd/cimx/sb800/spi.c
+++ b/src/southbridge/amd/cimx/sb800/spi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/southbridge/amd/cimx/sb900/Amd.h b/src/southbridge/amd/cimx/sb900/Amd.h
index 02c9ef8..861fc05 100644
--- a/src/southbridge/amd/cimx/sb900/Amd.h
+++ b/src/southbridge/amd/cimx/sb900/Amd.h
@@ -25,8 +25,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ***************************************************************************
  *
  */
diff --git a/src/southbridge/amd/cimx/sb900/AmdSbLib.h b/src/southbridge/amd/cimx/sb900/AmdSbLib.h
index e45005b..a144d43 100644
--- a/src/southbridge/amd/cimx/sb900/AmdSbLib.h
+++ b/src/southbridge/amd/cimx/sb900/AmdSbLib.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ***************************************************************************
  *
  */
diff --git a/src/southbridge/amd/cimx/sb900/Kconfig b/src/southbridge/amd/cimx/sb900/Kconfig
index 4693bb2..b7a903c 100644
--- a/src/southbridge/amd/cimx/sb900/Kconfig
+++ b/src/southbridge/amd/cimx/sb900/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_CIMX_SB900
diff --git a/src/southbridge/amd/cimx/sb900/Makefile.inc b/src/southbridge/amd/cimx/sb900/Makefile.inc
index 60dae52..9730ed3 100644
--- a/src/southbridge/amd/cimx/sb900/Makefile.inc
+++ b/src/southbridge/amd/cimx/sb900/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 
diff --git a/src/southbridge/amd/cimx/sb900/SbPlatform.h b/src/southbridge/amd/cimx/sb900/SbPlatform.h
index 33c09cc..22a45ff 100644
--- a/src/southbridge/amd/cimx/sb900/SbPlatform.h
+++ b/src/southbridge/amd/cimx/sb900/SbPlatform.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ***************************************************************************
  *
  */
diff --git a/src/southbridge/amd/cimx/sb900/amd_pci_int_defs.h b/src/southbridge/amd/cimx/sb900/amd_pci_int_defs.h
index 85f07e4..c832ae3 100644
--- a/src/southbridge/amd/cimx/sb900/amd_pci_int_defs.h
+++ b/src/southbridge/amd/cimx/sb900/amd_pci_int_defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_DEFS_H
diff --git a/src/southbridge/amd/cimx/sb900/amd_pci_int_types.h b/src/southbridge/amd/cimx/sb900/amd_pci_int_types.h
index cb9a578..178799a 100644
--- a/src/southbridge/amd/cimx/sb900/amd_pci_int_types.h
+++ b/src/southbridge/amd/cimx/sb900/amd_pci_int_types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_TYPES_H
diff --git a/src/southbridge/amd/cimx/sb900/bootblock.c b/src/southbridge/amd/cimx/sb900/bootblock.c
index 8cf8a04..2edd3ff 100644
--- a/src/southbridge/amd/cimx/sb900/bootblock.c
+++ b/src/southbridge/amd/cimx/sb900/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/amd/cimx/sb900/cfg.c b/src/southbridge/amd/cimx/sb900/cfg.c
index ed35a5d..be97490 100644
--- a/src/southbridge/amd/cimx/sb900/cfg.c
+++ b/src/southbridge/amd/cimx/sb900/cfg.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb900/chip.h b/src/southbridge/amd/cimx/sb900/chip.h
index 5709ee6..cb46ac5 100644
--- a/src/southbridge/amd/cimx/sb900/chip.h
+++ b/src/southbridge/amd/cimx/sb900/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CIMX_SB900_CHIP_H_
diff --git a/src/southbridge/amd/cimx/sb900/early.c b/src/southbridge/amd/cimx/sb900/early.c
index 0856fe6..5d8eabf 100644
--- a/src/southbridge/amd/cimx/sb900/early.c
+++ b/src/southbridge/amd/cimx/sb900/early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/cimx/sb900/late.c b/src/southbridge/amd/cimx/sb900/late.c
index fbff7df..a1a1ec9 100644
--- a/src/southbridge/amd/cimx/sb900/late.c
+++ b/src/southbridge/amd/cimx/sb900/late.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb900/lpc.c b/src/southbridge/amd/cimx/sb900/lpc.c
index 1bab601..5fdc9b5 100644
--- a/src/southbridge/amd/cimx/sb900/lpc.c
+++ b/src/southbridge/amd/cimx/sb900/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci.h>
diff --git a/src/southbridge/amd/cimx/sb900/lpc.h b/src/southbridge/amd/cimx/sb900/lpc.h
index 056a1a0..aa2b8b4 100644
--- a/src/southbridge/amd/cimx/sb900/lpc.h
+++ b/src/southbridge/amd/cimx/sb900/lpc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB900_LPC_H_
diff --git a/src/southbridge/amd/cimx/sb900/reset.c b/src/southbridge/amd/cimx/sb900/reset.c
index 0eed8fa..16e2c9c 100644
--- a/src/southbridge/amd/cimx/sb900/reset.c
+++ b/src/southbridge/amd/cimx/sb900/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/cimx/sb900/sb_cimx.h b/src/southbridge/amd/cimx/sb900/sb_cimx.h
index 28da372..76da6c7 100644
--- a/src/southbridge/amd/cimx/sb900/sb_cimx.h
+++ b/src/southbridge/amd/cimx/sb900/sb_cimx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb900/smbus.c b/src/southbridge/amd/cimx/sb900/smbus.c
index 425fe7c..b69359a 100644
--- a/src/southbridge/amd/cimx/sb900/smbus.c
+++ b/src/southbridge/amd/cimx/sb900/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/cimx/sb900/smbus.h b/src/southbridge/amd/cimx/sb900/smbus.h
index 04317c4..a954480 100644
--- a/src/southbridge/amd/cimx/sb900/smbus.h
+++ b/src/southbridge/amd/cimx/sb900/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB900_SMBUS_H_
diff --git a/src/southbridge/amd/common/amd_pci_util.c b/src/southbridge/amd/common/amd_pci_util.c
index 6104644..aeb108d 100644
--- a/src/southbridge/amd/common/amd_pci_util.c
+++ b/src/southbridge/amd/common/amd_pci_util.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/common/amd_pci_util.h b/src/southbridge/amd/common/amd_pci_util.h
index 9ba1286..e6d6d83 100644
--- a/src/southbridge/amd/common/amd_pci_util.h
+++ b/src/southbridge/amd/common/amd_pci_util.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_UTIL_H
diff --git a/src/southbridge/amd/cs5535/cs5535.h b/src/southbridge/amd/cs5535/cs5535.h
index 29b8244..a1a05e5 100644
--- a/src/southbridge/amd/cs5535/cs5535.h
+++ b/src/southbridge/amd/cs5535/cs5535.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CS5535_H
diff --git a/src/southbridge/amd/cs5536/Kconfig b/src/southbridge/amd/cs5536/Kconfig
index 95abc92..ee5dc6d 100644
--- a/src/southbridge/amd/cs5536/Kconfig
+++ b/src/southbridge/amd/cs5536/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_CS5536
diff --git a/src/southbridge/amd/cs5536/Makefile.inc b/src/southbridge/amd/cs5536/Makefile.inc
index 5918da6..f9e6693 100644
--- a/src/southbridge/amd/cs5536/Makefile.inc
+++ b/src/southbridge/amd/cs5536/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_AMD_CS5536),y)
diff --git a/src/southbridge/amd/cs5536/chip.h b/src/southbridge/amd/cs5536/chip.h
index 136aedc..cd44931 100644
--- a/src/southbridge/amd/cs5536/chip.h
+++ b/src/southbridge/amd/cs5536/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOUTHBRIDGE_AMD_CS5536
diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c
index 67eabb0..92f3a46 100644
--- a/src/southbridge/amd/cs5536/cs5536.c
+++ b/src/southbridge/amd/cs5536/cs5536.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/amd/cs5536/cs5536.h b/src/southbridge/amd/cs5536/cs5536.h
index 480916f..8a5094f 100644
--- a/src/southbridge/amd/cs5536/cs5536.h
+++ b/src/southbridge/amd/cs5536/cs5536.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CS5536_H
diff --git a/src/southbridge/amd/cs5536/early_setup.c b/src/southbridge/amd/cs5536/early_setup.c
index 705eca6..468d1e1 100644
--- a/src/southbridge/amd/cs5536/early_setup.c
+++ b/src/southbridge/amd/cs5536/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/cs5536/early_smbus.c b/src/southbridge/amd/cs5536/early_smbus.c
index 4e73cc3..428bd9b 100644
--- a/src/southbridge/amd/cs5536/early_smbus.c
+++ b/src/southbridge/amd/cs5536/early_smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "cs5536.h"
diff --git a/src/southbridge/amd/cs5536/ide.c b/src/southbridge/amd/cs5536/ide.c
index 28aebdf..b04b952 100644
--- a/src/southbridge/amd/cs5536/ide.c
+++ b/src/southbridge/amd/cs5536/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/cs5536/pirq.c b/src/southbridge/amd/cs5536/pirq.c
index b9e1e75..365c800 100644
--- a/src/southbridge/amd/cs5536/pirq.c
+++ b/src/southbridge/amd/cs5536/pirq.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/southbridge/amd/cs5536/smbus.c b/src/southbridge/amd/cs5536/smbus.c
index 633119f..0eb0a61 100644
--- a/src/southbridge/amd/cs5536/smbus.c
+++ b/src/southbridge/amd/cs5536/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/cs5536/smbus.h b/src/southbridge/amd/cs5536/smbus.h
index 76e56a4..208ca24 100644
--- a/src/southbridge/amd/cs5536/smbus.h
+++ b/src/southbridge/amd/cs5536/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CS5536_SMBUS_H
diff --git a/src/southbridge/amd/pi/Kconfig b/src/southbridge/amd/pi/Kconfig
index a8e3fe8..b22ff3f 100644
--- a/src/southbridge/amd/pi/Kconfig
+++ b/src/southbridge/amd/pi/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 source src/southbridge/amd/pi/hudson/Kconfig
diff --git a/src/southbridge/amd/pi/Makefile.inc b/src/southbridge/amd/pi/Makefile.inc
index b7a2656..e8b99e1 100644
--- a/src/southbridge/amd/pi/Makefile.inc
+++ b/src/southbridge/amd/pi/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_PI_AVALON) += hudson
 subdirs-$(CONFIG_SOUTHBRIDGE_AMD_PI_BOLTON) += hudson
diff --git a/src/southbridge/amd/pi/hudson/Kconfig b/src/southbridge/amd/pi/hudson/Kconfig
index 237183a..0e1eee3 100644
--- a/src/southbridge/amd/pi/hudson/Kconfig
+++ b/src/southbridge/amd/pi/hudson/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_PI_BOLTON
diff --git a/src/southbridge/amd/pi/hudson/acpi/audio.asl b/src/southbridge/amd/pi/hudson/acpi/audio.asl
index 8caf1aa..0fee21c 100644
--- a/src/southbridge/amd/pi/hudson/acpi/audio.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device(AZHD) {	/* 0:14.2 - HD Audio */
diff --git a/src/southbridge/amd/pi/hudson/acpi/fch.asl b/src/southbridge/amd/pi/hudson/acpi/fch.asl
index cee721f..a9b4936 100644
--- a/src/southbridge/amd/pi/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* South Bridge */
diff --git a/src/southbridge/amd/pi/hudson/acpi/lpc.asl b/src/southbridge/amd/pi/hudson/acpi/lpc.asl
index 1ab16e6..49786f1 100644
--- a/src/southbridge/amd/pi/hudson/acpi/lpc.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/lpc.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* 0:14.3 - LPC */
diff --git a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl
index 1b41337..fe7439f 100644
--- a/src/southbridge/amd/pi/hudson/acpi/pci_int.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/pci_int.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* PCIe Configuration Space for CONFIG_MMCONF_BUS_NUMBER busses */
diff --git a/src/southbridge/amd/pi/hudson/acpi/pcie.asl b/src/southbridge/amd/pi/hudson/acpi/pcie.asl
index 0626cab..4250f68 100644
--- a/src/southbridge/amd/pi/hudson/acpi/pcie.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/pcie.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	/* PCI IRQ mapping registers, C00h-C01h. */
diff --git a/src/southbridge/amd/pi/hudson/acpi/sleepstates.asl b/src/southbridge/amd/pi/hudson/acpi/sleepstates.asl
index c5e3038..22299bf 100644
--- a/src/southbridge/amd/pi/hudson/acpi/sleepstates.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Supported sleep states: */
diff --git a/src/southbridge/amd/pi/hudson/acpi/smbus.asl b/src/southbridge/amd/pi/hudson/acpi/smbus.asl
index 744ff46..b7cd85e 100644
--- a/src/southbridge/amd/pi/hudson/acpi/smbus.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/smbus.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* SMBus Support */
diff --git a/src/southbridge/amd/pi/hudson/acpi/usb.asl b/src/southbridge/amd/pi/hudson/acpi/usb.asl
index 9b56985..3868d35 100644
--- a/src/southbridge/amd/pi/hudson/acpi/usb.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* 0:12.0 - OHCI */
diff --git a/src/southbridge/amd/pi/hudson/amd_pci_int_defs.h b/src/southbridge/amd/pi/hudson/amd_pci_int_defs.h
index a1e5e07..b05c5af 100644
--- a/src/southbridge/amd/pi/hudson/amd_pci_int_defs.h
+++ b/src/southbridge/amd/pi/hudson/amd_pci_int_defs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_DEFS_H
diff --git a/src/southbridge/amd/pi/hudson/amd_pci_int_types.h b/src/southbridge/amd/pi/hudson/amd_pci_int_types.h
index b48f87e..dad07e7 100644
--- a/src/southbridge/amd/pi/hudson/amd_pci_int_types.h
+++ b/src/southbridge/amd/pi/hudson/amd_pci_int_types.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef AMD_PCI_INT_TYPES_H
diff --git a/src/southbridge/amd/pi/hudson/bootblock.c b/src/southbridge/amd/pi/hudson/bootblock.c
index 2e76b08..1dcbadf 100644
--- a/src/southbridge/amd/pi/hudson/bootblock.c
+++ b/src/southbridge/amd/pi/hudson/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/pi/hudson/chip.h b/src/southbridge/amd/pi/hudson/chip.h
index a3e3d2e..eba7a09 100644
--- a/src/southbridge/amd/pi/hudson/chip.h
+++ b/src/southbridge/amd/pi/hudson/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_CHIP_H
diff --git a/src/southbridge/amd/pi/hudson/early_setup.c b/src/southbridge/amd/pi/hudson/early_setup.c
index 7f79f75..cd6886b 100644
--- a/src/southbridge/amd/pi/hudson/early_setup.c
+++ b/src/southbridge/amd/pi/hudson/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _HUDSON_EARLY_SETUP_C_
diff --git a/src/southbridge/amd/pi/hudson/enable_usbdebug.c b/src/southbridge/amd/pi/hudson/enable_usbdebug.c
index c699831..34ea3b8 100644
--- a/src/southbridge/amd/pi/hudson/enable_usbdebug.c
+++ b/src/southbridge/amd/pi/hudson/enable_usbdebug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/pi/hudson/fadt.c b/src/southbridge/amd/pi/hudson/fadt.c
index cef10b1..bf6ef35 100644
--- a/src/southbridge/amd/pi/hudson/fadt.c
+++ b/src/southbridge/amd/pi/hudson/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/pi/hudson/hda.c b/src/southbridge/amd/pi/hudson/hda.c
index 1eb7759..8b1cd7a 100644
--- a/src/southbridge/amd/pi/hudson/hda.c
+++ b/src/southbridge/amd/pi/hudson/hda.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/hudson.c b/src/southbridge/amd/pi/hudson/hudson.c
index 4ef65e9..e9a7dd1 100644
--- a/src/southbridge/amd/pi/hudson/hudson.c
+++ b/src/southbridge/amd/pi/hudson/hudson.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/hudson.h b/src/southbridge/amd/pi/hudson/hudson.h
index 41767bf..a58f871 100644
--- a/src/southbridge/amd/pi/hudson/hudson.h
+++ b/src/southbridge/amd/pi/hudson/hudson.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_H
diff --git a/src/southbridge/amd/pi/hudson/ide.c b/src/southbridge/amd/pi/hudson/ide.c
index a8455dd..4db3405 100644
--- a/src/southbridge/amd/pi/hudson/ide.c
+++ b/src/southbridge/amd/pi/hudson/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/imc.c b/src/southbridge/amd/pi/hudson/imc.c
index a493418..1ef317a 100644
--- a/src/southbridge/amd/pi/hudson/imc.c
+++ b/src/southbridge/amd/pi/hudson/imc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/southbridge/amd/pi/hudson/imc.h b/src/southbridge/amd/pi/hudson/imc.h
index f1e7c77..d734d25 100644
--- a/src/southbridge/amd/pi/hudson/imc.h
+++ b/src/southbridge/amd/pi/hudson/imc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_IMC_H
diff --git a/src/southbridge/amd/pi/hudson/lpc.c b/src/southbridge/amd/pi/hudson/lpc.c
index 2d1354c..62afbce 100644
--- a/src/southbridge/amd/pi/hudson/lpc.c
+++ b/src/southbridge/amd/pi/hudson/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/pci.c b/src/southbridge/amd/pi/hudson/pci.c
index d9b707a..1a30498 100644
--- a/src/southbridge/amd/pi/hudson/pci.c
+++ b/src/southbridge/amd/pi/hudson/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/pci_devs.h b/src/southbridge/amd/pi/hudson/pci_devs.h
index acff37a..1139b85 100644
--- a/src/southbridge/amd/pi/hudson/pci_devs.h
+++ b/src/southbridge/amd/pi/hudson/pci_devs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _PI_HUDSON_PCI_DEVS_H_
diff --git a/src/southbridge/amd/pi/hudson/pcie.c b/src/southbridge/amd/pi/hudson/pcie.c
index 1de1947..18aa638 100644
--- a/src/southbridge/amd/pi/hudson/pcie.c
+++ b/src/southbridge/amd/pi/hudson/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/reset.c b/src/southbridge/amd/pi/hudson/reset.c
index f8850b1..03e3068 100644
--- a/src/southbridge/amd/pi/hudson/reset.c
+++ b/src/southbridge/amd/pi/hudson/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/pi/hudson/sata.c b/src/southbridge/amd/pi/hudson/sata.c
index 1d2cd93..f9798bc 100644
--- a/src/southbridge/amd/pi/hudson/sata.c
+++ b/src/southbridge/amd/pi/hudson/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/sd.c b/src/southbridge/amd/pi/hudson/sd.c
index c77f8da..e48a227 100644
--- a/src/southbridge/amd/pi/hudson/sd.c
+++ b/src/southbridge/amd/pi/hudson/sd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/amd/pi/hudson/sm.c b/src/southbridge/amd/pi/hudson/sm.c
index 09fbf8b..4e9006a 100644
--- a/src/southbridge/amd/pi/hudson/sm.c
+++ b/src/southbridge/amd/pi/hudson/sm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/pi/hudson/smbus.c b/src/southbridge/amd/pi/hudson/smbus.c
index 3f19139..d31904d 100644
--- a/src/southbridge/amd/pi/hudson/smbus.c
+++ b/src/southbridge/amd/pi/hudson/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _HUDSON_SMBUS_C_
diff --git a/src/southbridge/amd/pi/hudson/smbus.h b/src/southbridge/amd/pi/hudson/smbus.h
index bf43104..f143488 100644
--- a/src/southbridge/amd/pi/hudson/smbus.h
+++ b/src/southbridge/amd/pi/hudson/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef HUDSON_SMBUS_H
diff --git a/src/southbridge/amd/pi/hudson/smbus_spd.c b/src/southbridge/amd/pi/hudson/smbus_spd.c
index 5286394..e3d0168 100644
--- a/src/southbridge/amd/pi/hudson/smbus_spd.c
+++ b/src/southbridge/amd/pi/hudson/smbus_spd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_def.h>
diff --git a/src/southbridge/amd/pi/hudson/usb.c b/src/southbridge/amd/pi/hudson/usb.c
index ef8f675..9cf2bf4 100644
--- a/src/southbridge/amd/pi/hudson/usb.c
+++ b/src/southbridge/amd/pi/hudson/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs690/Kconfig b/src/southbridge/amd/rs690/Kconfig
index f24fcff..730842a 100644
--- a/src/southbridge/amd/rs690/Kconfig
+++ b/src/southbridge/amd/rs690/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_RS690
diff --git a/src/southbridge/amd/rs690/chip.h b/src/southbridge/amd/rs690/chip.h
index 5eafb77..d511889 100644
--- a/src/southbridge/amd/rs690/chip.h
+++ b/src/southbridge/amd/rs690/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RS690_CHIP_H
diff --git a/src/southbridge/amd/rs690/cmn.c b/src/southbridge/amd/rs690/cmn.c
index e3625ed..83d4014 100644
--- a/src/southbridge/amd/rs690/cmn.c
+++ b/src/southbridge/amd/rs690/cmn.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs690/early_setup.c b/src/southbridge/amd/rs690/early_setup.c
index 1b6f8c3..0d64664 100644
--- a/src/southbridge/amd/rs690/early_setup.c
+++ b/src/southbridge/amd/rs690/early_setup.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/rs690/gfx.c b/src/southbridge/amd/rs690/gfx.c
index 55112c2..17acac1 100644
--- a/src/southbridge/amd/rs690/gfx.c
+++ b/src/southbridge/amd/rs690/gfx.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/rs690/ht.c b/src/southbridge/amd/rs690/ht.c
index d980588..10bba6e 100644
--- a/src/southbridge/amd/rs690/ht.c
+++ b/src/southbridge/amd/rs690/ht.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs690/pcie.c b/src/southbridge/amd/rs690/pcie.c
index 468e0b3..2d3651f 100644
--- a/src/southbridge/amd/rs690/pcie.c
+++ b/src/southbridge/amd/rs690/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs690/rs690.c b/src/southbridge/amd/rs690/rs690.c
index 9f720ee..b697da0 100644
--- a/src/southbridge/amd/rs690/rs690.c
+++ b/src/southbridge/amd/rs690/rs690.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs690/rs690.h b/src/southbridge/amd/rs690/rs690.h
index 52aa88b..1e9697d 100644
--- a/src/southbridge/amd/rs690/rs690.h
+++ b/src/southbridge/amd/rs690/rs690.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __RS690_H__
diff --git a/src/southbridge/amd/rs780/Kconfig b/src/southbridge/amd/rs780/Kconfig
index f0a392f..5db1774 100644
--- a/src/southbridge/amd/rs780/Kconfig
+++ b/src/southbridge/amd/rs780/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_RS780
diff --git a/src/southbridge/amd/rs780/chip.h b/src/southbridge/amd/rs780/chip.h
index 124ce02..c23fae7 100644
--- a/src/southbridge/amd/rs780/chip.h
+++ b/src/southbridge/amd/rs780/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef RS780_CHIP_H
diff --git a/src/southbridge/amd/rs780/cmn.c b/src/southbridge/amd/rs780/cmn.c
index fc6d1ab..781ab3d 100644
--- a/src/southbridge/amd/rs780/cmn.c
+++ b/src/southbridge/amd/rs780/cmn.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs780/early_setup.c b/src/southbridge/amd/rs780/early_setup.c
index 49845a4..5f48495 100644
--- a/src/southbridge/amd/rs780/early_setup.c
+++ b/src/southbridge/amd/rs780/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "rev.h"
diff --git a/src/southbridge/amd/rs780/gfx.c b/src/southbridge/amd/rs780/gfx.c
index d232db8..b49193c 100644
--- a/src/southbridge/amd/rs780/gfx.c
+++ b/src/southbridge/amd/rs780/gfx.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/rs780/ht.c b/src/southbridge/amd/rs780/ht.c
index 5f216ea..cf89c44 100644
--- a/src/southbridge/amd/rs780/ht.c
+++ b/src/southbridge/amd/rs780/ht.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs780/pcie.c b/src/southbridge/amd/rs780/pcie.c
index 00c9458..05c5043 100644
--- a/src/southbridge/amd/rs780/pcie.c
+++ b/src/southbridge/amd/rs780/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs780/rev.h b/src/southbridge/amd/rs780/rev.h
index bd28194..1f94a44 100644
--- a/src/southbridge/amd/rs780/rev.h
+++ b/src/southbridge/amd/rs780/rev.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __RS780_REV_H__
diff --git a/src/southbridge/amd/rs780/rs780.c b/src/southbridge/amd/rs780/rs780.c
index c7003c7..002b284 100644
--- a/src/southbridge/amd/rs780/rs780.c
+++ b/src/southbridge/amd/rs780/rs780.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/rs780/rs780.h b/src/southbridge/amd/rs780/rs780.h
index dd2743f..b89c24b 100644
--- a/src/southbridge/amd/rs780/rs780.h
+++ b/src/southbridge/amd/rs780/rs780.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __RS780_H__
diff --git a/src/southbridge/amd/sb600/Kconfig b/src/southbridge/amd/sb600/Kconfig
index b3af324..7bbd632 100644
--- a/src/southbridge/amd/sb600/Kconfig
+++ b/src/southbridge/amd/sb600/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_SB600
diff --git a/src/southbridge/amd/sb600/ac97.c b/src/southbridge/amd/sb600/ac97.c
index ec31d27..ee0aaf1 100644
--- a/src/southbridge/amd/sb600/ac97.c
+++ b/src/southbridge/amd/sb600/ac97.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/bootblock.c b/src/southbridge/amd/sb600/bootblock.c
index d807448..1836e17 100644
--- a/src/southbridge/amd/sb600/bootblock.c
+++ b/src/southbridge/amd/sb600/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/sb600/chip.h b/src/southbridge/amd/sb600/chip.h
index e7efbbe..d7e69aa 100644
--- a/src/southbridge/amd/sb600/chip.h
+++ b/src/southbridge/amd/sb600/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB600_CHIP_H
diff --git a/src/southbridge/amd/sb600/early_setup.c b/src/southbridge/amd/sb600/early_setup.c
index a549d63..77755f5 100644
--- a/src/southbridge/amd/sb600/early_setup.c
+++ b/src/southbridge/amd/sb600/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/southbridge/amd/sb600/enable_usbdebug.c b/src/southbridge/amd/sb600/enable_usbdebug.c
index be17ca6..5388beb 100644
--- a/src/southbridge/amd/sb600/enable_usbdebug.c
+++ b/src/southbridge/amd/sb600/enable_usbdebug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/sb600/hda.c b/src/southbridge/amd/sb600/hda.c
index e82dec0..f734334 100644
--- a/src/southbridge/amd/sb600/hda.c
+++ b/src/southbridge/amd/sb600/hda.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/ide.c b/src/southbridge/amd/sb600/ide.c
index 6cd31d6..b80f297 100644
--- a/src/southbridge/amd/sb600/ide.c
+++ b/src/southbridge/amd/sb600/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/lpc.c b/src/southbridge/amd/sb600/lpc.c
index 78fe1fb..274f7e4 100644
--- a/src/southbridge/amd/sb600/lpc.c
+++ b/src/southbridge/amd/sb600/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/pci.c b/src/southbridge/amd/sb600/pci.c
index 9a111f6..93396c8 100644
--- a/src/southbridge/amd/sb600/pci.c
+++ b/src/southbridge/amd/sb600/pci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/reset.c b/src/southbridge/amd/sb600/reset.c
index 1ac4f9f..b83c493 100644
--- a/src/southbridge/amd/sb600/reset.c
+++ b/src/southbridge/amd/sb600/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/sb600/sata.c b/src/southbridge/amd/sb600/sata.c
index eca8a29..61a78f2 100644
--- a/src/southbridge/amd/sb600/sata.c
+++ b/src/southbridge/amd/sb600/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/sb600.c b/src/southbridge/amd/sb600/sb600.c
index 04252df..fcd9f9d 100644
--- a/src/southbridge/amd/sb600/sb600.c
+++ b/src/southbridge/amd/sb600/sb600.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/sb600.h b/src/southbridge/amd/sb600/sb600.h
index d76d3bd..04e8325 100644
--- a/src/southbridge/amd/sb600/sb600.h
+++ b/src/southbridge/amd/sb600/sb600.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB600_H
diff --git a/src/southbridge/amd/sb600/sm.c b/src/southbridge/amd/sb600/sm.c
index 40fde47..64ec927 100644
--- a/src/southbridge/amd/sb600/sm.c
+++ b/src/southbridge/amd/sb600/sm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb600/smbus.c b/src/southbridge/amd/sb600/smbus.c
index b2f2bde..8cf0d11 100644
--- a/src/southbridge/amd/sb600/smbus.c
+++ b/src/southbridge/amd/sb600/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smbus.h"
diff --git a/src/southbridge/amd/sb600/smbus.h b/src/southbridge/amd/sb600/smbus.h
index 80b42e9..ddc4714 100644
--- a/src/southbridge/amd/sb600/smbus.h
+++ b/src/southbridge/amd/sb600/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB600_SMBUS_H
diff --git a/src/southbridge/amd/sb600/usb.c b/src/southbridge/amd/sb600/usb.c
index 63f7f4f..1c48a3c 100644
--- a/src/southbridge/amd/sb600/usb.c
+++ b/src/southbridge/amd/sb600/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/Kconfig b/src/southbridge/amd/sb700/Kconfig
index 42ca2bb..680ac83 100644
--- a/src/southbridge/amd/sb700/Kconfig
+++ b/src/southbridge/amd/sb700/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_SB700
diff --git a/src/southbridge/amd/sb700/bootblock.c b/src/southbridge/amd/sb700/bootblock.c
index 67e6434..1fd711f 100644
--- a/src/southbridge/amd/sb700/bootblock.c
+++ b/src/southbridge/amd/sb700/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/sb700/chip.h b/src/southbridge/amd/sb700/chip.h
index 87ba05c..7dc2c0a 100644
--- a/src/southbridge/amd/sb700/chip.h
+++ b/src/southbridge/amd/sb700/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB700_CHIP_H
diff --git a/src/southbridge/amd/sb700/early_setup.c b/src/southbridge/amd/sb700/early_setup.c
index d25599e..ec79dc4 100644
--- a/src/southbridge/amd/sb700/early_setup.c
+++ b/src/southbridge/amd/sb700/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB700_EARLY_SETUP_C_
diff --git a/src/southbridge/amd/sb700/enable_usbdebug.c b/src/southbridge/amd/sb700/enable_usbdebug.c
index 37e529a..8a83599 100644
--- a/src/southbridge/amd/sb700/enable_usbdebug.c
+++ b/src/southbridge/amd/sb700/enable_usbdebug.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/sb700/fadt.c b/src/southbridge/amd/sb700/fadt.c
index 96996a3..261d022 100644
--- a/src/southbridge/amd/sb700/fadt.c
+++ b/src/southbridge/amd/sb700/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/sb700/hda.c b/src/southbridge/amd/sb700/hda.c
index 702a837..3d8759b 100644
--- a/src/southbridge/amd/sb700/hda.c
+++ b/src/southbridge/amd/sb700/hda.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/ide.c b/src/southbridge/amd/sb700/ide.c
index 8803d7f..a0b5a6b 100644
--- a/src/southbridge/amd/sb700/ide.c
+++ b/src/southbridge/amd/sb700/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/lpc.c b/src/southbridge/amd/sb700/lpc.c
index a39ec18..f2d0c47 100644
--- a/src/southbridge/amd/sb700/lpc.c
+++ b/src/southbridge/amd/sb700/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/pci.c b/src/southbridge/amd/sb700/pci.c
index d211b4a..b383236 100644
--- a/src/southbridge/amd/sb700/pci.c
+++ b/src/southbridge/amd/sb700/pci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/pmio.c b/src/southbridge/amd/sb700/pmio.c
index 4e4834a..5bafde1 100644
--- a/src/southbridge/amd/sb700/pmio.c
+++ b/src/southbridge/amd/sb700/pmio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/sb700/pmio.h b/src/southbridge/amd/sb700/pmio.h
index e99cd11..85b99ae 100644
--- a/src/southbridge/amd/sb700/pmio.h
+++ b/src/southbridge/amd/sb700/pmio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/amd/sb700/reset.c b/src/southbridge/amd/sb700/reset.c
index f6dae0a..014c1b9 100644
--- a/src/southbridge/amd/sb700/reset.c
+++ b/src/southbridge/amd/sb700/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/sb700/sata.c b/src/southbridge/amd/sb700/sata.c
index 172ad36..54a2c3e 100644
--- a/src/southbridge/amd/sb700/sata.c
+++ b/src/southbridge/amd/sb700/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/sb700.c b/src/southbridge/amd/sb700/sb700.c
index 2cab3c1..2f4ca56 100644
--- a/src/southbridge/amd/sb700/sb700.c
+++ b/src/southbridge/amd/sb700/sb700.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/sb700.h b/src/southbridge/amd/sb700/sb700.h
index ca020a5..6d5bfaa 100644
--- a/src/southbridge/amd/sb700/sb700.h
+++ b/src/southbridge/amd/sb700/sb700.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB700_H
diff --git a/src/southbridge/amd/sb700/sm.c b/src/southbridge/amd/sb700/sm.c
index f544c88..099063b 100644
--- a/src/southbridge/amd/sb700/sm.c
+++ b/src/southbridge/amd/sb700/sm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb700/smbus.c b/src/southbridge/amd/sb700/smbus.c
index 94f5e24..b6de506 100644
--- a/src/southbridge/amd/sb700/smbus.c
+++ b/src/southbridge/amd/sb700/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB700_SMBUS_C_
diff --git a/src/southbridge/amd/sb700/smbus.h b/src/southbridge/amd/sb700/smbus.h
index d223fe7..11552e5 100644
--- a/src/southbridge/amd/sb700/smbus.h
+++ b/src/southbridge/amd/sb700/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB700_SMBUS_H
diff --git a/src/southbridge/amd/sb700/usb.c b/src/southbridge/amd/sb700/usb.c
index c4e2b9a..3a3ab09 100644
--- a/src/southbridge/amd/sb700/usb.c
+++ b/src/southbridge/amd/sb700/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/Kconfig b/src/southbridge/amd/sb800/Kconfig
index 1d04c09..c9c4782 100644
--- a/src/southbridge/amd/sb800/Kconfig
+++ b/src/southbridge/amd/sb800/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_SB800
diff --git a/src/southbridge/amd/sb800/bootblock.c b/src/southbridge/amd/sb800/bootblock.c
index ba25f10..01522fb 100644
--- a/src/southbridge/amd/sb800/bootblock.c
+++ b/src/southbridge/amd/sb800/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/sb800/chip.h b/src/southbridge/amd/sb800/chip.h
index adbabe0..d1a1fc5 100644
--- a/src/southbridge/amd/sb800/chip.h
+++ b/src/southbridge/amd/sb800/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB800_CHIP_H
diff --git a/src/southbridge/amd/sb800/early_setup.c b/src/southbridge/amd/sb800/early_setup.c
index 2d1d2c6..773e4ee 100644
--- a/src/southbridge/amd/sb800/early_setup.c
+++ b/src/southbridge/amd/sb800/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB800_EARLY_SETUP_C_
diff --git a/src/southbridge/amd/sb800/enable_usbdebug.c b/src/southbridge/amd/sb800/enable_usbdebug.c
index 4965762..c0723d8 100644
--- a/src/southbridge/amd/sb800/enable_usbdebug.c
+++ b/src/southbridge/amd/sb800/enable_usbdebug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/sb800/fadt.c b/src/southbridge/amd/sb800/fadt.c
index fea98f9..00be0a7 100644
--- a/src/southbridge/amd/sb800/fadt.c
+++ b/src/southbridge/amd/sb800/fadt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/amd/sb800/hda.c b/src/southbridge/amd/sb800/hda.c
index 2d8df43..907f619 100644
--- a/src/southbridge/amd/sb800/hda.c
+++ b/src/southbridge/amd/sb800/hda.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/ide.c b/src/southbridge/amd/sb800/ide.c
index 080272c..5d77c2e 100644
--- a/src/southbridge/amd/sb800/ide.c
+++ b/src/southbridge/amd/sb800/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/lpc.c b/src/southbridge/amd/sb800/lpc.c
index 0cd5b32..fcdb699 100644
--- a/src/southbridge/amd/sb800/lpc.c
+++ b/src/southbridge/amd/sb800/lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/pci.c b/src/southbridge/amd/sb800/pci.c
index dceeb6b..54d2928 100644
--- a/src/southbridge/amd/sb800/pci.c
+++ b/src/southbridge/amd/sb800/pci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/pcie.c b/src/southbridge/amd/sb800/pcie.c
index 12ebcd5..c4e32b4 100644
--- a/src/southbridge/amd/sb800/pcie.c
+++ b/src/southbridge/amd/sb800/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/reset.c b/src/southbridge/amd/sb800/reset.c
index f8850b1..03e3068 100644
--- a/src/southbridge/amd/sb800/reset.c
+++ b/src/southbridge/amd/sb800/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/amd/sb800/sata.c b/src/southbridge/amd/sb800/sata.c
index f416bb6..d015e7f 100644
--- a/src/southbridge/amd/sb800/sata.c
+++ b/src/southbridge/amd/sb800/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/sb800.c b/src/southbridge/amd/sb800/sb800.c
index 4da922b..e52138c 100644
--- a/src/southbridge/amd/sb800/sb800.c
+++ b/src/southbridge/amd/sb800/sb800.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/sb800.h b/src/southbridge/amd/sb800/sb800.h
index 9049182..b538350 100644
--- a/src/southbridge/amd/sb800/sb800.h
+++ b/src/southbridge/amd/sb800/sb800.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB800_H
diff --git a/src/southbridge/amd/sb800/sm.c b/src/southbridge/amd/sb800/sm.c
index 1523c60..190de33 100644
--- a/src/southbridge/amd/sb800/sm.c
+++ b/src/southbridge/amd/sb800/sm.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sb800/smbus.c b/src/southbridge/amd/sb800/smbus.c
index 2bc5079..4f8df17 100644
--- a/src/southbridge/amd/sb800/smbus.c
+++ b/src/southbridge/amd/sb800/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SB800_SMBUS_C_
diff --git a/src/southbridge/amd/sb800/smbus.h b/src/southbridge/amd/sb800/smbus.h
index df10381..151894a 100644
--- a/src/southbridge/amd/sb800/smbus.h
+++ b/src/southbridge/amd/sb800/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SB800_SMBUS_H
diff --git a/src/southbridge/amd/sb800/usb.c b/src/southbridge/amd/sb800/usb.c
index 15088bb..22b174b 100644
--- a/src/southbridge/amd/sb800/usb.c
+++ b/src/southbridge/amd/sb800/usb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sr5650/Kconfig b/src/southbridge/amd/sr5650/Kconfig
index c501f3a..f7f203a 100644
--- a/src/southbridge/amd/sr5650/Kconfig
+++ b/src/southbridge/amd/sr5650/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_AMD_SR5650
diff --git a/src/southbridge/amd/sr5650/chip.h b/src/southbridge/amd/sr5650/chip.h
index 8a68998..ffdebc3 100644
--- a/src/southbridge/amd/sr5650/chip.h
+++ b/src/southbridge/amd/sr5650/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SR5650_CHIP_H
diff --git a/src/southbridge/amd/sr5650/cmn.h b/src/southbridge/amd/sr5650/cmn.h
index 23d25d5..d6c13f3 100644
--- a/src/southbridge/amd/sr5650/cmn.h
+++ b/src/southbridge/amd/sr5650/cmn.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SR5650_CMN_H__
diff --git a/src/southbridge/amd/sr5650/early_setup.c b/src/southbridge/amd/sr5650/early_setup.c
index d91f3bd..21f50ed 100644
--- a/src/southbridge/amd/sr5650/early_setup.c
+++ b/src/southbridge/amd/sr5650/early_setup.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/amd/sr5650/ht.c b/src/southbridge/amd/sr5650/ht.c
index c497107..0b8250e 100644
--- a/src/southbridge/amd/sr5650/ht.c
+++ b/src/southbridge/amd/sr5650/ht.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sr5650/pcie.c b/src/southbridge/amd/sr5650/pcie.c
index 3720a61..adccdc0 100644
--- a/src/southbridge/amd/sr5650/pcie.c
+++ b/src/southbridge/amd/sr5650/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sr5650/rev.h b/src/southbridge/amd/sr5650/rev.h
index 18385d5..ade96c5 100644
--- a/src/southbridge/amd/sr5650/rev.h
+++ b/src/southbridge/amd/sr5650/rev.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SR5650_REV_H__
diff --git a/src/southbridge/amd/sr5650/sr5650.c b/src/southbridge/amd/sr5650/sr5650.c
index 441be66..60b9968 100644
--- a/src/southbridge/amd/sr5650/sr5650.c
+++ b/src/southbridge/amd/sr5650/sr5650.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/amd/sr5650/sr5650.h b/src/southbridge/amd/sr5650/sr5650.h
index ebbde41..70c95f1 100644
--- a/src/southbridge/amd/sr5650/sr5650.h
+++ b/src/southbridge/amd/sr5650/sr5650.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __SR5650_H__
diff --git a/src/southbridge/broadcom/bcm21000/pcie.c b/src/southbridge/broadcom/bcm21000/pcie.c
index 89abc96..ca8a8cf 100644
--- a/src/southbridge/broadcom/bcm21000/pcie.c
+++ b/src/southbridge/broadcom/bcm21000/pcie.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5780/nic.c b/src/southbridge/broadcom/bcm5780/nic.c
index fa2fa8b..afa279d 100644
--- a/src/southbridge/broadcom/bcm5780/nic.c
+++ b/src/southbridge/broadcom/bcm5780/nic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5780/pcie.c b/src/southbridge/broadcom/bcm5780/pcie.c
index 1c5f38c..8e735ff 100644
--- a/src/southbridge/broadcom/bcm5780/pcie.c
+++ b/src/southbridge/broadcom/bcm5780/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5780/pcix.c b/src/southbridge/broadcom/bcm5780/pcix.c
index 3eb5bb7..39f91a9 100644
--- a/src/southbridge/broadcom/bcm5780/pcix.c
+++ b/src/southbridge/broadcom/bcm5780/pcix.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c
index 6446a55..2cb34d6 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.c
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.h b/src/southbridge/broadcom/bcm5785/bcm5785.h
index 4d83b6f..0a25fd7 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.h
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BCM5785_H
diff --git a/src/southbridge/broadcom/bcm5785/bootblock.c b/src/southbridge/broadcom/bcm5785/bootblock.c
index a532866..8ca6b85 100644
--- a/src/southbridge/broadcom/bcm5785/bootblock.c
+++ b/src/southbridge/broadcom/bcm5785/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/broadcom/bcm5785/chip.h b/src/southbridge/broadcom/bcm5785/chip.h
index ef7a2f5..86441db 100644
--- a/src/southbridge/broadcom/bcm5785/chip.h
+++ b/src/southbridge/broadcom/bcm5785/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef BCM5785_CHIP_H
diff --git a/src/southbridge/broadcom/bcm5785/early_setup.c b/src/southbridge/broadcom/bcm5785/early_setup.c
index 6ff5c41..0e33d25 100644
--- a/src/southbridge/broadcom/bcm5785/early_setup.c
+++ b/src/southbridge/broadcom/bcm5785/early_setup.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/southbridge/broadcom/bcm5785/early_smbus.c b/src/southbridge/broadcom/bcm5785/early_smbus.c
index aae95b9..2c5b9e8 100644
--- a/src/southbridge/broadcom/bcm5785/early_smbus.c
+++ b/src/southbridge/broadcom/bcm5785/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smbus.h"
diff --git a/src/southbridge/broadcom/bcm5785/ide.c b/src/southbridge/broadcom/bcm5785/ide.c
index 0019820..0cd0f4b 100644
--- a/src/southbridge/broadcom/bcm5785/ide.c
+++ b/src/southbridge/broadcom/bcm5785/ide.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5785/lpc.c b/src/southbridge/broadcom/bcm5785/lpc.c
index ef70df6..36605e7 100644
--- a/src/southbridge/broadcom/bcm5785/lpc.c
+++ b/src/southbridge/broadcom/bcm5785/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5785/reset.c b/src/southbridge/broadcom/bcm5785/reset.c
index ac1e3f5..d18cda6 100644
--- a/src/southbridge/broadcom/bcm5785/reset.c
+++ b/src/southbridge/broadcom/bcm5785/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/broadcom/bcm5785/sata.c b/src/southbridge/broadcom/bcm5785/sata.c
index f5b3971..4815ff9 100644
--- a/src/southbridge/broadcom/bcm5785/sata.c
+++ b/src/southbridge/broadcom/bcm5785/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5785/sb_pci_main.c b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
index 3390b0d..91019d3 100644
--- a/src/southbridge/broadcom/bcm5785/sb_pci_main.c
+++ b/src/southbridge/broadcom/bcm5785/sb_pci_main.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/broadcom/bcm5785/smbus.h b/src/southbridge/broadcom/bcm5785/smbus.h
index 1d35cd4..b3f035c 100644
--- a/src/southbridge/broadcom/bcm5785/smbus.h
+++ b/src/southbridge/broadcom/bcm5785/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/broadcom/bcm5785/usb.c b/src/southbridge/broadcom/bcm5785/usb.c
index 5410d76..ab3b067 100644
--- a/src/southbridge/broadcom/bcm5785/usb.c
+++ b/src/southbridge/broadcom/bcm5785/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/dmp/vortex86ex/Kconfig b/src/southbridge/dmp/vortex86ex/Kconfig
index e7d5bc6..6f65b08 100644
--- a/src/southbridge/dmp/vortex86ex/Kconfig
+++ b/src/southbridge/dmp/vortex86ex/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_DMP_VORTEX86EX
diff --git a/src/southbridge/dmp/vortex86ex/Makefile.inc b/src/southbridge/dmp/vortex86ex/Makefile.inc
index 36567b1..7dd0ec1 100644
--- a/src/southbridge/dmp/vortex86ex/Makefile.inc
+++ b/src/southbridge/dmp/vortex86ex/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_DMP_VORTEX86EX),y)
diff --git a/src/southbridge/dmp/vortex86ex/audio.c b/src/southbridge/dmp/vortex86ex/audio.c
index 2a34ac4..e19b7b3 100644
--- a/src/southbridge/dmp/vortex86ex/audio.c
+++ b/src/southbridge/dmp/vortex86ex/audio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/azalia_device.h>
diff --git a/src/southbridge/dmp/vortex86ex/chip.h b/src/southbridge/dmp/vortex86ex/chip.h
index b715de6..0fddb19 100644
--- a/src/southbridge/dmp/vortex86ex/chip.h
+++ b/src/southbridge/dmp/vortex86ex/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOUTHBRIDGE_DMP_VORTEX86EX
diff --git a/src/southbridge/dmp/vortex86ex/hard_reset.c b/src/southbridge/dmp/vortex86ex/hard_reset.c
index a05487c..7152975 100644
--- a/src/southbridge/dmp/vortex86ex/hard_reset.c
+++ b/src/southbridge/dmp/vortex86ex/hard_reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/dmp/vortex86ex/ide_sd_sata.c b/src/southbridge/dmp/vortex86ex/ide_sd_sata.c
index 5e49e85..59449bf 100644
--- a/src/southbridge/dmp/vortex86ex/ide_sd_sata.c
+++ b/src/southbridge/dmp/vortex86ex/ide_sd_sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/southbridge/dmp/vortex86ex/southbridge.c b/src/southbridge/dmp/vortex86ex/southbridge.c
index 192de74..6d9ba45 100644
--- a/src/southbridge/dmp/vortex86ex/southbridge.c
+++ b/src/southbridge/dmp/vortex86ex/southbridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/dmp/vortex86ex/southbridge.h b/src/southbridge/dmp/vortex86ex/southbridge.h
index 0b7c769..2814781 100644
--- a/src/southbridge/dmp/vortex86ex/southbridge.h
+++ b/src/southbridge/dmp/vortex86ex/southbridge.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_H
diff --git a/src/southbridge/intel/bd82x6x/Kconfig b/src/southbridge/intel/bd82x6x/Kconfig
index 9bdeefa..d59cfbf 100644
--- a/src/southbridge/intel/bd82x6x/Kconfig
+++ b/src/southbridge/intel/bd82x6x/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/southbridge/intel/bd82x6x/Makefile.inc b/src/southbridge/intel/bd82x6x/Makefile.inc
index ff140a0..fd76935 100644
--- a/src/southbridge/intel/bd82x6x/Makefile.inc
+++ b/src/southbridge/intel/bd82x6x/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_C216)$(CONFIG_SOUTHBRIDGE_INTEL_BD82X6X),y)
diff --git a/src/southbridge/intel/bd82x6x/acpi/audio.asl b/src/southbridge/intel/bd82x6x/acpi/audio.asl
index 6679bd1..521f0d2 100644
--- a/src/southbridge/intel/bd82x6x/acpi/audio.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel PCH HDA */
diff --git a/src/southbridge/intel/bd82x6x/acpi/default_irq_route.asl b/src/southbridge/intel/bd82x6x/acpi/default_irq_route.asl
index 3bde17b..4644208 100644
--- a/src/southbridge/intel/bd82x6x/acpi/default_irq_route.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/default_irq_route.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PCI Interrupt Routing */
diff --git a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
index 026f682..e319d34 100644
--- a/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/globalnvs.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/southbridge/intel/bd82x6x/acpi/irqlinks.asl b/src/southbridge/intel/bd82x6x/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/southbridge/intel/bd82x6x/acpi/irqlinks.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/southbridge/intel/bd82x6x/acpi/lpc.asl b/src/southbridge/intel/bd82x6x/acpi/lpc.asl
index 83c04d5..bd3b871 100644
--- a/src/southbridge/intel/bd82x6x/acpi/lpc.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/lpc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/southbridge/intel/bd82x6x/acpi/pch.asl b/src/southbridge/intel/bd82x6x/acpi/pch.asl
index 974cac5..6dcba7c 100644
--- a/src/southbridge/intel/bd82x6x/acpi/pch.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/pch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Cougar Point PCH support */
diff --git a/src/southbridge/intel/bd82x6x/acpi/pcie.asl b/src/southbridge/intel/bd82x6x/acpi/pcie.asl
index 33440c3..60baa22 100644
--- a/src/southbridge/intel/bd82x6x/acpi/pcie.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/pcie.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel 6/7 Series PCH PCIe support */
diff --git a/src/southbridge/intel/bd82x6x/acpi/pcie_port.asl b/src/southbridge/intel/bd82x6x/acpi/pcie_port.asl
index 823e8b0..d7f7fcc 100644
--- a/src/southbridge/intel/bd82x6x/acpi/pcie_port.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/pcie_port.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Included in each PCIe Root Port device */
diff --git a/src/southbridge/intel/bd82x6x/acpi/platform.asl b/src/southbridge/intel/bd82x6x/acpi/platform.asl
index e2d6008..e9ae6c9 100644
--- a/src/southbridge/intel/bd82x6x/acpi/platform.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/platform.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/southbridge/intel/bd82x6x/acpi/sata.asl b/src/southbridge/intel/bd82x6x/acpi/sata.asl
index 00d3010..c7f7eb3 100644
--- a/src/southbridge/intel/bd82x6x/acpi/sata.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/sata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SATA Controller 0:1f.2
diff --git a/src/southbridge/intel/bd82x6x/acpi/sleepstates.asl b/src/southbridge/intel/bd82x6x/acpi/sleepstates.asl
index fef196e..1640951 100644
--- a/src/southbridge/intel/bd82x6x/acpi/sleepstates.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/southbridge/intel/bd82x6x/acpi/smbus.asl b/src/southbridge/intel/bd82x6x/acpi/smbus.asl
index efd323d..131f345 100644
--- a/src/southbridge/intel/bd82x6x/acpi/smbus.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/smbus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/southbridge/intel/bd82x6x/acpi/usb.asl b/src/southbridge/intel/bd82x6x/acpi/usb.asl
index f6330e0..7cbc8d5 100644
--- a/src/southbridge/intel/bd82x6x/acpi/usb.asl
+++ b/src/southbridge/intel/bd82x6x/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Cougar Point USB support */
diff --git a/src/southbridge/intel/bd82x6x/azalia.c b/src/southbridge/intel/bd82x6x/azalia.c
index 2dd8836..f34f4b0 100644
--- a/src/southbridge/intel/bd82x6x/azalia.c
+++ b/src/southbridge/intel/bd82x6x/azalia.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/bootblock.c b/src/southbridge/intel/bd82x6x/bootblock.c
index 18532df..6b3408d 100644
--- a/src/southbridge/intel/bd82x6x/bootblock.c
+++ b/src/southbridge/intel/bd82x6x/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/chip.h b/src/southbridge/intel/bd82x6x/chip.h
index 3fa9192..7c85af2 100644
--- a/src/southbridge/intel/bd82x6x/chip.h
+++ b/src/southbridge/intel/bd82x6x/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_BD82X6X_CHIP_H
diff --git a/src/southbridge/intel/bd82x6x/early_me.c b/src/southbridge/intel/bd82x6x/early_me.c
index ed9351f..c37d27f 100644
--- a/src/southbridge/intel/bd82x6x/early_me.c
+++ b/src/southbridge/intel/bd82x6x/early_me.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_me_mrc.c b/src/southbridge/intel/bd82x6x/early_me_mrc.c
index b7dbf34..64b6d84 100644
--- a/src/southbridge/intel/bd82x6x/early_me_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_me_mrc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_pch.c b/src/southbridge/intel/bd82x6x/early_pch.c
index 4dcdb8f..7423a77 100644
--- a/src/southbridge/intel/bd82x6x/early_pch.c
+++ b/src/southbridge/intel/bd82x6x/early_pch.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/early_pch_common.c b/src/southbridge/intel/bd82x6x/early_pch_common.c
index 3852875..3a1ecf4 100644
--- a/src/southbridge/intel/bd82x6x/early_pch_common.c
+++ b/src/southbridge/intel/bd82x6x/early_pch_common.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_rcba.c b/src/southbridge/intel/bd82x6x/early_rcba.c
index 68a13cf..3f61309 100644
--- a/src/southbridge/intel/bd82x6x/early_rcba.c
+++ b/src/southbridge/intel/bd82x6x/early_rcba.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/bd82x6x/early_smbus.c b/src/southbridge/intel/bd82x6x/early_smbus.c
index 286de8c..aeb88cd 100644
--- a/src/southbridge/intel/bd82x6x/early_smbus.c
+++ b/src/southbridge/intel/bd82x6x/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_spi.c b/src/southbridge/intel/bd82x6x/early_spi.c
index 1ebe044..1ae5c3e 100644
--- a/src/southbridge/intel/bd82x6x/early_spi.c
+++ b/src/southbridge/intel/bd82x6x/early_spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_thermal.c b/src/southbridge/intel/bd82x6x/early_thermal.c
index 1cbe954..9fb8d42 100644
--- a/src/southbridge/intel/bd82x6x/early_thermal.c
+++ b/src/southbridge/intel/bd82x6x/early_thermal.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_usb.c b/src/southbridge/intel/bd82x6x/early_usb.c
index 6973c6c..81493c5 100644
--- a/src/southbridge/intel/bd82x6x/early_usb.c
+++ b/src/southbridge/intel/bd82x6x/early_usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/early_usb_mrc.c b/src/southbridge/intel/bd82x6x/early_usb_mrc.c
index 0533ae7..32b2703 100644
--- a/src/southbridge/intel/bd82x6x/early_usb_mrc.c
+++ b/src/southbridge/intel/bd82x6x/early_usb_mrc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/elog.c b/src/southbridge/intel/bd82x6x/elog.c
index c93d3ec..07815be 100644
--- a/src/southbridge/intel/bd82x6x/elog.c
+++ b/src/southbridge/intel/bd82x6x/elog.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/finalize.c b/src/southbridge/intel/bd82x6x/finalize.c
index 3e7c85b..9f94226 100644
--- a/src/southbridge/intel/bd82x6x/finalize.c
+++ b/src/southbridge/intel/bd82x6x/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/gpio.c b/src/southbridge/intel/bd82x6x/gpio.c
index b430272..1b3ba78 100644
--- a/src/southbridge/intel/bd82x6x/gpio.c
+++ b/src/southbridge/intel/bd82x6x/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/bd82x6x/gpio.h b/src/southbridge/intel/bd82x6x/gpio.h
index 18ae81d..07da62a 100644
--- a/src/southbridge/intel/bd82x6x/gpio.h
+++ b/src/southbridge/intel/bd82x6x/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef INTEL_BD82X6X_GPIO_H
diff --git a/src/southbridge/intel/bd82x6x/lpc.c b/src/southbridge/intel/bd82x6x/lpc.c
index 6bf43de..be9ae3c 100644
--- a/src/southbridge/intel/bd82x6x/lpc.c
+++ b/src/southbridge/intel/bd82x6x/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/madt.c b/src/southbridge/intel/bd82x6x/madt.c
index 713da0c..8abd244 100644
--- a/src/southbridge/intel/bd82x6x/madt.c
+++ b/src/southbridge/intel/bd82x6x/madt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/intel/bd82x6x/me.c b/src/southbridge/intel/bd82x6x/me.c
index ab3d475..840344a 100644
--- a/src/southbridge/intel/bd82x6x/me.c
+++ b/src/southbridge/intel/bd82x6x/me.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/bd82x6x/me.h b/src/southbridge/intel/bd82x6x/me.h
index 967d46b..2917238 100644
--- a/src/southbridge/intel/bd82x6x/me.h
+++ b/src/southbridge/intel/bd82x6x/me.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_ME_H
diff --git a/src/southbridge/intel/bd82x6x/me_8.x.c b/src/southbridge/intel/bd82x6x/me_8.x.c
index 6bd26c4..96c2f9b 100644
--- a/src/southbridge/intel/bd82x6x/me_8.x.c
+++ b/src/southbridge/intel/bd82x6x/me_8.x.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/bd82x6x/me_status.c b/src/southbridge/intel/bd82x6x/me_status.c
index 37fcf57..b4ed0a2 100644
--- a/src/southbridge/intel/bd82x6x/me_status.c
+++ b/src/southbridge/intel/bd82x6x/me_status.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/southbridge/intel/bd82x6x/nvs.h b/src/southbridge/intel/bd82x6x/nvs.h
index 84f7998..42db8c8 100644
--- a/src/southbridge/intel/bd82x6x/nvs.h
+++ b/src/southbridge/intel/bd82x6x/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/bd82x6x/pch.c b/src/southbridge/intel/bd82x6x/pch.c
index d4b873d..d5ee74d 100644
--- a/src/southbridge/intel/bd82x6x/pch.c
+++ b/src/southbridge/intel/bd82x6x/pch.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/pch.h b/src/southbridge/intel/bd82x6x/pch.h
index 3ce5d63..d0687dd 100644
--- a/src/southbridge/intel/bd82x6x/pch.h
+++ b/src/southbridge/intel/bd82x6x/pch.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_BD82X6X_PCH_H
diff --git a/src/southbridge/intel/bd82x6x/pci.c b/src/southbridge/intel/bd82x6x/pci.c
index 864c60c..81104fa 100644
--- a/src/southbridge/intel/bd82x6x/pci.c
+++ b/src/southbridge/intel/bd82x6x/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/pcie.c b/src/southbridge/intel/bd82x6x/pcie.c
index 1b8ac76..cd4995f 100644
--- a/src/southbridge/intel/bd82x6x/pcie.c
+++ b/src/southbridge/intel/bd82x6x/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/reset.c b/src/southbridge/intel/bd82x6x/reset.c
index e914613..4d225b3 100644
--- a/src/southbridge/intel/bd82x6x/reset.c
+++ b/src/southbridge/intel/bd82x6x/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/sata.c b/src/southbridge/intel/bd82x6x/sata.c
index 66a4c56..ba4e2ab 100644
--- a/src/southbridge/intel/bd82x6x/sata.c
+++ b/src/southbridge/intel/bd82x6x/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/bd82x6x/smbus.c b/src/southbridge/intel/bd82x6x/smbus.c
index 0198841..67460b8 100644
--- a/src/southbridge/intel/bd82x6x/smbus.c
+++ b/src/southbridge/intel/bd82x6x/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/smbus.h b/src/southbridge/intel/bd82x6x/smbus.h
index b9983a4..e953191 100644
--- a/src/southbridge/intel/bd82x6x/smbus.h
+++ b/src/southbridge/intel/bd82x6x/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/bd82x6x/smi.c b/src/southbridge/intel/bd82x6x/smi.c
index d9c0e08..df8b61f 100644
--- a/src/southbridge/intel/bd82x6x/smi.c
+++ b/src/southbridge/intel/bd82x6x/smi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/intel/bd82x6x/smihandler.c b/src/southbridge/intel/bd82x6x/smihandler.c
index d9d63b7..f7e619e 100644
--- a/src/southbridge/intel/bd82x6x/smihandler.c
+++ b/src/southbridge/intel/bd82x6x/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c
index ec06dbd..9a98b5e 100644
--- a/src/southbridge/intel/bd82x6x/usb_ehci.c
+++ b/src/southbridge/intel/bd82x6x/usb_ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <kconfig.h>
diff --git a/src/southbridge/intel/bd82x6x/usb_xhci.c b/src/southbridge/intel/bd82x6x/usb_xhci.c
index cdc7bed..8c95d98 100644
--- a/src/southbridge/intel/bd82x6x/usb_xhci.c
+++ b/src/southbridge/intel/bd82x6x/usb_xhci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/bd82x6x/watchdog.c b/src/southbridge/intel/bd82x6x/watchdog.c
index 91bc615..4e35a41 100644
--- a/src/southbridge/intel/bd82x6x/watchdog.c
+++ b/src/southbridge/intel/bd82x6x/watchdog.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/common/Makefile.inc b/src/southbridge/intel/common/Makefile.inc
index 36dc432..f61994b 100644
--- a/src/southbridge/intel/common/Makefile.inc
+++ b/src/southbridge/intel/common/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # CONFIG_HAVE_INTEL_FIRMWARE protects doing anything to the build.
diff --git a/src/southbridge/intel/common/firmware/Kconfig b/src/southbridge/intel/common/firmware/Kconfig
index 25efe40..a23a114 100644
--- a/src/southbridge/intel/common/firmware/Kconfig
+++ b/src/southbridge/intel/common/firmware/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config HAVE_INTEL_FIRMWARE
diff --git a/src/southbridge/intel/common/firmware/Makefile.inc b/src/southbridge/intel/common/firmware/Makefile.inc
index 6fa4d27..0f2c264 100644
--- a/src/southbridge/intel/common/firmware/Makefile.inc
+++ b/src/southbridge/intel/common/firmware/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_HAVE_INTEL_FIRMWARE),y)
diff --git a/src/southbridge/intel/common/pciehp.c b/src/southbridge/intel/common/pciehp.c
index 9a957fe..74530c9 100644
--- a/src/southbridge/intel/common/pciehp.c
+++ b/src/southbridge/intel/common/pciehp.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index b664a63..5a788f8 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file is derived from the flashrom project. */
diff --git a/src/southbridge/intel/common/usb_debug.c b/src/southbridge/intel/common/usb_debug.c
index 3c81986..c5e17bb 100644
--- a/src/southbridge/intel/common/usb_debug.c
+++ b/src/southbridge/intel/common/usb_debug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/intel/esb6300/reset.c b/src/southbridge/intel/esb6300/reset.c
index 77787a5..95696db 100644
--- a/src/southbridge/intel/esb6300/reset.c
+++ b/src/southbridge/intel/esb6300/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i3100/chip.h b/src/southbridge/intel/i3100/chip.h
index aa5b157..153d5a1 100644
--- a/src/southbridge/intel/i3100/chip.h
+++ b/src/southbridge/intel/i3100/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/early_lpc.c b/src/southbridge/intel/i3100/early_lpc.c
index adbe88a..d18cfdb 100644
--- a/src/southbridge/intel/i3100/early_lpc.c
+++ b/src/southbridge/intel/i3100/early_lpc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/early_smbus.c b/src/southbridge/intel/i3100/early_smbus.c
index 67ec5e1..dde597a 100644
--- a/src/southbridge/intel/i3100/early_smbus.c
+++ b/src/southbridge/intel/i3100/early_smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/ehci.c b/src/southbridge/intel/i3100/ehci.c
index 77d9a87..14aaf05 100644
--- a/src/southbridge/intel/i3100/ehci.c
+++ b/src/southbridge/intel/i3100/ehci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/i3100.c b/src/southbridge/intel/i3100/i3100.c
index 8a20446..f68b9ad 100644
--- a/src/southbridge/intel/i3100/i3100.c
+++ b/src/southbridge/intel/i3100/i3100.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/i3100.h b/src/southbridge/intel/i3100/i3100.h
index 449dd8d..b2c45dd 100644
--- a/src/southbridge/intel/i3100/i3100.h
+++ b/src/southbridge/intel/i3100/i3100.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I3100_I3100_H
diff --git a/src/southbridge/intel/i3100/ioapic.c b/src/southbridge/intel/i3100/ioapic.c
index e2e3d2e..17b1201 100644
--- a/src/southbridge/intel/i3100/ioapic.c
+++ b/src/southbridge/intel/i3100/ioapic.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/lpc.c b/src/southbridge/intel/i3100/lpc.c
index aef855f..70213c2 100644
--- a/src/southbridge/intel/i3100/lpc.c
+++ b/src/southbridge/intel/i3100/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/pci.c b/src/southbridge/intel/i3100/pci.c
index 04abecc..207b714 100644
--- a/src/southbridge/intel/i3100/pci.c
+++ b/src/southbridge/intel/i3100/pci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/pciexp_portb.c b/src/southbridge/intel/i3100/pciexp_portb.c
index 41e921c..98d8c10 100644
--- a/src/southbridge/intel/i3100/pciexp_portb.c
+++ b/src/southbridge/intel/i3100/pciexp_portb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/reset.c b/src/southbridge/intel/i3100/reset.c
index 7438c3e..1974129 100644
--- a/src/southbridge/intel/i3100/reset.c
+++ b/src/southbridge/intel/i3100/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/sata.c b/src/southbridge/intel/i3100/sata.c
index 0716e1d..bb5cbff 100644
--- a/src/southbridge/intel/i3100/sata.c
+++ b/src/southbridge/intel/i3100/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/smbus.c b/src/southbridge/intel/i3100/smbus.c
index 2feb00f..a5f23cc 100644
--- a/src/southbridge/intel/i3100/smbus.c
+++ b/src/southbridge/intel/i3100/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i3100/smbus.h b/src/southbridge/intel/i3100/smbus.h
index 0f00c0f..f7ff447 100644
--- a/src/southbridge/intel/i3100/smbus.h
+++ b/src/southbridge/intel/i3100/smbus.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This code is based on src/southbridge/intel/esb6300/esb6300_smbus.h */
diff --git a/src/southbridge/intel/i3100/uhci.c b/src/southbridge/intel/i3100/uhci.c
index 70b321e..f35c689 100644
--- a/src/southbridge/intel/i3100/uhci.c
+++ b/src/southbridge/intel/i3100/uhci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  */
 
diff --git a/src/southbridge/intel/i82371eb/Makefile.inc b/src/southbridge/intel/i82371eb/Makefile.inc
index 7b46970..a00768e 100644
--- a/src/southbridge/intel/i82371eb/Makefile.inc
+++ b/src/southbridge/intel/i82371eb/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82371EB),y)
diff --git a/src/southbridge/intel/i82371eb/acpi/isabridge.asl b/src/southbridge/intel/i82371eb/acpi/isabridge.asl
index be68b18..600b0c5 100644
--- a/src/southbridge/intel/i82371eb/acpi/isabridge.asl
+++ b/src/southbridge/intel/i82371eb/acpi/isabridge.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/i82371eb/acpi/pirq.asl b/src/southbridge/intel/i82371eb/acpi/pirq.asl
index 29383fd..2baf595 100644
--- a/src/southbridge/intel/i82371eb/acpi/pirq.asl
+++ b/src/southbridge/intel/i82371eb/acpi/pirq.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Field (\_SB.PCI0.LPCB.PCIC, AnyAcc, NoLock, Preserve)
diff --git a/src/southbridge/intel/i82371eb/acpi_tables.c b/src/southbridge/intel/i82371eb/acpi_tables.c
index fa3029c..57ceba5 100644
--- a/src/southbridge/intel/i82371eb/acpi_tables.c
+++ b/src/southbridge/intel/i82371eb/acpi_tables.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82371eb/bootblock.c b/src/southbridge/intel/i82371eb/bootblock.c
index 43dba4c..da2fb82 100644
--- a/src/southbridge/intel/i82371eb/bootblock.c
+++ b/src/southbridge/intel/i82371eb/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82371eb/chip.h b/src/southbridge/intel/i82371eb/chip.h
index 5e09a88..77b9263 100644
--- a/src/southbridge/intel/i82371eb/chip.h
+++ b/src/southbridge/intel/i82371eb/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82371EB_CHIP_H
diff --git a/src/southbridge/intel/i82371eb/early_pm.c b/src/southbridge/intel/i82371eb/early_pm.c
index 048bbb5..305ee8c 100644
--- a/src/southbridge/intel/i82371eb/early_pm.c
+++ b/src/southbridge/intel/i82371eb/early_pm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82371eb/early_smbus.c b/src/southbridge/intel/i82371eb/early_smbus.c
index a829048..428dfc0 100644
--- a/src/southbridge/intel/i82371eb/early_smbus.c
+++ b/src/southbridge/intel/i82371eb/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82371eb/fadt.c b/src/southbridge/intel/i82371eb/fadt.c
index fe03ae4..17851ae 100644
--- a/src/southbridge/intel/i82371eb/fadt.c
+++ b/src/southbridge/intel/i82371eb/fadt.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/southbridge/intel/i82371eb/i82371eb.c b/src/southbridge/intel/i82371eb/i82371eb.c
index ae79133..5662540 100644
--- a/src/southbridge/intel/i82371eb/i82371eb.c
+++ b/src/southbridge/intel/i82371eb/i82371eb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Note: This code supports the 82371FB/SB/MX/AB/EB/MB and 82437MX. */
diff --git a/src/southbridge/intel/i82371eb/i82371eb.h b/src/southbridge/intel/i82371eb/i82371eb.h
index bd697ca..c4b8001 100644
--- a/src/southbridge/intel/i82371eb/i82371eb.h
+++ b/src/southbridge/intel/i82371eb/i82371eb.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82371EB_I82371EB_H
diff --git a/src/southbridge/intel/i82371eb/ide.c b/src/southbridge/intel/i82371eb/ide.c
index 9cdb303..0701e08 100644
--- a/src/southbridge/intel/i82371eb/ide.c
+++ b/src/southbridge/intel/i82371eb/ide.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* TODO: Check if this really works for all of the southbridges. */
diff --git a/src/southbridge/intel/i82371eb/isa.c b/src/southbridge/intel/i82371eb/isa.c
index 61006e6..e34f399 100644
--- a/src/southbridge/intel/i82371eb/isa.c
+++ b/src/southbridge/intel/i82371eb/isa.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82371eb/reset.c b/src/southbridge/intel/i82371eb/reset.c
index 112ba96..b30469b 100644
--- a/src/southbridge/intel/i82371eb/reset.c
+++ b/src/southbridge/intel/i82371eb/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82371eb/smbus.c b/src/southbridge/intel/i82371eb/smbus.c
index 3817357..c80d3c0 100644
--- a/src/southbridge/intel/i82371eb/smbus.c
+++ b/src/southbridge/intel/i82371eb/smbus.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82371eb/usb.c b/src/southbridge/intel/i82371eb/usb.c
index 5a0a097..d3381e7 100644
--- a/src/southbridge/intel/i82371eb/usb.c
+++ b/src/southbridge/intel/i82371eb/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82371eb/wakeup.c b/src/southbridge/intel/i82371eb/wakeup.c
index 005d341..55c8f14 100644
--- a/src/southbridge/intel/i82371eb/wakeup.c
+++ b/src/southbridge/intel/i82371eb/wakeup.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82801ax/Kconfig b/src/southbridge/intel/i82801ax/Kconfig
index 7899faa..f08140a 100644
--- a/src/southbridge/intel/i82801ax/Kconfig
+++ b/src/southbridge/intel/i82801ax/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/southbridge/intel/i82801ax/Makefile.inc b/src/southbridge/intel/i82801ax/Makefile.inc
index d7e9d74..6531d3a 100644
--- a/src/southbridge/intel/i82801ax/Makefile.inc
+++ b/src/southbridge/intel/i82801ax/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82801AX),y)
diff --git a/src/southbridge/intel/i82801ax/ac97.c b/src/southbridge/intel/i82801ax/ac97.c
index 1f88172..7bad9db 100644
--- a/src/southbridge/intel/i82801ax/ac97.c
+++ b/src/southbridge/intel/i82801ax/ac97.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ax/chip.h b/src/southbridge/intel/i82801ax/chip.h
index 1d8f0ea..f95b358 100644
--- a/src/southbridge/intel/i82801ax/chip.h
+++ b/src/southbridge/intel/i82801ax/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/i82801ax/early_smbus.c b/src/southbridge/intel/i82801ax/early_smbus.c
index c6d8c52..6c2469f 100644
--- a/src/southbridge/intel/i82801ax/early_smbus.c
+++ b/src/southbridge/intel/i82801ax/early_smbus.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ax/i82801ax.c b/src/southbridge/intel/i82801ax/i82801ax.c
index f6430bc..abe3660 100644
--- a/src/southbridge/intel/i82801ax/i82801ax.c
+++ b/src/southbridge/intel/i82801ax/i82801ax.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ax/i82801ax.h b/src/southbridge/intel/i82801ax/i82801ax.h
index b83da08..be96f4b 100644
--- a/src/southbridge/intel/i82801ax/i82801ax.h
+++ b/src/southbridge/intel/i82801ax/i82801ax.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801AX_I82801AX_H
diff --git a/src/southbridge/intel/i82801ax/ide.c b/src/southbridge/intel/i82801ax/ide.c
index cb61032..b41a57c 100644
--- a/src/southbridge/intel/i82801ax/ide.c
+++ b/src/southbridge/intel/i82801ax/ide.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ax/lpc.c b/src/southbridge/intel/i82801ax/lpc.c
index e960551..e3354ff 100644
--- a/src/southbridge/intel/i82801ax/lpc.c
+++ b/src/southbridge/intel/i82801ax/lpc.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ax/pci.c b/src/southbridge/intel/i82801ax/pci.c
index 82dde5f..9d28e07 100644
--- a/src/southbridge/intel/i82801ax/pci.c
+++ b/src/southbridge/intel/i82801ax/pci.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ax/reset.c b/src/southbridge/intel/i82801ax/reset.c
index b71badf..fbd1182 100644
--- a/src/southbridge/intel/i82801ax/reset.c
+++ b/src/southbridge/intel/i82801ax/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/southbridge/intel/i82801ax/smbus.c b/src/southbridge/intel/i82801ax/smbus.c
index 76a78d1..56e0b60 100644
--- a/src/southbridge/intel/i82801ax/smbus.c
+++ b/src/southbridge/intel/i82801ax/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82801ax/smbus.h b/src/southbridge/intel/i82801ax/smbus.h
index e2e5977..c137680 100644
--- a/src/southbridge/intel/i82801ax/smbus.h
+++ b/src/southbridge/intel/i82801ax/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/i82801ax/usb.c b/src/southbridge/intel/i82801ax/usb.c
index 0e1c307..e98af8d 100644
--- a/src/southbridge/intel/i82801ax/usb.c
+++ b/src/southbridge/intel/i82801ax/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ax/watchdog.c b/src/southbridge/intel/i82801ax/watchdog.c
index 6862ff6..21212eb 100644
--- a/src/southbridge/intel/i82801ax/watchdog.c
+++ b/src/southbridge/intel/i82801ax/watchdog.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/Kconfig b/src/southbridge/intel/i82801bx/Kconfig
index f0e8e9d..fba3e04 100644
--- a/src/southbridge/intel/i82801bx/Kconfig
+++ b/src/southbridge/intel/i82801bx/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_I82801BX
diff --git a/src/southbridge/intel/i82801bx/Makefile.inc b/src/southbridge/intel/i82801bx/Makefile.inc
index aaabfe0..9e1be26 100644
--- a/src/southbridge/intel/i82801bx/Makefile.inc
+++ b/src/southbridge/intel/i82801bx/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82801BX),y)
diff --git a/src/southbridge/intel/i82801bx/ac97.c b/src/southbridge/intel/i82801bx/ac97.c
index 62b5f07..141ade8 100644
--- a/src/southbridge/intel/i82801bx/ac97.c
+++ b/src/southbridge/intel/i82801bx/ac97.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/chip.h b/src/southbridge/intel/i82801bx/chip.h
index 24ae471..fcce15f 100644
--- a/src/southbridge/intel/i82801bx/chip.h
+++ b/src/southbridge/intel/i82801bx/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/i82801bx/early_smbus.c b/src/southbridge/intel/i82801bx/early_smbus.c
index 3662d49..86f1c93 100644
--- a/src/southbridge/intel/i82801bx/early_smbus.c
+++ b/src/southbridge/intel/i82801bx/early_smbus.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801bx/i82801bx.c b/src/southbridge/intel/i82801bx/i82801bx.c
index 831cb40..bf705f6 100644
--- a/src/southbridge/intel/i82801bx/i82801bx.c
+++ b/src/southbridge/intel/i82801bx/i82801bx.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/i82801bx.h b/src/southbridge/intel/i82801bx/i82801bx.h
index faacc18..5ab9e76 100644
--- a/src/southbridge/intel/i82801bx/i82801bx.h
+++ b/src/southbridge/intel/i82801bx/i82801bx.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801BX_I82801BX_H
diff --git a/src/southbridge/intel/i82801bx/ide.c b/src/southbridge/intel/i82801bx/ide.c
index 35a685c..fcec417 100644
--- a/src/southbridge/intel/i82801bx/ide.c
+++ b/src/southbridge/intel/i82801bx/ide.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/lpc.c b/src/southbridge/intel/i82801bx/lpc.c
index 7247cdc..4b9f6a6 100644
--- a/src/southbridge/intel/i82801bx/lpc.c
+++ b/src/southbridge/intel/i82801bx/lpc.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/nic.c b/src/southbridge/intel/i82801bx/nic.c
index c357769..4f0d307 100644
--- a/src/southbridge/intel/i82801bx/nic.c
+++ b/src/southbridge/intel/i82801bx/nic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/pci.c b/src/southbridge/intel/i82801bx/pci.c
index 5676a95..d5cbdee 100644
--- a/src/southbridge/intel/i82801bx/pci.c
+++ b/src/southbridge/intel/i82801bx/pci.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/reset.c b/src/southbridge/intel/i82801bx/reset.c
index 3cc046f..c54b7df 100644
--- a/src/southbridge/intel/i82801bx/reset.c
+++ b/src/southbridge/intel/i82801bx/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801bx/smbus.c b/src/southbridge/intel/i82801bx/smbus.c
index 836c256..8cc68a5 100644
--- a/src/southbridge/intel/i82801bx/smbus.c
+++ b/src/southbridge/intel/i82801bx/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/i82801bx/smbus.h b/src/southbridge/intel/i82801bx/smbus.h
index 8203f1a..c1f85e8 100644
--- a/src/southbridge/intel/i82801bx/smbus.h
+++ b/src/southbridge/intel/i82801bx/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/i82801bx/usb.c b/src/southbridge/intel/i82801bx/usb.c
index 698a742..6db114f 100644
--- a/src/southbridge/intel/i82801bx/usb.c
+++ b/src/southbridge/intel/i82801bx/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801bx/watchdog.c b/src/southbridge/intel/i82801bx/watchdog.c
index 6862ff6..21212eb 100644
--- a/src/southbridge/intel/i82801bx/watchdog.c
+++ b/src/southbridge/intel/i82801bx/watchdog.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/Kconfig b/src/southbridge/intel/i82801dx/Kconfig
index e656985..a9d0d5d 100644
--- a/src/southbridge/intel/i82801dx/Kconfig
+++ b/src/southbridge/intel/i82801dx/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/southbridge/intel/i82801dx/Makefile.inc b/src/southbridge/intel/i82801dx/Makefile.inc
index 6c3c1fa..b62fe61 100644
--- a/src/southbridge/intel/i82801dx/Makefile.inc
+++ b/src/southbridge/intel/i82801dx/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82801DX),y)
diff --git a/src/southbridge/intel/i82801dx/ac97.c b/src/southbridge/intel/i82801dx/ac97.c
index 142e0b0..60a738e 100644
--- a/src/southbridge/intel/i82801dx/ac97.c
+++ b/src/southbridge/intel/i82801dx/ac97.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/chip.h b/src/southbridge/intel/i82801dx/chip.h
index a5b9605..d503caa 100644
--- a/src/southbridge/intel/i82801dx/chip.h
+++ b/src/southbridge/intel/i82801dx/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef I82801DX_CHIP_H
diff --git a/src/southbridge/intel/i82801dx/early_smbus.c b/src/southbridge/intel/i82801dx/early_smbus.c
index dd5c967..c359acb 100644
--- a/src/southbridge/intel/i82801dx/early_smbus.c
+++ b/src/southbridge/intel/i82801dx/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801dx/i82801dx.c b/src/southbridge/intel/i82801dx/i82801dx.c
index ea929fa..62e94f4 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.c
+++ b/src/southbridge/intel/i82801dx/i82801dx.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/i82801dx.h b/src/southbridge/intel/i82801dx/i82801dx.h
index 194e728..86e8410 100644
--- a/src/southbridge/intel/i82801dx/i82801dx.h
+++ b/src/southbridge/intel/i82801dx/i82801dx.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* the problem: we have 82801dbm support in fb1, and 82801er in fb2.
diff --git a/src/southbridge/intel/i82801dx/ide.c b/src/southbridge/intel/i82801dx/ide.c
index ef8573b..a3b3f52 100644
--- a/src/southbridge/intel/i82801dx/ide.c
+++ b/src/southbridge/intel/i82801dx/ide.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/lpc.c b/src/southbridge/intel/i82801dx/lpc.c
index 29a457a..41d8a24 100644
--- a/src/southbridge/intel/i82801dx/lpc.c
+++ b/src/southbridge/intel/i82801dx/lpc.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/nvs.h b/src/southbridge/intel/i82801dx/nvs.h
index 4820dc7..1a4cb42 100644
--- a/src/southbridge/intel/i82801dx/nvs.h
+++ b/src/southbridge/intel/i82801dx/nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/southbridge/intel/i82801dx/pci.c b/src/southbridge/intel/i82801dx/pci.c
index 514279c..2a2a022 100644
--- a/src/southbridge/intel/i82801dx/pci.c
+++ b/src/southbridge/intel/i82801dx/pci.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/reset.c b/src/southbridge/intel/i82801dx/reset.c
index 77787a5..95696db 100644
--- a/src/southbridge/intel/i82801dx/reset.c
+++ b/src/southbridge/intel/i82801dx/reset.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801dx/smbus.c b/src/southbridge/intel/i82801dx/smbus.c
index fb443a9..737d8bd 100644
--- a/src/southbridge/intel/i82801dx/smbus.c
+++ b/src/southbridge/intel/i82801dx/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "i82801dx.h"
diff --git a/src/southbridge/intel/i82801dx/smi.c b/src/southbridge/intel/i82801dx/smi.c
index b5eaf87..8b680eb 100644
--- a/src/southbridge/intel/i82801dx/smi.c
+++ b/src/southbridge/intel/i82801dx/smi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/intel/i82801dx/smihandler.c b/src/southbridge/intel/i82801dx/smihandler.c
index 1ff7ca9..c66b7ff 100644
--- a/src/southbridge/intel/i82801dx/smihandler.c
+++ b/src/southbridge/intel/i82801dx/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/intel/i82801dx/tco_timer.c b/src/southbridge/intel/i82801dx/tco_timer.c
index 94effc3..6fa8999 100644
--- a/src/southbridge/intel/i82801dx/tco_timer.c
+++ b/src/southbridge/intel/i82801dx/tco_timer.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void i82801dx_halt_tco_timer(void)
diff --git a/src/southbridge/intel/i82801dx/usb.c b/src/southbridge/intel/i82801dx/usb.c
index 4c38d7a..39e3f41 100644
--- a/src/southbridge/intel/i82801dx/usb.c
+++ b/src/southbridge/intel/i82801dx/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801dx/usb2.c b/src/southbridge/intel/i82801dx/usb2.c
index 69652e4..a865f39 100644
--- a/src/southbridge/intel/i82801dx/usb2.c
+++ b/src/southbridge/intel/i82801dx/usb2.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig
index acbac83..4980ac4 100644
--- a/src/southbridge/intel/i82801gx/Kconfig
+++ b/src/southbridge/intel/i82801gx/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/southbridge/intel/i82801gx/Makefile.inc b/src/southbridge/intel/i82801gx/Makefile.inc
index 4bf3447..92d2181 100644
--- a/src/southbridge/intel/i82801gx/Makefile.inc
+++ b/src/southbridge/intel/i82801gx/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82801GX),y)
diff --git a/src/southbridge/intel/i82801gx/ac97.c b/src/southbridge/intel/i82801gx/ac97.c
index 3490b1b..36497d5 100644
--- a/src/southbridge/intel/i82801gx/ac97.c
+++ b/src/southbridge/intel/i82801gx/ac97.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/acpi/ac97.asl b/src/southbridge/intel/i82801gx/acpi/ac97.asl
index e3a08c0..938a68a 100644
--- a/src/southbridge/intel/i82801gx/acpi/ac97.asl
+++ b/src/southbridge/intel/i82801gx/acpi/ac97.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G AC'97 Audio and Modem */
diff --git a/src/southbridge/intel/i82801gx/acpi/audio.asl b/src/southbridge/intel/i82801gx/acpi/audio.asl
index 19d97f8..1565157 100644
--- a/src/southbridge/intel/i82801gx/acpi/audio.asl
+++ b/src/southbridge/intel/i82801gx/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G HDA */
diff --git a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
index 38033be..0ed40ab 100644
--- a/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801gx/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/southbridge/intel/i82801gx/acpi/ich7.asl b/src/southbridge/intel/i82801gx/acpi/ich7.asl
index 6550914..211c69e 100644
--- a/src/southbridge/intel/i82801gx/acpi/ich7.asl
+++ b/src/southbridge/intel/i82801gx/acpi/ich7.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel 82801Gx support */
diff --git a/src/southbridge/intel/i82801gx/acpi/irqlinks.asl b/src/southbridge/intel/i82801gx/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/southbridge/intel/i82801gx/acpi/irqlinks.asl
+++ b/src/southbridge/intel/i82801gx/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/southbridge/intel/i82801gx/acpi/lpc.asl b/src/southbridge/intel/i82801gx/acpi/lpc.asl
index 52174c9..a2cac21 100644
--- a/src/southbridge/intel/i82801gx/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801gx/acpi/lpc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/southbridge/intel/i82801gx/acpi/pata.asl b/src/southbridge/intel/i82801gx/acpi/pata.asl
index f899e12..496ee9c 100644
--- a/src/southbridge/intel/i82801gx/acpi/pata.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel PATA Controller 0:1f.1
diff --git a/src/southbridge/intel/i82801gx/acpi/pci.asl b/src/southbridge/intel/i82801gx/acpi/pci.asl
index 59a2fd0..919b8ba 100644
--- a/src/southbridge/intel/i82801gx/acpi/pci.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel PCI to PCI bridge 0:1e.0
diff --git a/src/southbridge/intel/i82801gx/acpi/pcie.asl b/src/southbridge/intel/i82801gx/acpi/pcie.asl
index 99a9e5e..ecef935 100644
--- a/src/southbridge/intel/i82801gx/acpi/pcie.asl
+++ b/src/southbridge/intel/i82801gx/acpi/pcie.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G PCIe support */
diff --git a/src/southbridge/intel/i82801gx/acpi/platform.asl b/src/southbridge/intel/i82801gx/acpi/platform.asl
index 5636e10..2d2e3a7 100644
--- a/src/southbridge/intel/i82801gx/acpi/platform.asl
+++ b/src/southbridge/intel/i82801gx/acpi/platform.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* The APM port can be used for generating software SMIs */
diff --git a/src/southbridge/intel/i82801gx/acpi/sata.asl b/src/southbridge/intel/i82801gx/acpi/sata.asl
index fb685a3..e71ca43 100644
--- a/src/southbridge/intel/i82801gx/acpi/sata.asl
+++ b/src/southbridge/intel/i82801gx/acpi/sata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SATA Controller 0:1f.2
diff --git a/src/southbridge/intel/i82801gx/acpi/sleepstates.asl b/src/southbridge/intel/i82801gx/acpi/sleepstates.asl
index fef196e..1640951 100644
--- a/src/southbridge/intel/i82801gx/acpi/sleepstates.asl
+++ b/src/southbridge/intel/i82801gx/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/southbridge/intel/i82801gx/acpi/smbus.asl b/src/southbridge/intel/i82801gx/acpi/smbus.asl
index 95c4755..ddf67a9 100644
--- a/src/southbridge/intel/i82801gx/acpi/smbus.asl
+++ b/src/southbridge/intel/i82801gx/acpi/smbus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/southbridge/intel/i82801gx/acpi/usb.asl b/src/southbridge/intel/i82801gx/acpi/usb.asl
index 26402b0..b01f332 100644
--- a/src/southbridge/intel/i82801gx/acpi/usb.asl
+++ b/src/southbridge/intel/i82801gx/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G USB support */
diff --git a/src/southbridge/intel/i82801gx/azalia.c b/src/southbridge/intel/i82801gx/azalia.c
index cdf2c25..3cb49e8 100644
--- a/src/southbridge/intel/i82801gx/azalia.c
+++ b/src/southbridge/intel/i82801gx/azalia.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/bootblock.c b/src/southbridge/intel/i82801gx/bootblock.c
index dde1ae9..7991056 100644
--- a/src/southbridge/intel/i82801gx/bootblock.c
+++ b/src/southbridge/intel/i82801gx/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801gx/chip.h b/src/southbridge/intel/i82801gx/chip.h
index 0734a55..de2415e 100644
--- a/src/southbridge/intel/i82801gx/chip.h
+++ b/src/southbridge/intel/i82801gx/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801GX_CHIP_H
diff --git a/src/southbridge/intel/i82801gx/early_lpc.c b/src/southbridge/intel/i82801gx/early_lpc.c
index 06dcdba..eb2672e 100644
--- a/src/southbridge/intel/i82801gx/early_lpc.c
+++ b/src/southbridge/intel/i82801gx/early_lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801gx/early_smbus.c b/src/southbridge/intel/i82801gx/early_smbus.c
index a9ea905..8155d8a 100644
--- a/src/southbridge/intel/i82801gx/early_smbus.c
+++ b/src/southbridge/intel/i82801gx/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801gx/i82801gx.c b/src/southbridge/intel/i82801gx/i82801gx.c
index 5d94e20..148510c 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.c
+++ b/src/southbridge/intel/i82801gx/i82801gx.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/i82801gx.h b/src/southbridge/intel/i82801gx/i82801gx.h
index bbadde7..a828862 100644
--- a/src/southbridge/intel/i82801gx/i82801gx.h
+++ b/src/southbridge/intel/i82801gx/i82801gx.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801GX_I82801GX_H
diff --git a/src/southbridge/intel/i82801gx/ide.c b/src/southbridge/intel/i82801gx/ide.c
index 1b927ec..c5d7a1d 100644
--- a/src/southbridge/intel/i82801gx/ide.c
+++ b/src/southbridge/intel/i82801gx/ide.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c
index 6a89291..07c4d35 100644
--- a/src/southbridge/intel/i82801gx/lpc.c
+++ b/src/southbridge/intel/i82801gx/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/nic.c b/src/southbridge/intel/i82801gx/nic.c
index fd003e7..cfac7ef 100644
--- a/src/southbridge/intel/i82801gx/nic.c
+++ b/src/southbridge/intel/i82801gx/nic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This code should work for all ICH* southbridges with a NIC. */
diff --git a/src/southbridge/intel/i82801gx/nvs.h b/src/southbridge/intel/i82801gx/nvs.h
index f707660..56ae920 100644
--- a/src/southbridge/intel/i82801gx/nvs.h
+++ b/src/southbridge/intel/i82801gx/nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/southbridge/intel/i82801gx/pci.c b/src/southbridge/intel/i82801gx/pci.c
index 9e09b3b..2de5220 100644
--- a/src/southbridge/intel/i82801gx/pci.c
+++ b/src/southbridge/intel/i82801gx/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/pcie.c b/src/southbridge/intel/i82801gx/pcie.c
index 0ec0085..3e4aa77 100644
--- a/src/southbridge/intel/i82801gx/pcie.c
+++ b/src/southbridge/intel/i82801gx/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/reset.c b/src/southbridge/intel/i82801gx/reset.c
index 0ca7b54..174c3c8 100644
--- a/src/southbridge/intel/i82801gx/reset.c
+++ b/src/southbridge/intel/i82801gx/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801gx/sata.c b/src/southbridge/intel/i82801gx/sata.c
index 6e7fcef..16e9859 100644
--- a/src/southbridge/intel/i82801gx/sata.c
+++ b/src/southbridge/intel/i82801gx/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/smbus.c b/src/southbridge/intel/i82801gx/smbus.c
index e556d72..b8c6897 100644
--- a/src/southbridge/intel/i82801gx/smbus.c
+++ b/src/southbridge/intel/i82801gx/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/smbus.h b/src/southbridge/intel/i82801gx/smbus.h
index a10fb61..6f91906 100644
--- a/src/southbridge/intel/i82801gx/smbus.h
+++ b/src/southbridge/intel/i82801gx/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/i82801gx/smi.c b/src/southbridge/intel/i82801gx/smi.c
index bd598fd..50ae724 100644
--- a/src/southbridge/intel/i82801gx/smi.c
+++ b/src/southbridge/intel/i82801gx/smi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/intel/i82801gx/smihandler.c b/src/southbridge/intel/i82801gx/smihandler.c
index 93c1a8d..3ea7215 100644
--- a/src/southbridge/intel/i82801gx/smihandler.c
+++ b/src/southbridge/intel/i82801gx/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/intel/i82801gx/usb.c b/src/southbridge/intel/i82801gx/usb.c
index 2893372..b572118 100644
--- a/src/southbridge/intel/i82801gx/usb.c
+++ b/src/southbridge/intel/i82801gx/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/usb_ehci.c b/src/southbridge/intel/i82801gx/usb_ehci.c
index 51415ae..8fce33a 100644
--- a/src/southbridge/intel/i82801gx/usb_ehci.c
+++ b/src/southbridge/intel/i82801gx/usb_ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801gx/watchdog.c b/src/southbridge/intel/i82801gx/watchdog.c
index 0262556..64c1658 100644
--- a/src/southbridge/intel/i82801gx/watchdog.c
+++ b/src/southbridge/intel/i82801gx/watchdog.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig
index 77fb634..12ecbd1 100644
--- a/src/southbridge/intel/i82801ix/Kconfig
+++ b/src/southbridge/intel/i82801ix/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_I82801IX
diff --git a/src/southbridge/intel/i82801ix/Makefile.inc b/src/southbridge/intel/i82801ix/Makefile.inc
index 6b49ea6..c97e55d 100644
--- a/src/southbridge/intel/i82801ix/Makefile.inc
+++ b/src/southbridge/intel/i82801ix/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_I82801IX),y)
diff --git a/src/southbridge/intel/i82801ix/acpi/audio.asl b/src/southbridge/intel/i82801ix/acpi/audio.asl
index 1bb0201..8d22d7c 100644
--- a/src/southbridge/intel/i82801ix/acpi/audio.asl
+++ b/src/southbridge/intel/i82801ix/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801I HDA */
diff --git a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
index 1563e1d..be8a222 100644
--- a/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
+++ b/src/southbridge/intel/i82801ix/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/southbridge/intel/i82801ix/acpi/ich9.asl b/src/southbridge/intel/i82801ix/acpi/ich9.asl
index c7e0ce8..2d9559e 100644
--- a/src/southbridge/intel/i82801ix/acpi/ich9.asl
+++ b/src/southbridge/intel/i82801ix/acpi/ich9.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel 82801Ix support */
diff --git a/src/southbridge/intel/i82801ix/acpi/irqlinks.asl b/src/southbridge/intel/i82801ix/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/southbridge/intel/i82801ix/acpi/irqlinks.asl
+++ b/src/southbridge/intel/i82801ix/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/southbridge/intel/i82801ix/acpi/lpc.asl b/src/southbridge/intel/i82801ix/acpi/lpc.asl
index 2609dcd..41235ae 100644
--- a/src/southbridge/intel/i82801ix/acpi/lpc.asl
+++ b/src/southbridge/intel/i82801ix/acpi/lpc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/southbridge/intel/i82801ix/acpi/pci.asl b/src/southbridge/intel/i82801ix/acpi/pci.asl
index 2967c42..8b13765 100644
--- a/src/southbridge/intel/i82801ix/acpi/pci.asl
+++ b/src/southbridge/intel/i82801ix/acpi/pci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel PCI to PCI bridge 0:1e.0
diff --git a/src/southbridge/intel/i82801ix/acpi/pcie.asl b/src/southbridge/intel/i82801ix/acpi/pcie.asl
index 50d1f46..14c8950 100644
--- a/src/southbridge/intel/i82801ix/acpi/pcie.asl
+++ b/src/southbridge/intel/i82801ix/acpi/pcie.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G PCIe support */
diff --git a/src/southbridge/intel/i82801ix/acpi/pcie_port.asl b/src/southbridge/intel/i82801ix/acpi/pcie_port.asl
index 823e8b0..d7f7fcc 100644
--- a/src/southbridge/intel/i82801ix/acpi/pcie_port.asl
+++ b/src/southbridge/intel/i82801ix/acpi/pcie_port.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Included in each PCIe Root Port device */
diff --git a/src/southbridge/intel/i82801ix/acpi/sata.asl b/src/southbridge/intel/i82801ix/acpi/sata.asl
index 6c0f508..7bf1fac 100644
--- a/src/southbridge/intel/i82801ix/acpi/sata.asl
+++ b/src/southbridge/intel/i82801ix/acpi/sata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Note: Some BIOSes put the S-ATA code into an SSDT to make it easily
diff --git a/src/southbridge/intel/i82801ix/acpi/sleepstates.asl b/src/southbridge/intel/i82801ix/acpi/sleepstates.asl
index e17aa3b..7f43acd 100644
--- a/src/southbridge/intel/i82801ix/acpi/sleepstates.asl
+++ b/src/southbridge/intel/i82801ix/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/southbridge/intel/i82801ix/acpi/smbus.asl b/src/southbridge/intel/i82801ix/acpi/smbus.asl
index 95c4755..ddf67a9 100644
--- a/src/southbridge/intel/i82801ix/acpi/smbus.asl
+++ b/src/southbridge/intel/i82801ix/acpi/smbus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/southbridge/intel/i82801ix/acpi/usb.asl b/src/southbridge/intel/i82801ix/acpi/usb.asl
index a4d98bb..5e54766 100644
--- a/src/southbridge/intel/i82801ix/acpi/usb.asl
+++ b/src/southbridge/intel/i82801ix/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801I USB support */
diff --git a/src/southbridge/intel/i82801ix/bootblock.c b/src/southbridge/intel/i82801ix/bootblock.c
index 7b5d2e5..1b7e581 100644
--- a/src/southbridge/intel/i82801ix/bootblock.c
+++ b/src/southbridge/intel/i82801ix/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ix/chip.h b/src/southbridge/intel/i82801ix/chip.h
index ca663f8..277dc80 100644
--- a/src/southbridge/intel/i82801ix/chip.h
+++ b/src/southbridge/intel/i82801ix/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801IX_CHIP_H
diff --git a/src/southbridge/intel/i82801ix/dmi_setup.c b/src/southbridge/intel/i82801ix/dmi_setup.c
index 793ac60..f3a37a4 100644
--- a/src/southbridge/intel/i82801ix/dmi_setup.c
+++ b/src/southbridge/intel/i82801ix/dmi_setup.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ix/early_init.c b/src/southbridge/intel/i82801ix/early_init.c
index 343d978..b2e0db6 100644
--- a/src/southbridge/intel/i82801ix/early_init.c
+++ b/src/southbridge/intel/i82801ix/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ix/early_smbus.c b/src/southbridge/intel/i82801ix/early_smbus.c
index 34a7181..2864164 100644
--- a/src/southbridge/intel/i82801ix/early_smbus.c
+++ b/src/southbridge/intel/i82801ix/early_smbus.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ix/hdaudio.c b/src/southbridge/intel/i82801ix/hdaudio.c
index d2fb4a8..3f8414e 100644
--- a/src/southbridge/intel/i82801ix/hdaudio.c
+++ b/src/southbridge/intel/i82801ix/hdaudio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ix/i82801ix.c b/src/southbridge/intel/i82801ix/i82801ix.c
index 5f725cb..f3daf4f 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.c
+++ b/src/southbridge/intel/i82801ix/i82801ix.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/southbridge/intel/i82801ix/i82801ix.h b/src/southbridge/intel/i82801ix/i82801ix.h
index 1793ead..9c9c4e6 100644
--- a/src/southbridge/intel/i82801ix/i82801ix.h
+++ b/src/southbridge/intel/i82801ix/i82801ix.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_I82801GX_I82801IX_H
diff --git a/src/southbridge/intel/i82801ix/lpc.c b/src/southbridge/intel/i82801ix/lpc.c
index ac1d49f..73b13b9 100644
--- a/src/southbridge/intel/i82801ix/lpc.c
+++ b/src/southbridge/intel/i82801ix/lpc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ix/nvs.h b/src/southbridge/intel/i82801ix/nvs.h
index f707660..56ae920 100644
--- a/src/southbridge/intel/i82801ix/nvs.h
+++ b/src/southbridge/intel/i82801ix/nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/southbridge/intel/i82801ix/pci.c b/src/southbridge/intel/i82801ix/pci.c
index e3b627a..55a74b9 100644
--- a/src/southbridge/intel/i82801ix/pci.c
+++ b/src/southbridge/intel/i82801ix/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/intel/i82801ix/pcie.c b/src/southbridge/intel/i82801ix/pcie.c
index 5858176..c212e04 100644
--- a/src/southbridge/intel/i82801ix/pcie.c
+++ b/src/southbridge/intel/i82801ix/pcie.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ix/sata.c b/src/southbridge/intel/i82801ix/sata.c
index ec1b39e..2963c16 100644
--- a/src/southbridge/intel/i82801ix/sata.c
+++ b/src/southbridge/intel/i82801ix/sata.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ix/smbus.c b/src/southbridge/intel/i82801ix/smbus.c
index 9ae267d..c0835a4 100644
--- a/src/southbridge/intel/i82801ix/smbus.c
+++ b/src/southbridge/intel/i82801ix/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/i82801ix/smbus.h b/src/southbridge/intel/i82801ix/smbus.h
index fb7e3bc..77b6bfb 100644
--- a/src/southbridge/intel/i82801ix/smbus.h
+++ b/src/southbridge/intel/i82801ix/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/i82801ix/smi.c b/src/southbridge/intel/i82801ix/smi.c
index 5c1e939..91ed3a9 100644
--- a/src/southbridge/intel/i82801ix/smi.c
+++ b/src/southbridge/intel/i82801ix/smi.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/intel/i82801ix/smihandler.c b/src/southbridge/intel/i82801ix/smihandler.c
index 1b87626..325d389 100644
--- a/src/southbridge/intel/i82801ix/smihandler.c
+++ b/src/southbridge/intel/i82801ix/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/intel/i82801ix/thermal.c b/src/southbridge/intel/i82801ix/thermal.c
index fba0711..cffe6b8 100644
--- a/src/southbridge/intel/i82801ix/thermal.c
+++ b/src/southbridge/intel/i82801ix/thermal.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/i82801ix/usb_ehci.c b/src/southbridge/intel/i82801ix/usb_ehci.c
index 1afb5d6..503f46d 100644
--- a/src/southbridge/intel/i82801ix/usb_ehci.c
+++ b/src/southbridge/intel/i82801ix/usb_ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/ibexpeak/Kconfig b/src/southbridge/intel/ibexpeak/Kconfig
index a2c5153..d0eaf3e 100644
--- a/src/southbridge/intel/ibexpeak/Kconfig
+++ b/src/southbridge/intel/ibexpeak/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_IBEXPEAK
diff --git a/src/southbridge/intel/ibexpeak/Makefile.inc b/src/southbridge/intel/ibexpeak/Makefile.inc
index 77f2797..bb63d1f 100644
--- a/src/southbridge/intel/ibexpeak/Makefile.inc
+++ b/src/southbridge/intel/ibexpeak/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_IBEXPEAK),y)
diff --git a/src/southbridge/intel/ibexpeak/azalia.c b/src/southbridge/intel/ibexpeak/azalia.c
index 79938d3..6e01689 100644
--- a/src/southbridge/intel/ibexpeak/azalia.c
+++ b/src/southbridge/intel/ibexpeak/azalia.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/ibexpeak/chip.h b/src/southbridge/intel/ibexpeak/chip.h
index 383a226..e6205c7 100644
--- a/src/southbridge/intel/ibexpeak/chip.h
+++ b/src/southbridge/intel/ibexpeak/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_IBEXPEAK_CHIP_H
diff --git a/src/southbridge/intel/ibexpeak/early_smbus.c b/src/southbridge/intel/ibexpeak/early_smbus.c
index 758bb41..41cc6a8 100644
--- a/src/southbridge/intel/ibexpeak/early_smbus.c
+++ b/src/southbridge/intel/ibexpeak/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/ibexpeak/early_thermal.c b/src/southbridge/intel/ibexpeak/early_thermal.c
index 1b00846..a647277 100644
--- a/src/southbridge/intel/ibexpeak/early_thermal.c
+++ b/src/southbridge/intel/ibexpeak/early_thermal.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/ibexpeak/lpc.c b/src/southbridge/intel/ibexpeak/lpc.c
index 6565293..5ce80f5 100644
--- a/src/southbridge/intel/ibexpeak/lpc.c
+++ b/src/southbridge/intel/ibexpeak/lpc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/ibexpeak/madt.c b/src/southbridge/intel/ibexpeak/madt.c
index 96cdeff..4c60ed0 100644
--- a/src/southbridge/intel/ibexpeak/madt.c
+++ b/src/southbridge/intel/ibexpeak/madt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/southbridge/intel/ibexpeak/me.c b/src/southbridge/intel/ibexpeak/me.c
index 96e16e3..220fdae 100644
--- a/src/southbridge/intel/ibexpeak/me.c
+++ b/src/southbridge/intel/ibexpeak/me.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/ibexpeak/me.h b/src/southbridge/intel/ibexpeak/me.h
index 906c1d3..5d40eb8 100644
--- a/src/southbridge/intel/ibexpeak/me.h
+++ b/src/southbridge/intel/ibexpeak/me.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_ME_H
diff --git a/src/southbridge/intel/ibexpeak/nvs.h b/src/southbridge/intel/ibexpeak/nvs.h
index 2dd9354..91b104a 100644
--- a/src/southbridge/intel/ibexpeak/nvs.h
+++ b/src/southbridge/intel/ibexpeak/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "vendorcode/google/chromeos/gnvs.h"
diff --git a/src/southbridge/intel/ibexpeak/pch.h b/src/southbridge/intel/ibexpeak/pch.h
index 72f2a5c..32749a4 100644
--- a/src/southbridge/intel/ibexpeak/pch.h
+++ b/src/southbridge/intel/ibexpeak/pch.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_BD82X6X_PCH_H
diff --git a/src/southbridge/intel/ibexpeak/sata.c b/src/southbridge/intel/ibexpeak/sata.c
index 6700820..21102ee 100644
--- a/src/southbridge/intel/ibexpeak/sata.c
+++ b/src/southbridge/intel/ibexpeak/sata.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/ibexpeak/smbus.c b/src/southbridge/intel/ibexpeak/smbus.c
index 2bb4cbf..25d1eef 100644
--- a/src/southbridge/intel/ibexpeak/smbus.c
+++ b/src/southbridge/intel/ibexpeak/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/ibexpeak/smbus.h b/src/southbridge/intel/ibexpeak/smbus.h
index fa05140..dfdafbb 100644
--- a/src/southbridge/intel/ibexpeak/smbus.h
+++ b/src/southbridge/intel/ibexpeak/smbus.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/ibexpeak/smi.c b/src/southbridge/intel/ibexpeak/smi.c
index 46efa5e..36ff34a 100644
--- a/src/southbridge/intel/ibexpeak/smi.c
+++ b/src/southbridge/intel/ibexpeak/smi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define __SIMPLE_DEVICE__
diff --git a/src/southbridge/intel/ibexpeak/smihandler.c b/src/southbridge/intel/ibexpeak/smihandler.c
index 6e1ee83..67659fd 100644
--- a/src/southbridge/intel/ibexpeak/smihandler.c
+++ b/src/southbridge/intel/ibexpeak/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/intel/ibexpeak/thermal.c b/src/southbridge/intel/ibexpeak/thermal.c
index e6c35b2..25f19b7 100644
--- a/src/southbridge/intel/ibexpeak/thermal.c
+++ b/src/southbridge/intel/ibexpeak/thermal.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/ibexpeak/usb_ehci.c b/src/southbridge/intel/ibexpeak/usb_ehci.c
index 2cf0f3e..c952f76 100644
--- a/src/southbridge/intel/ibexpeak/usb_ehci.c
+++ b/src/southbridge/intel/ibexpeak/usb_ehci.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/Kconfig b/src/southbridge/intel/lynxpoint/Kconfig
index 3221cff..5917102 100644
--- a/src/southbridge/intel/lynxpoint/Kconfig
+++ b/src/southbridge/intel/lynxpoint/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/southbridge/intel/lynxpoint/Makefile.inc b/src/southbridge/intel/lynxpoint/Makefile.inc
index 7cff6b8..64cb80d 100644
--- a/src/southbridge/intel/lynxpoint/Makefile.inc
+++ b/src/southbridge/intel/lynxpoint/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_LYNXPOINT),y)
diff --git a/src/southbridge/intel/lynxpoint/acpi.c b/src/southbridge/intel/lynxpoint/acpi.c
index 22f8921..eda6e23 100644
--- a/src/southbridge/intel/lynxpoint/acpi.c
+++ b/src/southbridge/intel/lynxpoint/acpi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/acpi.h>
diff --git a/src/southbridge/intel/lynxpoint/acpi/audio.asl b/src/southbridge/intel/lynxpoint/acpi/audio.asl
index 15b21b1..c0ba4e3 100644
--- a/src/southbridge/intel/lynxpoint/acpi/audio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel PCH HDA */
diff --git a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
index c693856..080748e 100644
--- a/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/globalnvs.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/southbridge/intel/lynxpoint/acpi/irqlinks.asl b/src/southbridge/intel/lynxpoint/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/southbridge/intel/lynxpoint/acpi/irqlinks.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpc.asl b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
index 57a1759..a493d7c 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpc.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/lpc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl b/src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl
index 4111c1b..027d58b 100644
--- a/src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/lpt_lp.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* LynxPoint-H */
diff --git a/src/southbridge/intel/lynxpoint/acpi/pch.asl b/src/southbridge/intel/lynxpoint/acpi/pch.asl
index 9321378..612d572 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pch.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Cougar Point PCH support */
diff --git a/src/southbridge/intel/lynxpoint/acpi/pcie.asl b/src/southbridge/intel/lynxpoint/acpi/pcie.asl
index 33440c3..60baa22 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pcie.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pcie.asl
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel 6/7 Series PCH PCIe support */
diff --git a/src/southbridge/intel/lynxpoint/acpi/pcie_port.asl b/src/southbridge/intel/lynxpoint/acpi/pcie_port.asl
index 276227b..4b646f6 100644
--- a/src/southbridge/intel/lynxpoint/acpi/pcie_port.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/pcie_port.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Included in each PCIe Root Port device */
diff --git a/src/southbridge/intel/lynxpoint/acpi/sata.asl b/src/southbridge/intel/lynxpoint/acpi/sata.asl
index fb685a3..e71ca43 100644
--- a/src/southbridge/intel/lynxpoint/acpi/sata.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/sata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SATA Controller 0:1f.2
diff --git a/src/southbridge/intel/lynxpoint/acpi/serialio.asl b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
index d755d8b..b7b32b6 100644
--- a/src/southbridge/intel/lynxpoint/acpi/serialio.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/serialio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LynxPoint Serial IO Devices in ACPI Mode
diff --git a/src/southbridge/intel/lynxpoint/acpi/sleepstates.asl b/src/southbridge/intel/lynxpoint/acpi/sleepstates.asl
index fef196e..1640951 100644
--- a/src/southbridge/intel/lynxpoint/acpi/sleepstates.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(){0x0,0x0,0x0,0x0})
diff --git a/src/southbridge/intel/lynxpoint/acpi/smbus.asl b/src/southbridge/intel/lynxpoint/acpi/smbus.asl
index efd323d..131f345 100644
--- a/src/southbridge/intel/lynxpoint/acpi/smbus.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/smbus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/southbridge/intel/lynxpoint/acpi/usb.asl b/src/southbridge/intel/lynxpoint/acpi/usb.asl
index efc2f3c..a08e661 100644
--- a/src/southbridge/intel/lynxpoint/acpi/usb.asl
+++ b/src/southbridge/intel/lynxpoint/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel Cougar Point USB support */
diff --git a/src/southbridge/intel/lynxpoint/azalia.c b/src/southbridge/intel/lynxpoint/azalia.c
index 11aa893..38fbdef 100644
--- a/src/southbridge/intel/lynxpoint/azalia.c
+++ b/src/southbridge/intel/lynxpoint/azalia.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/bootblock.c b/src/southbridge/intel/lynxpoint/bootblock.c
index 8c2133b..2cac2da 100644
--- a/src/southbridge/intel/lynxpoint/bootblock.c
+++ b/src/southbridge/intel/lynxpoint/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/chip.h b/src/southbridge/intel/lynxpoint/chip.h
index d208dac..0118f0e 100644
--- a/src/southbridge/intel/lynxpoint/chip.h
+++ b/src/southbridge/intel/lynxpoint/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_LYNXPOINT_CHIP_H
diff --git a/src/southbridge/intel/lynxpoint/early_me.c b/src/southbridge/intel/lynxpoint/early_me.c
index ba3a631..1f482eb 100644
--- a/src/southbridge/intel/lynxpoint/early_me.c
+++ b/src/southbridge/intel/lynxpoint/early_me.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/early_pch.c b/src/southbridge/intel/lynxpoint/early_pch.c
index b57662f..157a0c6 100644
--- a/src/southbridge/intel/lynxpoint/early_pch.c
+++ b/src/southbridge/intel/lynxpoint/early_pch.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/intel/lynxpoint/early_smbus.c b/src/southbridge/intel/lynxpoint/early_smbus.c
index 286de8c..aeb88cd 100644
--- a/src/southbridge/intel/lynxpoint/early_smbus.c
+++ b/src/southbridge/intel/lynxpoint/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/early_spi.c b/src/southbridge/intel/lynxpoint/early_spi.c
index 1ebe044..1ae5c3e 100644
--- a/src/southbridge/intel/lynxpoint/early_spi.c
+++ b/src/southbridge/intel/lynxpoint/early_spi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/early_usb.c b/src/southbridge/intel/lynxpoint/early_usb.c
index 39ff526..08195d6 100644
--- a/src/southbridge/intel/lynxpoint/early_usb.c
+++ b/src/southbridge/intel/lynxpoint/early_usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/elog.c b/src/southbridge/intel/lynxpoint/elog.c
index d26e948..f383ad1 100644
--- a/src/southbridge/intel/lynxpoint/elog.c
+++ b/src/southbridge/intel/lynxpoint/elog.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/finalize.c b/src/southbridge/intel/lynxpoint/finalize.c
index 7c91336..8d593bb 100644
--- a/src/southbridge/intel/lynxpoint/finalize.c
+++ b/src/southbridge/intel/lynxpoint/finalize.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/gpio.c b/src/southbridge/intel/lynxpoint/gpio.c
index 7a429d8..8988ea0 100644
--- a/src/southbridge/intel/lynxpoint/gpio.c
+++ b/src/southbridge/intel/lynxpoint/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/lynxpoint/gpio.h b/src/southbridge/intel/lynxpoint/gpio.h
index 3bfb3cd..0aa5786 100644
--- a/src/southbridge/intel/lynxpoint/gpio.h
+++ b/src/southbridge/intel/lynxpoint/gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef INTEL_LYNXPOINT_GPIO_H
diff --git a/src/southbridge/intel/lynxpoint/hda_verb.c b/src/southbridge/intel/lynxpoint/hda_verb.c
index e4853f8..ef04a14 100644
--- a/src/southbridge/intel/lynxpoint/hda_verb.c
+++ b/src/southbridge/intel/lynxpoint/hda_verb.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/hda_verb.h b/src/southbridge/intel/lynxpoint/hda_verb.h
index e9eb529..38f9f62 100644
--- a/src/southbridge/intel/lynxpoint/hda_verb.h
+++ b/src/southbridge/intel/lynxpoint/hda_verb.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef LYNXPOINT_HDA_VERB_H
diff --git a/src/southbridge/intel/lynxpoint/lp_gpio.c b/src/southbridge/intel/lynxpoint/lp_gpio.c
index 44334fb..566ec5b 100644
--- a/src/southbridge/intel/lynxpoint/lp_gpio.c
+++ b/src/southbridge/intel/lynxpoint/lp_gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/intel/lynxpoint/lp_gpio.h b/src/southbridge/intel/lynxpoint/lp_gpio.h
index 3603b58..a3a93fe 100644
--- a/src/southbridge/intel/lynxpoint/lp_gpio.h
+++ b/src/southbridge/intel/lynxpoint/lp_gpio.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef INTEL_LYNXPOINT_LP_GPIO_H
diff --git a/src/southbridge/intel/lynxpoint/lpc.c b/src/southbridge/intel/lynxpoint/lpc.c
index 8308f41..8e3d766 100644
--- a/src/southbridge/intel/lynxpoint/lpc.c
+++ b/src/southbridge/intel/lynxpoint/lpc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/me.h b/src/southbridge/intel/lynxpoint/me.h
index effd719..571d7dd 100644
--- a/src/southbridge/intel/lynxpoint/me.h
+++ b/src/southbridge/intel/lynxpoint/me.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _INTEL_ME_H
diff --git a/src/southbridge/intel/lynxpoint/me_9.x.c b/src/southbridge/intel/lynxpoint/me_9.x.c
index 704af3d..bb0a098 100644
--- a/src/southbridge/intel/lynxpoint/me_9.x.c
+++ b/src/southbridge/intel/lynxpoint/me_9.x.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/lynxpoint/me_status.c b/src/southbridge/intel/lynxpoint/me_status.c
index 31b77cf..069d5d0 100644
--- a/src/southbridge/intel/lynxpoint/me_status.c
+++ b/src/southbridge/intel/lynxpoint/me_status.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/southbridge/intel/lynxpoint/nvs.h b/src/southbridge/intel/lynxpoint/nvs.h
index 7de0ac1..0358085 100644
--- a/src/southbridge/intel/lynxpoint/nvs.h
+++ b/src/southbridge/intel/lynxpoint/nvs.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "vendorcode/google/chromeos/gnvs.h"
diff --git a/src/southbridge/intel/lynxpoint/pch.c b/src/southbridge/intel/lynxpoint/pch.c
index f302fcb..bbd73eb 100644
--- a/src/southbridge/intel/lynxpoint/pch.c
+++ b/src/southbridge/intel/lynxpoint/pch.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/pch.h b/src/southbridge/intel/lynxpoint/pch.h
index 15efed8..9bc2353 100644
--- a/src/southbridge/intel/lynxpoint/pch.h
+++ b/src/southbridge/intel/lynxpoint/pch.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_LYNXPOINT_PCH_H
diff --git a/src/southbridge/intel/lynxpoint/pci.c b/src/southbridge/intel/lynxpoint/pci.c
index 864c60c..81104fa 100644
--- a/src/southbridge/intel/lynxpoint/pci.c
+++ b/src/southbridge/intel/lynxpoint/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/pcie.c b/src/southbridge/intel/lynxpoint/pcie.c
index b9fed08..b08650f 100644
--- a/src/southbridge/intel/lynxpoint/pcie.c
+++ b/src/southbridge/intel/lynxpoint/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/pmutil.c b/src/southbridge/intel/lynxpoint/pmutil.c
index 3bd3614..4d00489 100644
--- a/src/southbridge/intel/lynxpoint/pmutil.c
+++ b/src/southbridge/intel/lynxpoint/pmutil.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/intel/lynxpoint/rcba.c b/src/southbridge/intel/lynxpoint/rcba.c
index 570d7bd..d20ced0 100644
--- a/src/southbridge/intel/lynxpoint/rcba.c
+++ b/src/southbridge/intel/lynxpoint/rcba.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/southbridge/intel/lynxpoint/reset.c b/src/southbridge/intel/lynxpoint/reset.c
index e914613..4d225b3 100644
--- a/src/southbridge/intel/lynxpoint/reset.c
+++ b/src/southbridge/intel/lynxpoint/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/sata.c b/src/southbridge/intel/lynxpoint/sata.c
index 3175a1a..b9cc353 100644
--- a/src/southbridge/intel/lynxpoint/sata.c
+++ b/src/southbridge/intel/lynxpoint/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/serialio.c b/src/southbridge/intel/lynxpoint/serialio.c
index 470d53d..ca0925b 100644
--- a/src/southbridge/intel/lynxpoint/serialio.c
+++ b/src/southbridge/intel/lynxpoint/serialio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/lynxpoint/smbus.c b/src/southbridge/intel/lynxpoint/smbus.c
index b7c8503..e0c6f9f 100644
--- a/src/southbridge/intel/lynxpoint/smbus.c
+++ b/src/southbridge/intel/lynxpoint/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/smbus.h b/src/southbridge/intel/lynxpoint/smbus.h
index b9983a4..e953191 100644
--- a/src/southbridge/intel/lynxpoint/smbus.h
+++ b/src/southbridge/intel/lynxpoint/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/lynxpoint/smi.c b/src/southbridge/intel/lynxpoint/smi.c
index 2cd352c..7b9e551 100644
--- a/src/southbridge/intel/lynxpoint/smi.c
+++ b/src/southbridge/intel/lynxpoint/smi.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <bootstate.h>
diff --git a/src/southbridge/intel/lynxpoint/smihandler.c b/src/southbridge/intel/lynxpoint/smihandler.c
index f41670a..f360e71 100644
--- a/src/southbridge/intel/lynxpoint/smihandler.c
+++ b/src/southbridge/intel/lynxpoint/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <delay.h>
diff --git a/src/southbridge/intel/lynxpoint/usb_ehci.c b/src/southbridge/intel/lynxpoint/usb_ehci.c
index b4adce7..f1774bf 100644
--- a/src/southbridge/intel/lynxpoint/usb_ehci.c
+++ b/src/southbridge/intel/lynxpoint/usb_ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/usb_xhci.c b/src/southbridge/intel/lynxpoint/usb_xhci.c
index ebdfce1..9987c87 100644
--- a/src/southbridge/intel/lynxpoint/usb_xhci.c
+++ b/src/southbridge/intel/lynxpoint/usb_xhci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/lynxpoint/watchdog.c b/src/southbridge/intel/lynxpoint/watchdog.c
index 91bc615..4e35a41 100644
--- a/src/southbridge/intel/lynxpoint/watchdog.c
+++ b/src/southbridge/intel/lynxpoint/watchdog.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/Kconfig b/src/southbridge/intel/sch/Kconfig
index 23bee0e..7d6098f 100644
--- a/src/southbridge/intel/sch/Kconfig
+++ b/src/southbridge/intel/sch/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_INTEL_SCH
diff --git a/src/southbridge/intel/sch/Makefile.inc b/src/southbridge/intel/sch/Makefile.inc
index 0b21801..526bb54 100644
--- a/src/southbridge/intel/sch/Makefile.inc
+++ b/src/southbridge/intel/sch/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_INTEL_SCH),y)
diff --git a/src/southbridge/intel/sch/acpi/ac97.asl b/src/southbridge/intel/sch/acpi/ac97.asl
index e3a08c0..938a68a 100644
--- a/src/southbridge/intel/sch/acpi/ac97.asl
+++ b/src/southbridge/intel/sch/acpi/ac97.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G AC'97 Audio and Modem */
diff --git a/src/southbridge/intel/sch/acpi/audio.asl b/src/southbridge/intel/sch/acpi/audio.asl
index 19d97f8..1565157 100644
--- a/src/southbridge/intel/sch/acpi/audio.asl
+++ b/src/southbridge/intel/sch/acpi/audio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G HDA */
diff --git a/src/southbridge/intel/sch/acpi/globalnvs.asl b/src/southbridge/intel/sch/acpi/globalnvs.asl
index 0a86076..8b0a989 100644
--- a/src/southbridge/intel/sch/acpi/globalnvs.asl
+++ b/src/southbridge/intel/sch/acpi/globalnvs.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Global Variables */
diff --git a/src/southbridge/intel/sch/acpi/irqlinks.asl b/src/southbridge/intel/sch/acpi/irqlinks.asl
index acc03f0..f702801 100644
--- a/src/southbridge/intel/sch/acpi/irqlinks.asl
+++ b/src/southbridge/intel/sch/acpi/irqlinks.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (LNKA)
diff --git a/src/southbridge/intel/sch/acpi/lpc.asl b/src/southbridge/intel/sch/acpi/lpc.asl
index a98985b..937802e 100644
--- a/src/southbridge/intel/sch/acpi/lpc.asl
+++ b/src/southbridge/intel/sch/acpi/lpc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel LPC Bus Device  - 0:1f.0
diff --git a/src/southbridge/intel/sch/acpi/pata.asl b/src/southbridge/intel/sch/acpi/pata.asl
index f899e12..496ee9c 100644
--- a/src/southbridge/intel/sch/acpi/pata.asl
+++ b/src/southbridge/intel/sch/acpi/pata.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel PATA Controller 0:1f.1
diff --git a/src/southbridge/intel/sch/acpi/pci.asl b/src/southbridge/intel/sch/acpi/pci.asl
index 4ae44c1..6ed3448 100644
--- a/src/southbridge/intel/sch/acpi/pci.asl
+++ b/src/southbridge/intel/sch/acpi/pci.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel PCI to PCI bridge 0:1e.0
diff --git a/src/southbridge/intel/sch/acpi/pcie.asl b/src/southbridge/intel/sch/acpi/pcie.asl
index 99a9e5e..ecef935 100644
--- a/src/southbridge/intel/sch/acpi/pcie.asl
+++ b/src/southbridge/intel/sch/acpi/pcie.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G PCIe support */
diff --git a/src/southbridge/intel/sch/acpi/sch.asl b/src/southbridge/intel/sch/acpi/sch.asl
index 4eb185b..4b50a7d 100644
--- a/src/southbridge/intel/sch/acpi/sch.asl
+++ b/src/southbridge/intel/sch/acpi/sch.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G support
diff --git a/src/southbridge/intel/sch/acpi/sleepstates.asl b/src/southbridge/intel/sch/acpi/sleepstates.asl
index 460fd75..ac099c3 100644
--- a/src/southbridge/intel/sch/acpi/sleepstates.asl
+++ b/src/southbridge/intel/sch/acpi/sleepstates.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Name(\_S0, Package(4){0x0,0x0,0,0})
diff --git a/src/southbridge/intel/sch/acpi/smbus.asl b/src/southbridge/intel/sch/acpi/smbus.asl
index 23e1e1b..cffda06 100644
--- a/src/southbridge/intel/sch/acpi/smbus.asl
+++ b/src/southbridge/intel/sch/acpi/smbus.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Intel SMBus Controller 0:1f.3
diff --git a/src/southbridge/intel/sch/acpi/usb.asl b/src/southbridge/intel/sch/acpi/usb.asl
index 26402b0..b01f332 100644
--- a/src/southbridge/intel/sch/acpi/usb.asl
+++ b/src/southbridge/intel/sch/acpi/usb.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Intel i82801G USB support */
diff --git a/src/southbridge/intel/sch/audio.c b/src/southbridge/intel/sch/audio.c
index bba2f7b..be28d73 100644
--- a/src/southbridge/intel/sch/audio.c
+++ b/src/southbridge/intel/sch/audio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/chip.h b/src/southbridge/intel/sch/chip.h
index 86c66e8..5e26565 100644
--- a/src/southbridge/intel/sch/chip.h
+++ b/src/southbridge/intel/sch/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_SCH_CHIP_H
diff --git a/src/southbridge/intel/sch/early_smbus.c b/src/southbridge/intel/sch/early_smbus.c
index a9ea905..8155d8a 100644
--- a/src/southbridge/intel/sch/early_smbus.c
+++ b/src/southbridge/intel/sch/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/sch/ide.c b/src/southbridge/intel/sch/ide.c
index 4353fbf..82b7650 100644
--- a/src/southbridge/intel/sch/ide.c
+++ b/src/southbridge/intel/sch/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/lpc.c b/src/southbridge/intel/sch/lpc.c
index 0c031db..068ead4 100644
--- a/src/southbridge/intel/sch/lpc.c
+++ b/src/southbridge/intel/sch/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/mmc.c b/src/southbridge/intel/sch/mmc.c
index d40a0f5..5f21c55 100644
--- a/src/southbridge/intel/sch/mmc.c
+++ b/src/southbridge/intel/sch/mmc.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/nvs.h b/src/southbridge/intel/sch/nvs.h
index 199a258..79bb37b 100644
--- a/src/southbridge/intel/sch/nvs.h
+++ b/src/southbridge/intel/sch/nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/southbridge/intel/sch/pcie.c b/src/southbridge/intel/sch/pcie.c
index e5a501e..c7871e0 100644
--- a/src/southbridge/intel/sch/pcie.c
+++ b/src/southbridge/intel/sch/pcie.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/reset.c b/src/southbridge/intel/sch/reset.c
index 42310df..2d76027 100644
--- a/src/southbridge/intel/sch/reset.c
+++ b/src/southbridge/intel/sch/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/sch/sch.h b/src/southbridge/intel/sch/sch.h
index 340bb6b..6318adf 100644
--- a/src/southbridge/intel/sch/sch.h
+++ b/src/southbridge/intel/sch/sch.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_INTEL_SCH_SCH_H
diff --git a/src/southbridge/intel/sch/smbus.c b/src/southbridge/intel/sch/smbus.c
index c3bff67..b7ccfc1 100644
--- a/src/southbridge/intel/sch/smbus.c
+++ b/src/southbridge/intel/sch/smbus.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/smbus.h b/src/southbridge/intel/sch/smbus.h
index 58bed89..4cb5a42 100644
--- a/src/southbridge/intel/sch/smbus.h
+++ b/src/southbridge/intel/sch/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/intel/sch/smi.c b/src/southbridge/intel/sch/smi.c
index 6ac7874..ca71b67 100644
--- a/src/southbridge/intel/sch/smi.c
+++ b/src/southbridge/intel/sch/smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/intel/sch/smihandler.c b/src/southbridge/intel/sch/smihandler.c
index 47468bc..d22be0f 100644
--- a/src/southbridge/intel/sch/smihandler.c
+++ b/src/southbridge/intel/sch/smihandler.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/intel/sch/south.c b/src/southbridge/intel/sch/south.c
index ae80ec5..fa73065 100644
--- a/src/southbridge/intel/sch/south.c
+++ b/src/southbridge/intel/sch/south.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/usb.c b/src/southbridge/intel/sch/usb.c
index cc7b91f..8ec2d46 100644
--- a/src/southbridge/intel/sch/usb.c
+++ b/src/southbridge/intel/sch/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/usb_client.c b/src/southbridge/intel/sch/usb_client.c
index 3694040..e8ea824 100644
--- a/src/southbridge/intel/sch/usb_client.c
+++ b/src/southbridge/intel/sch/usb_client.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/intel/sch/usb_ehci.c b/src/southbridge/intel/sch/usb_ehci.c
index 5afb416..acb16bc 100644
--- a/src/southbridge/intel/sch/usb_ehci.c
+++ b/src/southbridge/intel/sch/usb_ehci.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/ac97.c b/src/southbridge/nvidia/ck804/ac97.c
index 18055ba..506a52e 100644
--- a/src/southbridge/nvidia/ck804/ac97.c
+++ b/src/southbridge/nvidia/ck804/ac97.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/bootblock.c b/src/southbridge/nvidia/ck804/bootblock.c
index fa2d724..0a267dd 100644
--- a/src/southbridge/nvidia/ck804/bootblock.c
+++ b/src/southbridge/nvidia/ck804/bootblock.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/nvidia/ck804/chip.h b/src/southbridge/nvidia/ck804/chip.h
index 507de7a..2be28eb 100644
--- a/src/southbridge/nvidia/ck804/chip.h
+++ b/src/southbridge/nvidia/ck804/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_NVIDIA_CK804_CHIP_H
diff --git a/src/southbridge/nvidia/ck804/ck804.c b/src/southbridge/nvidia/ck804/ck804.c
index 0ca6b07..d9f435c 100644
--- a/src/southbridge/nvidia/ck804/ck804.c
+++ b/src/southbridge/nvidia/ck804/ck804.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/ck804.h b/src/southbridge/nvidia/ck804/ck804.h
index 3da18f4..c247ac7 100644
--- a/src/southbridge/nvidia/ck804/ck804.h
+++ b/src/southbridge/nvidia/ck804/ck804.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_NVIDIA_CK804_CK804_H
diff --git a/src/southbridge/nvidia/ck804/early_setup.c b/src/southbridge/nvidia/ck804/early_setup.c
index 9c0a783..418fb31 100644
--- a/src/southbridge/nvidia/ck804/early_setup.c
+++ b/src/southbridge/nvidia/ck804/early_setup.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/southbridge/nvidia/ck804/early_setup_car.c b/src/southbridge/nvidia/ck804/early_setup_car.c
index 87fdbdd..56adc47 100644
--- a/src/southbridge/nvidia/ck804/early_setup_car.c
+++ b/src/southbridge/nvidia/ck804/early_setup_car.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "ck804.h"
diff --git a/src/southbridge/nvidia/ck804/early_setup_ss.h b/src/southbridge/nvidia/ck804/early_setup_ss.h
index 4d6bada..8061d82 100644
--- a/src/southbridge/nvidia/ck804/early_setup_ss.h
+++ b/src/southbridge/nvidia/ck804/early_setup_ss.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static const unsigned int pcie_ss_tbl[] = {
diff --git a/src/southbridge/nvidia/ck804/early_smbus.c b/src/southbridge/nvidia/ck804/early_smbus.c
index e67964b..79b7e10 100644
--- a/src/southbridge/nvidia/ck804/early_smbus.c
+++ b/src/southbridge/nvidia/ck804/early_smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/nvidia/ck804/enable_usbdebug.c b/src/southbridge/nvidia/ck804/enable_usbdebug.c
index baf260b..05d567b 100644
--- a/src/southbridge/nvidia/ck804/enable_usbdebug.c
+++ b/src/southbridge/nvidia/ck804/enable_usbdebug.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/nvidia/ck804/ht.c b/src/southbridge/nvidia/ck804/ht.c
index 68fc986..2f34411 100644
--- a/src/southbridge/nvidia/ck804/ht.c
+++ b/src/southbridge/nvidia/ck804/ht.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/ide.c b/src/southbridge/nvidia/ck804/ide.c
index 1a24d92..481ba49 100644
--- a/src/southbridge/nvidia/ck804/ide.c
+++ b/src/southbridge/nvidia/ck804/ide.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/lpc.c b/src/southbridge/nvidia/ck804/lpc.c
index be8a39c..27bcaa3 100644
--- a/src/southbridge/nvidia/ck804/lpc.c
+++ b/src/southbridge/nvidia/ck804/lpc.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/nic.c b/src/southbridge/nvidia/ck804/nic.c
index 7f17c23..2f6d620 100644
--- a/src/southbridge/nvidia/ck804/nic.c
+++ b/src/southbridge/nvidia/ck804/nic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/pci.c b/src/southbridge/nvidia/ck804/pci.c
index 3c2efba..fdfcaa6 100644
--- a/src/southbridge/nvidia/ck804/pci.c
+++ b/src/southbridge/nvidia/ck804/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/pcie.c b/src/southbridge/nvidia/ck804/pcie.c
index 5bd64f2..cd526c7 100644
--- a/src/southbridge/nvidia/ck804/pcie.c
+++ b/src/southbridge/nvidia/ck804/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/reset.c b/src/southbridge/nvidia/ck804/reset.c
index 60dcfb4..6c5c378 100644
--- a/src/southbridge/nvidia/ck804/reset.c
+++ b/src/southbridge/nvidia/ck804/reset.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/nvidia/ck804/romstrap.inc b/src/southbridge/nvidia/ck804/romstrap.inc
index 08bdc18..75c20d2 100644
--- a/src/southbridge/nvidia/ck804/romstrap.inc
+++ b/src/southbridge/nvidia/ck804/romstrap.inc
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	.section ".romstrap", "a", @progbits
diff --git a/src/southbridge/nvidia/ck804/romstrap.ld b/src/southbridge/nvidia/ck804/romstrap.ld
index 1d074ab..286e97f 100644
--- a/src/southbridge/nvidia/ck804/romstrap.ld
+++ b/src/southbridge/nvidia/ck804/romstrap.ld
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 SECTIONS {
diff --git a/src/southbridge/nvidia/ck804/sata.c b/src/southbridge/nvidia/ck804/sata.c
index 752be3f..2be1b61 100644
--- a/src/southbridge/nvidia/ck804/sata.c
+++ b/src/southbridge/nvidia/ck804/sata.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/smbus.c b/src/southbridge/nvidia/ck804/smbus.c
index 2803df0..4e5c6ed 100644
--- a/src/southbridge/nvidia/ck804/smbus.c
+++ b/src/southbridge/nvidia/ck804/smbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/smbus.h b/src/southbridge/nvidia/ck804/smbus.h
index 7746ea9..8d98dc4 100644
--- a/src/southbridge/nvidia/ck804/smbus.h
+++ b/src/southbridge/nvidia/ck804/smbus.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/nvidia/ck804/usb.c b/src/southbridge/nvidia/ck804/usb.c
index 75e9208..f130516 100644
--- a/src/southbridge/nvidia/ck804/usb.c
+++ b/src/southbridge/nvidia/ck804/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/ck804/usb2.c b/src/southbridge/nvidia/ck804/usb2.c
index a962d3c..ef737da 100644
--- a/src/southbridge/nvidia/ck804/usb2.c
+++ b/src/southbridge/nvidia/ck804/usb2.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/azalia.c b/src/southbridge/nvidia/mcp55/azalia.c
index bb4376f..1dddc62 100644
--- a/src/southbridge/nvidia/mcp55/azalia.c
+++ b/src/southbridge/nvidia/mcp55/azalia.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/bootblock.c b/src/southbridge/nvidia/mcp55/bootblock.c
index f20e9b2..56d9814 100644
--- a/src/southbridge/nvidia/mcp55/bootblock.c
+++ b/src/southbridge/nvidia/mcp55/bootblock.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/nvidia/mcp55/chip.h b/src/southbridge/nvidia/mcp55/chip.h
index da252cd..18b1a51 100644
--- a/src/southbridge/nvidia/mcp55/chip.h
+++ b/src/southbridge/nvidia/mcp55/chip.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_NVIDIA_MCP55_CHIP_H
diff --git a/src/southbridge/nvidia/mcp55/early_ctrl.c b/src/southbridge/nvidia/mcp55/early_ctrl.c
index 3607b93..ef04d6c 100644
--- a/src/southbridge/nvidia/mcp55/early_ctrl.c
+++ b/src/southbridge/nvidia/mcp55/early_ctrl.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/southbridge/nvidia/mcp55/early_setup_car.c b/src/southbridge/nvidia/mcp55/early_setup_car.c
index d919610..2257625 100644
--- a/src/southbridge/nvidia/mcp55/early_setup_car.c
+++ b/src/southbridge/nvidia/mcp55/early_setup_car.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifdef UNUSED_CODE
diff --git a/src/southbridge/nvidia/mcp55/early_setup_ss.h b/src/southbridge/nvidia/mcp55/early_setup_ss.h
index 9ce6cb5..e737b44 100644
--- a/src/southbridge/nvidia/mcp55/early_setup_ss.h
+++ b/src/southbridge/nvidia/mcp55/early_setup_ss.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static const unsigned int pcie_ss_tbl[] = {
diff --git a/src/southbridge/nvidia/mcp55/early_smbus.c b/src/southbridge/nvidia/mcp55/early_smbus.c
index bca5f99..b240496 100644
--- a/src/southbridge/nvidia/mcp55/early_smbus.c
+++ b/src/southbridge/nvidia/mcp55/early_smbus.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smbus.h"
diff --git a/src/southbridge/nvidia/mcp55/enable_usbdebug.c b/src/southbridge/nvidia/mcp55/enable_usbdebug.c
index 02d5f34..ca25075 100644
--- a/src/southbridge/nvidia/mcp55/enable_usbdebug.c
+++ b/src/southbridge/nvidia/mcp55/enable_usbdebug.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Use simple device model for this file even in ramstage
diff --git a/src/southbridge/nvidia/mcp55/fadt.c b/src/southbridge/nvidia/mcp55/fadt.c
index c6a066e..c84d129 100644
--- a/src/southbridge/nvidia/mcp55/fadt.c
+++ b/src/southbridge/nvidia/mcp55/fadt.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/ht.c b/src/southbridge/nvidia/mcp55/ht.c
index 54ffc8b..253e4a4 100644
--- a/src/southbridge/nvidia/mcp55/ht.c
+++ b/src/southbridge/nvidia/mcp55/ht.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/ide.c b/src/southbridge/nvidia/mcp55/ide.c
index 925b7c5..2b3ca80 100644
--- a/src/southbridge/nvidia/mcp55/ide.c
+++ b/src/southbridge/nvidia/mcp55/ide.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/lpc.c b/src/southbridge/nvidia/mcp55/lpc.c
index 5726c76..e8e0b23 100644
--- a/src/southbridge/nvidia/mcp55/lpc.c
+++ b/src/southbridge/nvidia/mcp55/lpc.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/mcp55.c b/src/southbridge/nvidia/mcp55/mcp55.c
index 3287012..413670c 100644
--- a/src/southbridge/nvidia/mcp55/mcp55.c
+++ b/src/southbridge/nvidia/mcp55/mcp55.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/mcp55.h b/src/southbridge/nvidia/mcp55/mcp55.h
index 8f73f12..e3d0565 100644
--- a/src/southbridge/nvidia/mcp55/mcp55.h
+++ b/src/southbridge/nvidia/mcp55/mcp55.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_NVIDIA_MCP55_MCP55_H
diff --git a/src/southbridge/nvidia/mcp55/nic.c b/src/southbridge/nvidia/mcp55/nic.c
index f80c0d8..a2cd5a4 100644
--- a/src/southbridge/nvidia/mcp55/nic.c
+++ b/src/southbridge/nvidia/mcp55/nic.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/pci.c b/src/southbridge/nvidia/mcp55/pci.c
index cd3d5ab..2d3e790 100644
--- a/src/southbridge/nvidia/mcp55/pci.c
+++ b/src/southbridge/nvidia/mcp55/pci.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/pcie.c b/src/southbridge/nvidia/mcp55/pcie.c
index 07292d6..7a15017 100644
--- a/src/southbridge/nvidia/mcp55/pcie.c
+++ b/src/southbridge/nvidia/mcp55/pcie.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/reset.c b/src/southbridge/nvidia/mcp55/reset.c
index 66138f4..19068fb 100644
--- a/src/southbridge/nvidia/mcp55/reset.c
+++ b/src/southbridge/nvidia/mcp55/reset.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/nvidia/mcp55/romstrap.inc b/src/southbridge/nvidia/mcp55/romstrap.inc
index 472e08b..0410f86 100644
--- a/src/southbridge/nvidia/mcp55/romstrap.inc
+++ b/src/southbridge/nvidia/mcp55/romstrap.inc
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	.section ".romstrap", "a", @progbits
diff --git a/src/southbridge/nvidia/mcp55/romstrap.ld b/src/southbridge/nvidia/mcp55/romstrap.ld
index ad2bf05..a0e9602 100644
--- a/src/southbridge/nvidia/mcp55/romstrap.ld
+++ b/src/southbridge/nvidia/mcp55/romstrap.ld
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 SECTIONS {
diff --git a/src/southbridge/nvidia/mcp55/sata.c b/src/southbridge/nvidia/mcp55/sata.c
index 8a940b8..727a3e9 100644
--- a/src/southbridge/nvidia/mcp55/sata.c
+++ b/src/southbridge/nvidia/mcp55/sata.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/smbus.c b/src/southbridge/nvidia/mcp55/smbus.c
index 2a56069..e7cc957 100644
--- a/src/southbridge/nvidia/mcp55/smbus.c
+++ b/src/southbridge/nvidia/mcp55/smbus.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/smbus.h b/src/southbridge/nvidia/mcp55/smbus.h
index 70ef1ac..84d37c9 100644
--- a/src/southbridge/nvidia/mcp55/smbus.h
+++ b/src/southbridge/nvidia/mcp55/smbus.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/nvidia/mcp55/usb.c b/src/southbridge/nvidia/mcp55/usb.c
index 1c5331c..0d7016d 100644
--- a/src/southbridge/nvidia/mcp55/usb.c
+++ b/src/southbridge/nvidia/mcp55/usb.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/nvidia/mcp55/usb2.c b/src/southbridge/nvidia/mcp55/usb2.c
index 70f5be5..dcdeec4 100644
--- a/src/southbridge/nvidia/mcp55/usb2.c
+++ b/src/southbridge/nvidia/mcp55/usb2.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/rdc/r8610/Kconfig b/src/southbridge/rdc/r8610/Kconfig
index 5ec6ca2..dc62b9b 100644
--- a/src/southbridge/rdc/r8610/Kconfig
+++ b/src/southbridge/rdc/r8610/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_RDC_R8610
diff --git a/src/southbridge/rdc/r8610/Makefile.inc b/src/southbridge/rdc/r8610/Makefile.inc
index e958907..9f42e4c 100644
--- a/src/southbridge/rdc/r8610/Makefile.inc
+++ b/src/southbridge/rdc/r8610/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_RDC_R8610),y)
diff --git a/src/southbridge/rdc/r8610/bootblock.c b/src/southbridge/rdc/r8610/bootblock.c
index c2793f9..e469d15 100644
--- a/src/southbridge/rdc/r8610/bootblock.c
+++ b/src/southbridge/rdc/r8610/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/rdc/r8610/r8610.c b/src/southbridge/rdc/r8610/r8610.c
index 328f3be..832249b 100644
--- a/src/southbridge/rdc/r8610/r8610.c
+++ b/src/southbridge/rdc/r8610/r8610.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/ricoh/rl5c476/Kconfig b/src/southbridge/ricoh/rl5c476/Kconfig
index 86e8ab9..5171048 100644
--- a/src/southbridge/ricoh/rl5c476/Kconfig
+++ b/src/southbridge/ricoh/rl5c476/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_RICOH_RL5C476
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c
index e556841..ba791cd 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.h b/src/southbridge/ricoh/rl5c476/rl5c476.h
index 9431334..58528a5 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.h
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
  /* rl5c476 routines and defines*/
diff --git a/src/southbridge/sis/sis966/aza.c b/src/southbridge/sis/sis966/aza.c
index 09efda0..a6ddcec 100644
--- a/src/southbridge/sis/sis966/aza.c
+++ b/src/southbridge/sis/sis966/aza.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/bootblock.c b/src/southbridge/sis/sis966/bootblock.c
index c485b25..217b681 100644
--- a/src/southbridge/sis/sis966/bootblock.c
+++ b/src/southbridge/sis/sis966/bootblock.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/sis/sis966/chip.h b/src/southbridge/sis/sis966/chip.h
index 18ad5dd..3a395d2 100644
--- a/src/southbridge/sis/sis966/chip.h
+++ b/src/southbridge/sis/sis966/chip.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SIS966_CHIP_H
diff --git a/src/southbridge/sis/sis966/early_ctrl.c b/src/southbridge/sis/sis966/early_ctrl.c
index 4860ddc..789d790 100644
--- a/src/southbridge/sis/sis966/early_ctrl.c
+++ b/src/southbridge/sis/sis966/early_ctrl.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <reset.h>
diff --git a/src/southbridge/sis/sis966/early_setup_car.c b/src/southbridge/sis/sis966/early_setup_car.c
index ed63f6d..af7cfe0 100644
--- a/src/southbridge/sis/sis966/early_setup_car.c
+++ b/src/southbridge/sis/sis966/early_setup_car.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 void sis966_early_pcie_setup(unsigned busnx, unsigned devnx, unsigned anactrl_io_base, unsigned pci_e_x)
diff --git a/src/southbridge/sis/sis966/early_setup_ss.h b/src/southbridge/sis/sis966/early_setup_ss.h
index 7a76f26..b2906cd 100644
--- a/src/southbridge/sis/sis966/early_setup_ss.h
+++ b/src/southbridge/sis/sis966/early_setup_ss.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static const unsigned int pcie_ss_tbl[] = {
diff --git a/src/southbridge/sis/sis966/early_smbus.c b/src/southbridge/sis/sis966/early_smbus.c
index 5c6f7d7..673459c 100644
--- a/src/southbridge/sis/sis966/early_smbus.c
+++ b/src/southbridge/sis/sis966/early_smbus.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "smbus.h"
diff --git a/src/southbridge/sis/sis966/enable_usbdebug.c b/src/southbridge/sis/sis966/enable_usbdebug.c
index 88ae772..9c5d484 100644
--- a/src/southbridge/sis/sis966/enable_usbdebug.c
+++ b/src/southbridge/sis/sis966/enable_usbdebug.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* TODO: Check whether this actually works (might be copy-paste leftover). */
diff --git a/src/southbridge/sis/sis966/ide.c b/src/southbridge/sis/sis966/ide.c
index 870f8a2..fea4d3d 100644
--- a/src/southbridge/sis/sis966/ide.c
+++ b/src/southbridge/sis/sis966/ide.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/lpc.c b/src/southbridge/sis/sis966/lpc.c
index e5eaa06..51c510a 100644
--- a/src/southbridge/sis/sis966/lpc.c
+++ b/src/southbridge/sis/sis966/lpc.c
@@ -21,8 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/nic.c b/src/southbridge/sis/sis966/nic.c
index d7f9641..3d9ee31 100644
--- a/src/southbridge/sis/sis966/nic.c
+++ b/src/southbridge/sis/sis966/nic.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/pcie.c b/src/southbridge/sis/sis966/pcie.c
index 1207410..6e6dbc4 100644
--- a/src/southbridge/sis/sis966/pcie.c
+++ b/src/southbridge/sis/sis966/pcie.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/reset.c b/src/southbridge/sis/sis966/reset.c
index 66138f4..19068fb 100644
--- a/src/southbridge/sis/sis966/reset.c
+++ b/src/southbridge/sis/sis966/reset.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/sis/sis966/romstrap.inc b/src/southbridge/sis/sis966/romstrap.inc
index b32ad10..30fe548 100644
--- a/src/southbridge/sis/sis966/romstrap.inc
+++ b/src/southbridge/sis/sis966/romstrap.inc
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 	.section ".romstrap", "a", @progbits
diff --git a/src/southbridge/sis/sis966/romstrap.ld b/src/southbridge/sis/sis966/romstrap.ld
index ad2bf05..a0e9602 100644
--- a/src/southbridge/sis/sis966/romstrap.ld
+++ b/src/southbridge/sis/sis966/romstrap.ld
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 SECTIONS {
diff --git a/src/southbridge/sis/sis966/sata.c b/src/southbridge/sis/sis966/sata.c
index b6cd3bd..50d36bb 100644
--- a/src/southbridge/sis/sis966/sata.c
+++ b/src/southbridge/sis/sis966/sata.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/sis761.c b/src/southbridge/sis/sis966/sis761.c
index 9e50eb7..6d49581 100644
--- a/src/southbridge/sis/sis966/sis761.c
+++ b/src/southbridge/sis/sis966/sis761.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/sis/sis966/sis966.c b/src/southbridge/sis/sis966/sis966.c
index b1535c1..7cd66b2 100644
--- a/src/southbridge/sis/sis966/sis966.c
+++ b/src/southbridge/sis/sis966/sis966.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/sis966.h b/src/southbridge/sis/sis966/sis966.h
index 5064949..22b99c6 100644
--- a/src/southbridge/sis/sis966/sis966.h
+++ b/src/southbridge/sis/sis966/sis966.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SIS966_H
diff --git a/src/southbridge/sis/sis966/smbus.h b/src/southbridge/sis/sis966/smbus.h
index 89aaeeb..06502d2 100644
--- a/src/southbridge/sis/sis966/smbus.h
+++ b/src/southbridge/sis/sis966/smbus.h
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/smbus_def.h>
diff --git a/src/southbridge/sis/sis966/usb.c b/src/southbridge/sis/sis966/usb.c
index 188b75a..ea126a3 100644
--- a/src/southbridge/sis/sis966/usb.c
+++ b/src/southbridge/sis/sis966/usb.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/sis/sis966/usb2.c b/src/southbridge/sis/sis966/usb2.c
index 4286754..59ef72b 100644
--- a/src/southbridge/sis/sis966/usb2.c
+++ b/src/southbridge/sis/sis966/usb2.c
@@ -19,8 +19,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/ti/pci1x2x/pci1x2x.c b/src/southbridge/ti/pci1x2x/pci1x2x.c
index 1cf199d..cc7ea97 100644
--- a/src/southbridge/ti/pci1x2x/pci1x2x.c
+++ b/src/southbridge/ti/pci1x2x/pci1x2x.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/ti/pci7420/Kconfig b/src/southbridge/ti/pci7420/Kconfig
index 1bfe011..70d68a4 100644
--- a/src/southbridge/ti/pci7420/Kconfig
+++ b/src/southbridge/ti/pci7420/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_TI_PCI7420
diff --git a/src/southbridge/ti/pci7420/Makefile.inc b/src/southbridge/ti/pci7420/Makefile.inc
index b7ef48e..a4bb531 100644
--- a/src/southbridge/ti/pci7420/Makefile.inc
+++ b/src/southbridge/ti/pci7420/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_TI_PCI7420),y)
diff --git a/src/southbridge/ti/pci7420/cardbus.c b/src/southbridge/ti/pci7420/cardbus.c
index 41e2b70..c1d1e50 100644
--- a/src/southbridge/ti/pci7420/cardbus.c
+++ b/src/southbridge/ti/pci7420/cardbus.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/ti/pci7420/chip.h b/src/southbridge/ti/pci7420/chip.h
index c31e1e0..91a93e5 100644
--- a/src/southbridge/ti/pci7420/chip.h
+++ b/src/southbridge/ti/pci7420/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _SOUTHBRIDGE_TI_PCI7420
diff --git a/src/southbridge/ti/pci7420/firewire.c b/src/southbridge/ti/pci7420/firewire.c
index b16f737..b1d5e11 100644
--- a/src/southbridge/ti/pci7420/firewire.c
+++ b/src/southbridge/ti/pci7420/firewire.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/ti/pci7420/pci7420.h b/src/southbridge/ti/pci7420/pci7420.h
index a31feb5..b9402f3 100644
--- a/src/southbridge/ti/pci7420/pci7420.h
+++ b/src/southbridge/ti/pci7420/pci7420.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 		     // 0844d060 (old)
diff --git a/src/southbridge/ti/pcixx12/Kconfig b/src/southbridge/ti/pcixx12/Kconfig
index d7cfc17..57f2208 100644
--- a/src/southbridge/ti/pcixx12/Kconfig
+++ b/src/southbridge/ti/pcixx12/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_TI_PCIXX12
diff --git a/src/southbridge/ti/pcixx12/Makefile.inc b/src/southbridge/ti/pcixx12/Makefile.inc
index eeba071..77e6d19 100644
--- a/src/southbridge/ti/pcixx12/Makefile.inc
+++ b/src/southbridge/ti/pcixx12/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_TI_PCIXX12),y)
diff --git a/src/southbridge/ti/pcixx12/pcixx12.c b/src/southbridge/ti/pcixx12/pcixx12.c
index a478de1..9979e16 100644
--- a/src/southbridge/ti/pcixx12/pcixx12.c
+++ b/src/southbridge/ti/pcixx12/pcixx12.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/via/k8t890/bridge.c b/src/southbridge/via/k8t890/bridge.c
index 9d8e046..96cb6b4 100644
--- a/src/southbridge/via/k8t890/bridge.c
+++ b/src/southbridge/via/k8t890/bridge.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/k8t890/chrome.c b/src/southbridge/via/k8t890/chrome.c
index bc9511c..8d85348 100644
--- a/src/southbridge/via/k8t890/chrome.c
+++ b/src/southbridge/via/k8t890/chrome.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/via/k8t890/ctrl.c b/src/southbridge/via/k8t890/ctrl.c
index 40f0dc6..438dc08 100644
--- a/src/southbridge/via/k8t890/ctrl.c
+++ b/src/southbridge/via/k8t890/ctrl.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/k8t890/dram.c b/src/southbridge/via/k8t890/dram.c
index c693c39..8486089 100644
--- a/src/southbridge/via/k8t890/dram.c
+++ b/src/southbridge/via/k8t890/dram.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/k8t890/early_car.c b/src/southbridge/via/k8t890/early_car.c
index 6e3bf55..64a55b5 100644
--- a/src/southbridge/via/k8t890/early_car.c
+++ b/src/southbridge/via/k8t890/early_car.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/southbridge/via/k8t890/error.c b/src/southbridge/via/k8t890/error.c
index a590aad..c099f0c 100644
--- a/src/southbridge/via/k8t890/error.c
+++ b/src/southbridge/via/k8t890/error.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/k8t890/host.c b/src/southbridge/via/k8t890/host.c
index 92eaf37..197e953 100644
--- a/src/southbridge/via/k8t890/host.c
+++ b/src/southbridge/via/k8t890/host.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/k8t890/host_ctrl.c b/src/southbridge/via/k8t890/host_ctrl.c
index 3d028a6..f27d183 100644
--- a/src/southbridge/via/k8t890/host_ctrl.c
+++ b/src/southbridge/via/k8t890/host_ctrl.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/k8t890/k8t890.h b/src/southbridge/via/k8t890/k8t890.h
index 7cb3a43..5543598 100644
--- a/src/southbridge/via/k8t890/k8t890.h
+++ b/src/southbridge/via/k8t890/k8t890.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_VIA_K8T890_K8T890_H
diff --git a/src/southbridge/via/k8t890/k8x8xx.h b/src/southbridge/via/k8t890/k8x8xx.h
index baca06d..a705cac 100644
--- a/src/southbridge/via/k8t890/k8x8xx.h
+++ b/src/southbridge/via/k8t890/k8x8xx.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_VIA_K8T890_K8X8XX_H
diff --git a/src/southbridge/via/k8t890/pcie.c b/src/southbridge/via/k8t890/pcie.c
index 0c1eded..edf26c7 100644
--- a/src/southbridge/via/k8t890/pcie.c
+++ b/src/southbridge/via/k8t890/pcie.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/via/k8t890/romstrap.inc b/src/southbridge/via/k8t890/romstrap.inc
index 0f65044..5cac3ef 100644
--- a/src/southbridge/via/k8t890/romstrap.inc
+++ b/src/southbridge/via/k8t890/romstrap.inc
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This file constructs the ROM strap table for K8T890 and K8M890 */
diff --git a/src/southbridge/via/k8t890/romstrap.ld b/src/southbridge/via/k8t890/romstrap.ld
index cf17b36..408eb4a 100644
--- a/src/southbridge/via/k8t890/romstrap.ld
+++ b/src/southbridge/via/k8t890/romstrap.ld
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Modified for K8T890 ROM strap by Rudolf Marek <r.marek at assembler.cz>. */
diff --git a/src/southbridge/via/k8t890/traf_ctrl.c b/src/southbridge/via/k8t890/traf_ctrl.c
index c7fb5c9..1881a14 100644
--- a/src/southbridge/via/k8t890/traf_ctrl.c
+++ b/src/southbridge/via/k8t890/traf_ctrl.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/vt8237r/Kconfig b/src/southbridge/via/vt8237r/Kconfig
index 6019654..4d40095 100644
--- a/src/southbridge/via/vt8237r/Kconfig
+++ b/src/southbridge/via/vt8237r/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/southbridge/via/vt8237r/Makefile.inc b/src/southbridge/via/vt8237r/Makefile.inc
index 783d486..a3dec7b 100644
--- a/src/southbridge/via/vt8237r/Makefile.inc
+++ b/src/southbridge/via/vt8237r/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifeq ($(CONFIG_SOUTHBRIDGE_VIA_VT8237R),y)
diff --git a/src/southbridge/via/vt8237r/bootblock.c b/src/southbridge/via/vt8237r/bootblock.c
index 9989dec..85779fc 100644
--- a/src/southbridge/via/vt8237r/bootblock.c
+++ b/src/southbridge/via/vt8237r/bootblock.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/southbridge/via/vt8237r/chip.h b/src/southbridge/via/vt8237r/chip.h
index 7a66ef8..8757586 100644
--- a/src/southbridge/via/vt8237r/chip.h
+++ b/src/southbridge/via/vt8237r/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_VIA_VT8237R_CHIP_H
diff --git a/src/southbridge/via/vt8237r/ctrl.c b/src/southbridge/via/vt8237r/ctrl.c
index 1ea18e3..8ceadf77 100644
--- a/src/southbridge/via/vt8237r/ctrl.c
+++ b/src/southbridge/via/vt8237r/ctrl.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/southbridge/via/vt8237r/early_smbus.c b/src/southbridge/via/vt8237r/early_smbus.c
index 949046d..269141e 100644
--- a/src/southbridge/via/vt8237r/early_smbus.c
+++ b/src/southbridge/via/vt8237r/early_smbus.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #if !defined(__ROMCC__)
diff --git a/src/southbridge/via/vt8237r/fadt.c b/src/southbridge/via/vt8237r/fadt.c
index 03b8deb..9563e7e 100644
--- a/src/southbridge/via/vt8237r/fadt.c
+++ b/src/southbridge/via/vt8237r/fadt.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/src/southbridge/via/vt8237r/ide.c b/src/southbridge/via/vt8237r/ide.c
index a718e63..4bfdf4b 100644
--- a/src/southbridge/via/vt8237r/ide.c
+++ b/src/southbridge/via/vt8237r/ide.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Based on other VIA SB code. */
diff --git a/src/southbridge/via/vt8237r/lpc.c b/src/southbridge/via/vt8237r/lpc.c
index f7f2dbe..cdf39fd 100644
--- a/src/southbridge/via/vt8237r/lpc.c
+++ b/src/southbridge/via/vt8237r/lpc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Inspiration from other VIA SB code. */
diff --git a/src/southbridge/via/vt8237r/nic.c b/src/southbridge/via/vt8237r/nic.c
index 39e6358..f7f585b 100644
--- a/src/southbridge/via/vt8237r/nic.c
+++ b/src/southbridge/via/vt8237r/nic.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/via/vt8237r/nvs.h b/src/southbridge/via/vt8237r/nvs.h
index 61b3159..726811f 100644
--- a/src/southbridge/via/vt8237r/nvs.h
+++ b/src/southbridge/via/vt8237r/nvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 typedef struct {
diff --git a/src/southbridge/via/vt8237r/pirq.c b/src/southbridge/via/vt8237r/pirq.c
index 9305762..f37a5c1 100644
--- a/src/southbridge/via/vt8237r/pirq.c
+++ b/src/southbridge/via/vt8237r/pirq.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/pirq_routing.h>
diff --git a/src/southbridge/via/vt8237r/sata.c b/src/southbridge/via/vt8237r/sata.c
index c9b60d9..d6748ef 100644
--- a/src/southbridge/via/vt8237r/sata.c
+++ b/src/southbridge/via/vt8237r/sata.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/via/vt8237r/smi.c b/src/southbridge/via/vt8237r/smi.c
index bd87344..00dd980 100644
--- a/src/southbridge/via/vt8237r/smi.c
+++ b/src/southbridge/via/vt8237r/smi.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/southbridge/via/vt8237r/smihandler.c b/src/southbridge/via/vt8237r/smihandler.c
index ac98129..bdd44b0 100644
--- a/src/southbridge/via/vt8237r/smihandler.c
+++ b/src/southbridge/via/vt8237r/smihandler.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/southbridge/via/vt8237r/usb.c b/src/southbridge/via/vt8237r/usb.c
index 259be89..9a5cdc9 100644
--- a/src/southbridge/via/vt8237r/usb.c
+++ b/src/southbridge/via/vt8237r/usb.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/via/vt8237r/vt8237r.c b/src/southbridge/via/vt8237r/vt8237r.c
index a8a5059..e466a73 100644
--- a/src/southbridge/via/vt8237r/vt8237r.c
+++ b/src/southbridge/via/vt8237r/vt8237r.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <console/console.h>
diff --git a/src/southbridge/via/vt8237r/vt8237r.h b/src/southbridge/via/vt8237r/vt8237r.h
index 4f570a6..56b26c5 100644
--- a/src/southbridge/via/vt8237r/vt8237r.h
+++ b/src/southbridge/via/vt8237r/vt8237r.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SOUTHBRIDGE_VIA_VT8237R_VT8237R_H
diff --git a/src/southbridge/via/vt82c686/early_serial.c b/src/southbridge/via/vt82c686/early_serial.c
index 711f211..4cade9c 100644
--- a/src/southbridge/via/vt82c686/early_serial.c
+++ b/src/southbridge/via/vt82c686/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This has been ported to the VIA VT82C686(A/B) from the SMSC FDC37M60x
diff --git a/src/southbridge/via/vt82c686/vt82c686.h b/src/southbridge/via/vt82c686/vt82c686.h
index a414af5..240289d 100644
--- a/src/southbridge/via/vt82c686/vt82c686.h
+++ b/src/southbridge/via/vt82c686/vt82c686.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Datasheets:
diff --git a/src/superio/Makefile.inc b/src/superio/Makefile.inc
index 0c5445a..9d2e292 100644
--- a/src/superio/Makefile.inc
+++ b/src/superio/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += fintek
diff --git a/src/superio/acpi/pnp.asl b/src/superio/acpi/pnp.asl
index 632789e..d76456c 100644
--- a/src/superio/acpi/pnp.asl
+++ b/src/superio/acpi/pnp.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ACPI_PNP_DEFS_ASL
diff --git a/src/superio/acpi/pnp_config.asl b/src/superio/acpi/pnp_config.asl
index bd9dc20..52894a5 100644
--- a/src/superio/acpi/pnp_config.asl
+++ b/src/superio/acpi/pnp_config.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* ======== General PnP configuration functions ======= */
diff --git a/src/superio/acpi/pnp_generic.asl b/src/superio/acpi/pnp_generic.asl
index 691f31f..207c7a0 100644
--- a/src/superio/acpi/pnp_generic.asl
+++ b/src/superio/acpi/pnp_generic.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* =================== Generic PnP Device =================== */
diff --git a/src/superio/acpi/pnp_kbc.asl b/src/superio/acpi/pnp_kbc.asl
index 1c39258..f0ac01e 100644
--- a/src/superio/acpi/pnp_kbc.asl
+++ b/src/superio/acpi/pnp_kbc.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* =================== Keyboard Controller ================== */
diff --git a/src/superio/acpi/pnp_uart.asl b/src/superio/acpi/pnp_uart.asl
index 4dcfb7a..1b09a5c 100644
--- a/src/superio/acpi/pnp_uart.asl
+++ b/src/superio/acpi/pnp_uart.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* ========================== UART ========================== */
diff --git a/src/superio/common/conf_mode.c b/src/superio/common/conf_mode.c
index 5253bfc..d7f7223 100644
--- a/src/superio/common/conf_mode.c
+++ b/src/superio/common/conf_mode.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/Kconfig b/src/superio/fintek/Kconfig
index 2662a85..d30935d 100644
--- a/src/superio/fintek/Kconfig
+++ b/src/superio/fintek/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Generic Fintek romstage driver - Just enough UART initialisation code for
diff --git a/src/superio/fintek/Makefile.inc b/src/superio/fintek/Makefile.inc
index 40abb8a..74b732e 100644
--- a/src/superio/fintek/Makefile.inc
+++ b/src/superio/fintek/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ## include generic fintek pre-ram stage driver
diff --git a/src/superio/fintek/common/early_serial.c b/src/superio/fintek/common/early_serial.c
index caa5a8e..c87a2a3 100644
--- a/src/superio/fintek/common/early_serial.c
+++ b/src/superio/fintek/common/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/fintek/common/fintek.h b/src/superio/fintek/common/fintek.h
index 125a0c8..b0be9f9 100644
--- a/src/superio/fintek/common/fintek.h
+++ b/src/superio/fintek/common/fintek.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_COMMON_ROMSTAGE_H
diff --git a/src/superio/fintek/f71805f/Makefile.inc b/src/superio/fintek/f71805f/Makefile.inc
index d8252f3..32d7895 100644
--- a/src/superio/fintek/f71805f/Makefile.inc
+++ b/src/superio/fintek/f71805f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F71805F) += superio.c
diff --git a/src/superio/fintek/f71805f/f71805f.h b/src/superio/fintek/f71805f/f71805f.h
index 51e62a5..476b12e 100644
--- a/src/superio/fintek/f71805f/f71805f.h
+++ b/src/superio/fintek/f71805f/f71805f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71805F_H
diff --git a/src/superio/fintek/f71805f/superio.c b/src/superio/fintek/f71805f/superio.c
index a761d1d..fc75a54 100644
--- a/src/superio/fintek/f71805f/superio.c
+++ b/src/superio/fintek/f71805f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71859/Makefile.inc b/src/superio/fintek/f71859/Makefile.inc
index 3d5cbe6..f99803e 100644
--- a/src/superio/fintek/f71859/Makefile.inc
+++ b/src/superio/fintek/f71859/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F71859) += superio.c
diff --git a/src/superio/fintek/f71859/f71859.h b/src/superio/fintek/f71859/f71859.h
index 4c9c367..500a57f 100644
--- a/src/superio/fintek/f71859/f71859.h
+++ b/src/superio/fintek/f71859/f71859.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71859_H
diff --git a/src/superio/fintek/f71859/superio.c b/src/superio/fintek/f71859/superio.c
index 87bd08a..6a120d2 100644
--- a/src/superio/fintek/f71859/superio.c
+++ b/src/superio/fintek/f71859/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71863fg/Makefile.inc b/src/superio/fintek/f71863fg/Makefile.inc
index ebfb922..132fa18 100644
--- a/src/superio/fintek/f71863fg/Makefile.inc
+++ b/src/superio/fintek/f71863fg/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F71863FG) += superio.c
diff --git a/src/superio/fintek/f71863fg/f71863fg.h b/src/superio/fintek/f71863fg/f71863fg.h
index 99f850a..75afcb1 100644
--- a/src/superio/fintek/f71863fg/f71863fg.h
+++ b/src/superio/fintek/f71863fg/f71863fg.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71863FG_H
diff --git a/src/superio/fintek/f71863fg/superio.c b/src/superio/fintek/f71863fg/superio.c
index 10f47a0..57c0798 100644
--- a/src/superio/fintek/f71863fg/superio.c
+++ b/src/superio/fintek/f71863fg/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71869ad/Makefile.inc b/src/superio/fintek/f71869ad/Makefile.inc
index 9a3a877..d7dbe9f 100644
--- a/src/superio/fintek/f71869ad/Makefile.inc
+++ b/src/superio/fintek/f71869ad/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F71869AD) += f71869ad_multifunc.c
diff --git a/src/superio/fintek/f71869ad/chip.h b/src/superio/fintek/f71869ad/chip.h
index 7ea401a..029ebda 100644
--- a/src/superio/fintek/f71869ad/chip.h
+++ b/src/superio/fintek/f71869ad/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71869AD_CHIP_H
diff --git a/src/superio/fintek/f71869ad/f71869ad.h b/src/superio/fintek/f71869ad/f71869ad.h
index 30006f0..1876824 100644
--- a/src/superio/fintek/f71869ad/f71869ad.h
+++ b/src/superio/fintek/f71869ad/f71869ad.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71869AD_H
diff --git a/src/superio/fintek/f71869ad/f71869ad_hwm.c b/src/superio/fintek/f71869ad/f71869ad_hwm.c
index ceae030..d50b643 100644
--- a/src/superio/fintek/f71869ad/f71869ad_hwm.c
+++ b/src/superio/fintek/f71869ad/f71869ad_hwm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71869ad/f71869ad_multifunc.c b/src/superio/fintek/f71869ad/f71869ad_multifunc.c
index 66ae95c..e7f4ca7 100644
--- a/src/superio/fintek/f71869ad/f71869ad_multifunc.c
+++ b/src/superio/fintek/f71869ad/f71869ad_multifunc.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71869ad/fintek_internal.h b/src/superio/fintek/f71869ad/fintek_internal.h
index bf68e2b..0827481 100644
--- a/src/superio/fintek/f71869ad/fintek_internal.h
+++ b/src/superio/fintek/f71869ad/fintek_internal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71869AD_INTERNAL_H
diff --git a/src/superio/fintek/f71869ad/superio.c b/src/superio/fintek/f71869ad/superio.c
index e956351..5055d03 100644
--- a/src/superio/fintek/f71869ad/superio.c
+++ b/src/superio/fintek/f71869ad/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71872/Makefile.inc b/src/superio/fintek/f71872/Makefile.inc
index e243833..f057682 100644
--- a/src/superio/fintek/f71872/Makefile.inc
+++ b/src/superio/fintek/f71872/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F71872) += superio.c
diff --git a/src/superio/fintek/f71872/f71872.h b/src/superio/fintek/f71872/f71872.h
index 97a6417..c27a208 100644
--- a/src/superio/fintek/f71872/f71872.h
+++ b/src/superio/fintek/f71872/f71872.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71872_H
diff --git a/src/superio/fintek/f71872/superio.c b/src/superio/fintek/f71872/superio.c
index c251675..8fd17ba 100644
--- a/src/superio/fintek/f71872/superio.c
+++ b/src/superio/fintek/f71872/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f71889/Makefile.inc b/src/superio/fintek/f71889/Makefile.inc
index aeb4369..df64a17 100644
--- a/src/superio/fintek/f71889/Makefile.inc
+++ b/src/superio/fintek/f71889/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F71889) += superio.c
diff --git a/src/superio/fintek/f71889/f71889.h b/src/superio/fintek/f71889/f71889.h
index c41aa6c..543fec5 100644
--- a/src/superio/fintek/f71889/f71889.h
+++ b/src/superio/fintek/f71889/f71889.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F71889_H
diff --git a/src/superio/fintek/f71889/superio.c b/src/superio/fintek/f71889/superio.c
index fb1cc0a..fab8d37 100644
--- a/src/superio/fintek/f71889/superio.c
+++ b/src/superio/fintek/f71889/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f81216h/Makefile.inc b/src/superio/fintek/f81216h/Makefile.inc
index bbbb556..f5653c0 100644
--- a/src/superio/fintek/f81216h/Makefile.inc
+++ b/src/superio/fintek/f81216h/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_FINTEK_F81216H) += early_serial.c
diff --git a/src/superio/fintek/f81216h/chip.h b/src/superio/fintek/f81216h/chip.h
index 9076414..5658839 100644
--- a/src/superio/fintek/f81216h/chip.h
+++ b/src/superio/fintek/f81216h/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F81216H_CHIP_H
diff --git a/src/superio/fintek/f81216h/early_serial.c b/src/superio/fintek/f81216h/early_serial.c
index 0cb5090..203afb9 100644
--- a/src/superio/fintek/f81216h/early_serial.c
+++ b/src/superio/fintek/f81216h/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f81216h/f81216h.h b/src/superio/fintek/f81216h/f81216h.h
index 55ef6da..ecd3594 100644
--- a/src/superio/fintek/f81216h/f81216h.h
+++ b/src/superio/fintek/f81216h/f81216h.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F81216H_H
diff --git a/src/superio/fintek/f81216h/superio.c b/src/superio/fintek/f81216h/superio.c
index ff83a90a..2cc25a5 100644
--- a/src/superio/fintek/f81216h/superio.c
+++ b/src/superio/fintek/f81216h/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f81865f/Makefile.inc b/src/superio/fintek/f81865f/Makefile.inc
index bc4f7b2..0293c1a 100644
--- a/src/superio/fintek/f81865f/Makefile.inc
+++ b/src/superio/fintek/f81865f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F81865F) += superio.c
diff --git a/src/superio/fintek/f81865f/f81865f.h b/src/superio/fintek/f81865f/f81865f.h
index 5a1f5db..5cd05f0 100644
--- a/src/superio/fintek/f81865f/f81865f.h
+++ b/src/superio/fintek/f81865f/f81865f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/fintek/f81865f/superio.c b/src/superio/fintek/f81865f/superio.c
index 59aa9d2..84c5efa 100644
--- a/src/superio/fintek/f81865f/superio.c
+++ b/src/superio/fintek/f81865f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/fintek/f81866d/Makefile.inc b/src/superio/fintek/f81866d/Makefile.inc
index 2023b6c..aa25031 100644
--- a/src/superio/fintek/f81866d/Makefile.inc
+++ b/src/superio/fintek/f81866d/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_FINTEK_F81866D) += f81866d_hwm.c
diff --git a/src/superio/fintek/f81866d/chip.h b/src/superio/fintek/f81866d/chip.h
index 9c9e799..e0175b5 100644
--- a/src/superio/fintek/f81866d/chip.h
+++ b/src/superio/fintek/f81866d/chip.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F81866D_CHIP_H
diff --git a/src/superio/fintek/f81866d/f81866d.h b/src/superio/fintek/f81866d/f81866d.h
index 70a33b6..2831141 100644
--- a/src/superio/fintek/f81866d/f81866d.h
+++ b/src/superio/fintek/f81866d/f81866d.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/fintek/f81866d/f81866d_hwm.c b/src/superio/fintek/f81866d/f81866d_hwm.c
index bc24468..18a8516 100644
--- a/src/superio/fintek/f81866d/f81866d_hwm.c
+++ b/src/superio/fintek/f81866d/f81866d_hwm.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Setup only for Fan2
diff --git a/src/superio/fintek/f81866d/fintek_internal.h b/src/superio/fintek/f81866d/fintek_internal.h
index acd7532..39a33ec 100644
--- a/src/superio/fintek/f81866d/fintek_internal.h
+++ b/src/superio/fintek/f81866d/fintek_internal.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_FINTEK_F81866D_INTERNAL_H
diff --git a/src/superio/fintek/f81866d/superio.c b/src/superio/fintek/f81866d/superio.c
index a2245a0..705536f 100644
--- a/src/superio/fintek/f81866d/superio.c
+++ b/src/superio/fintek/f81866d/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/intel/Kconfig b/src/superio/intel/Kconfig
index 606f92a..d305f03 100644
--- a/src/superio/intel/Kconfig
+++ b/src/superio/intel/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SUPERIO_INTEL_I3100
diff --git a/src/superio/intel/Makefile.inc b/src/superio/intel/Makefile.inc
index 193c717..0bc739a 100644
--- a/src/superio/intel/Makefile.inc
+++ b/src/superio/intel/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += i3100
diff --git a/src/superio/intel/i3100/Makefile.inc b/src/superio/intel/i3100/Makefile.inc
index 9ca8748..1cf350f 100644
--- a/src/superio/intel/i3100/Makefile.inc
+++ b/src/superio/intel/i3100/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_INTEL_I3100) += early_serial.c
diff --git a/src/superio/intel/i3100/early_serial.c b/src/superio/intel/i3100/early_serial.c
index 8db150f..6203660 100644
--- a/src/superio/intel/i3100/early_serial.c
+++ b/src/superio/intel/i3100/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/intel/i3100/i3100.h b/src/superio/intel/i3100/i3100.h
index ef699dc..1fb1864 100644
--- a/src/superio/intel/i3100/i3100.h
+++ b/src/superio/intel/i3100/i3100.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_INTEL_I3100_H
diff --git a/src/superio/intel/i3100/superio.c b/src/superio/intel/i3100/superio.c
index 71c43ca..c3bc183 100644
--- a/src/superio/intel/i3100/superio.c
+++ b/src/superio/intel/i3100/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/superio/ite/Kconfig b/src/superio/ite/Kconfig
index 2043016..9e4997a 100644
--- a/src/superio/ite/Kconfig
+++ b/src/superio/ite/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Generic ITE romstage driver - Just enough UART initialisation code for
diff --git a/src/superio/ite/Makefile.inc b/src/superio/ite/Makefile.inc
index 2ee61f8..99bcbfb 100644
--- a/src/superio/ite/Makefile.inc
+++ b/src/superio/ite/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ## include generic ite pre-ram stage driver
diff --git a/src/superio/ite/common/early_serial.c b/src/superio/ite/common/early_serial.c
index 635f6ba..7e39cf2 100644
--- a/src/superio/ite/common/early_serial.c
+++ b/src/superio/ite/common/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/common/ite.h b/src/superio/ite/common/ite.h
index 59835f2..61fe155 100644
--- a/src/superio/ite/common/ite.h
+++ b/src/superio/ite/common/ite.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_COMMON_ROMSTAGE_H
diff --git a/src/superio/ite/it8661f/Makefile.inc b/src/superio/ite/it8661f/Makefile.inc
index 9286db5..66d378e 100644
--- a/src/superio/ite/it8661f/Makefile.inc
+++ b/src/superio/ite/it8661f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_ITE_IT8661F) += early_serial.c
diff --git a/src/superio/ite/it8661f/early_serial.c b/src/superio/ite/it8661f/early_serial.c
index 9efeb97..5031ef8 100644
--- a/src/superio/ite/it8661f/early_serial.c
+++ b/src/superio/ite/it8661f/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/it8661f/it8661f.h b/src/superio/ite/it8661f/it8661f.h
index 3dc6bab..ada0da8 100644
--- a/src/superio/ite/it8661f/it8661f.h
+++ b/src/superio/ite/it8661f/it8661f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8661F_H
diff --git a/src/superio/ite/it8661f/superio.c b/src/superio/ite/it8661f/superio.c
index 678d0c5..759592b 100644
--- a/src/superio/ite/it8661f/superio.c
+++ b/src/superio/ite/it8661f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/ite/it8671f/Makefile.inc b/src/superio/ite/it8671f/Makefile.inc
index f9c9b0c..7a97491 100644
--- a/src/superio/ite/it8671f/Makefile.inc
+++ b/src/superio/ite/it8671f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_ITE_IT8671F) += early_serial.c
diff --git a/src/superio/ite/it8671f/early_serial.c b/src/superio/ite/it8671f/early_serial.c
index c9e3919..bf11ede 100644
--- a/src/superio/ite/it8671f/early_serial.c
+++ b/src/superio/ite/it8671f/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/it8671f/it8671f.h b/src/superio/ite/it8671f/it8671f.h
index 382c861..0b966af 100644
--- a/src/superio/ite/it8671f/it8671f.h
+++ b/src/superio/ite/it8671f/it8671f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8671F_H
diff --git a/src/superio/ite/it8671f/superio.c b/src/superio/ite/it8671f/superio.c
index 7e5b8c2..4d3ba85 100644
--- a/src/superio/ite/it8671f/superio.c
+++ b/src/superio/ite/it8671f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/ite/it8712f/Makefile.inc b/src/superio/ite/it8712f/Makefile.inc
index 802702d..56ecd22 100644
--- a/src/superio/ite/it8712f/Makefile.inc
+++ b/src/superio/ite/it8712f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_ITE_IT8712F) += superio.c
diff --git a/src/superio/ite/it8712f/it8712f.h b/src/superio/ite/it8712f/it8712f.h
index 62e92ca..53c5739 100644
--- a/src/superio/ite/it8712f/it8712f.h
+++ b/src/superio/ite/it8712f/it8712f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8712F_H
diff --git a/src/superio/ite/it8712f/superio.c b/src/superio/ite/it8712f/superio.c
index 1efe756..a87343e 100644
--- a/src/superio/ite/it8712f/superio.c
+++ b/src/superio/ite/it8712f/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/ite/it8716f/Makefile.inc b/src/superio/ite/it8716f/Makefile.inc
index 96a4641..fabd9f6 100644
--- a/src/superio/ite/it8716f/Makefile.inc
+++ b/src/superio/ite/it8716f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_ITE_IT8716F) += superio.c
diff --git a/src/superio/ite/it8716f/it8716f.h b/src/superio/ite/it8716f/it8716f.h
index 0e102d6..b7b90e4 100644
--- a/src/superio/ite/it8716f/it8716f.h
+++ b/src/superio/ite/it8716f/it8716f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8716F_H
diff --git a/src/superio/ite/it8716f/superio.c b/src/superio/ite/it8716f/superio.c
index 3af455e..4736f05 100644
--- a/src/superio/ite/it8716f/superio.c
+++ b/src/superio/ite/it8716f/superio.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/ite/it8718f/Makefile.inc b/src/superio/ite/it8718f/Makefile.inc
index 8d6b893..1b4203b 100644
--- a/src/superio/ite/it8718f/Makefile.inc
+++ b/src/superio/ite/it8718f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_ITE_IT8718F) += early_serial.c
diff --git a/src/superio/ite/it8718f/early_serial.c b/src/superio/ite/it8718f/early_serial.c
index eec79f2..e5f799a 100644
--- a/src/superio/ite/it8718f/early_serial.c
+++ b/src/superio/ite/it8718f/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/it8718f/it8718f.h b/src/superio/ite/it8718f/it8718f.h
index f44f90d..a8875cd 100644
--- a/src/superio/ite/it8718f/it8718f.h
+++ b/src/superio/ite/it8718f/it8718f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8718F_H
diff --git a/src/superio/ite/it8718f/superio.c b/src/superio/ite/it8718f/superio.c
index 17f4da5..c2274c4 100644
--- a/src/superio/ite/it8718f/superio.c
+++ b/src/superio/ite/it8718f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/ite/it8721f/Makefile.inc b/src/superio/ite/it8721f/Makefile.inc
index e00ab9e..b138a31 100644
--- a/src/superio/ite/it8721f/Makefile.inc
+++ b/src/superio/ite/it8721f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_ITE_IT8721F) += superio.c
diff --git a/src/superio/ite/it8721f/it8721f.h b/src/superio/ite/it8721f/it8721f.h
index c5e2434..2658a63 100644
--- a/src/superio/ite/it8721f/it8721f.h
+++ b/src/superio/ite/it8721f/it8721f.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8721F_H
diff --git a/src/superio/ite/it8721f/superio.c b/src/superio/ite/it8721f/superio.c
index b67a85b..bbaf7b3 100644
--- a/src/superio/ite/it8721f/superio.c
+++ b/src/superio/ite/it8721f/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/ite/it8728f/Makefile.inc b/src/superio/ite/it8728f/Makefile.inc
index 4cf0e02..20ab157 100644
--- a/src/superio/ite/it8728f/Makefile.inc
+++ b/src/superio/ite/it8728f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_ITE_IT8728F) += it8728f_hwm.c
diff --git a/src/superio/ite/it8728f/chip.h b/src/superio/ite/it8728f/chip.h
index d0e4cdc..33ec039 100644
--- a/src/superio/ite/it8728f/chip.h
+++ b/src/superio/ite/it8728f/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8728F_CHIP_H
diff --git a/src/superio/ite/it8728f/it8728f.h b/src/superio/ite/it8728f/it8728f.h
index 4d5b61b..4b1d94a 100644
--- a/src/superio/ite/it8728f/it8728f.h
+++ b/src/superio/ite/it8728f/it8728f.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8728F_H
diff --git a/src/superio/ite/it8728f/it8728f_hwm.c b/src/superio/ite/it8728f/it8728f_hwm.c
index c7a939d..d465a9a 100644
--- a/src/superio/ite/it8728f/it8728f_hwm.c
+++ b/src/superio/ite/it8728f/it8728f_hwm.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/it8728f/it8728f_internal.h b/src/superio/ite/it8728f/it8728f_internal.h
index 391f6e5..797c0fa 100644
--- a/src/superio/ite/it8728f/it8728f_internal.h
+++ b/src/superio/ite/it8728f/it8728f_internal.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8728F_INTERNAL_H
diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c
index e1011a5..0b860a6 100644
--- a/src/superio/ite/it8728f/superio.c
+++ b/src/superio/ite/it8728f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/it8772f/Makefile.inc b/src/superio/ite/it8772f/Makefile.inc
index 52cf2b7..a73d30e 100644
--- a/src/superio/ite/it8772f/Makefile.inc
+++ b/src/superio/ite/it8772f/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_ITE_IT8772F) += early_init.c
diff --git a/src/superio/ite/it8772f/acpi/superio.asl b/src/superio/ite/it8772f/acpi/superio.asl
index 3e1e73b..59eff3d 100644
--- a/src/superio/ite/it8772f/acpi/superio.asl
+++ b/src/superio/ite/it8772f/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/superio/ite/it8772f/chip.h b/src/superio/ite/it8772f/chip.h
index 583010d..1562f60 100644
--- a/src/superio/ite/it8772f/chip.h
+++ b/src/superio/ite/it8772f/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8772F_CHIP_H
diff --git a/src/superio/ite/it8772f/early_init.c b/src/superio/ite/it8772f/early_init.c
index b5bc4ee..0928264 100644
--- a/src/superio/ite/it8772f/early_init.c
+++ b/src/superio/ite/it8772f/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/ite/it8772f/it8772f.h b/src/superio/ite/it8772f/it8772f.h
index 493b528..41d10b6 100644
--- a/src/superio/ite/it8772f/it8772f.h
+++ b/src/superio/ite/it8772f/it8772f.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_ITE_IT8772F_H
diff --git a/src/superio/ite/it8772f/superio.c b/src/superio/ite/it8772f/superio.c
index 0127d48..14a238e 100644
--- a/src/superio/ite/it8772f/superio.c
+++ b/src/superio/ite/it8772f/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/nsc/Kconfig b/src/superio/nsc/Kconfig
index 2243ee4..ace6144 100644
--- a/src/superio/nsc/Kconfig
+++ b/src/superio/nsc/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 
diff --git a/src/superio/nsc/Makefile.inc b/src/superio/nsc/Makefile.inc
index fb50bce..1e1b6a9 100644
--- a/src/superio/nsc/Makefile.inc
+++ b/src/superio/nsc/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += pc8374
diff --git a/src/superio/nsc/pc8374/Makefile.inc b/src/superio/nsc/pc8374/Makefile.inc
index b31172b..dd0266f 100644
--- a/src/superio/nsc/pc8374/Makefile.inc
+++ b/src/superio/nsc/pc8374/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NSC_PC8374) += superio.c
diff --git a/src/superio/nsc/pc8374/early_init.c b/src/superio/nsc/pc8374/early_init.c
index e068413..0812823 100644
--- a/src/superio/nsc/pc8374/early_init.c
+++ b/src/superio/nsc/pc8374/early_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc8374/pc8374.h b/src/superio/nsc/pc8374/pc8374.h
index 8e2874a..b097c61 100644
--- a/src/superio/nsc/pc8374/pc8374.h
+++ b/src/superio/nsc/pc8374/pc8374.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC8374_PC8374_H
diff --git a/src/superio/nsc/pc8374/superio.c b/src/superio/nsc/pc8374/superio.c
index 110cfcb..4ab3b26 100644
--- a/src/superio/nsc/pc8374/superio.c
+++ b/src/superio/nsc/pc8374/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87309/Makefile.inc b/src/superio/nsc/pc87309/Makefile.inc
index c4f340a..0b8f52b 100644
--- a/src/superio/nsc/pc87309/Makefile.inc
+++ b/src/superio/nsc/pc87309/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_NSC_PC87309) += early_serial.c
diff --git a/src/superio/nsc/pc87309/early_serial.c b/src/superio/nsc/pc87309/early_serial.c
index d506435..098aeda 100644
--- a/src/superio/nsc/pc87309/early_serial.c
+++ b/src/superio/nsc/pc87309/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87309/pc87309.h b/src/superio/nsc/pc87309/pc87309.h
index d6b5d01..269cd55 100644
--- a/src/superio/nsc/pc87309/pc87309.h
+++ b/src/superio/nsc/pc87309/pc87309.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87309_H
diff --git a/src/superio/nsc/pc87309/superio.c b/src/superio/nsc/pc87309/superio.c
index e5d29a5..678df11 100644
--- a/src/superio/nsc/pc87309/superio.c
+++ b/src/superio/nsc/pc87309/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87360/Makefile.inc b/src/superio/nsc/pc87360/Makefile.inc
index ca47cf8..67860c0 100644
--- a/src/superio/nsc/pc87360/Makefile.inc
+++ b/src/superio/nsc/pc87360/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_NSC_PC87360) += early_serial.c
diff --git a/src/superio/nsc/pc87360/early_serial.c b/src/superio/nsc/pc87360/early_serial.c
index a69af56..2a81ce4 100644
--- a/src/superio/nsc/pc87360/early_serial.c
+++ b/src/superio/nsc/pc87360/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87360/pc87360.h b/src/superio/nsc/pc87360/pc87360.h
index f8d5023..031466a 100644
--- a/src/superio/nsc/pc87360/pc87360.h
+++ b/src/superio/nsc/pc87360/pc87360.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87360_H
diff --git a/src/superio/nsc/pc87360/superio.c b/src/superio/nsc/pc87360/superio.c
index be4e05b..3311928 100644
--- a/src/superio/nsc/pc87360/superio.c
+++ b/src/superio/nsc/pc87360/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87366/Makefile.inc b/src/superio/nsc/pc87366/Makefile.inc
index ed535eb..9e2de8b 100644
--- a/src/superio/nsc/pc87366/Makefile.inc
+++ b/src/superio/nsc/pc87366/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_NSC_PC87366) += early_serial.c
diff --git a/src/superio/nsc/pc87366/early_serial.c b/src/superio/nsc/pc87366/early_serial.c
index b552f0b..7ae020b 100644
--- a/src/superio/nsc/pc87366/early_serial.c
+++ b/src/superio/nsc/pc87366/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87366/pc87366.h b/src/superio/nsc/pc87366/pc87366.h
index 79e44ac..b3ed6fa 100644
--- a/src/superio/nsc/pc87366/pc87366.h
+++ b/src/superio/nsc/pc87366/pc87366.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87366_H
diff --git a/src/superio/nsc/pc87366/superio.c b/src/superio/nsc/pc87366/superio.c
index a8dc695..70271b8 100644
--- a/src/superio/nsc/pc87366/superio.c
+++ b/src/superio/nsc/pc87366/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87382/Makefile.inc b/src/superio/nsc/pc87382/Makefile.inc
index fc60523..34a19ea 100644
--- a/src/superio/nsc/pc87382/Makefile.inc
+++ b/src/superio/nsc/pc87382/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NSC_PC87382) += superio.c
diff --git a/src/superio/nsc/pc87382/pc87382.h b/src/superio/nsc/pc87382/pc87382.h
index b694e10..147fec2 100644
--- a/src/superio/nsc/pc87382/pc87382.h
+++ b/src/superio/nsc/pc87382/pc87382.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87382_H
diff --git a/src/superio/nsc/pc87382/superio.c b/src/superio/nsc/pc87382/superio.c
index 84fe2cb..73eca3a 100644
--- a/src/superio/nsc/pc87382/superio.c
+++ b/src/superio/nsc/pc87382/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87384/Makefile.inc b/src/superio/nsc/pc87384/Makefile.inc
index e4f2956..4413844 100644
--- a/src/superio/nsc/pc87384/Makefile.inc
+++ b/src/superio/nsc/pc87384/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NSC_PC87384) += superio.c
diff --git a/src/superio/nsc/pc87384/pc87384.h b/src/superio/nsc/pc87384/pc87384.h
index eab8d70..c0b4267 100644
--- a/src/superio/nsc/pc87384/pc87384.h
+++ b/src/superio/nsc/pc87384/pc87384.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87384_H
diff --git a/src/superio/nsc/pc87384/superio.c b/src/superio/nsc/pc87384/superio.c
index 1702ac0..4943eec 100644
--- a/src/superio/nsc/pc87384/superio.c
+++ b/src/superio/nsc/pc87384/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87392/Makefile.inc b/src/superio/nsc/pc87392/Makefile.inc
index fb99185..c768ef8 100644
--- a/src/superio/nsc/pc87392/Makefile.inc
+++ b/src/superio/nsc/pc87392/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NSC_PC87392) += superio.c
diff --git a/src/superio/nsc/pc87392/early_serial.c b/src/superio/nsc/pc87392/early_serial.c
index 52fef1f..3573975 100644
--- a/src/superio/nsc/pc87392/early_serial.c
+++ b/src/superio/nsc/pc87392/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87392/pc87392.h b/src/superio/nsc/pc87392/pc87392.h
index 9e54631..d0c26cf 100644
--- a/src/superio/nsc/pc87392/pc87392.h
+++ b/src/superio/nsc/pc87392/pc87392.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87392_H
diff --git a/src/superio/nsc/pc87392/superio.c b/src/superio/nsc/pc87392/superio.c
index b97993c..98b446a 100644
--- a/src/superio/nsc/pc87392/superio.c
+++ b/src/superio/nsc/pc87392/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87417/Makefile.inc b/src/superio/nsc/pc87417/Makefile.inc
index f558bf4..3990ce3 100644
--- a/src/superio/nsc/pc87417/Makefile.inc
+++ b/src/superio/nsc/pc87417/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_NSC_PC87417) += early_init.c
diff --git a/src/superio/nsc/pc87417/early_init.c b/src/superio/nsc/pc87417/early_init.c
index ea7a140..c6f1681 100644
--- a/src/superio/nsc/pc87417/early_init.c
+++ b/src/superio/nsc/pc87417/early_init.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87417/early_serial.c b/src/superio/nsc/pc87417/early_serial.c
index 6e6e57c..496c288 100644
--- a/src/superio/nsc/pc87417/early_serial.c
+++ b/src/superio/nsc/pc87417/early_serial.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc87417/pc87417.h b/src/superio/nsc/pc87417/pc87417.h
index 6f481b7..3589704 100644
--- a/src/superio/nsc/pc87417/pc87417.h
+++ b/src/superio/nsc/pc87417/pc87417.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC87417_H
diff --git a/src/superio/nsc/pc87417/superio.c b/src/superio/nsc/pc87417/superio.c
index ff5f08c..31a27fc 100644
--- a/src/superio/nsc/pc87417/superio.c
+++ b/src/superio/nsc/pc87417/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc97307/Makefile.inc b/src/superio/nsc/pc97307/Makefile.inc
index 94a3f73..ce41f16 100644
--- a/src/superio/nsc/pc97307/Makefile.inc
+++ b/src/superio/nsc/pc97307/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NSC_PC97307) += superio.c
diff --git a/src/superio/nsc/pc97307/pc97307.h b/src/superio/nsc/pc97307/pc97307.h
index 4ac18e9..c87e809 100644
--- a/src/superio/nsc/pc97307/pc97307.h
+++ b/src/superio/nsc/pc97307/pc97307.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC97307_PC97307_H
diff --git a/src/superio/nsc/pc97307/superio.c b/src/superio/nsc/pc97307/superio.c
index 19a4dd6..6c75cd7 100644
--- a/src/superio/nsc/pc97307/superio.c
+++ b/src/superio/nsc/pc97307/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc97317/Makefile.inc b/src/superio/nsc/pc97317/Makefile.inc
index 8cfbd91..fcd13b1 100644
--- a/src/superio/nsc/pc97317/Makefile.inc
+++ b/src/superio/nsc/pc97317/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_NSC_PC97317) += early_serial.c
diff --git a/src/superio/nsc/pc97317/early_serial.c b/src/superio/nsc/pc97317/early_serial.c
index c5b53f7..63f29c6 100644
--- a/src/superio/nsc/pc97317/early_serial.c
+++ b/src/superio/nsc/pc97317/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nsc/pc97317/pc97317.h b/src/superio/nsc/pc97317/pc97317.h
index 8c213e1..366f4ef 100644
--- a/src/superio/nsc/pc97317/pc97317.h
+++ b/src/superio/nsc/pc97317/pc97317.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NSC_PC97317_H
diff --git a/src/superio/nsc/pc97317/superio.c b/src/superio/nsc/pc97317/superio.c
index 827c899..2688471 100644
--- a/src/superio/nsc/pc97317/superio.c
+++ b/src/superio/nsc/pc97317/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/Kconfig b/src/superio/nuvoton/Kconfig
index 0abcd22..92c9518 100644
--- a/src/superio/nuvoton/Kconfig
+++ b/src/superio/nuvoton/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Generic Nuvoton romstage driver - Just enough UART initialisation code for
diff --git a/src/superio/nuvoton/Makefile.inc b/src/superio/nuvoton/Makefile.inc
index 49a8eb8..24da226 100644
--- a/src/superio/nuvoton/Makefile.inc
+++ b/src/superio/nuvoton/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ## include generic nuvoton pre-ram stage driver
diff --git a/src/superio/nuvoton/common/early_serial.c b/src/superio/nuvoton/common/early_serial.c
index e43dae4..31f5feb 100644
--- a/src/superio/nuvoton/common/early_serial.c
+++ b/src/superio/nuvoton/common/early_serial.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/nuvoton/common/nuvoton.h b/src/superio/nuvoton/common/nuvoton.h
index 8255be7..f93708e 100644
--- a/src/superio/nuvoton/common/nuvoton.h
+++ b/src/superio/nuvoton/common/nuvoton.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NUVOTON_COMMON_ROMSTAGE_H
diff --git a/src/superio/nuvoton/nct5104d/Makefile.inc b/src/superio/nuvoton/nct5104d/Makefile.inc
index 73146d8..b12da06 100644
--- a/src/superio/nuvoton/nct5104d/Makefile.inc
+++ b/src/superio/nuvoton/nct5104d/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += superio.c
diff --git a/src/superio/nuvoton/nct5104d/chip.h b/src/superio/nuvoton/nct5104d/chip.h
index f23f052..38ee057 100644
--- a/src/superio/nuvoton/nct5104d/chip.h
+++ b/src/superio/nuvoton/nct5104d/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NUVOTON_NCT5104D_CHIP_H
diff --git a/src/superio/nuvoton/nct5104d/early_init.c b/src/superio/nuvoton/nct5104d/early_init.c
index 3b431ac..f8c836d 100644
--- a/src/superio/nuvoton/nct5104d/early_init.c
+++ b/src/superio/nuvoton/nct5104d/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/nct5104d/nct5104d.h b/src/superio/nuvoton/nct5104d/nct5104d.h
index 205fc84..de4e76b 100644
--- a/src/superio/nuvoton/nct5104d/nct5104d.h
+++ b/src/superio/nuvoton/nct5104d/nct5104d.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NUVOTON_NCT5104D_H
diff --git a/src/superio/nuvoton/nct5104d/superio.c b/src/superio/nuvoton/nct5104d/superio.c
index 171eaef..5e08edd 100644
--- a/src/superio/nuvoton/nct5104d/superio.c
+++ b/src/superio/nuvoton/nct5104d/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/nct5572d/Makefile.inc b/src/superio/nuvoton/nct5572d/Makefile.inc
index 9f131b6..a3c2315 100644
--- a/src/superio/nuvoton/nct5572d/Makefile.inc
+++ b/src/superio/nuvoton/nct5572d/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT5572D) += superio.c
diff --git a/src/superio/nuvoton/nct5572d/nct5572d.h b/src/superio/nuvoton/nct5572d/nct5572d.h
index 94e7988..1020003 100644
--- a/src/superio/nuvoton/nct5572d/nct5572d.h
+++ b/src/superio/nuvoton/nct5572d/nct5572d.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NUVOTON_NCT5572D
diff --git a/src/superio/nuvoton/nct5572d/superio.c b/src/superio/nuvoton/nct5572d/superio.c
index c5278d6..8c1ac73 100644
--- a/src/superio/nuvoton/nct5572d/superio.c
+++ b/src/superio/nuvoton/nct5572d/superio.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/nct6776/Makefile.inc b/src/superio/nuvoton/nct6776/Makefile.inc
index 80113ea..d106eb7 100644
--- a/src/superio/nuvoton/nct6776/Makefile.inc
+++ b/src/superio/nuvoton/nct6776/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT6776) += superio.c
diff --git a/src/superio/nuvoton/nct6776/nct6776.h b/src/superio/nuvoton/nct6776/nct6776.h
index bf3842d..62fe237 100644
--- a/src/superio/nuvoton/nct6776/nct6776.h
+++ b/src/superio/nuvoton/nct6776/nct6776.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Both NCT6776D and NCT6776F package variants are supported. */
diff --git a/src/superio/nuvoton/nct6776/superio.c b/src/superio/nuvoton/nct6776/superio.c
index 0d10d19..26dcae3 100644
--- a/src/superio/nuvoton/nct6776/superio.c
+++ b/src/superio/nuvoton/nct6776/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/nct6779d/Makefile.inc b/src/superio/nuvoton/nct6779d/Makefile.inc
index c8314f7..87cd2bf 100644
--- a/src/superio/nuvoton/nct6779d/Makefile.inc
+++ b/src/superio/nuvoton/nct6779d/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT6779D) += superio.c
diff --git a/src/superio/nuvoton/nct6779d/nct6779d.h b/src/superio/nuvoton/nct6779d/nct6779d.h
index b464025..4409f62 100644
--- a/src/superio/nuvoton/nct6779d/nct6779d.h
+++ b/src/superio/nuvoton/nct6779d/nct6779d.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NUVOTON_NCT6779D_H
diff --git a/src/superio/nuvoton/nct6779d/superio.c b/src/superio/nuvoton/nct6779d/superio.c
index 79a25b7..9cbea33 100644
--- a/src/superio/nuvoton/nct6779d/superio.c
+++ b/src/superio/nuvoton/nct6779d/superio.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/wpcm450/Makefile.inc b/src/superio/nuvoton/wpcm450/Makefile.inc
index 8cf50ec..f7c2da3 100644
--- a/src/superio/nuvoton/wpcm450/Makefile.inc
+++ b/src/superio/nuvoton/wpcm450/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += early_init.c
diff --git a/src/superio/nuvoton/wpcm450/early_init.c b/src/superio/nuvoton/wpcm450/early_init.c
index 85e8fc6..b75cf35 100644
--- a/src/superio/nuvoton/wpcm450/early_init.c
+++ b/src/superio/nuvoton/wpcm450/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/wpcm450/superio.c b/src/superio/nuvoton/wpcm450/superio.c
index 0e101ad..e6ad9dd 100644
--- a/src/superio/nuvoton/wpcm450/superio.c
+++ b/src/superio/nuvoton/wpcm450/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/nuvoton/wpcm450/wpcm450.h b/src/superio/nuvoton/wpcm450/wpcm450.h
index 027d44a..5757996 100644
--- a/src/superio/nuvoton/wpcm450/wpcm450.h
+++ b/src/superio/nuvoton/wpcm450/wpcm450.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_NUVOTON_WPCM450_WPCM450_H
diff --git a/src/superio/renesas/Kconfig b/src/superio/renesas/Kconfig
index 1112e31..1cf0e31 100644
--- a/src/superio/renesas/Kconfig
+++ b/src/superio/renesas/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SUPERIO_RENESAS_M3885X
diff --git a/src/superio/renesas/Makefile.inc b/src/superio/renesas/Makefile.inc
index 46e6c40..ba10b36 100644
--- a/src/superio/renesas/Makefile.inc
+++ b/src/superio/renesas/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += m3885x
diff --git a/src/superio/renesas/m3885x/Makefile.inc b/src/superio/renesas/m3885x/Makefile.inc
index 4bc379a..f872973 100644
--- a/src/superio/renesas/m3885x/Makefile.inc
+++ b/src/superio/renesas/m3885x/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_RENESAS_M3885X) += superio.c
diff --git a/src/superio/renesas/m3885x/superio.c b/src/superio/renesas/m3885x/superio.c
index 6934f77..eef2904 100644
--- a/src/superio/renesas/m3885x/superio.c
+++ b/src/superio/renesas/m3885x/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/serverengines/Kconfig b/src/superio/serverengines/Kconfig
index 6baed92..e456c6a 100644
--- a/src/superio/serverengines/Kconfig
+++ b/src/superio/serverengines/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SUPERIO_SERVERENGINES_PILOT
diff --git a/src/superio/serverengines/Makefile.inc b/src/superio/serverengines/Makefile.inc
index f9cf423..ba596e9 100644
--- a/src/superio/serverengines/Makefile.inc
+++ b/src/superio/serverengines/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += pilot
diff --git a/src/superio/serverengines/pilot/Makefile.inc b/src/superio/serverengines/pilot/Makefile.inc
index 606a07c..48a0364 100644
--- a/src/superio/serverengines/pilot/Makefile.inc
+++ b/src/superio/serverengines/pilot/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SERVERENGINES_PILOT) += early_init.c
diff --git a/src/superio/serverengines/pilot/early_init.c b/src/superio/serverengines/pilot/early_init.c
index 191b67f..cfdef7e 100644
--- a/src/superio/serverengines/pilot/early_init.c
+++ b/src/superio/serverengines/pilot/early_init.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PILOT Super I/O is only based on LPC observation done on factory system. */
diff --git a/src/superio/serverengines/pilot/early_serial.c b/src/superio/serverengines/pilot/early_serial.c
index 6bf1424..2bb8566 100644
--- a/src/superio/serverengines/pilot/early_serial.c
+++ b/src/superio/serverengines/pilot/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* PILOT Super I/O is only based on LPC observation done on factory system. */
diff --git a/src/superio/serverengines/pilot/pilot.h b/src/superio/serverengines/pilot/pilot.h
index d6eda50..61ca2fc 100644
--- a/src/superio/serverengines/pilot/pilot.h
+++ b/src/superio/serverengines/pilot/pilot.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SERVERENGINES_PILOT_PILOT_H
diff --git a/src/superio/smsc/Kconfig b/src/superio/smsc/Kconfig
index 00d4126..2f9dd81 100644
--- a/src/superio/smsc/Kconfig
+++ b/src/superio/smsc/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SUPERIO_WANTS_14MHZ_CLOCK
diff --git a/src/superio/smsc/Makefile.inc b/src/superio/smsc/Makefile.inc
index 1856884..532f38f 100644
--- a/src/superio/smsc/Makefile.inc
+++ b/src/superio/smsc/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += dme1737
diff --git a/src/superio/smsc/dme1737/Makefile.inc b/src/superio/smsc/dme1737/Makefile.inc
index fcd8ff1..dbcf9b3 100644
--- a/src/superio/smsc/dme1737/Makefile.inc
+++ b/src/superio/smsc/dme1737/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_DME1737) += early_serial.c
diff --git a/src/superio/smsc/dme1737/dme1737.h b/src/superio/smsc/dme1737/dme1737.h
index ee2d43d..159e9a7 100644
--- a/src/superio/smsc/dme1737/dme1737.h
+++ b/src/superio/smsc/dme1737/dme1737.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_DME1737_H
diff --git a/src/superio/smsc/dme1737/early_serial.c b/src/superio/smsc/dme1737/early_serial.c
index d2d4764..f7d0f87 100644
--- a/src/superio/smsc/dme1737/early_serial.c
+++ b/src/superio/smsc/dme1737/early_serial.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/dme1737/superio.c b/src/superio/smsc/dme1737/superio.c
index 528f71d..7e965f2 100644
--- a/src/superio/smsc/dme1737/superio.c
+++ b/src/superio/smsc/dme1737/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/fdc37m60x/Makefile.inc b/src/superio/smsc/fdc37m60x/Makefile.inc
index e6a4b90..d691942 100644
--- a/src/superio/smsc/fdc37m60x/Makefile.inc
+++ b/src/superio/smsc/fdc37m60x/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_SMSC_FDC37M60X) += superio.c
diff --git a/src/superio/smsc/fdc37m60x/early_serial.c b/src/superio/smsc/fdc37m60x/early_serial.c
index db2c25c..9d4f1ab 100644
--- a/src/superio/smsc/fdc37m60x/early_serial.c
+++ b/src/superio/smsc/fdc37m60x/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/fdc37m60x/fdc37m60x.h b/src/superio/smsc/fdc37m60x/fdc37m60x.h
index 09b69e3..4554438 100644
--- a/src/superio/smsc/fdc37m60x/fdc37m60x.h
+++ b/src/superio/smsc/fdc37m60x/fdc37m60x.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_FDC37M60X_FDC37M60X_H
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index cd21971..d69069c 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/smsc/fdc37n972/Makefile.inc b/src/superio/smsc/fdc37n972/Makefile.inc
index 9348d0c..04dd2b7 100644
--- a/src/superio/smsc/fdc37n972/Makefile.inc
+++ b/src/superio/smsc/fdc37n972/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_SMSC_FDC37N972) += fdc37n972.c
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.c b/src/superio/smsc/fdc37n972/fdc37n972.c
index dc4e784..ddf05d3 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.c
+++ b/src/superio/smsc/fdc37n972/fdc37n972.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/device.h>
diff --git a/src/superio/smsc/fdc37n972/fdc37n972.h b/src/superio/smsc/fdc37n972/fdc37n972.h
index c14df61..8deb629 100644
--- a/src/superio/smsc/fdc37n972/fdc37n972.h
+++ b/src/superio/smsc/fdc37n972/fdc37n972.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_FDC37N972_H
diff --git a/src/superio/smsc/kbc1100/Makefile.inc b/src/superio/smsc/kbc1100/Makefile.inc
index 8985b3f..607fed6 100644
--- a/src/superio/smsc/kbc1100/Makefile.inc
+++ b/src/superio/smsc/kbc1100/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-$(CONFIG_SUPERIO_SMSC_KBC1100) += early_init.c
diff --git a/src/superio/smsc/kbc1100/early_init.c b/src/superio/smsc/kbc1100/early_init.c
index fd0f234..a91b521 100644
--- a/src/superio/smsc/kbc1100/early_init.c
+++ b/src/superio/smsc/kbc1100/early_init.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */
diff --git a/src/superio/smsc/kbc1100/kbc1100.h b/src/superio/smsc/kbc1100/kbc1100.h
index 64a915c..a064a06 100644
--- a/src/superio/smsc/kbc1100/kbc1100.h
+++ b/src/superio/smsc/kbc1100/kbc1100.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_KBC1100_H
diff --git a/src/superio/smsc/kbc1100/superio.c b/src/superio/smsc/kbc1100/superio.c
index dce220b..2de0887 100644
--- a/src/superio/smsc/kbc1100/superio.c
+++ b/src/superio/smsc/kbc1100/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM driver for the SMSC KBC1100 Super I/O chip */
diff --git a/src/superio/smsc/lpc47b272/Makefile.inc b/src/superio/smsc/lpc47b272/Makefile.inc
index 147c0a0..ae6e9f0 100644
--- a/src/superio/smsc/lpc47b272/Makefile.inc
+++ b/src/superio/smsc/lpc47b272/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47B272) += early_serial.c
diff --git a/src/superio/smsc/lpc47b272/early_serial.c b/src/superio/smsc/lpc47b272/early_serial.c
index 48587e0..46afff5 100644
--- a/src/superio/smsc/lpc47b272/early_serial.c
+++ b/src/superio/smsc/lpc47b272/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Pre-RAM driver for SMSC LPC47B272 Super I/O chip. */
diff --git a/src/superio/smsc/lpc47b272/lpc47b272.h b/src/superio/smsc/lpc47b272/lpc47b272.h
index 45bf942..3535025 100644
--- a/src/superio/smsc/lpc47b272/lpc47b272.h
+++ b/src/superio/smsc/lpc47b272/lpc47b272.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47B272_H
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index 1504be8..3879ec4 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM driver for SMSC LPC47B272 Super I/O chip. */
diff --git a/src/superio/smsc/lpc47b397/Makefile.inc b/src/superio/smsc/lpc47b397/Makefile.inc
index 5e359d7..b27e0d0 100644
--- a/src/superio/smsc/lpc47b397/Makefile.inc
+++ b/src/superio/smsc/lpc47b397/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47B397) += early_serial.c
diff --git a/src/superio/smsc/lpc47b397/early_gpio.c b/src/superio/smsc/lpc47b397/early_gpio.c
index 4da18ea..d84b192 100644
--- a/src/superio/smsc/lpc47b397/early_gpio.c
+++ b/src/superio/smsc/lpc47b397/early_gpio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 static void lpc47b397_gpio_offset_out(u16 iobase, u16 offset, u8 value)
diff --git a/src/superio/smsc/lpc47b397/early_serial.c b/src/superio/smsc/lpc47b397/early_serial.c
index f5b321e..5e37fe9 100644
--- a/src/superio/smsc/lpc47b397/early_serial.c
+++ b/src/superio/smsc/lpc47b397/early_serial.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/lpc47b397/lpc47b397.h b/src/superio/smsc/lpc47b397/lpc47b397.h
index bc70ba9..c49d5f7 100644
--- a/src/superio/smsc/lpc47b397/lpc47b397.h
+++ b/src/superio/smsc/lpc47b397/lpc47b397.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47B397_H
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index a9a8092..2ad4c73 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/lpc47m10x/Makefile.inc b/src/superio/smsc/lpc47m10x/Makefile.inc
index ff823fc..84a78e2 100644
--- a/src/superio/smsc/lpc47m10x/Makefile.inc
+++ b/src/superio/smsc/lpc47m10x/Makefile.inc
@@ -18,8 +18,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47M10X) += early_serial.c
diff --git a/src/superio/smsc/lpc47m10x/early_serial.c b/src/superio/smsc/lpc47m10x/early_serial.c
index d48e54e..62ff315 100644
--- a/src/superio/smsc/lpc47m10x/early_serial.c
+++ b/src/superio/smsc/lpc47m10x/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/lpc47m10x/lpc47m10x.h b/src/superio/smsc/lpc47m10x/lpc47m10x.h
index 5e40793..0eb7ec1 100644
--- a/src/superio/smsc/lpc47m10x/lpc47m10x.h
+++ b/src/superio/smsc/lpc47m10x/lpc47m10x.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47M10X_H
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index b39b9fb..c005e1a 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/lpc47m15x/Makefile.inc b/src/superio/smsc/lpc47m15x/Makefile.inc
index 7f66075..1e028a6 100644
--- a/src/superio/smsc/lpc47m15x/Makefile.inc
+++ b/src/superio/smsc/lpc47m15x/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47M15X) += early_serial.c
diff --git a/src/superio/smsc/lpc47m15x/early_serial.c b/src/superio/smsc/lpc47m15x/early_serial.c
index 6dedba5..995cba1 100644
--- a/src/superio/smsc/lpc47m15x/early_serial.c
+++ b/src/superio/smsc/lpc47m15x/early_serial.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Pre-RAM driver for the SMSC LPC47M15X Super I/O chip */
diff --git a/src/superio/smsc/lpc47m15x/lpc47m15x.h b/src/superio/smsc/lpc47m15x/lpc47m15x.h
index 636a030..7851798 100644
--- a/src/superio/smsc/lpc47m15x/lpc47m15x.h
+++ b/src/superio/smsc/lpc47m15x/lpc47m15x.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47M15X_H
diff --git a/src/superio/smsc/lpc47m15x/superio.c b/src/superio/smsc/lpc47m15x/superio.c
index 99d339e..ac59102 100644
--- a/src/superio/smsc/lpc47m15x/superio.c
+++ b/src/superio/smsc/lpc47m15x/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM driver for the SMSC LPC47M15X Super I/O chip */
diff --git a/src/superio/smsc/lpc47n207/Makefile.inc b/src/superio/smsc/lpc47n207/Makefile.inc
index f284ec6..45cd6c3 100644
--- a/src/superio/smsc/lpc47n207/Makefile.inc
+++ b/src/superio/smsc/lpc47n207/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_LPC47N207) += early_serial.c
diff --git a/src/superio/smsc/lpc47n207/early_serial.c b/src/superio/smsc/lpc47n207/early_serial.c
index 7249e11..3c820e6 100644
--- a/src/superio/smsc/lpc47n207/early_serial.c
+++ b/src/superio/smsc/lpc47n207/early_serial.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/lpc47n207/lpc47n207.h b/src/superio/smsc/lpc47n207/lpc47n207.h
index 3be7d1e..88aafe5 100644
--- a/src/superio/smsc/lpc47n207/lpc47n207.h
+++ b/src/superio/smsc/lpc47n207/lpc47n207.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47N207_H
diff --git a/src/superio/smsc/lpc47n217/Makefile.inc b/src/superio/smsc/lpc47n217/Makefile.inc
index b7678be..f6ebc0e 100644
--- a/src/superio/smsc/lpc47n217/Makefile.inc
+++ b/src/superio/smsc/lpc47n217/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N217) += superio.c
diff --git a/src/superio/smsc/lpc47n217/early_serial.c b/src/superio/smsc/lpc47n217/early_serial.c
index 9c9095d..bbb27ab 100644
--- a/src/superio/smsc/lpc47n217/early_serial.c
+++ b/src/superio/smsc/lpc47n217/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Pre-RAM driver for SMSC LPC47N217 Super I/O chip. */
diff --git a/src/superio/smsc/lpc47n217/lpc47n217.h b/src/superio/smsc/lpc47n217/lpc47n217.h
index 66ec688..1017887 100644
--- a/src/superio/smsc/lpc47n217/lpc47n217.h
+++ b/src/superio/smsc/lpc47n217/lpc47n217.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47N217_LPC47N217_H
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 55661c6..e08bc51 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM-based driver for SMSC LPC47N217 Super I/O chip. */
diff --git a/src/superio/smsc/lpc47n227/Makefile.inc b/src/superio/smsc/lpc47n227/Makefile.inc
index 2773873..c402b5d 100644
--- a/src/superio/smsc/lpc47n227/Makefile.inc
+++ b/src/superio/smsc/lpc47n227/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_SMSC_LPC47N227) += superio.c
diff --git a/src/superio/smsc/lpc47n227/early_serial.c b/src/superio/smsc/lpc47n227/early_serial.c
index a28ee6f..3f2b912 100644
--- a/src/superio/smsc/lpc47n227/early_serial.c
+++ b/src/superio/smsc/lpc47n227/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Pre-RAM driver for SMSC LPC47N227 Super I/O chip. */
diff --git a/src/superio/smsc/lpc47n227/lpc47n227.h b/src/superio/smsc/lpc47n227/lpc47n227.h
index c18eb74..77f4035 100644
--- a/src/superio/smsc/lpc47n227/lpc47n227.h
+++ b/src/superio/smsc/lpc47n227/lpc47n227.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_LPC47N227_LPC47N227_H
diff --git a/src/superio/smsc/lpc47n227/superio.c b/src/superio/smsc/lpc47n227/superio.c
index 6167417..f10a4b7 100644
--- a/src/superio/smsc/lpc47n227/superio.c
+++ b/src/superio/smsc/lpc47n227/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM-based driver for SMSC LPC47N227 Super I/O chip. */
diff --git a/src/superio/smsc/mec1308/Makefile.inc b/src/superio/smsc/mec1308/Makefile.inc
index b274ef3..5ad346b 100644
--- a/src/superio/smsc/mec1308/Makefile.inc
+++ b/src/superio/smsc/mec1308/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 ramstage-$(CONFIG_SUPERIO_SMSC_MEC1308) += superio.c
diff --git a/src/superio/smsc/mec1308/acpi/superio.asl b/src/superio/smsc/mec1308/acpi/superio.asl
index 8ac98eb..ba2a942 100644
--- a/src/superio/smsc/mec1308/acpi/superio.asl
+++ b/src/superio/smsc/mec1308/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/superio/smsc/mec1308/mec1308.h b/src/superio/smsc/mec1308/mec1308.h
index 1631021..8f586c1 100644
--- a/src/superio/smsc/mec1308/mec1308.h
+++ b/src/superio/smsc/mec1308/mec1308.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_MEC1308_H
diff --git a/src/superio/smsc/mec1308/superio.c b/src/superio/smsc/mec1308/superio.c
index cff5e62..19ddcb2 100644
--- a/src/superio/smsc/mec1308/superio.c
+++ b/src/superio/smsc/mec1308/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM driver for the SMSC MEC1308 Super I/O chip */
diff --git a/src/superio/smsc/sch4037/Makefile.inc b/src/superio/smsc/sch4037/Makefile.inc
index 88167a6..298e0fe 100644
--- a/src/superio/smsc/sch4037/Makefile.inc
+++ b/src/superio/smsc/sch4037/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += sch4037_early_init.c
diff --git a/src/superio/smsc/sch4037/sch4037.h b/src/superio/smsc/sch4037/sch4037.h
index 8f9a4e5..f12ffee 100644
--- a/src/superio/smsc/sch4037/sch4037.h
+++ b/src/superio/smsc/sch4037/sch4037.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SCH_4037_H
diff --git a/src/superio/smsc/sch4037/sch4037_early_init.c b/src/superio/smsc/sch4037/sch4037_early_init.c
index da21071..f4b6f76 100644
--- a/src/superio/smsc/sch4037/sch4037_early_init.c
+++ b/src/superio/smsc/sch4037/sch4037_early_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c
index ef36521..ea5c6d5 100644
--- a/src/superio/smsc/sch4037/superio.c
+++ b/src/superio/smsc/sch4037/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM driver for the SMSC KBC1100 Super I/O chip */
diff --git a/src/superio/smsc/sio1007/Makefile.inc b/src/superio/smsc/sio1007/Makefile.inc
index 8506344..9a59958 100644
--- a/src/superio/smsc/sio1007/Makefile.inc
+++ b/src/superio/smsc/sio1007/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_SIO1007) += early_serial.c
diff --git a/src/superio/smsc/sio1007/acpi/superio.asl b/src/superio/smsc/sio1007/acpi/superio.asl
index 3e1e73b..59eff3d 100644
--- a/src/superio/smsc/sio1007/acpi/superio.asl
+++ b/src/superio/smsc/sio1007/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 // Scope is \_SB.PCI0.LPCB
diff --git a/src/superio/smsc/sio1007/chip.h b/src/superio/smsc/sio1007/chip.h
index f717648..ea17be0 100644
--- a/src/superio/smsc/sio1007/chip.h
+++ b/src/superio/smsc/sio1007/chip.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_1007_CHIP_H
diff --git a/src/superio/smsc/sio1007/early_serial.c b/src/superio/smsc/sio1007/early_serial.c
index 39b1003..1badbb7 100644
--- a/src/superio/smsc/sio1007/early_serial.c
+++ b/src/superio/smsc/sio1007/early_serial.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/superio/smsc/sio1036/Makefile.inc b/src/superio/smsc/sio1036/Makefile.inc
index e8f1e19..57600bb 100644
--- a/src/superio/smsc/sio1036/Makefile.inc
+++ b/src/superio/smsc/sio1036/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 romstage-$(CONFIG_SUPERIO_SMSC_SIO1036) += sio1036_early_init.c
diff --git a/src/superio/smsc/sio1036/sio1036.h b/src/superio/smsc/sio1036/sio1036.h
index 5499cd6..68f3e9a 100644
--- a/src/superio/smsc/sio1036/sio1036.h
+++ b/src/superio/smsc/sio1036/sio1036.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_SIO1306_H
diff --git a/src/superio/smsc/sio1036/sio1036_early_init.c b/src/superio/smsc/sio1036/sio1036_early_init.c
index 2eda7bc..decf977 100644
--- a/src/superio/smsc/sio1036/sio1036_early_init.c
+++ b/src/superio/smsc/sio1036/sio1036_early_init.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* Pre-RAM driver for the SMSC KBC1100 Super I/O chip */
diff --git a/src/superio/smsc/sio1036/superio.c b/src/superio/smsc/sio1036/superio.c
index 495f23d..937777b 100644
--- a/src/superio/smsc/sio1036/superio.c
+++ b/src/superio/smsc/sio1036/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* RAM driver for the SMSC SIO1036 Super I/O chip */
diff --git a/src/superio/smsc/sio10n268/Makefile.inc b/src/superio/smsc/sio10n268/Makefile.inc
index 1cb6124..27a1fbe 100644
--- a/src/superio/smsc/sio10n268/Makefile.inc
+++ b/src/superio/smsc/sio10n268/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_SMSC_SIO10N268) += sio10n268.c
diff --git a/src/superio/smsc/sio10n268/sio10n268.c b/src/superio/smsc/sio10n268/sio10n268.c
index e0ca8b9..cc46545 100644
--- a/src/superio/smsc/sio10n268/sio10n268.c
+++ b/src/superio/smsc/sio10n268/sio10n268.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdlib.h>
diff --git a/src/superio/smsc/sio10n268/sio10n268.h b/src/superio/smsc/sio10n268/sio10n268.h
index 192363d..36fdc26 100644
--- a/src/superio/smsc/sio10n268/sio10n268.h
+++ b/src/superio/smsc/sio10n268/sio10n268.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_SIO10N268_SIO10N268_H
diff --git a/src/superio/smsc/smscsuperio/Makefile.inc b/src/superio/smsc/smscsuperio/Makefile.inc
index 52c7d13..20c2276 100644
--- a/src/superio/smsc/smscsuperio/Makefile.inc
+++ b/src/superio/smsc/smscsuperio/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_SMSC_SMSCSUPERIO) += early_serial.c
diff --git a/src/superio/smsc/smscsuperio/early_serial.c b/src/superio/smsc/smscsuperio/early_serial.c
index 3eb9347..b112bca 100644
--- a/src/superio/smsc/smscsuperio/early_serial.c
+++ b/src/superio/smsc/smscsuperio/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/smsc/smscsuperio/smscsuperio.h b/src/superio/smsc/smscsuperio/smscsuperio.h
index 63fcc0e..8418eef 100644
--- a/src/superio/smsc/smscsuperio/smscsuperio.h
+++ b/src/superio/smsc/smscsuperio/smscsuperio.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_SMSC_SMSCSUPERIO_H
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index 6e0019d..28a3ae7 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/via/Kconfig b/src/superio/via/Kconfig
index e8fdc81..b645156 100644
--- a/src/superio/via/Kconfig
+++ b/src/superio/via/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config SUPERIO_VIA_VT1211
diff --git a/src/superio/via/Makefile.inc b/src/superio/via/Makefile.inc
index f8447e3..50a8cf6 100644
--- a/src/superio/via/Makefile.inc
+++ b/src/superio/via/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-y += vt1211
diff --git a/src/superio/via/vt1211/Makefile.inc b/src/superio/via/vt1211/Makefile.inc
index ee55847..4b2e1b2 100644
--- a/src/superio/via/vt1211/Makefile.inc
+++ b/src/superio/via/vt1211/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_VIA_VT1211) += vt1211.c
diff --git a/src/superio/via/vt1211/vt1211.c b/src/superio/via/vt1211/vt1211.c
index e0a2275..6041f29 100644
--- a/src/superio/via/vt1211/vt1211.c
+++ b/src/superio/via/vt1211/vt1211.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/via/vt1211/vt1211.h b/src/superio/via/vt1211/vt1211.h
index b447728..07d3671 100644
--- a/src/superio/via/vt1211/vt1211.h
+++ b/src/superio/via/vt1211/vt1211.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_VIA_VT1211_VT1211_H
diff --git a/src/superio/winbond/Kconfig b/src/superio/winbond/Kconfig
index a08d5af..4ef872f 100644
--- a/src/superio/winbond/Kconfig
+++ b/src/superio/winbond/Kconfig
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # Generic Winbond romstage driver - Just enough UART initialisation code for
diff --git a/src/superio/winbond/Makefile.inc b/src/superio/winbond/Makefile.inc
index 6fd447e..895e147 100644
--- a/src/superio/winbond/Makefile.inc
+++ b/src/superio/winbond/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ## include generic winbond pre-ram stage driver
diff --git a/src/superio/winbond/common/early_serial.c b/src/superio/winbond/common/early_serial.c
index 2cb624c..ffee19a 100644
--- a/src/superio/winbond/common/early_serial.c
+++ b/src/superio/winbond/common/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/winbond/common/winbond.h b/src/superio/winbond/common/winbond.h
index 03331b6..8bb9a24 100644
--- a/src/superio/winbond/common/winbond.h
+++ b/src/superio/winbond/common/winbond.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_COMMON_ROMSTAGE_H
diff --git a/src/superio/winbond/w83627dhg/Makefile.inc b/src/superio/winbond/w83627dhg/Makefile.inc
index 17e4b74..4574e6d 100644
--- a/src/superio/winbond/w83627dhg/Makefile.inc
+++ b/src/superio/winbond/w83627dhg/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_WINBOND_W83627DHG) += early_serial.c
diff --git a/src/superio/winbond/w83627dhg/acpi/superio.asl b/src/superio/winbond/w83627dhg/acpi/superio.asl
index e83a769..3750534 100644
--- a/src/superio/winbond/w83627dhg/acpi/superio.asl
+++ b/src/superio/winbond/w83627dhg/acpi/superio.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/winbond/w83627dhg/early_serial.c b/src/superio/winbond/w83627dhg/early_serial.c
index 320c540..7326985 100644
--- a/src/superio/winbond/w83627dhg/early_serial.c
+++ b/src/superio/winbond/w83627dhg/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627dhg/superio.c b/src/superio/winbond/w83627dhg/superio.c
index 31a890d..9751da2 100644
--- a/src/superio/winbond/w83627dhg/superio.c
+++ b/src/superio/winbond/w83627dhg/superio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627dhg/w83627dhg.h b/src/superio/winbond/w83627dhg/w83627dhg.h
index 3f07e58..850d887 100644
--- a/src/superio/winbond/w83627dhg/w83627dhg.h
+++ b/src/superio/winbond/w83627dhg/w83627dhg.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83627DHG_H
diff --git a/src/superio/winbond/w83627ehg/Makefile.inc b/src/superio/winbond/w83627ehg/Makefile.inc
index 8044300..66b9246 100644
--- a/src/superio/winbond/w83627ehg/Makefile.inc
+++ b/src/superio/winbond/w83627ehg/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += early_serial.c
diff --git a/src/superio/winbond/w83627ehg/early_serial.c b/src/superio/winbond/w83627ehg/early_serial.c
index a197a49..4dc2c16 100644
--- a/src/superio/winbond/w83627ehg/early_serial.c
+++ b/src/superio/winbond/w83627ehg/early_serial.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627ehg/superio.c b/src/superio/winbond/w83627ehg/superio.c
index 302b480..4a61914 100644
--- a/src/superio/winbond/w83627ehg/superio.c
+++ b/src/superio/winbond/w83627ehg/superio.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627ehg/w83627ehg.h b/src/superio/winbond/w83627ehg/w83627ehg.h
index 33fb186..ec776c7 100644
--- a/src/superio/winbond/w83627ehg/w83627ehg.h
+++ b/src/superio/winbond/w83627ehg/w83627ehg.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83627EHG_H
diff --git a/src/superio/winbond/w83627hf/Makefile.inc b/src/superio/winbond/w83627hf/Makefile.inc
index fd2ee09..f03512b 100644
--- a/src/superio/winbond/w83627hf/Makefile.inc
+++ b/src/superio/winbond/w83627hf/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_WINBOND_W83627HF) += early_init.c
diff --git a/src/superio/winbond/w83627hf/acpi/superio.asl b/src/superio/winbond/w83627hf/acpi/superio.asl
index 08a94b0..965fc94 100644
--- a/src/superio/winbond/w83627hf/acpi/superio.asl
+++ b/src/superio/winbond/w83627hf/acpi/superio.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/src/superio/winbond/w83627hf/early_init.c b/src/superio/winbond/w83627hf/early_init.c
index 6486a2f..437d951 100644
--- a/src/superio/winbond/w83627hf/early_init.c
+++ b/src/superio/winbond/w83627hf/early_init.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627hf/early_serial.c b/src/superio/winbond/w83627hf/early_serial.c
index 9317a99..545bf98 100644
--- a/src/superio/winbond/w83627hf/early_serial.c
+++ b/src/superio/winbond/w83627hf/early_serial.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627hf/superio.c b/src/superio/winbond/w83627hf/superio.c
index ec10be1..0458b2e 100644
--- a/src/superio/winbond/w83627hf/superio.c
+++ b/src/superio/winbond/w83627hf/superio.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627hf/w83627hf.h b/src/superio/winbond/w83627hf/w83627hf.h
index 5935a7f..27b3150 100644
--- a/src/superio/winbond/w83627hf/w83627hf.h
+++ b/src/superio/winbond/w83627hf/w83627hf.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83627HF_H
diff --git a/src/superio/winbond/w83627thg/Makefile.inc b/src/superio/winbond/w83627thg/Makefile.inc
index f5b532a..29fbb32 100644
--- a/src/superio/winbond/w83627thg/Makefile.inc
+++ b/src/superio/winbond/w83627thg/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_WINBOND_W83627THG) += superio.c
diff --git a/src/superio/winbond/w83627thg/superio.c b/src/superio/winbond/w83627thg/superio.c
index 8fcd99b..998f568 100644
--- a/src/superio/winbond/w83627thg/superio.c
+++ b/src/superio/winbond/w83627thg/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627thg/w83627thg.h b/src/superio/winbond/w83627thg/w83627thg.h
index 7695322..9886487 100644
--- a/src/superio/winbond/w83627thg/w83627thg.h
+++ b/src/superio/winbond/w83627thg/w83627thg.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83627THG_W83627THG_H
diff --git a/src/superio/winbond/w83627uhg/Makefile.inc b/src/superio/winbond/w83627uhg/Makefile.inc
index 7bb23c0..ae242b8 100644
--- a/src/superio/winbond/w83627uhg/Makefile.inc
+++ b/src/superio/winbond/w83627uhg/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
+## along with this program., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
 ##
 
 ramstage-$(CONFIG_SUPERIO_WINBOND_W83627UHG) += superio.c
diff --git a/src/superio/winbond/w83627uhg/superio.c b/src/superio/winbond/w83627uhg/superio.c
index 7e3ebdb..e83302c 100644
--- a/src/superio/winbond/w83627uhg/superio.c
+++ b/src/superio/winbond/w83627uhg/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
+ * along with this program., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83627uhg/w83627uhg.h b/src/superio/winbond/w83627uhg/w83627uhg.h
index 1925a57..b2b66ec 100644
--- a/src/superio/winbond/w83627uhg/w83627uhg.h
+++ b/src/superio/winbond/w83627uhg/w83627uhg.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
+ * along with this program., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 $
  */
 
 #ifndef SUPERIO_WINBOND_W83627UHG_W83627UHG_H
diff --git a/src/superio/winbond/w83697hf/Makefile.inc b/src/superio/winbond/w83697hf/Makefile.inc
index f22db30..9db0a0b 100644
--- a/src/superio/winbond/w83697hf/Makefile.inc
+++ b/src/superio/winbond/w83697hf/Makefile.inc
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 romstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += early_serial.c
diff --git a/src/superio/winbond/w83697hf/chip.h b/src/superio/winbond/w83697hf/chip.h
index 0a14378..b89570b 100644
--- a/src/superio/winbond/w83697hf/chip.h
+++ b/src/superio/winbond/w83697hf/chip.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83697HF_CHIP_H
diff --git a/src/superio/winbond/w83697hf/early_serial.c b/src/superio/winbond/w83697hf/early_serial.c
index dda0cf3..dd99ad1 100644
--- a/src/superio/winbond/w83697hf/early_serial.c
+++ b/src/superio/winbond/w83697hf/early_serial.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83697hf/superio.c b/src/superio/winbond/w83697hf/superio.c
index fe0adcc..674ce44 100644
--- a/src/superio/winbond/w83697hf/superio.c
+++ b/src/superio/winbond/w83697hf/superio.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83697hf/w83697hf.h b/src/superio/winbond/w83697hf/w83697hf.h
index 1e104df..f024abc 100644
--- a/src/superio/winbond/w83697hf/w83697hf.h
+++ b/src/superio/winbond/w83697hf/w83697hf.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83697HF_H
diff --git a/src/superio/winbond/w83977tf/Makefile.inc b/src/superio/winbond/w83977tf/Makefile.inc
index bfba0e0..6730913 100644
--- a/src/superio/winbond/w83977tf/Makefile.inc
+++ b/src/superio/winbond/w83977tf/Makefile.inc
@@ -16,8 +16,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ramstage-$(CONFIG_SUPERIO_WINBOND_W83977TF) += superio.c
diff --git a/src/superio/winbond/w83977tf/early_serial.c b/src/superio/winbond/w83977tf/early_serial.c
index eb35140..6287975 100644
--- a/src/superio/winbond/w83977tf/early_serial.c
+++ b/src/superio/winbond/w83977tf/early_serial.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83977tf/superio.c b/src/superio/winbond/w83977tf/superio.c
index 5f75dd8..cfa8c15 100644
--- a/src/superio/winbond/w83977tf/superio.c
+++ b/src/superio/winbond/w83977tf/superio.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/superio/winbond/w83977tf/w83977tf.h b/src/superio/winbond/w83977tf/w83977tf.h
index f74de1a..189142d 100644
--- a/src/superio/winbond/w83977tf/w83977tf.h
+++ b/src/superio/winbond/w83977tf/w83977tf.h
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIO_WINBOND_W83977TF_W83977TF_H
diff --git a/src/vendorcode/amd/Kconfig b/src/vendorcode/amd/Kconfig
index 5f00d89..0fca10c 100644
--- a/src/vendorcode/amd/Kconfig
+++ b/src/vendorcode/amd/Kconfig
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 if CPU_AMD_PI
diff --git a/src/vendorcode/amd/agesa/f10/Makefile.inc b/src/vendorcode/amd/agesa/f10/Makefile.inc
index fe4a797..aaa1d61 100644
--- a/src/vendorcode/amd/agesa/f10/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f10/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 #*****************************************************************************
 
diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc
index 94e3e43..eddb6e5 100644
--- a/src/vendorcode/amd/agesa/f15/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f15/Makefile.inc
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 
diff --git a/src/vendorcode/amd/cimx/sb800/Makefile.inc b/src/vendorcode/amd/cimx/sb800/Makefile.inc
index fde6239..93f58dc 100644
--- a/src/vendorcode/amd/cimx/sb800/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb800/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 CPPFLAGS_x86_32 += -I$(src)/mainboard/$(MAINBOARDDIR)
diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc
index 8d753d1..9204614 100644
--- a/src/vendorcode/amd/cimx/sb900/Makefile.inc
+++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 CPPFLAGS_x86_32 += -I$(src)/mainboard/$(MAINBOARDDIR)
diff --git a/src/vendorcode/google/Kconfig b/src/vendorcode/google/Kconfig
index 6201810..32b0d15 100644
--- a/src/vendorcode/google/Kconfig
+++ b/src/vendorcode/google/Kconfig
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 source src/vendorcode/google/chromeos/Kconfig
diff --git a/src/vendorcode/google/Makefile.inc b/src/vendorcode/google/Makefile.inc
index 3cb1256..a0ef114 100644
--- a/src/vendorcode/google/Makefile.inc
+++ b/src/vendorcode/google/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 subdirs-$(CONFIG_CHROMEOS) += chromeos
diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig
index 8309d19..ea6e715 100644
--- a/src/vendorcode/google/chromeos/Kconfig
+++ b/src/vendorcode/google/chromeos/Kconfig
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config MAINBOARD_HAS_CHROMEOS
diff --git a/src/vendorcode/google/chromeos/Makefile.inc b/src/vendorcode/google/chromeos/Makefile.inc
index 612af41..84fa376 100644
--- a/src/vendorcode/google/chromeos/Makefile.inc
+++ b/src/vendorcode/google/chromeos/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 bootblock-y += chromeos.c
diff --git a/src/vendorcode/google/chromeos/acpi/chromeos.asl b/src/vendorcode/google/chromeos/acpi/chromeos.asl
index 0696c21..6899e91 100644
--- a/src/vendorcode/google/chromeos/acpi/chromeos.asl
+++ b/src/vendorcode/google/chromeos/acpi/chromeos.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Device (CRHW)
diff --git a/src/vendorcode/google/chromeos/acpi/gnvs.asl b/src/vendorcode/google/chromeos/acpi/gnvs.asl
index 4c9edd7..f537624 100644
--- a/src/vendorcode/google/chromeos/acpi/gnvs.asl
+++ b/src/vendorcode/google/chromeos/acpi/gnvs.asl
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This is the ChromeOS specific ACPI information needed by
diff --git a/src/vendorcode/google/chromeos/acpi/ramoops.asl b/src/vendorcode/google/chromeos/acpi/ramoops.asl
index 351a382..a0b4e4b 100644
--- a/src/vendorcode/google/chromeos/acpi/ramoops.asl
+++ b/src/vendorcode/google/chromeos/acpi/ramoops.asl
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 Scope (\_SB)
diff --git a/src/vendorcode/google/chromeos/chromeos.c b/src/vendorcode/google/chromeos/chromeos.c
index 4864b8c..7e33bac 100644
--- a/src/vendorcode/google/chromeos/chromeos.c
+++ b/src/vendorcode/google/chromeos/chromeos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/src/vendorcode/google/chromeos/chromeos.h b/src/vendorcode/google/chromeos/chromeos.h
index bdc9435..bded514 100644
--- a/src/vendorcode/google/chromeos/chromeos.h
+++ b/src/vendorcode/google/chromeos/chromeos.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CHROMEOS_H__
diff --git a/src/vendorcode/google/chromeos/elog.c b/src/vendorcode/google/chromeos/elog.c
index df52eaf..8fdd17c 100644
--- a/src/vendorcode/google/chromeos/elog.c
+++ b/src/vendorcode/google/chromeos/elog.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbmem.h>
diff --git a/src/vendorcode/google/chromeos/fmap.c b/src/vendorcode/google/chromeos/fmap.c
index 490cadb..08f6eb8 100644
--- a/src/vendorcode/google/chromeos/fmap.c
+++ b/src/vendorcode/google/chromeos/fmap.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/src/vendorcode/google/chromeos/gnvs.c b/src/vendorcode/google/chromeos/gnvs.c
index ca21d23..67f0f22 100644
--- a/src/vendorcode/google/chromeos/gnvs.c
+++ b/src/vendorcode/google/chromeos/gnvs.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/vendorcode/google/chromeos/gnvs.h b/src/vendorcode/google/chromeos/gnvs.h
index 066bb4c..49e9bbe 100644
--- a/src/vendorcode/google/chromeos/gnvs.h
+++ b/src/vendorcode/google/chromeos/gnvs.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __VENDORCODE_GOOGLE_CHROMEOS_GNVS_H
diff --git a/src/vendorcode/google/chromeos/ramoops.c b/src/vendorcode/google/chromeos/ramoops.c
index 1766114..0423684 100644
--- a/src/vendorcode/google/chromeos/ramoops.c
+++ b/src/vendorcode/google/chromeos/ramoops.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/src/vendorcode/google/chromeos/symbols.h b/src/vendorcode/google/chromeos/symbols.h
index 65c24cd..f961b80 100644
--- a/src/vendorcode/google/chromeos/symbols.h
+++ b/src/vendorcode/google/chromeos/symbols.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CHROMEOS_SYMBOLS_H
diff --git a/src/vendorcode/google/chromeos/vbnv_cmos.c b/src/vendorcode/google/chromeos/vbnv_cmos.c
index fe5a04f..b91f043 100644
--- a/src/vendorcode/google/chromeos/vbnv_cmos.c
+++ b/src/vendorcode/google/chromeos/vbnv_cmos.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/vendorcode/google/chromeos/vbnv_ec.c b/src/vendorcode/google/chromeos/vbnv_ec.c
index 2a592c4..9c9b131 100644
--- a/src/vendorcode/google/chromeos/vbnv_ec.c
+++ b/src/vendorcode/google/chromeos/vbnv_ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <types.h>
diff --git a/src/vendorcode/google/chromeos/vbnv_flash.c b/src/vendorcode/google/chromeos/vbnv_flash.c
index 0ee9eaa..b380c18 100644
--- a/src/vendorcode/google/chromeos/vbnv_flash.c
+++ b/src/vendorcode/google/chromeos/vbnv_flash.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  *
  * TODO: Make this CAR-friendly in case we use it on x86 some day.
  */
diff --git a/src/vendorcode/google/chromeos/vbnv_layout.h b/src/vendorcode/google/chromeos/vbnv_layout.h
index c6b8525..c674a7c 100644
--- a/src/vendorcode/google/chromeos/vbnv_layout.h
+++ b/src/vendorcode/google/chromeos/vbnv_layout.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef VBNV_LAYOUT_H
diff --git a/src/vendorcode/google/chromeos/vboot2/Kconfig b/src/vendorcode/google/chromeos/vboot2/Kconfig
index 33c33a5..3568148 100644
--- a/src/vendorcode/google/chromeos/vboot2/Kconfig
+++ b/src/vendorcode/google/chromeos/vboot2/Kconfig
@@ -12,8 +12,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config VBOOT_STARTS_IN_BOOTBLOCK
diff --git a/src/vendorcode/google/chromeos/vboot2/Makefile.inc b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
index c2ee868..53e47ab 100644
--- a/src/vendorcode/google/chromeos/vboot2/Makefile.inc
+++ b/src/vendorcode/google/chromeos/vboot2/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 libverstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
diff --git a/src/vendorcode/google/chromeos/vboot2/common.c b/src/vendorcode/google/chromeos/vboot2/common.c
index 663ffd8..c92ca61 100644
--- a/src/vendorcode/google/chromeos/vboot2/common.c
+++ b/src/vendorcode/google/chromeos/vboot2/common.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <cbfs.h>
diff --git a/src/vendorcode/google/chromeos/vboot2/misc.h b/src/vendorcode/google/chromeos/vboot2/misc.h
index 2c26461..4c37eb0 100644
--- a/src/vendorcode/google/chromeos/vboot2/misc.h
+++ b/src/vendorcode/google/chromeos/vboot2/misc.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CHROMEOS_VBOOT2_MISC_H__
diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c
index 769e267..84341c1 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_handoff.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/stages.h>
diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
index d2e7758..a43ad90 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <assets.h>
diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_logic.c b/src/vendorcode/google/chromeos/vboot2/vboot_logic.c
index 0767454..15e982b 100644
--- a/src/vendorcode/google/chromeos/vboot2/vboot_logic.c
+++ b/src/vendorcode/google/chromeos/vboot2/vboot_logic.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <antirollback.h>
diff --git a/src/vendorcode/google/chromeos/vboot2/verstage.c b/src/vendorcode/google/chromeos/vboot2/verstage.c
index 751f588..5cafcdb 100644
--- a/src/vendorcode/google/chromeos/vboot2/verstage.c
+++ b/src/vendorcode/google/chromeos/vboot2/verstage.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/exception.h>
diff --git a/src/vendorcode/google/chromeos/vboot_common.c b/src/vendorcode/google/chromeos/vboot_common.c
index 6184b0d..b3673a2 100644
--- a/src/vendorcode/google/chromeos/vboot_common.c
+++ b/src/vendorcode/google/chromeos/vboot_common.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/vendorcode/google/chromeos/vboot_common.h b/src/vendorcode/google/chromeos/vboot_common.h
index 3a9c89b..950a7af 100644
--- a/src/vendorcode/google/chromeos/vboot_common.h
+++ b/src/vendorcode/google/chromeos/vboot_common.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef VBOOT_COMMON_H
 #define VBOOT_COMMON_H
diff --git a/src/vendorcode/google/chromeos/vboot_handoff.h b/src/vendorcode/google/chromeos/vboot_handoff.h
index 997ea30..15e2bb6 100644
--- a/src/vendorcode/google/chromeos/vboot_handoff.h
+++ b/src/vendorcode/google/chromeos/vboot_handoff.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #ifndef VBOOT_HANDOFF_H
 #define VBOOT_HANDOFF_H
diff --git a/src/vendorcode/google/chromeos/vpd_calibration.c b/src/vendorcode/google/chromeos/vpd_calibration.c
index 7fd234c..813a8a4 100644
--- a/src/vendorcode/google/chromeos/vpd_calibration.c
+++ b/src/vendorcode/google/chromeos/vpd_calibration.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <b64_decode.h>
diff --git a/src/vendorcode/google/chromeos/vpd_mac.c b/src/vendorcode/google/chromeos/vpd_mac.c
index 2ed17a0..f1a1486 100644
--- a/src/vendorcode/google/chromeos/vpd_mac.c
+++ b/src/vendorcode/google/chromeos/vpd_mac.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/vendorcode/google/chromeos/vpd_serialno.c b/src/vendorcode/google/chromeos/vpd_serialno.c
index 7de6926..7cc3e93 100644
--- a/src/vendorcode/google/chromeos/vpd_serialno.c
+++ b/src/vendorcode/google/chromeos/vpd_serialno.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <boot/coreboot_tables.h>
diff --git a/src/vendorcode/google/chromeos/watchdog.c b/src/vendorcode/google/chromeos/watchdog.c
index 4bf0b7c..9a4cac5 100644
--- a/src/vendorcode/google/chromeos/watchdog.c
+++ b/src/vendorcode/google/chromeos/watchdog.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/src/vendorcode/intel/Kconfig b/src/vendorcode/intel/Kconfig
index 1d1049e..0166b3a 100644
--- a/src/vendorcode/intel/Kconfig
+++ b/src/vendorcode/intel/Kconfig
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 config FSP_VENDORCODE_HEADER_PATH
diff --git a/src/vendorcode/intel/Makefile.inc b/src/vendorcode/intel/Makefile.inc
index b95d4f9..0268eb6 100644
--- a/src/vendorcode/intel/Makefile.inc
+++ b/src/vendorcode/intel/Makefile.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 ifneq ($(CONFIG_FSP_VENDORCODE_HEADER_PATH),)
diff --git a/toolchain.inc b/toolchain.inc
index 5fd5a77..f8cddfb 100644
--- a/toolchain.inc
+++ b/toolchain.inc
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 # ccache integration
diff --git a/util/acpi/acpidump-all b/util/acpi/acpidump-all
index 1d16e9d..507e433 100755
--- a/util/acpi/acpidump-all
+++ b/util/acpi/acpidump-all
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 rm -rf out
diff --git a/util/autoport/ec_lenovo.go b/util/autoport/ec_lenovo.go
index ab5e7ab..790b9ff 100644
--- a/util/autoport/ec_lenovo.go
+++ b/util/autoport/ec_lenovo.go
@@ -97,8 +97,7 @@ void h8_mainboard_init_dock (void)
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/util/bimgtool/bimgtool.c b/util/bimgtool/bimgtool.c
index 505bf7d..85f7f4a 100644
--- a/util/bimgtool/bimgtool.c
+++ b/util/bimgtool/bimgtool.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <errno.h>
diff --git a/util/board_status/getrevision.sh b/util/board_status/getrevision.sh
index 8423339..d0d194e 100755
--- a/util/board_status/getrevision.sh
+++ b/util/board_status/getrevision.sh
@@ -17,8 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 EXIT_SUCCESS=0
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 991030a..e23ba62 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index d2a2c46..57a3f48 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <inttypes.h>
diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c
index ac1f09a..b4bbd17 100644
--- a/util/cbfstool/cbfs-payload-linux.c
+++ b/util/cbfstool/cbfs-payload-linux.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index 8621805..b0be3e3 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.h
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CBFS_H
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 895927d..779de8e 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <inttypes.h>
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h
index f602976..3ff7e83 100644
--- a/util/cbfstool/cbfs_image.h
+++ b/util/cbfstool/cbfs_image.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CBFS_IMAGE_H
diff --git a/util/cbfstool/cbfs_sections.c b/util/cbfstool/cbfs_sections.c
index 249ea95..748f430 100644
--- a/util/cbfstool/cbfs_sections.c
+++ b/util/cbfstool/cbfs_sections.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "cbfs_sections.h"
diff --git a/util/cbfstool/cbfs_sections.h b/util/cbfstool/cbfs_sections.h
index 4d14fa9..b8be8f9 100644
--- a/util/cbfstool/cbfs_sections.h
+++ b/util/cbfstool/cbfs_sections.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef CBFS_SECTIONS_H_
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 8048c83..bebb8ec 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h
index cd74a82..4717d7b 100644
--- a/util/cbfstool/coff.h
+++ b/util/cbfstool/coff.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define DOS_MAGIC 0x5a4d
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 7e36b7f..f217d6d 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index b638653..5a6d473 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CBFSTOOL_COMMON_H
diff --git a/util/cbfstool/compress.c b/util/cbfstool/compress.c
index 2bde7df..8ee32eb 100644
--- a/util/cbfstool/compress.c
+++ b/util/cbfstool/compress.c
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <string.h>
diff --git a/util/cbfstool/console/console.h b/util/cbfstool/console/console.h
index c51ab0a..7d8c4c2 100644
--- a/util/cbfstool/console/console.h
+++ b/util/cbfstool/console/console.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _CBFSTOOL_CONSOLE_H_
diff --git a/util/cbfstool/elf.h b/util/cbfstool/elf.h
index 675fd22..ae893f8 100644
--- a/util/cbfstool/elf.h
+++ b/util/cbfstool/elf.h
@@ -13,8 +13,7 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc. */
+   License along with the GNU C Library. */
 
 #ifndef _ELF_H
 #define	_ELF_H 1
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 4cf3534..1eb59ee 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/elfparsing.h b/util/cbfstool/elfparsing.h
index f7d3c23..f5ee7bd 100644
--- a/util/cbfstool/elfparsing.h
+++ b/util/cbfstool/elfparsing.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef ELFPARSING_H
diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c
index 6039714..5d90809 100644
--- a/util/cbfstool/fit.c
+++ b/util/cbfstool/fit.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h
index 51e3c0f..9cf0a1e 100644
--- a/util/cbfstool/fit.h
+++ b/util/cbfstool/fit.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef __CBFSTOOL_FIT_H
diff --git a/util/cbfstool/flashmap_tests.c b/util/cbfstool/flashmap_tests.c
index 547931a..97e8dc0 100644
--- a/util/cbfstool/flashmap_tests.c
+++ b/util/cbfstool/flashmap_tests.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "flashmap/fmap.h"
diff --git a/util/cbfstool/fmap_from_fmd.c b/util/cbfstool/fmap_from_fmd.c
index 45ee2e8..87e6747 100644
--- a/util/cbfstool/fmap_from_fmd.c
+++ b/util/cbfstool/fmap_from_fmd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "fmap_from_fmd.h"
diff --git a/util/cbfstool/fmap_from_fmd.h b/util/cbfstool/fmap_from_fmd.h
index 1e4da01..d5f19a3 100644
--- a/util/cbfstool/fmap_from_fmd.h
+++ b/util/cbfstool/fmap_from_fmd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FMAP_FROM_FMD_H_
diff --git a/util/cbfstool/fmaptool.c b/util/cbfstool/fmaptool.c
index d0720be..489fae6 100644
--- a/util/cbfstool/fmaptool.c
+++ b/util/cbfstool/fmaptool.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "common.h"
diff --git a/util/cbfstool/fmd.c b/util/cbfstool/fmd.c
index 1d769f6..710ac6e 100644
--- a/util/cbfstool/fmd.c
+++ b/util/cbfstool/fmd.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "fmd.h"
diff --git a/util/cbfstool/fmd.h b/util/cbfstool/fmd.h
index 9a22a96..42a76aa 100644
--- a/util/cbfstool/fmd.h
+++ b/util/cbfstool/fmd.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef FMD_H_
diff --git a/util/cbfstool/fmd_parser.y b/util/cbfstool/fmd_parser.y
index caa2beb..8e684d2 100644
--- a/util/cbfstool/fmd_parser.y
+++ b/util/cbfstool/fmd_parser.y
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 %{
diff --git a/util/cbfstool/fmd_scanner.l b/util/cbfstool/fmd_scanner.l
index 439548e..6d6ba75 100644
--- a/util/cbfstool/fmd_scanner.l
+++ b/util/cbfstool/fmd_scanner.l
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 %{
diff --git a/util/cbfstool/fv.h b/util/cbfstool/fv.h
index 0bb176c..32db664 100644
--- a/util/cbfstool/fv.h
+++ b/util/cbfstool/fv.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #define FV_SIGNATURE 0x4856465f
diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h
index ba6f8b0..167f547 100644
--- a/util/cbfstool/linux.h
+++ b/util/cbfstool/linux.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c
index 6bbdc4f..7d08e1b 100644
--- a/util/cbfstool/linux_trampoline.c
+++ b/util/cbfstool/linux_trampoline.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #if 0
diff --git a/util/cbfstool/linux_trampoline.h b/util/cbfstool/linux_trampoline.h
index aebcb10..7b47cde 100644
--- a/util/cbfstool/linux_trampoline.h
+++ b/util/cbfstool/linux_trampoline.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /*
diff --git a/util/cbfstool/option.h b/util/cbfstool/option.h
index 4c71cad..e709d2b 100644
--- a/util/cbfstool/option.h
+++ b/util/cbfstool/option.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef OPTION_H_
diff --git a/util/cbfstool/partitioned_file.c b/util/cbfstool/partitioned_file.c
index 041ef11..291f77c 100644
--- a/util/cbfstool/partitioned_file.c
+++ b/util/cbfstool/partitioned_file.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "partitioned_file.h"
diff --git a/util/cbfstool/partitioned_file.h b/util/cbfstool/partitioned_file.h
index 3698a19..a405cf6 100644
--- a/util/cbfstool/partitioned_file.h
+++ b/util/cbfstool/partitioned_file.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef PARITITONED_FILE_H_
diff --git a/util/cbfstool/rmodtool.c b/util/cbfstool/rmodtool.c
index 188d749..7055a3d 100644
--- a/util/cbfstool/rmodtool.c
+++ b/util/cbfstool/rmodtool.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index 986ba62..3a5e129 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <inttypes.h>
diff --git a/util/cbfstool/rmodule.h b/util/cbfstool/rmodule.h
index 9a65677..cde2eb2 100644
--- a/util/cbfstool/rmodule.h
+++ b/util/cbfstool/rmodule.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef TOOL_RMODULE_H
diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c
index 1949fa6e..5512d93 100644
--- a/util/cbfstool/xdr.c
+++ b/util/cbfstool/xdr.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index 91bb045..31bfeb2 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 PROGRAM = cbmem
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 74cb52d..700adb5 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <inttypes.h>
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 2992a6c..7de4fa0 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 cd $(dirname $0)
diff --git a/util/dtd_parser/dtd_parser.py b/util/dtd_parser/dtd_parser.py
index 8b5c75e..016d2a5 100755
--- a/util/dtd_parser/dtd_parser.py
+++ b/util/dtd_parser/dtd_parser.py
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 '''
diff --git a/util/ectool/Makefile b/util/ectool/Makefile
index 3ab0bc8..4964b6c 100644
--- a/util/ectool/Makefile
+++ b/util/ectool/Makefile
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 CC = gcc
diff --git a/util/ectool/ec.c b/util/ectool/ec.c
index 61e7c25..e81e6f7 100644
--- a/util/ectool/ec.c
+++ b/util/ectool/ec.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/ectool/ec.h b/util/ectool/ec.h
index dec5439..05b21ea 100644
--- a/util/ectool/ec.h
+++ b/util/ectool/ec.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef _EC_H
diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c
index 1631deb..294f378 100644
--- a/util/ectool/ectool.c
+++ b/util/ectool/ectool.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
index 2a009c1..d5d4af7 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 DATE=""
diff --git a/util/ifdfake/Makefile b/util/ifdfake/Makefile
index bb9d87a..d2641d2 100644
--- a/util/ifdfake/Makefile
+++ b/util/ifdfake/Makefile
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 PROGRAM = ifdfake
diff --git a/util/ifdfake/ifdfake.c b/util/ifdfake/ifdfake.c
index 7b268df..18419bd 100644
--- a/util/ifdfake/ifdfake.c
+++ b/util/ifdfake/ifdfake.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <errno.h>
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index 02a02c4..2a4fb91 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 PROGRAM = ifdtool
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index feaffa8..16eb5c5 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <unistd.h>
diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h
index 195d91c..a09a432 100644
--- a/util/ifdtool/ifdtool.h
+++ b/util/ifdtool/ifdtool.h
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index d5fb1da..4c500af 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 PROGRAM = inteltool
diff --git a/util/inteltool/amb.c b/util/inteltool/amb.c
index 416e1b7..9ecc2d7 100644
--- a/util/inteltool/amb.c
+++ b/util/inteltool/amb.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stddef.h>
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c
index b13e04b..76b543f 100644
--- a/util/inteltool/cpu.c
+++ b/util/inteltool/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <fcntl.h>
diff --git a/util/inteltool/gfx.c b/util/inteltool/gfx.c
index f9b1fba..08bdb98 100644
--- a/util/inteltool/gfx.c
+++ b/util/inteltool/gfx.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 07d838b..5db6e43 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index f91b3ad..bd423b5 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index dffe204..6ea4619 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/util/inteltool/ivy_memory.c b/util/inteltool/ivy_memory.c
index 98eef41..b554a38 100644
--- a/util/inteltool/ivy_memory.c
+++ b/util/inteltool/ivy_memory.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index aacaf96..5ca7a7a 100644
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c
index ebe0877..bc232aa 100644
--- a/util/inteltool/pcie.c
+++ b/util/inteltool/pcie.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index d0fd0e0..5775a1f 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index 9fd05be..1450927 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/intelvbttool/intelvbttool.c b/util/intelvbttool/intelvbttool.c
index 3dd2a1e..50e7282 100644
--- a/util/intelvbttool/intelvbttool.c
+++ b/util/intelvbttool/intelvbttool.c
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile
index ae45b6d..1e44745 100644
--- a/util/k8resdump/Makefile
+++ b/util/k8resdump/Makefile
@@ -13,8 +13,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 PROGRAM = k8resdump
diff --git a/util/k8resdump/k8resdump.c b/util/k8resdump/k8resdump.c
index 1bd974e..b1b22a3 100644
--- a/util/k8resdump/k8resdump.c
+++ b/util/k8resdump/k8resdump.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 /* This program will dump the IO/memory/PCI resources from the K8
diff --git a/util/lint/lint-000-license-headers b/util/lint/lint-000-license-headers
index 12cbe6c..08d3117 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 #
 # DESCR: Check that all files in src/ and util/ have valid license headers
diff --git a/util/lint/lint-001-no-global-config-in-romstage b/util/lint/lint-001-no-global-config-in-romstage
index 562b1f7..fd5b357 100755
--- a/util/lint/lint-001-no-global-config-in-romstage
+++ b/util/lint/lint-001-no-global-config-in-romstage
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 # DESCR: Check that no symbol #defined in any romstage.c is used elsewhere
 
diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace
index 3f60040..befbf21 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 # DESCR: Check for superfluous whitespace in the tree
 
diff --git a/util/lint/lint-stable-004-style-labels b/util/lint/lint-stable-004-style-labels
index 1f7953e..b750d36 100755
--- a/util/lint/lint-stable-004-style-labels
+++ b/util/lint/lint-stable-004-style-labels
@@ -13,8 +13,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 # DESCR: Check that C labels begin at start-of-line
 
diff --git a/util/lint/lint-stable-005-board-status b/util/lint/lint-stable-005-board-status
index a00fe0c..46fd2f3 100755
--- a/util/lint/lint-stable-005-board-status
+++ b/util/lint/lint-stable-005-board-status
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 # DESCR: Check that every board has a meaningful board_info.txt
 
diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
index 4089498..26cf61a 100644
--- a/util/msrtool/Makefile.in
+++ b/util/msrtool/Makefile.in
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 PROGRAM = msrtool
diff --git a/util/msrtool/configure b/util/msrtool/configure
index cda01ac..cdfeb2e 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -14,8 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 # If this is left unset, try to set the version string from the highest
diff --git a/util/msrtool/cs5536.c b/util/msrtool/cs5536.c
index e8982ca..a8ccd13 100644
--- a/util/msrtool/cs5536.c
+++ b/util/msrtool/cs5536.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index 0c05545..d847e57 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <sys/types.h>
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c
index 9c086f3..3e4b3e9 100644
--- a/util/msrtool/freebsd.c
+++ b/util/msrtool/freebsd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <sys/types.h>
diff --git a/util/msrtool/geodegx2.c b/util/msrtool/geodegx2.c
index 995a6d0..055a51b 100644
--- a/util/msrtool/geodegx2.c
+++ b/util/msrtool/geodegx2.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/geodelx.c b/util/msrtool/geodelx.c
index 921c1a8..f3a7016 100644
--- a/util/msrtool/geodelx.c
+++ b/util/msrtool/geodelx.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c
index 4d2d623..4959d32 100644
--- a/util/msrtool/intel_atom.c
+++ b/util/msrtool/intel_atom.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c
index 6869781..21b6183 100644
--- a/util/msrtool/intel_core1.c
+++ b/util/msrtool/intel_core1.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c
index b62e7c9..487c0e5 100644
--- a/util/msrtool/intel_core2_early.c
+++ b/util/msrtool/intel_core2_early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c
index 3156ae2..c3dc711 100644
--- a/util/msrtool/intel_core2_later.c
+++ b/util/msrtool/intel_core2_later.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c
index f382f87..aaf04ac 100644
--- a/util/msrtool/intel_nehalem.c
+++ b/util/msrtool/intel_nehalem.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c
index 5dcbbd9..f6849e3 100644
--- a/util/msrtool/intel_pentium3.c
+++ b/util/msrtool/intel_pentium3.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c
index 51511e5..3aed308 100644
--- a/util/msrtool/intel_pentium3_early.c
+++ b/util/msrtool/intel_pentium3_early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c
index feb0577..6ee6260 100644
--- a/util/msrtool/intel_pentium4_early.c
+++ b/util/msrtool/intel_pentium4_early.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c
index cbbcd01..610f592 100644
--- a/util/msrtool/intel_pentium4_later.c
+++ b/util/msrtool/intel_pentium4_later.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/k8.c b/util/msrtool/k8.c
index 754580f..1ad18d8 100644
--- a/util/msrtool/k8.c
+++ b/util/msrtool/k8.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "msrtool.h"
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c
index 2ead38f..b804978 100644
--- a/util/msrtool/linux.c
+++ b/util/msrtool/linux.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <sys/types.h>
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 66a34bf..17560dd 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index 8988eba..68e379e 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef MSRTOOL_H
diff --git a/util/msrtool/msrutils.c b/util/msrtool/msrutils.c
index fc44eac..643842b 100644
--- a/util/msrtool/msrutils.c
+++ b/util/msrtool/msrutils.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index 077bdab..80054ff 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <pci/pci.h>
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 1f19733..51f4f02 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 PROGRAM = nvramtool
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index 5643caa..e970602 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 OS_ARCH        = $(shell uname)
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c
index 95c5ee5..51065c7 100644
--- a/util/nvramtool/accessors/layout-bin.c
+++ b/util/nvramtool/accessors/layout-bin.c
@@ -31,7 +31,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include <string.h>
diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c
index f8113b5..aca5fd0 100644
--- a/util/nvramtool/accessors/layout-common.c
+++ b/util/nvramtool/accessors/layout-common.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include <ctype.h>
diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c
index 7e02768..d791685 100644
--- a/util/nvramtool/accessors/layout-text.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -30,7 +30,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h
index 62286c2..c3ba3ff 100644
--- a/util/nvramtool/accessors/layout-text.h
+++ b/util/nvramtool/accessors/layout-text.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef LAYOUT_FILE_H
diff --git a/util/nvramtool/cbfs.c b/util/nvramtool/cbfs.c
index 5db438b..a2aa93c 100644
--- a/util/nvramtool/cbfs.c
+++ b/util/nvramtool/cbfs.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifdef __MINGW32__
diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h
index a855f81..584c480 100644
--- a/util/nvramtool/cbfs.h
+++ b/util/nvramtool/cbfs.h
@@ -18,8 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/util/nvramtool/cli/nvramtool.8 b/util/nvramtool/cli/nvramtool.8
index a1e4a6c..526fbeb 100644
--- a/util/nvramtool/cli/nvramtool.8
+++ b/util/nvramtool/cli/nvramtool.8
@@ -24,7 +24,7 @@
 .\"  conditions of the GNU General Public License for more details.
 .\"
 .\"  You should have received a copy of the GNU General Public License along
-.\"  with this program; if not, write to the Free Software Foundation, Inc.
+.\"  with this program.
 .\"***************************************************************************/
 .TH NVRAMTOOL 8 "September 2008"
 .SH NAME
diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index 13d740f..b7ec92a 100644
--- a/util/nvramtool/cli/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include <fcntl.h>
diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c
index c92b135..efb63a2 100644
--- a/util/nvramtool/cli/opts.c
+++ b/util/nvramtool/cli/opts.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h
index d6c31b9..29680d5 100644
--- a/util/nvramtool/cli/opts.h
+++ b/util/nvramtool/cli/opts.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef OPTS_H
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 51b998e..7a4514a 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #if defined(__FreeBSD__)
diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h
index fe60147..b966e3f 100644
--- a/util/nvramtool/cmos_lowlevel.h
+++ b/util/nvramtool/cmos_lowlevel.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef NVRAMTOOL_CMOS_LOWLEVEL_H
diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c
index 49d11b1..3871987 100644
--- a/util/nvramtool/cmos_ops.c
+++ b/util/nvramtool/cmos_ops.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h
index d9d2735..b542fa4 100644
--- a/util/nvramtool/cmos_ops.h
+++ b/util/nvramtool/cmos_ops.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef CMOS_OPS_H
diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c
index ad469d9..4c9880a 100644
--- a/util/nvramtool/common.c
+++ b/util/nvramtool/common.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h
index 7f855c4..9f4e8c2 100644
--- a/util/nvramtool/common.h
+++ b/util/nvramtool/common.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef COMMON_H
diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c
index 55a6b9a..c46d408 100644
--- a/util/nvramtool/input_file.c
+++ b/util/nvramtool/input_file.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h
index b4b80aa..3b99571 100644
--- a/util/nvramtool/input_file.h
+++ b/util/nvramtool/input_file.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef INPUT_FILE_H
diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c
index 21698ae..ed7eaff 100644
--- a/util/nvramtool/layout.c
+++ b/util/nvramtool/layout.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include "common.h"
diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h
index 405c14a..118b18d 100644
--- a/util/nvramtool/layout.h
+++ b/util/nvramtool/layout.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef LAYOUT_H
diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index 135d4e5..ea8fe22 100644
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -25,7 +25,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include <stdint.h>
diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h
index ddb7938..293a3ca 100644
--- a/util/nvramtool/lbtable.h
+++ b/util/nvramtool/lbtable.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef LBTABLE_H
diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c
index 33f3445..73d1d16 100644
--- a/util/nvramtool/reg_expr.c
+++ b/util/nvramtool/reg_expr.c
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #include <stdarg.h>
diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h
index 55f6b5d..63ee62d 100644
--- a/util/nvramtool/reg_expr.h
+++ b/util/nvramtool/reg_expr.h
@@ -24,7 +24,7 @@
  *  conditions of the GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.
+ *  with this program.
 \*****************************************************************************/
 
 #ifndef REG_EXPR_H
diff --git a/util/optionlist/Makefile b/util/optionlist/Makefile
index 035c5f4..0d0f138 100644
--- a/util/optionlist/Makefile
+++ b/util/optionlist/Makefile
@@ -11,8 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 VERSION := $(shell git describe --dirty --always || git describe)
diff --git a/util/optionlist/kconfig2wiki b/util/optionlist/kconfig2wiki
index ddfa267..2706d2c 100755
--- a/util/optionlist/kconfig2wiki
+++ b/util/optionlist/kconfig2wiki
@@ -17,8 +17,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 import glob
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 6c77762..deb4243 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <ctype.h>
diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h
index d6acee9..71714e2 100644
--- a/util/sconfig/sconfig.h
+++ b/util/sconfig/sconfig.h
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l
index 8ab3a02..e429ec9 100755
--- a/util/sconfig/sconfig.l
+++ b/util/sconfig/sconfig.l
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "sconfig.tab.h"
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index 10b05a9..ffbb7c2 100755
--- a/util/sconfig/sconfig.y
+++ b/util/sconfig/sconfig.y
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "sconfig.h"
diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c
index 335594b..578a2a3 100644
--- a/util/showdevicetree/showdt.c
+++ b/util/showdevicetree/showdt.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 #include  <stdio.h>
 /* you can't include string.h due to conflicts with coreboot prototypes. */
diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile
index b005a3f..ed0f003 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -14,8 +14,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc.
+## along with this program.
 ##
 
 PROGRAM = superiotool
diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 57d1c10..7d407d3 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/amd.c b/util/superiotool/amd.c
index 07ef150..68a399c 100644
--- a/util/superiotool/amd.c
+++ b/util/superiotool/amd.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index 1a6ffa3..f69a055 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/infineon.c b/util/superiotool/infineon.c
index 4ee7960..12ccdf8 100644
--- a/util/superiotool/infineon.c
+++ b/util/superiotool/infineon.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 295cbdc..214ca95 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index 883ad7c..c0fb37a 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/nuvoton.c b/util/superiotool/nuvoton.c
index 4376494..ac3bdc2 100644
--- a/util/superiotool/nuvoton.c
+++ b/util/superiotool/nuvoton.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/pci.c b/util/superiotool/pci.c
index 32c2376..8fcf68f 100644
--- a/util/superiotool/pci.c
+++ b/util/superiotool/pci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/serverengines.c b/util/superiotool/serverengines.c
index d662000..3f0d428 100644
--- a/util/superiotool/serverengines.c
+++ b/util/superiotool/serverengines.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 734cb91..cac56a2 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index a5e912d..8a2751f 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 7e7ec0c..4f69d88 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -17,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #ifndef SUPERIOTOOL_H
diff --git a/util/superiotool/via.c b/util/superiotool/via.c
index 589a13e..b1cf31a 100644
--- a/util/superiotool/via.c
+++ b/util/superiotool/via.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 3cc93eb..4cb0d8f 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include "superiotool.h"
diff --git a/util/uio_usbdebug/console/printk.c b/util/uio_usbdebug/console/printk.c
index 26292e3..12fca14 100644
--- a/util/uio_usbdebug/console/printk.c
+++ b/util/uio_usbdebug/console/printk.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/uio_usbdebug/drivers/usb/pci_ehci.c b/util/uio_usbdebug/drivers/usb/pci_ehci.c
index c7c1282..8f4eb75 100644
--- a/util/uio_usbdebug/drivers/usb/pci_ehci.c
+++ b/util/uio_usbdebug/drivers/usb/pci_ehci.c
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <device/pci_ehci.h>
diff --git a/util/uio_usbdebug/include/device/device.h b/util/uio_usbdebug/include/device/device.h
index 709c644..e6de37b 100644
--- a/util/uio_usbdebug/include/device/device.h
+++ b/util/uio_usbdebug/include/device/device.h
@@ -11,8 +11,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 
diff --git a/util/uio_usbdebug/linux/uio_ehci_pci.c b/util/uio_usbdebug/linux/uio_ehci_pci.c
index 52d8c99..cdcba1f 100644
--- a/util/uio_usbdebug/linux/uio_ehci_pci.c
+++ b/util/uio_usbdebug/linux/uio_ehci_pci.c
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <linux/device.h>
diff --git a/util/uio_usbdebug/uio_usbdebug.c b/util/uio_usbdebug/uio_usbdebug.c
index d40d3c0..4dc6298 100644
--- a/util/uio_usbdebug/uio_usbdebug.c
+++ b/util/uio_usbdebug/uio_usbdebug.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/uio_usbdebug/uio_usbdebug_intel.c b/util/uio_usbdebug/uio_usbdebug_intel.c
index 34b65f5..8d56b0d 100644
--- a/util/uio_usbdebug/uio_usbdebug_intel.c
+++ b/util/uio_usbdebug/uio_usbdebug_intel.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <arch/io.h>
diff --git a/util/viatool/Makefile b/util/viatool/Makefile
index 1658557..43f91b7 100644
--- a/util/viatool/Makefile
+++ b/util/viatool/Makefile
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 PROGRAM = viatool
diff --git a/util/viatool/cpu.c b/util/viatool/cpu.c
index d0f6623..a6a04b3 100644
--- a/util/viatool/cpu.c
+++ b/util/viatool/cpu.c
@@ -13,8 +13,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <fcntl.h>
diff --git a/util/viatool/viatool.c b/util/viatool/viatool.c
index a3a2f43..df9a784 100644
--- a/util/viatool/viatool.c
+++ b/util/viatool/viatool.c
@@ -16,8 +16,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdio.h>
diff --git a/util/viatool/viatool.h b/util/viatool/viatool.h
index 997c5ad..c42a0b4 100644
--- a/util/viatool/viatool.h
+++ b/util/viatool/viatool.h
@@ -15,8 +15,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
+ * along with this program.
  */
 
 #include <stdint.h>
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 46a30d1..80b2154 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -15,8 +15,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc.
+# along with this program.
 #
 
 TMPFILE=""



More information about the coreboot-gerrit mailing list