Remove address from GPLv2 headers

As per discussion with lawyers[tm], it's not a good idea to
shorten the license header too much - not for legal reasons
but because there are tools that look for them, and giving
them a standard pattern simplifies things.

However, we got confirmation that we don't have to update
every file ever added to coreboot whenever the FSF gets a
new lease, but can drop the address instead.

util/kconfig is excluded because that's imported code that
we may want to synchronize every now and then.

$ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, *MA[, ]*02110-1301[, ]*USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 59 Temple Place[-, ]*Suite 330, Boston, MA *02111-1307[, ]*USA:Foundation, Inc.:" {} +
$ find * -type f -exec sed -i "s:Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.:Foundation, Inc.:" {} +
$ find * -type f
	-a \! -name \*.patch \
	-a \! -name \*_shipped \
	-a \! -name LICENSE_GPL \
	-a \! -name LGPL.txt \
	-a \! -name COPYING \
	-a \! -name DISCLAIMER \
	-exec sed -i "/Foundation, Inc./ N;s:Foundation, Inc.* USA\.* *:Foundation, Inc. :;s:Foundation, Inc. $:Foundation, Inc.:" {} +

Change-Id: Icc968a5a5f3a5df8d32b940f9cdb35350654bef9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/9233
Tested-by: build bot (Jenkins)
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>

80 files changed, 80 insertions, 87 deletions

diff --git a/src/include/assert.h b/src/include/assert.h
index 669f8e5a46..085720b12c 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __ASSERT_H__
diff --git a/src/include/base3.h b/src/include/base3.h
index e92cc8bae7..7504ca6646 100644
--- a/src/include/base3.h
+++ b/src/include/base3.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __SRC_INCLUDE_BASE3_H__
diff --git a/src/include/bcd.h b/src/include/bcd.h
index a0850271b8..d10e185b92 100644
--- a/src/include/bcd.h
+++ b/src/include/bcd.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _BCD_H_
diff --git a/src/include/boardid.h b/src/include/boardid.h
index ce8dc6c19c..6023456026 100644
--- a/src/include/boardid.h
+++ b/src/include/boardid.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __INCLUDE_BOARDID_H__
diff --git a/src/include/bootmem.h b/src/include/bootmem.h
index 656769f8db..c9ef2cb774 100644
--- a/src/include/bootmem.h
+++ b/src/include/bootmem.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef BOOTMEM_H
diff --git a/src/include/bootmode.h b/src/include/bootmode.h
index bad17af27d..da4e070607 100644
--- a/src/include/bootmode.h
+++ b/src/include/bootmode.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __BOOTMODE_H__
diff --git a/src/include/bootstate.h b/src/include/bootstate.h
index 8b5e4be62f..4952780560 100644
--- a/src/include/bootstate.h
+++ b/src/include/bootstate.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef BOOTSTATE_H
 #define BOOTSTATE_H
diff --git a/src/include/cbfs.h b/src/include/cbfs.h
index 1d7917cf31..8db87e3885 100644
--- a/src/include/cbfs.h
+++ b/src/include/cbfs.h
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h
index c71cc26e78..f00a26cc46 100644
--- a/src/include/cbfs_core.h
+++ b/src/include/cbfs_core.h
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h
index 95dcb1a650..df388570bf 100644
--- a/src/include/cbfs_serialized.h
+++ b/src/include/cbfs_serialized.h
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  * ---------------------------------------------------------------------------
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/src/include/cbmem.h b/src/include/cbmem.h
index 08c1d647bd..20cc174d05 100644
--- a/src/include/cbmem.h
+++ b/src/include/cbmem.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _CBMEM_H_
diff --git a/src/include/console/cbmem_console.h b/src/include/console/cbmem_console.h
index 8f7fcb262f..e9ec66ee9e 100644
--- a/src/include/console/cbmem_console.h
+++ b/src/include/console/cbmem_console.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 #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 65e65bbd57..dea5c690b5 100644
--- a/src/include/console/console.h
+++ b/src/include/console/console.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CONSOLE_CONSOLE_H_
diff --git a/src/include/console/early_print.h b/src/include/console/early_print.h
index f719e7106e..4771a430ae 100644
--- a/src/include/console/early_print.h
+++ b/src/include/console/early_print.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __CONSOLE_EARLY_PRINT_H_
diff --git a/src/include/console/ne2k.h b/src/include/console/ne2k.h
index 16cecb5ccd..d839a7cc0d 100644
--- a/src/include/console/ne2k.h
+++ b/src/include/console/ne2k.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _NE2K_H__
diff --git a/src/include/console/post_codes.h b/src/include/console/post_codes.h
index b2db2da7d5..5227e7a938 100644
--- a/src/include/console/post_codes.h
+++ b/src/include/console/post_codes.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /**
diff --git a/src/include/console/streams.h b/src/include/console/streams.h
index 892ae40f1c..1c6806da4e 100644
--- a/src/include/console/streams.h
+++ b/src/include/console/streams.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _CONSOLE_STREAMS_H_
diff --git a/src/include/console/uart.h b/src/include/console/uart.h
index 1304003c8a..d8fb095eb8 100644
--- a/src/include/console/uart.h
+++ b/src/include/console/uart.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CONSOLE_UART_H
diff --git a/src/include/console/usb.h b/src/include/console/usb.h
index b5aab66649..0ef1d05dfc 100644
--- a/src/include/console/usb.h
+++ b/src/include/console/usb.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _CONSOLE_USB_H_
diff --git a/src/include/console/vtxprintf.h b/src/include/console/vtxprintf.h
index 3f0c63e299..5543877059 100644
--- a/src/include/console/vtxprintf.h
+++ b/src/include/console/vtxprintf.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __CONSOLE_VTXPRINTF_H
diff --git a/src/include/cpu/amd/amdfam10_sysconf.h b/src/include/cpu/amd/amdfam10_sysconf.h
index 261c2dbaf7..89fcd7cf9a 100644
--- a/src/include/cpu/amd/amdfam10_sysconf.h
+++ b/src/include/cpu/amd/amdfam10_sysconf.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef AMDFAM10_SYSCONF_H
diff --git a/src/include/cpu/amd/amdfam12.h b/src/include/cpu/amd/amdfam12.h
index 896d30c5b6..3ffd452d3c 100644
--- a/src/include/cpu/amd/amdfam12.h
+++ b/src/include/cpu/amd/amdfam12.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_AMD_FAM12_H
diff --git a/src/include/cpu/amd/amdfam14.h b/src/include/cpu/amd/amdfam14.h
index d8b8843410..db5759565b 100644
--- a/src/include/cpu/amd/amdfam14.h
+++ b/src/include/cpu/amd/amdfam14.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_AMD_FAM14_H
diff --git a/src/include/cpu/amd/amdfam15.h b/src/include/cpu/amd/amdfam15.h
index 67e7cee5df..a31b534acd 100644
--- a/src/include/cpu/amd/amdfam15.h
+++ b/src/include/cpu/amd/amdfam15.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_AMD_FAM15_H
diff --git a/src/include/cpu/amd/amdfam16.h b/src/include/cpu/amd/amdfam16.h
index 7097372400..0b325ad048 100644
--- a/src/include/cpu/amd/amdfam16.h
+++ b/src/include/cpu/amd/amdfam16.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_AMD_FAM16_H
diff --git a/src/include/cpu/amd/common/cbtypes.h b/src/include/cpu/amd/common/cbtypes.h
index fd8d960f8e..346f1a31a4 100644
--- a/src/include/cpu/amd/common/cbtypes.h
+++ b/src/include/cpu/amd/common/cbtypes.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _CBTYPES_H_
diff --git a/src/include/cpu/amd/lxdef.h b/src/include/cpu/amd/lxdef.h
index da26895847..3061339ba3 100644
--- a/src/include/cpu/amd/lxdef.h
+++ b/src/include/cpu/amd/lxdef.h
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #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 84f0ff5436..6c7decead8 100644
--- a/src/include/cpu/amd/model_10xxx_msr.h
+++ b/src/include/cpu/amd/model_10xxx_msr.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #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 929b1f3be5..b38f85ca01 100644
--- a/src/include/cpu/amd/model_10xxx_rev.h
+++ b/src/include/cpu/amd/model_10xxx_rev.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #include <arch/cpu.h>
diff --git a/src/include/cpu/amd/multicore.h b/src/include/cpu/amd/multicore.h
index c8712232c9..32f749f7c9 100644
--- a/src/include/cpu/amd/multicore.h
+++ b/src/include/cpu/amd/multicore.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_AMD_QUADCORE_H
diff --git a/src/include/cpu/amd/powernow.h b/src/include/cpu/amd/powernow.h
index c7313a9fd4..85356bd7a4 100644
--- a/src/include/cpu/amd/powernow.h
+++ b/src/include/cpu/amd/powernow.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef POWERNOW_H
diff --git a/src/include/cpu/intel/l2_cache.h b/src/include/cpu/intel/l2_cache.h
index a31fd9c534..0b7d77d717 100644
--- a/src/include/cpu/intel/l2_cache.h
+++ b/src/include/cpu/intel/l2_cache.h
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* 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 3d1c23ab32..d2fa1b755f 100644
--- a/src/include/cpu/intel/microcode.h
+++ b/src/include/cpu/intel/microcode.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #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 eb8b50607c..ea7cb7d2c8 100644
--- a/src/include/cpu/intel/speedstep.h
+++ b/src/include/cpu/intel/speedstep.h
@@ -16,8 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_INTEL_SPEEDSTEP_H
diff --git a/src/include/cpu/intel/turbo.h b/src/include/cpu/intel/turbo.h
index b60c8cf817..e6b27fe227 100644
--- a/src/include/cpu/intel/turbo.h
+++ b/src/include/cpu/intel/turbo.h
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _CPU_INTEL_TURBO_H
diff --git a/src/include/cpu/x86/cache.h b/src/include/cpu/x86/cache.h
index a4d976f156..f0c8348e6d 100644
--- a/src/include/cpu/x86/cache.h
+++ b/src/include/cpu/x86/cache.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_X86_CACHE
diff --git a/src/include/cpu/x86/cr.h b/src/include/cpu/x86/cr.h
index 1d9db8807d..4d2be3a77a 100644
--- a/src/include/cpu/x86/cr.h
+++ b/src/include/cpu/x86/cr.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #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 260b158d1f..8525a3cd44 100644
--- a/src/include/cpu/x86/gdt.h
+++ b/src/include/cpu/x86/gdt.h
@@ -12,7 +12,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_X86_GDT
diff --git a/src/include/cpu/x86/mp.h b/src/include/cpu/x86/mp.h
index 7e90ee43c7..c27eebaa5a 100644
--- a/src/include/cpu/x86/mp.h
+++ b/src/include/cpu/x86/mp.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _X86_MP_H_
diff --git a/src/include/cpu/x86/name.h b/src/include/cpu/x86/name.h
index 2fec878ae1..e58adb6bec 100644
--- a/src/include/cpu/x86/name.h
+++ b/src/include/cpu/x86/name.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef CPU_X86_NAME_H
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index adaf74b7ae..6992774040 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* AMD64 SMM State-Save Area
diff --git a/src/include/device/azalia.h b/src/include/device/azalia.h
index 1f672fed36..feace4da11 100644
--- a/src/include/device/azalia.h
+++ b/src/include/device/azalia.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef AZALIA_H_
 #define AZALIA_H_
diff --git a/src/include/device/azalia_device.h b/src/include/device/azalia_device.h
index 68c292a447..cbd5a030fd 100644
--- a/src/include/device/azalia_device.h
+++ b/src/include/device/azalia_device.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef DEVICE_AZALIA_H
diff --git a/src/include/device/i2c.h b/src/include/device/i2c.h
index c1f2a2103a..3dbc9ed064 100644
--- a/src/include/device/i2c.h
+++ b/src/include/device/i2c.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _DEVICE_I2C_H_
diff --git a/src/include/device/pci_ehci.h b/src/include/device/pci_ehci.h
index bd6b9698fb..33f42b1a5c 100644
--- a/src/include/device/pci_ehci.h
+++ b/src/include/device/pci_ehci.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _PCI_EHCI_H_
diff --git a/src/include/edid.h b/src/include/edid.h
index 9a1fda5d44..f77517773d 100644
--- a/src/include/edid.h
+++ b/src/include/edid.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef EDID_H
diff --git a/src/include/elog.h b/src/include/elog.h
index 5d360817da..ee7a0e2e75 100644
--- a/src/include/elog.h
+++ b/src/include/elog.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef ELOG_H_
diff --git a/src/include/endian.h b/src/include/endian.h
index ce6d7c3c21..d9199b4f95 100644
--- a/src/include/endian.h
+++ b/src/include/endian.h
@@ -13,8 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Foundation, Inc.
  */
 
 #ifndef _ENDIAN_H_
diff --git a/src/include/gic.h b/src/include/gic.h
index 2514420563..d46922d4e6 100644
--- a/src/include/gic.h
+++ b/src/include/gic.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef GIC_H
diff --git a/src/include/gpio.h b/src/include/gpio.h
index 7b64ebfe80..8cbf6ad2de 100644
--- a/src/include/gpio.h
+++ b/src/include/gpio.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __SRC_INCLUDE_GPIO_H__
diff --git a/src/include/halt.h b/src/include/halt.h
index 6b7d753514..bd3511ef97 100644
--- a/src/include/halt.h
+++ b/src/include/halt.h
@@ -15,8 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __HALT_H__
diff --git a/src/include/lib.h b/src/include/lib.h
index aa8fe4d792..7ad33dd552 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This file is for "nuisance prototypes" that have no other home. */
diff --git a/src/include/memlayout.h b/src/include/memlayout.h
index 263dc5ceda..651e60dc68 100644
--- a/src/include/memlayout.h
+++ b/src/include/memlayout.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* This file contains macro definitions for memlayout.ld linker scripts. */
diff --git a/src/include/memrange.h b/src/include/memrange.h
index 048c28754d..9016293963 100644
--- a/src/include/memrange.h
+++ b/src/include/memrange.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef MEMRANGE_H_
 #define MEMRANGE_H_
diff --git a/src/include/pc80/i8254.h b/src/include/pc80/i8254.h
index 964cc974d9..92077d02bb 100644
--- a/src/include/pc80/i8254.h
+++ b/src/include/pc80/i8254.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef PC80_I8254_H
diff --git a/src/include/pc80/i8259.h b/src/include/pc80/i8259.h
index 561fc5c863..2ac3b9e89a 100644
--- a/src/include/pc80/i8259.h
+++ b/src/include/pc80/i8259.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef PC80_I8259_H
diff --git a/src/include/pc80/vga.h b/src/include/pc80/vga.h
index 07add63d0f..38efc3bb25 100644
--- a/src/include/pc80/vga.h
+++ b/src/include/pc80/vga.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef VGA_H
diff --git a/src/include/pc80/vga_io.h b/src/include/pc80/vga_io.h
index 2b85eaca4b..e3bc0716b1 100644
--- a/src/include/pc80/vga_io.h
+++ b/src/include/pc80/vga_io.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef VGA_IO_H
diff --git a/src/include/program_loading.h b/src/include/program_loading.h
index 5fc0fd604a..981bd7b557 100644
--- a/src/include/program_loading.h
+++ b/src/include/program_loading.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef PROGRAM_LOADING_H
 #define PROGRAM_LOADING_H
diff --git a/src/include/reg_script.h b/src/include/reg_script.h
index 0c0ea01ce5..16cd8bbce5 100644
--- a/src/include/reg_script.h
+++ b/src/include/reg_script.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef REG_SCRIPT_H
diff --git a/src/include/rmodule-defs.h b/src/include/rmodule-defs.h
index 4139ef3d41..d61837f67d 100644
--- a/src/include/rmodule-defs.h
+++ b/src/include/rmodule-defs.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef RMODULE_DEFS_H
 #define RMODULE_DEFS_H
diff --git a/src/include/rmodule.h b/src/include/rmodule.h
index 242ed91f8b..c42614a833 100644
--- a/src/include/rmodule.h
+++ b/src/include/rmodule.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef RMODULE_H
 #define RMODULE_H
diff --git a/src/include/romstage_handoff.h b/src/include/romstage_handoff.h
index 09934ca442..b92c88492d 100644
--- a/src/include/romstage_handoff.h
+++ b/src/include/romstage_handoff.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef ROMSTAGE_HANDOFF_H
 #define ROMSTAGE_HANDOFF_H
diff --git a/src/include/rtc.h b/src/include/rtc.h
index ba9a9c351d..afe1bb5175 100644
--- a/src/include/rtc.h
+++ b/src/include/rtc.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _RTC_H_
diff --git a/src/include/rules.h b/src/include/rules.h
index 1a27fc6fcc..523031a809 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _RULES_H
diff --git a/src/include/sdram_mode.h b/src/include/sdram_mode.h
index 41462407ce..34ae127271 100644
--- a/src/include/sdram_mode.h
+++ b/src/include/sdram_mode.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+ * Foundation, Inc.
  */
 
 /*
diff --git a/src/include/smbios.h b/src/include/smbios.h
index c6132ec0fa..66d2b2f541 100644
--- a/src/include/smbios.h
+++ b/src/include/smbios.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef SMBIOS_H
diff --git a/src/include/spd.h b/src/include/spd.h
index ef0cf5a6a1..a0e39ff25a 100644
--- a/src/include/spd.h
+++ b/src/include/spd.h
@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /*
diff --git a/src/include/spd_cache.h b/src/include/spd_cache.h
index 64e3aab799..e12ea6d547 100644
--- a/src/include/spd_cache.h
+++ b/src/include/spd_cache.h
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef _SPD_CACHE_H_
diff --git a/src/include/spd_ddr2.h b/src/include/spd_ddr2.h
index 1e68599f32..6d7b061a39 100644
--- a/src/include/spd_ddr2.h
+++ b/src/include/spd_ddr2.h
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 /* SPDs for DDR2 SDRAM */
diff --git a/src/include/spi-generic.h b/src/include/spi-generic.h
index 4de138cf09..36bbb227e2 100644
--- a/src/include/spi-generic.h
+++ b/src/include/spi-generic.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Foundation, Inc.
  */
 
 #ifndef _SPI_GENERIC_H_
diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index 19df269cb0..24a5ab23bb 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * Foundation, Inc.
  */
 #ifndef _SPI_FLASH_H_
 #define _SPI_FLASH_H_
diff --git a/src/include/superio/conf_mode.h b/src/include/superio/conf_mode.h
index 2aca8c1472..4b8776cb7f 100644
--- a/src/include/superio/conf_mode.h
+++ b/src/include/superio/conf_mode.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef DEVICE_PNP_CONF_MODE_H
diff --git a/src/include/symbols.h b/src/include/symbols.h
index 279c5a214a..b47c88623c 100644
--- a/src/include/symbols.h
+++ b/src/include/symbols.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __SYMBOLS_H
diff --git a/src/include/thread.h b/src/include/thread.h
index 306aad670b..834ac5c00f 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef THREAD_H_
 #define THREAD_H_
diff --git a/src/include/timer.h b/src/include/timer.h
index 243edb933c..aa5746dbdc 100644
--- a/src/include/timer.h
+++ b/src/include/timer.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 #ifndef TIMER_H
 #define TIMER_H
diff --git a/src/include/timestamp.h b/src/include/timestamp.h
index a6bfced89e..d9afeea0c1 100644
--- a/src/include/timestamp.h
+++ b/src/include/timestamp.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __TIMESTAMP_H__
diff --git a/src/include/tpm.h b/src/include/tpm.h
index e25ad6ab26..464f32ed8a 100644
--- a/src/include/tpm.h
+++ b/src/include/tpm.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef TPM_H_
diff --git a/src/include/trace.h b/src/include/trace.h
index 79d35c9af1..724efc0880 100644
--- a/src/include/trace.h
+++ b/src/include/trace.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __TRACE_H
diff --git a/src/include/types.h b/src/include/types.h
index 24ebfafc54..4fbde6ed9b 100644
--- a/src/include/types.h
+++ b/src/include/types.h
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc.
  */
 
 #ifndef __TYPES_H