summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/acpi/acpidump-all2
-rw-r--r--util/bimgtool/bimgtool.c3
-rwxr-xr-xutil/board_status/getrevision.sh2
-rw-r--r--util/cbfstool/cbfs-mkpayload.c2
-rw-r--r--util/cbfstool/cbfs-mkstage.c2
-rw-r--r--util/cbfstool/cbfs-payload-linux.c2
-rw-r--r--util/cbfstool/cbfs.h2
-rw-r--r--util/cbfstool/cbfs_image.c2
-rw-r--r--util/cbfstool/cbfs_image.h2
-rw-r--r--util/cbfstool/cbfs_sections.c2
-rw-r--r--util/cbfstool/cbfs_sections.h2
-rw-r--r--util/cbfstool/cbfstool.c2
-rw-r--r--util/cbfstool/coff.h2
-rw-r--r--util/cbfstool/common.c2
-rw-r--r--util/cbfstool/common.h2
-rw-r--r--util/cbfstool/compress.c2
-rw-r--r--util/cbfstool/elf.h3
-rw-r--r--util/cbfstool/elfheaders.c2
-rw-r--r--util/cbfstool/elfparsing.h2
-rw-r--r--util/cbfstool/fit.c2
-rw-r--r--util/cbfstool/fit.h2
-rw-r--r--util/cbfstool/flashmap_tests.c2
-rw-r--r--util/cbfstool/fmap_from_fmd.c2
-rw-r--r--util/cbfstool/fmap_from_fmd.h2
-rw-r--r--util/cbfstool/fmaptool.c2
-rw-r--r--util/cbfstool/fmd.c2
-rw-r--r--util/cbfstool/fmd.h2
-rw-r--r--util/cbfstool/fmd_parser.y2
-rw-r--r--util/cbfstool/fmd_scanner.c_shipped2
-rw-r--r--util/cbfstool/fmd_scanner.l2
-rw-r--r--util/cbfstool/fv.h2
-rw-r--r--util/cbfstool/linux.h2
-rw-r--r--util/cbfstool/linux_trampoline.c2
-rw-r--r--util/cbfstool/linux_trampoline.h2
-rw-r--r--util/cbfstool/option.h2
-rw-r--r--util/cbfstool/partitioned_file.c2
-rw-r--r--util/cbfstool/partitioned_file.h2
-rw-r--r--util/cbfstool/rmodtool.c2
-rw-r--r--util/cbfstool/rmodule.c2
-rw-r--r--util/cbfstool/rmodule.h2
-rw-r--r--util/cbfstool/xdr.c2
-rw-r--r--util/cbmem/Makefile2
-rw-r--r--util/cbmem/cbmem.c2
-rwxr-xr-xutil/crossgcc/buildgcc2
-rwxr-xr-xutil/dtd_parser/dtd_parser.py2
-rw-r--r--util/ectool/Makefile2
-rw-r--r--util/ectool/ec.c2
-rw-r--r--util/ectool/ec.h2
-rw-r--r--util/ectool/ectool.c2
-rwxr-xr-xutil/genbuild_h/genbuild_h.sh2
-rw-r--r--util/ifdfake/Makefile2
-rw-r--r--util/ifdfake/ifdfake.c2
-rw-r--r--util/ifdtool/Makefile2
-rw-r--r--util/ifdtool/ifdtool.c2
-rw-r--r--util/ifdtool/ifdtool.h2
-rw-r--r--util/inteltool/Makefile2
-rw-r--r--util/inteltool/amb.c2
-rw-r--r--util/inteltool/cpu.c2
-rw-r--r--util/inteltool/gpio.c2
-rw-r--r--util/inteltool/inteltool.c2
-rw-r--r--util/inteltool/inteltool.h2
-rw-r--r--util/inteltool/ivy_memory.c2
-rw-r--r--util/inteltool/memory.c2
-rw-r--r--util/inteltool/pcie.c2
-rw-r--r--util/inteltool/powermgt.c2
-rw-r--r--util/inteltool/rootcmplx.c2
-rw-r--r--util/k8resdump/Makefile2
-rw-r--r--util/k8resdump/k8resdump.c2
-rwxr-xr-xutil/lint/lint-000-license-headers4
-rwxr-xr-xutil/lint/lint-001-no-global-config-in-romstage2
-rwxr-xr-xutil/lint/lint-stable-003-whitespace2
-rwxr-xr-xutil/lint/lint-stable-004-style-labels2
-rwxr-xr-xutil/lint/lint-stable-005-board-status2
-rw-r--r--util/msrtool/Makefile.in2
-rwxr-xr-xutil/msrtool/configure2
-rw-r--r--util/msrtool/cs5536.c2
-rw-r--r--util/msrtool/darwin.c2
-rw-r--r--util/msrtool/freebsd.c2
-rw-r--r--util/msrtool/geodegx2.c2
-rw-r--r--util/msrtool/geodelx.c2
-rw-r--r--util/msrtool/intel_atom.c2
-rw-r--r--util/msrtool/intel_core1.c2
-rw-r--r--util/msrtool/intel_core2_early.c2
-rw-r--r--util/msrtool/intel_core2_later.c2
-rw-r--r--util/msrtool/intel_nehalem.c2
-rw-r--r--util/msrtool/intel_pentium3.c2
-rw-r--r--util/msrtool/intel_pentium3_early.c2
-rw-r--r--util/msrtool/intel_pentium4_early.c2
-rw-r--r--util/msrtool/intel_pentium4_later.c2
-rw-r--r--util/msrtool/k8.c2
-rw-r--r--util/msrtool/linux.c2
-rw-r--r--util/msrtool/msrtool.c2
-rw-r--r--util/msrtool/msrtool.h2
-rw-r--r--util/msrtool/msrutils.c2
-rw-r--r--util/msrtool/sys.c2
-rw-r--r--util/nvramtool/Makefile2
-rw-r--r--util/nvramtool/Makefile.inc2
-rw-r--r--util/nvramtool/accessors/layout-bin.c3
-rw-r--r--util/nvramtool/accessors/layout-common.c3
-rw-r--r--util/nvramtool/accessors/layout-text.c3
-rw-r--r--util/nvramtool/accessors/layout-text.h3
-rw-r--r--util/nvramtool/cbfs.c2
-rw-r--r--util/nvramtool/cbfs.h2
-rw-r--r--util/nvramtool/cli/nvramtool.83
-rw-r--r--util/nvramtool/cli/nvramtool.c3
-rw-r--r--util/nvramtool/cli/opts.c3
-rw-r--r--util/nvramtool/cli/opts.h3
-rw-r--r--util/nvramtool/cmos_lowlevel.c3
-rw-r--r--util/nvramtool/cmos_lowlevel.h3
-rw-r--r--util/nvramtool/cmos_ops.c3
-rw-r--r--util/nvramtool/cmos_ops.h3
-rw-r--r--util/nvramtool/common.c3
-rw-r--r--util/nvramtool/common.h3
-rw-r--r--util/nvramtool/input_file.c3
-rw-r--r--util/nvramtool/input_file.h3
-rw-r--r--util/nvramtool/layout.c3
-rw-r--r--util/nvramtool/layout.h3
-rw-r--r--util/nvramtool/lbtable.c3
-rw-r--r--util/nvramtool/lbtable.h3
-rw-r--r--util/nvramtool/reg_expr.c3
-rw-r--r--util/nvramtool/reg_expr.h3
-rw-r--r--util/optionlist/Makefile2
-rwxr-xr-xutil/optionlist/kconfig2wiki2
-rw-r--r--util/romcc/COPYING2
-rw-r--r--util/sconfig/lex.yy.c_shipped2
-rw-r--r--util/sconfig/main.c2
-rw-r--r--util/sconfig/sconfig.h2
-rwxr-xr-xutil/sconfig/sconfig.l2
-rw-r--r--util/sconfig/sconfig.tab.c_shipped2
-rwxr-xr-xutil/sconfig/sconfig.y2
-rw-r--r--util/showdevicetree/showdt.c2
-rw-r--r--util/superiotool/Makefile2
-rw-r--r--util/superiotool/ali.c2
-rw-r--r--util/superiotool/amd.c2
-rw-r--r--util/superiotool/fintek.c2
-rw-r--r--util/superiotool/infineon.c2
-rw-r--r--util/superiotool/ite.c2
-rw-r--r--util/superiotool/nsc.c2
-rw-r--r--util/superiotool/nuvoton.c2
-rw-r--r--util/superiotool/pci.c2
-rw-r--r--util/superiotool/serverengines.c2
-rw-r--r--util/superiotool/smsc.c2
-rw-r--r--util/superiotool/superiotool.c2
-rw-r--r--util/superiotool/superiotool.h2
-rw-r--r--util/superiotool/via.c2
-rw-r--r--util/superiotool/winbond.c2
-rw-r--r--util/uio_usbdebug/console/printk.c2
-rw-r--r--util/uio_usbdebug/drivers/usb/pci_ehci.c2
-rw-r--r--util/uio_usbdebug/include/device/device.h2
-rw-r--r--util/uio_usbdebug/linux/uio_ehci_pci.c2
-rw-r--r--util/uio_usbdebug/uio_usbdebug.c2
-rw-r--r--util/uio_usbdebug/uio_usbdebug_intel.c2
-rw-r--r--util/viatool/Makefile2
-rw-r--r--util/viatool/cpu.c2
-rw-r--r--util/viatool/viatool.c2
-rw-r--r--util/viatool/viatool.h2
-rwxr-xr-xutil/xcompile/xcompile2
157 files changed, 158 insertions, 182 deletions
diff --git a/util/acpi/acpidump-all b/util/acpi/acpidump-all
index aa73a15d992c..77c328281ffd 100755
--- a/util/acpi/acpidump-all
+++ b/util/acpi/acpidump-all
@@ -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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc.
#
rm -rf out
diff --git a/util/bimgtool/bimgtool.c b/util/bimgtool/bimgtool.c
index b7b64912f099..a970234ffec8 100644
--- a/util/bimgtool/bimgtool.c
+++ b/util/bimgtool/bimgtool.c
@@ -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.
*/
#include <errno.h>
diff --git a/util/board_status/getrevision.sh b/util/board_status/getrevision.sh
index 9a949ffbb9f1..8423339bf092 100755
--- a/util/board_status/getrevision.sh
+++ b/util/board_status/getrevision.sh
@@ -18,7 +18,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.
#
EXIT_SUCCESS=0
diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c
index 5bebf51440fb..fcf691013ae2 100644
--- a/util/cbfstool/cbfs-mkpayload.c
+++ b/util/cbfstool/cbfs-mkpayload.c
@@ -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.
*/
#include <stdio.h>
diff --git a/util/cbfstool/cbfs-mkstage.c b/util/cbfstool/cbfs-mkstage.c
index d8ca7acb4409..f94d0da29994 100644
--- a/util/cbfstool/cbfs-mkstage.c
+++ b/util/cbfstool/cbfs-mkstage.c
@@ -17,7 +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., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ * Foundation, Inc.
*/
#include <inttypes.h>
diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c
index 0a230b290da0..b73c4312c28d 100644
--- a/util/cbfstool/cbfs-payload-linux.c
+++ b/util/cbfstool/cbfs-payload-linux.c
@@ -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 <stdio.h>
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h
index ef3959450ab0..befdb2fc4bde 100644
--- a/util/cbfstool/cbfs.h
+++ b/util/cbfstool/cbfs.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 __CBFS_H
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c
index 8fb2a60f36aa..2ce4bdd57211 100644
--- a/util/cbfstool/cbfs_image.c
+++ b/util/cbfstool/cbfs_image.c
@@ -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 <inttypes.h>
diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h
index 5ff8a9abef43..5df5dd271a67 100644
--- a/util/cbfstool/cbfs_image.h
+++ b/util/cbfstool/cbfs_image.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 __CBFS_IMAGE_H
diff --git a/util/cbfstool/cbfs_sections.c b/util/cbfstool/cbfs_sections.c
index 81912d5b96f7..249ea956a74f 100644
--- a/util/cbfstool/cbfs_sections.c
+++ b/util/cbfstool/cbfs_sections.c
@@ -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 "cbfs_sections.h"
diff --git a/util/cbfstool/cbfs_sections.h b/util/cbfstool/cbfs_sections.h
index 5a23899de252..4d14fa931f12 100644
--- a/util/cbfstool/cbfs_sections.h
+++ b/util/cbfstool/cbfs_sections.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 CBFS_SECTIONS_H_
diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c
index 68a83e7b4094..bd84b01e5b1b 100644
--- a/util/cbfstool/cbfstool.c
+++ b/util/cbfstool/cbfstool.c
@@ -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.
*/
#include <stdio.h>
diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h
index ee9de4e0f950..879356694244 100644
--- a/util/cbfstool/coff.h
+++ b/util/cbfstool/coff.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.
*/
#define DOS_MAGIC 0x5a4d
diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c
index 8773fe49c8b0..fffd096b7630 100644
--- a/util/cbfstool/common.c
+++ b/util/cbfstool/common.c
@@ -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.
*/
#include <stdio.h>
diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h
index ddec1a7e6806..7fa7c7e39bc1 100644
--- a/util/cbfstool/common.h
+++ b/util/cbfstool/common.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 __CBFSTOOL_COMMON_H
diff --git a/util/cbfstool/compress.c b/util/cbfstool/compress.c
index 9f865fb3274f..ab94b353290c 100644
--- a/util/cbfstool/compress.c
+++ b/util/cbfstool/compress.c
@@ -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.
*/
#include <string.h>
diff --git a/util/cbfstool/elf.h b/util/cbfstool/elf.h
index f6356c63b36f..675fd2229f15 100644
--- a/util/cbfstool/elf.h
+++ b/util/cbfstool/elf.h
@@ -14,8 +14,7 @@
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., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ Software Foundation, Inc. */
#ifndef _ELF_H
#define _ELF_H 1
diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index 7dc5e6568d01..4cf3534a232d 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -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 <stdio.h>
diff --git a/util/cbfstool/elfparsing.h b/util/cbfstool/elfparsing.h
index 0db1c595a294..f7d3c23d3b5a 100644
--- a/util/cbfstool/elfparsing.h
+++ b/util/cbfstool/elfparsing.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 ELFPARSING_H
diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c
index 7dbfc51bc078..0a7bea5725f8 100644
--- a/util/cbfstool/fit.c
+++ b/util/cbfstool/fit.c
@@ -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 <stdint.h>
diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h
index 63e22f4a2bbe..3f3185c75835 100644
--- a/util/cbfstool/fit.h
+++ b/util/cbfstool/fit.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 __CBFSTOOL_FIT_H
diff --git a/util/cbfstool/flashmap_tests.c b/util/cbfstool/flashmap_tests.c
index c54528577801..547931ac2f64 100644
--- a/util/cbfstool/flashmap_tests.c
+++ b/util/cbfstool/flashmap_tests.c
@@ -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 "flashmap/fmap.h"
diff --git a/util/cbfstool/fmap_from_fmd.c b/util/cbfstool/fmap_from_fmd.c
index 267174386be2..45ee2e8c4f45 100644
--- a/util/cbfstool/fmap_from_fmd.c
+++ b/util/cbfstool/fmap_from_fmd.c
@@ -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 "fmap_from_fmd.h"
diff --git a/util/cbfstool/fmap_from_fmd.h b/util/cbfstool/fmap_from_fmd.h
index 689c859ddc41..1e4da01efad6 100644
--- a/util/cbfstool/fmap_from_fmd.h
+++ b/util/cbfstool/fmap_from_fmd.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 FMAP_FROM_FMD_H_
diff --git a/util/cbfstool/fmaptool.c b/util/cbfstool/fmaptool.c
index 09b68d23bfad..d0720be0e930 100644
--- a/util/cbfstool/fmaptool.c
+++ b/util/cbfstool/fmaptool.c
@@ -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 "common.h"
diff --git a/util/cbfstool/fmd.c b/util/cbfstool/fmd.c
index a4430bed5852..1d769f619c5b 100644
--- a/util/cbfstool/fmd.c
+++ b/util/cbfstool/fmd.c
@@ -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 "fmd.h"
diff --git a/util/cbfstool/fmd.h b/util/cbfstool/fmd.h
index ff54cbfb4ad2..9a22a96e975a 100644
--- a/util/cbfstool/fmd.h
+++ b/util/cbfstool/fmd.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 FMD_H_
diff --git a/util/cbfstool/fmd_parser.y b/util/cbfstool/fmd_parser.y
index 2327ae4fbea6..caa2beb45f1b 100644
--- a/util/cbfstool/fmd_parser.y
+++ b/util/cbfstool/fmd_parser.y
@@ -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.
*/
%{
diff --git a/util/cbfstool/fmd_scanner.c_shipped b/util/cbfstool/fmd_scanner.c_shipped
index d0d93d3ce951..6cc22fb405b5 100644
--- a/util/cbfstool/fmd_scanner.c_shipped
+++ b/util/cbfstool/fmd_scanner.c_shipped
@@ -488,7 +488,7 @@ char *yytext;
*
* You 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.
*/
#line 21 "fmd_scanner.l"
#include "fmd_parser.h"
diff --git a/util/cbfstool/fmd_scanner.l b/util/cbfstool/fmd_scanner.l
index 0a582105f398..439548e495d1 100644
--- a/util/cbfstool/fmd_scanner.l
+++ b/util/cbfstool/fmd_scanner.l
@@ -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.
*/
%{
diff --git a/util/cbfstool/fv.h b/util/cbfstool/fv.h
index 1988da358810..0bb176cf71cf 100644
--- a/util/cbfstool/fv.h
+++ b/util/cbfstool/fv.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.
*/
#define FV_SIGNATURE 0x4856465f
diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h
index ae747e6c5ecb..0c8f9b46ab14 100644
--- a/util/cbfstool/linux.h
+++ b/util/cbfstool/linux.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.
*/
/*
diff --git a/util/cbfstool/linux_trampoline.c b/util/cbfstool/linux_trampoline.c
index 649bb64b0e68..6bbdc4f78a09 100644
--- a/util/cbfstool/linux_trampoline.c
+++ b/util/cbfstool/linux_trampoline.c
@@ -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.
*/
#if 0
diff --git a/util/cbfstool/linux_trampoline.h b/util/cbfstool/linux_trampoline.h
index ed5b82482543..aebcb10d9955 100644
--- a/util/cbfstool/linux_trampoline.h
+++ b/util/cbfstool/linux_trampoline.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/util/cbfstool/option.h b/util/cbfstool/option.h
index 70777f872f14..4c71cadf1706 100644
--- a/util/cbfstool/option.h
+++ b/util/cbfstool/option.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 OPTION_H_
diff --git a/util/cbfstool/partitioned_file.c b/util/cbfstool/partitioned_file.c
index 4e1a8b56ada0..9d67832a54a2 100644
--- a/util/cbfstool/partitioned_file.c
+++ b/util/cbfstool/partitioned_file.c
@@ -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 "partitioned_file.h"
diff --git a/util/cbfstool/partitioned_file.h b/util/cbfstool/partitioned_file.h
index 92f228e88f17..45833161e4ff 100644
--- a/util/cbfstool/partitioned_file.h
+++ b/util/cbfstool/partitioned_file.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 PARITITONED_FILE_H_
diff --git a/util/cbfstool/rmodtool.c b/util/cbfstool/rmodtool.c
index 1455cd9a3b12..188d74998b29 100644
--- a/util/cbfstool/rmodtool.c
+++ b/util/cbfstool/rmodtool.c
@@ -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 <stdio.h>
diff --git a/util/cbfstool/rmodule.c b/util/cbfstool/rmodule.c
index fa175db78928..8d8772d8185f 100644
--- a/util/cbfstool/rmodule.c
+++ b/util/cbfstool/rmodule.c
@@ -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.
*/
#include <inttypes.h>
diff --git a/util/cbfstool/rmodule.h b/util/cbfstool/rmodule.h
index 94f8f3d064f8..4531f8d0b98e 100644
--- a/util/cbfstool/rmodule.h
+++ b/util/cbfstool/rmodule.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 TOOL_RMODULE_H
diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c
index df2c4ba4a0bd..1949fa6e9c48 100644
--- a/util/cbfstool/xdr.c
+++ b/util/cbfstool/xdr.c
@@ -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 <stdio.h>
diff --git a/util/cbmem/Makefile b/util/cbmem/Makefile
index fe9e9234f924..1e75345c6849 100644
--- a/util/cbmem/Makefile
+++ b/util/cbmem/Makefile
@@ -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.
##
PROGRAM = cbmem
diff --git a/util/cbmem/cbmem.c b/util/cbmem/cbmem.c
index 3c6eee4793fc..e294c20578f4 100644
--- a/util/cbmem/cbmem.c
+++ b/util/cbmem/cbmem.c
@@ -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 <inttypes.h>
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 02a7d82cfad9..15bcd9209d28 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -17,7 +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., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA
+# Foundation, Inc.
#
cd `dirname $0`
diff --git a/util/dtd_parser/dtd_parser.py b/util/dtd_parser/dtd_parser.py
index 23cc7e769e72..8b5c75e50eb8 100755
--- a/util/dtd_parser/dtd_parser.py
+++ b/util/dtd_parser/dtd_parser.py
@@ -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.
#
'''
diff --git a/util/ectool/Makefile b/util/ectool/Makefile
index 539e71e9b8b4..3ab0bc8638a1 100644
--- a/util/ectool/Makefile
+++ b/util/ectool/Makefile
@@ -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.
##
CC = gcc
diff --git a/util/ectool/ec.c b/util/ectool/ec.c
index 323a43fe731c..61e7c25f859d 100644
--- a/util/ectool/ec.c
+++ b/util/ectool/ec.c
@@ -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 <stdio.h>
diff --git a/util/ectool/ec.h b/util/ectool/ec.h
index f25a3d92cbf9..dec5439203d3 100644
--- a/util/ectool/ec.h
+++ b/util/ectool/ec.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 _EC_H
diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c
index 2479633aaa1c..307c1f5c8b82 100644
--- a/util/ectool/ectool.c
+++ b/util/ectool/ectool.c
@@ -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 <stdio.h>
diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh
index 55a3b858fa18..6120c1bdd345 100755
--- a/util/genbuild_h/genbuild_h.sh
+++ b/util/genbuild_h/genbuild_h.sh
@@ -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.
#
DATE=""
diff --git a/util/ifdfake/Makefile b/util/ifdfake/Makefile
index 3a896eeb090c..bb9d87a1c07c 100644
--- a/util/ifdfake/Makefile
+++ b/util/ifdfake/Makefile
@@ -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.
#
PROGRAM = ifdfake
diff --git a/util/ifdfake/ifdfake.c b/util/ifdfake/ifdfake.c
index 8eb34a99728a..b70b6aeedfda 100644
--- a/util/ifdfake/ifdfake.c
+++ b/util/ifdfake/ifdfake.c
@@ -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 <errno.h>
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index 144028e570d9..0670ea698b20 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -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.
#
PROGRAM = ifdtool
diff --git a/util/ifdtool/ifdtool.c b/util/ifdtool/ifdtool.c
index 9569dfa4efc6..8d5d05904bbe 100644
--- a/util/ifdtool/ifdtool.c
+++ b/util/ifdtool/ifdtool.c
@@ -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 <unistd.h>
diff --git a/util/ifdtool/ifdtool.h b/util/ifdtool/ifdtool.h
index ed8f440bd1de..b91c02dddb51 100644
--- a/util/ifdtool/ifdtool.h
+++ b/util/ifdtool/ifdtool.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 <stdint.h>
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index f846672f7e46..f598ad4056a8 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.
#
PROGRAM = inteltool
diff --git a/util/inteltool/amb.c b/util/inteltool/amb.c
index 13397dbf5e1e..e83575187cb4 100644
--- a/util/inteltool/amb.c
+++ b/util/inteltool/amb.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stddef.h>
diff --git a/util/inteltool/cpu.c b/util/inteltool/cpu.c
index 626d735e344b..b13e04bfdb42 100644
--- a/util/inteltool/cpu.c
+++ b/util/inteltool/cpu.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <fcntl.h>
diff --git a/util/inteltool/gpio.c b/util/inteltool/gpio.c
index 7084c446ec23..07d838b1699b 100644
--- a/util/inteltool/gpio.c
+++ b/util/inteltool/gpio.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/inteltool/inteltool.c b/util/inteltool/inteltool.c
index a3712c54060a..f3520e2ce4e4 100644
--- a/util/inteltool/inteltool.c
+++ b/util/inteltool/inteltool.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/inteltool/inteltool.h b/util/inteltool/inteltool.h
index 6c1977e3b1ee..283425f879f8 100644
--- a/util/inteltool/inteltool.h
+++ b/util/inteltool/inteltool.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdint.h>
diff --git a/util/inteltool/ivy_memory.c b/util/inteltool/ivy_memory.c
index 50ee4c53bb5b..ba59b51bfd6a 100644
--- a/util/inteltool/ivy_memory.c
+++ b/util/inteltool/ivy_memory.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c
index 950d4a3a5347..a4ff1af7ea64 100644
--- a/util/inteltool/memory.c
+++ b/util/inteltool/memory.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
diff --git a/util/inteltool/pcie.c b/util/inteltool/pcie.c
index ecfa2f15c9dc..a3d827041ac5 100644
--- a/util/inteltool/pcie.c
+++ b/util/inteltool/pcie.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/inteltool/powermgt.c b/util/inteltool/powermgt.c
index 865cfba67255..d0fd0e040570 100644
--- a/util/inteltool/powermgt.c
+++ b/util/inteltool/powermgt.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/inteltool/rootcmplx.c b/util/inteltool/rootcmplx.c
index c0997372a286..9fd05bef353e 100644
--- a/util/inteltool/rootcmplx.c
+++ b/util/inteltool/rootcmplx.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile
index e69164fe1de3..5cb78ada43f4 100644
--- a/util/k8resdump/Makefile
+++ b/util/k8resdump/Makefile
@@ -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.
##
PROGRAM = k8resdump
diff --git a/util/k8resdump/k8resdump.c b/util/k8resdump/k8resdump.c
index bbb7c0ffff76..1bd974e9adc8 100644
--- a/util/k8resdump/k8resdump.c
+++ b/util/k8resdump/k8resdump.c
@@ -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 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 7074430b3643..12cbe6c3bc06 100755
--- a/util/lint/lint-000-license-headers
+++ b/util/lint/lint-000-license-headers
@@ -14,11 +14,11 @@
#
# You 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.
#
#
# DESCR: Check that all files in src/ and util/ have valid license headers
LC_ALL=C export LC_ALL
-grep -L "51 Franklin St, Fifth Floor, Boston" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/romcc/tests|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|/microcode-[^/]*.h$)"` | \
+grep -L "You should have received a copy of the GNU General Public License" `git ls-files src util |egrep -v "(^3rdparty|^src/vendorcode/|^util/kconfig/|^util/romcc/tests|\<COPYING\>|\<LICENSE\>|\<README\>|_shipped$|\.patch$|/microcode-[^/]*.h$)"` | \
sed -e "s,^.*$,File & has no valid GPL header.,"
diff --git a/util/lint/lint-001-no-global-config-in-romstage b/util/lint/lint-001-no-global-config-in-romstage
index 4b1d3170ce82..562b1f7fb472 100755
--- a/util/lint/lint-001-no-global-config-in-romstage
+++ b/util/lint/lint-001-no-global-config-in-romstage
@@ -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.
#
# 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 f13aa98f5643..819ef630340f 100755
--- a/util/lint/lint-stable-003-whitespace
+++ b/util/lint/lint-stable-003-whitespace
@@ -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.
#
# 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 10b0408575f5..1f7953e739a6 100755
--- a/util/lint/lint-stable-004-style-labels
+++ b/util/lint/lint-stable-004-style-labels
@@ -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.
#
# 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 32f5cdc0d171..94fc265f45e3 100755
--- a/util/lint/lint-stable-005-board-status
+++ b/util/lint/lint-stable-005-board-status
@@ -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.
#
# DESCR: Check that every board has a meaningful board_info.txt
diff --git a/util/msrtool/Makefile.in b/util/msrtool/Makefile.in
index f876da87163f..4089498bc99b 100644
--- a/util/msrtool/Makefile.in
+++ b/util/msrtool/Makefile.in
@@ -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.
#
PROGRAM = msrtool
diff --git a/util/msrtool/configure b/util/msrtool/configure
index 1d11a464b97f..cda01acfe6f1 100755
--- a/util/msrtool/configure
+++ b/util/msrtool/configure
@@ -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.
#
# 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 901757223729..e8982ca672c8 100644
--- a/util/msrtool/cs5536.c
+++ b/util/msrtool/cs5536.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/darwin.c b/util/msrtool/darwin.c
index a3a50ef3cfdb..0c05545c6f8b 100644
--- a/util/msrtool/darwin.c
+++ b/util/msrtool/darwin.c
@@ -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 <sys/types.h>
diff --git a/util/msrtool/freebsd.c b/util/msrtool/freebsd.c
index 74b6494e0ee9..9c086f3d3313 100644
--- a/util/msrtool/freebsd.c
+++ b/util/msrtool/freebsd.c
@@ -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.
*/
#include <sys/types.h>
diff --git a/util/msrtool/geodegx2.c b/util/msrtool/geodegx2.c
index b70a03d9a3a5..995a6d09b4d8 100644
--- a/util/msrtool/geodegx2.c
+++ b/util/msrtool/geodegx2.c
@@ -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.
*/
#include "msrtool.h"
diff --git a/util/msrtool/geodelx.c b/util/msrtool/geodelx.c
index cdb46bd9dffa..921c1a8a5166 100644
--- a/util/msrtool/geodelx.c
+++ b/util/msrtool/geodelx.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c
index b53da6a98458..c845b4ee66e7 100644
--- a/util/msrtool/intel_atom.c
+++ b/util/msrtool/intel_atom.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_core1.c b/util/msrtool/intel_core1.c
index a0d6d0866253..68697813ec57 100644
--- a/util/msrtool/intel_core1.c
+++ b/util/msrtool/intel_core1.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_core2_early.c b/util/msrtool/intel_core2_early.c
index fd79f6559633..b62e7c98522d 100644
--- a/util/msrtool/intel_core2_early.c
+++ b/util/msrtool/intel_core2_early.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c
index 80462c18480b..6d9fe8703c50 100644
--- a/util/msrtool/intel_core2_later.c
+++ b/util/msrtool/intel_core2_later.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c
index 367461564383..79aacd620dc3 100644
--- a/util/msrtool/intel_nehalem.c
+++ b/util/msrtool/intel_nehalem.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_pentium3.c b/util/msrtool/intel_pentium3.c
index 949b3ce175b5..5dcbbd96b938 100644
--- a/util/msrtool/intel_pentium3.c
+++ b/util/msrtool/intel_pentium3.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_pentium3_early.c b/util/msrtool/intel_pentium3_early.c
index 7c55b3fdedba..51511e52094a 100644
--- a/util/msrtool/intel_pentium3_early.c
+++ b/util/msrtool/intel_pentium3_early.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_early.c b/util/msrtool/intel_pentium4_early.c
index 34f8242aff35..feb0577aecfe 100644
--- a/util/msrtool/intel_pentium4_early.c
+++ b/util/msrtool/intel_pentium4_early.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c
index 5fed62e4273e..212ca1c61c5c 100644
--- a/util/msrtool/intel_pentium4_later.c
+++ b/util/msrtool/intel_pentium4_later.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/k8.c b/util/msrtool/k8.c
index 4bf5a1875d65..754580f82dc6 100644
--- a/util/msrtool/k8.c
+++ b/util/msrtool/k8.c
@@ -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 "msrtool.h"
diff --git a/util/msrtool/linux.c b/util/msrtool/linux.c
index 0e1a0da7bae8..2ead38f2aed7 100644
--- a/util/msrtool/linux.c
+++ b/util/msrtool/linux.c
@@ -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 <sys/types.h>
diff --git a/util/msrtool/msrtool.c b/util/msrtool/msrtool.c
index 356d460c9f50..66a34bf12c6a 100644
--- a/util/msrtool/msrtool.c
+++ b/util/msrtool/msrtool.c
@@ -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 <stdio.h>
diff --git a/util/msrtool/msrtool.h b/util/msrtool/msrtool.h
index e99921ac76ff..8988ebaeb42b 100644
--- a/util/msrtool/msrtool.h
+++ b/util/msrtool/msrtool.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 MSRTOOL_H
diff --git a/util/msrtool/msrutils.c b/util/msrtool/msrutils.c
index dbce53d9f021..fc44eac91513 100644
--- a/util/msrtool/msrutils.c
+++ b/util/msrtool/msrutils.c
@@ -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 <stdio.h>
diff --git a/util/msrtool/sys.c b/util/msrtool/sys.c
index 82c2dbfc4eb2..077bdab7a4c4 100644
--- a/util/msrtool/sys.c
+++ b/util/msrtool/sys.c
@@ -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.
*/
#include <pci/pci.h>
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 12f4a5c84566..1f197334f177 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -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.
##
PROGRAM = nvramtool
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc
index dc33370ae8b4..dc45edec4bc5 100644
--- a/util/nvramtool/Makefile.inc
+++ b/util/nvramtool/Makefile.inc
@@ -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.
##
OS_ARCH = $(shell uname)
diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c
index 4b7f8d65585c..dde3e27dd8ee 100644
--- a/util/nvramtool/accessors/layout-bin.c
+++ b/util/nvramtool/accessors/layout-bin.c
@@ -31,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include <string.h>
diff --git a/util/nvramtool/accessors/layout-common.c b/util/nvramtool/accessors/layout-common.c
index 0a99d3b89c9c..f8113b5743cb 100644
--- a/util/nvramtool/accessors/layout-common.c
+++ b/util/nvramtool/accessors/layout-common.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include <ctype.h>
diff --git a/util/nvramtool/accessors/layout-text.c b/util/nvramtool/accessors/layout-text.c
index a06f560ceea2..7e0276899690 100644
--- a/util/nvramtool/accessors/layout-text.c
+++ b/util/nvramtool/accessors/layout-text.c
@@ -30,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include "common.h"
diff --git a/util/nvramtool/accessors/layout-text.h b/util/nvramtool/accessors/layout-text.h
index 85628f7e5e87..62286c2a04cb 100644
--- a/util/nvramtool/accessors/layout-text.h
+++ b/util/nvramtool/accessors/layout-text.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef LAYOUT_FILE_H
diff --git a/util/nvramtool/cbfs.c b/util/nvramtool/cbfs.c
index abd40eec1293..1d340b4fbec9 100644
--- a/util/nvramtool/cbfs.c
+++ b/util/nvramtool/cbfs.c
@@ -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.
*/
#ifdef __MINGW32__
diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h
index bf5ca95dc5f1..8c02d9de8b32 100644
--- a/util/nvramtool/cbfs.h
+++ b/util/nvramtool/cbfs.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.
* ---------------------------------------------------------------------------
* 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 9159a2a6dd1c..a1e4a6c6e94a 100644
--- a/util/nvramtool/cli/nvramtool.8
+++ b/util/nvramtool/cli/nvramtool.8
@@ -24,8 +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.,
-.\" 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+.\" with this program; if not, write to the Free Software Foundation, Inc.
.\"***************************************************************************/
.TH NVRAMTOOL 8 "September 2008"
.SH NAME
diff --git a/util/nvramtool/cli/nvramtool.c b/util/nvramtool/cli/nvramtool.c
index bdfaaff26d90..13d740f98043 100644
--- a/util/nvramtool/cli/nvramtool.c
+++ b/util/nvramtool/cli/nvramtool.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include <fcntl.h>
diff --git a/util/nvramtool/cli/opts.c b/util/nvramtool/cli/opts.c
index a128c0be3177..c92b13594d7d 100644
--- a/util/nvramtool/cli/opts.c
+++ b/util/nvramtool/cli/opts.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include "common.h"
diff --git a/util/nvramtool/cli/opts.h b/util/nvramtool/cli/opts.h
index a011ef1136c8..d6c31b91fad0 100644
--- a/util/nvramtool/cli/opts.h
+++ b/util/nvramtool/cli/opts.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef OPTS_H
diff --git a/util/nvramtool/cmos_lowlevel.c b/util/nvramtool/cmos_lowlevel.c
index 32f0e0a6801a..51b998ebbb1d 100644
--- a/util/nvramtool/cmos_lowlevel.c
+++ b/util/nvramtool/cmos_lowlevel.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#if defined(__FreeBSD__)
diff --git a/util/nvramtool/cmos_lowlevel.h b/util/nvramtool/cmos_lowlevel.h
index 264bf85b6629..fe6014726cdd 100644
--- a/util/nvramtool/cmos_lowlevel.h
+++ b/util/nvramtool/cmos_lowlevel.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef NVRAMTOOL_CMOS_LOWLEVEL_H
diff --git a/util/nvramtool/cmos_ops.c b/util/nvramtool/cmos_ops.c
index cb6c37931d14..49d11b17ed91 100644
--- a/util/nvramtool/cmos_ops.c
+++ b/util/nvramtool/cmos_ops.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include "common.h"
diff --git a/util/nvramtool/cmos_ops.h b/util/nvramtool/cmos_ops.h
index 3ef502311f73..d9d2735a8d0e 100644
--- a/util/nvramtool/cmos_ops.h
+++ b/util/nvramtool/cmos_ops.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef CMOS_OPS_H
diff --git a/util/nvramtool/common.c b/util/nvramtool/common.c
index 15f8b0d5d16c..ad469d939d85 100644
--- a/util/nvramtool/common.c
+++ b/util/nvramtool/common.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include "common.h"
diff --git a/util/nvramtool/common.h b/util/nvramtool/common.h
index 0ca282941776..7f855c40406c 100644
--- a/util/nvramtool/common.h
+++ b/util/nvramtool/common.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef COMMON_H
diff --git a/util/nvramtool/input_file.c b/util/nvramtool/input_file.c
index 1520930175c8..55a6b9aefe40 100644
--- a/util/nvramtool/input_file.c
+++ b/util/nvramtool/input_file.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include "common.h"
diff --git a/util/nvramtool/input_file.h b/util/nvramtool/input_file.h
index 05d14de192b0..b4b80aab6a71 100644
--- a/util/nvramtool/input_file.h
+++ b/util/nvramtool/input_file.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef INPUT_FILE_H
diff --git a/util/nvramtool/layout.c b/util/nvramtool/layout.c
index f543d12b46ab..21698aee7d9f 100644
--- a/util/nvramtool/layout.c
+++ b/util/nvramtool/layout.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include "common.h"
diff --git a/util/nvramtool/layout.h b/util/nvramtool/layout.h
index 082c31b47a5e..405c14a89da9 100644
--- a/util/nvramtool/layout.h
+++ b/util/nvramtool/layout.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef LAYOUT_H
diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c
index 5f1f22d90be3..d6553c18b871 100644
--- a/util/nvramtool/lbtable.c
+++ b/util/nvramtool/lbtable.c
@@ -25,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include <stdint.h>
diff --git a/util/nvramtool/lbtable.h b/util/nvramtool/lbtable.h
index 9873ecb3269c..ddb79387882d 100644
--- a/util/nvramtool/lbtable.h
+++ b/util/nvramtool/lbtable.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef LBTABLE_H
diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c
index 7d1adbe0a1ff..3875f592e49c 100644
--- a/util/nvramtool/reg_expr.c
+++ b/util/nvramtool/reg_expr.c
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#include <stdarg.h>
diff --git a/util/nvramtool/reg_expr.h b/util/nvramtool/reg_expr.h
index c93215b782a3..55f6b5d917c2 100644
--- a/util/nvramtool/reg_expr.h
+++ b/util/nvramtool/reg_expr.h
@@ -24,8 +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.,
- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, write to the Free Software Foundation, Inc.
\*****************************************************************************/
#ifndef REG_EXPR_H
diff --git a/util/optionlist/Makefile b/util/optionlist/Makefile
index 592d28647e16..035c5f431dbc 100644
--- a/util/optionlist/Makefile
+++ b/util/optionlist/Makefile
@@ -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.
#
VERSION := $(shell git describe --dirty --always || git describe)
diff --git a/util/optionlist/kconfig2wiki b/util/optionlist/kconfig2wiki
index 4265d37b411d..ddfa26753801 100755
--- a/util/optionlist/kconfig2wiki
+++ b/util/optionlist/kconfig2wiki
@@ -18,7 +18,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.
#
import glob
diff --git a/util/romcc/COPYING b/util/romcc/COPYING
index 3661121f8b8b..31c3934cc759 100644
--- a/util/romcc/COPYING
+++ b/util/romcc/COPYING
@@ -306,7 +306,7 @@ the "copyright" line and a pointer to where the full notice is found.
You 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.
Also add information on how to contact you by electronic and paper mail.
diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index fcb898936552..774f708974f3 100644
--- a/util/sconfig/lex.yy.c_shipped
+++ b/util/sconfig/lex.yy.c_shipped
@@ -555,7 +555,7 @@ char *yytext;
*
* You 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 "sconfig.tab.h"
diff --git a/util/sconfig/main.c b/util/sconfig/main.c
index 1241a87fed3e..6c7776212354 100644
--- a/util/sconfig/main.c
+++ b/util/sconfig/main.c
@@ -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.
*/
#include <ctype.h>
diff --git a/util/sconfig/sconfig.h b/util/sconfig/sconfig.h
index b8a231a1c220..d6acee9b0eee 100644
--- a/util/sconfig/sconfig.h
+++ b/util/sconfig/sconfig.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.
*/
#include <stdio.h>
diff --git a/util/sconfig/sconfig.l b/util/sconfig/sconfig.l
index 37d487cb6504..8ab3a022c258 100755
--- a/util/sconfig/sconfig.l
+++ b/util/sconfig/sconfig.l
@@ -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.
*/
#include "sconfig.tab.h"
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 43a16d19581c..266eb115ca29 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -83,7 +83,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 "sconfig.h"
diff --git a/util/sconfig/sconfig.y b/util/sconfig/sconfig.y
index ba450b89c5f2..10b05a973c23 100755
--- a/util/sconfig/sconfig.y
+++ b/util/sconfig/sconfig.y
@@ -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.
*/
#include "sconfig.h"
diff --git a/util/showdevicetree/showdt.c b/util/showdevicetree/showdt.c
index 4e904a2c875f..335594be41f9 100644
--- a/util/showdevicetree/showdt.c
+++ b/util/showdevicetree/showdt.c
@@ -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 <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 7ce5ede0f0df..7a4f8bad263a 100644
--- a/util/superiotool/Makefile
+++ b/util/superiotool/Makefile
@@ -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.
##
PROGRAM = superiotool
diff --git a/util/superiotool/ali.c b/util/superiotool/ali.c
index 1d683c169922..57d1c106c463 100644
--- a/util/superiotool/ali.c
+++ b/util/superiotool/ali.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/amd.c b/util/superiotool/amd.c
index 4f76981bb223..07ef15073fcc 100644
--- a/util/superiotool/amd.c
+++ b/util/superiotool/amd.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/fintek.c b/util/superiotool/fintek.c
index fd118b75b558..1a6ffa32f40a 100644
--- a/util/superiotool/fintek.c
+++ b/util/superiotool/fintek.c
@@ -18,7 +18,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 "superiotool.h"
diff --git a/util/superiotool/infineon.c b/util/superiotool/infineon.c
index c01f88358f8b..4ee7960d0889 100644
--- a/util/superiotool/infineon.c
+++ b/util/superiotool/infineon.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/ite.c b/util/superiotool/ite.c
index 17e4452cf0ba..295cbdc4edc7 100644
--- a/util/superiotool/ite.c
+++ b/util/superiotool/ite.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/nsc.c b/util/superiotool/nsc.c
index 33982571e866..883ad7cc8024 100644
--- a/util/superiotool/nsc.c
+++ b/util/superiotool/nsc.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/nuvoton.c b/util/superiotool/nuvoton.c
index ea55a63f247f..bc9586992310 100644
--- a/util/superiotool/nuvoton.c
+++ b/util/superiotool/nuvoton.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/pci.c b/util/superiotool/pci.c
index af9b938ba77b..32c23762cd3a 100644
--- a/util/superiotool/pci.c
+++ b/util/superiotool/pci.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/serverengines.c b/util/superiotool/serverengines.c
index 920eb62fc2b9..d6620004f34b 100644
--- a/util/superiotool/serverengines.c
+++ b/util/superiotool/serverengines.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/smsc.c b/util/superiotool/smsc.c
index 72c0c7ae1f0b..734cb91a1fa0 100644
--- a/util/superiotool/smsc.c
+++ b/util/superiotool/smsc.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/superiotool.c b/util/superiotool/superiotool.c
index 5869cbf0d3f6..a5e912dc5694 100644
--- a/util/superiotool/superiotool.c
+++ b/util/superiotool/superiotool.c
@@ -18,7 +18,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 "superiotool.h"
diff --git a/util/superiotool/superiotool.h b/util/superiotool/superiotool.h
index 46f11a79852f..7e7ec0c8b74e 100644
--- a/util/superiotool/superiotool.h
+++ b/util/superiotool/superiotool.h
@@ -18,7 +18,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 SUPERIOTOOL_H
diff --git a/util/superiotool/via.c b/util/superiotool/via.c
index a08231683fd7..589a13e1b243 100644
--- a/util/superiotool/via.c
+++ b/util/superiotool/via.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/superiotool/winbond.c b/util/superiotool/winbond.c
index 2774a0bfcaf1..3cc93eb3084d 100644
--- a/util/superiotool/winbond.c
+++ b/util/superiotool/winbond.c
@@ -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.
*/
#include "superiotool.h"
diff --git a/util/uio_usbdebug/console/printk.c b/util/uio_usbdebug/console/printk.c
index a73407cfe86c..26292e3015e1 100644
--- a/util/uio_usbdebug/console/printk.c
+++ b/util/uio_usbdebug/console/printk.c
@@ -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 <stdio.h>
diff --git a/util/uio_usbdebug/drivers/usb/pci_ehci.c b/util/uio_usbdebug/drivers/usb/pci_ehci.c
index 6a316a7983b2..c7c1282cf0bf 100644
--- a/util/uio_usbdebug/drivers/usb/pci_ehci.c
+++ b/util/uio_usbdebug/drivers/usb/pci_ehci.c
@@ -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.
*/
#include <device/pci_ehci.h>
diff --git a/util/uio_usbdebug/include/device/device.h b/util/uio_usbdebug/include/device/device.h
index 1838f4d348bc..709c644c7665 100644
--- a/util/uio_usbdebug/include/device/device.h
+++ b/util/uio_usbdebug/include/device/device.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.
*/
diff --git a/util/uio_usbdebug/linux/uio_ehci_pci.c b/util/uio_usbdebug/linux/uio_ehci_pci.c
index d5c33e3fef1b..52d8c99a6990 100644
--- a/util/uio_usbdebug/linux/uio_ehci_pci.c
+++ b/util/uio_usbdebug/linux/uio_ehci_pci.c
@@ -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.
*/
#include <linux/device.h>
diff --git a/util/uio_usbdebug/uio_usbdebug.c b/util/uio_usbdebug/uio_usbdebug.c
index e2836fc3b119..d40d3c05fbac 100644
--- a/util/uio_usbdebug/uio_usbdebug.c
+++ b/util/uio_usbdebug/uio_usbdebug.c
@@ -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 <stdio.h>
diff --git a/util/uio_usbdebug/uio_usbdebug_intel.c b/util/uio_usbdebug/uio_usbdebug_intel.c
index 5e4d9264a39b..34b65f5d2d1d 100644
--- a/util/uio_usbdebug/uio_usbdebug_intel.c
+++ b/util/uio_usbdebug/uio_usbdebug_intel.c
@@ -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/io.h>
diff --git a/util/viatool/Makefile b/util/viatool/Makefile
index 5124a73dc3bc..becdde3dddc6 100644
--- a/util/viatool/Makefile
+++ b/util/viatool/Makefile
@@ -17,7 +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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc.
#
PROGRAM = viatool
diff --git a/util/viatool/cpu.c b/util/viatool/cpu.c
index 4c7c9e663880..d0f6623900fa 100644
--- a/util/viatool/cpu.c
+++ b/util/viatool/cpu.c
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <fcntl.h>
diff --git a/util/viatool/viatool.c b/util/viatool/viatool.c
index 3f19f2819cdf..a3a2f43333b4 100644
--- a/util/viatool/viatool.c
+++ b/util/viatool/viatool.c
@@ -17,7 +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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdio.h>
diff --git a/util/viatool/viatool.h b/util/viatool/viatool.h
index ed90112c18fd..997c5ad43196 100644
--- a/util/viatool/viatool.h
+++ b/util/viatool/viatool.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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc.
*/
#include <stdint.h>
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index ebc346b56fb8..37fe40628144 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -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.
#
TMPFILE=""