[PATCH 22/40] bsps/powerpc/: Scripted embedded brains header file clean up

Mon Mar 7 13:23:20 UTC 2022

From: Joel Sherrill <joel at rtems.org>

Updates #4625.
---
 bsps/powerpc/gen5200/ata/ata-dma-pio-single.c             | 6 ------
 bsps/powerpc/gen5200/ata/ata-instance.c                   | 6 ------
 bsps/powerpc/gen5200/ata/idecfg.c                         | 4 ++--
 bsps/powerpc/gen5200/ata/pcmcia_ide.c                     | 4 ++--
 bsps/powerpc/gen5200/ata/pcmcia_ide.h                     | 4 ++--
 bsps/powerpc/gen5200/bestcomm/bestcomm_glue.c             | 4 ++--
 bsps/powerpc/gen5200/console/console.c                    | 4 ++--
 bsps/powerpc/gen5200/dev/mpc5200-ata.c                    | 6 ------
 bsps/powerpc/gen5200/i2c/i2cdrv.c                         | 4 ++--
 bsps/powerpc/gen5200/i2c/mpc5200mbus.c                    | 4 ++--
 bsps/powerpc/gen5200/i2c/mpc5200mbus.h                    | 4 ++--
 bsps/powerpc/gen5200/include/bsp.h                        | 4 ++--
 bsps/powerpc/gen5200/include/bsp/ata.h                    | 6 ------
 bsps/powerpc/gen5200/include/bsp/bestcomm.h               | 6 ------
 bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h | 4 ++--
 bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h           | 6 ------
 bsps/powerpc/gen5200/include/bsp/irq.h                    | 4 ++--
 bsps/powerpc/gen5200/include/bsp/mpc5200.h                | 4 ++--
 bsps/powerpc/gen5200/include/bsp/mscan-base.h             | 8 +-------
 bsps/powerpc/gen5200/include/bsp/mscan.h                  | 4 ++--
 bsps/powerpc/gen5200/include/bsp/nvram.h                  | 4 ++--
 bsps/powerpc/gen5200/include/bsp/slicetimer.h             | 4 ++--
 bsps/powerpc/gen5200/include/bsp/u-boot-config.h          | 6 ------
 bsps/powerpc/gen5200/irq/irq.c                            | 4 ++--
 bsps/powerpc/gen5200/mscan/mscan-base.c                   | 8 +-------
 bsps/powerpc/gen5200/mscan/mscan.c                        | 4 ++--
 bsps/powerpc/gen5200/mscan/mscan_int.h                    | 4 ++--
 bsps/powerpc/gen5200/nvram/m93cxx.h                       | 4 ++--
 bsps/powerpc/gen5200/nvram/nvram.c                        | 4 ++--
 bsps/powerpc/gen5200/rtc/pcf8563.c                        | 4 ++--
 bsps/powerpc/gen5200/rtc/pcf8563.h                        | 4 ++--
 bsps/powerpc/gen5200/rtc/todcfg.c                         | 4 ++--
 bsps/powerpc/gen5200/slicetimer/slicetimer.c              | 4 ++--
 bsps/powerpc/gen5200/start/bestcomm.c                     | 6 ------
 bsps/powerpc/gen5200/start/bspstart.c                     | 4 ++--
 bsps/powerpc/gen5200/start/cpuinit.c                      | 4 ++--
 bsps/powerpc/gen5200/start/start.S                        | 4 ++--
 bsps/powerpc/gen83xx/console/console-config.c             | 6 ------
 bsps/powerpc/gen83xx/dev/gtm.c                            | 8 +-------
 bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c                 | 4 ++--
 bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c                 | 4 ++--
 bsps/powerpc/gen83xx/i2c/i2c_init.c                       | 4 ++--
 bsps/powerpc/gen83xx/include/bsp.h                        | 4 ++--
 bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h             | 4 ++--
 bsps/powerpc/gen83xx/include/bsp/irq.h                    | 4 ++--
 bsps/powerpc/gen83xx/include/bsp/tsec-config.h            | 6 ------
 bsps/powerpc/gen83xx/include/bsp/u-boot-config.h          | 6 ------
 bsps/powerpc/gen83xx/include/tm27.h                       | 8 +-------
 bsps/powerpc/gen83xx/irq/irq.c                            | 4 ++--
 bsps/powerpc/gen83xx/spi/spi_init.c                       | 4 ++--
 bsps/powerpc/gen83xx/start/bspreset.c                     | 8 +-------
 bsps/powerpc/gen83xx/start/bsprestart.c                   | 6 ------
 bsps/powerpc/gen83xx/start/bspstart.c                     | 6 ------
 bsps/powerpc/gen83xx/start/cpuinit.c                      | 4 ++--
 bsps/powerpc/gen83xx/start/start.S                        | 4 ++--
 bsps/powerpc/include/bsp/linker-symbols.h                 | 6 ------
 bsps/powerpc/include/bsp/start.h                          | 6 ------
 bsps/powerpc/include/bsp/tictac.h                         | 8 +-------
 bsps/powerpc/include/bsp/tsec.h                           | 4 ++--
 bsps/powerpc/include/libcpu/powerpc-utility.h             | 6 ------
 bsps/powerpc/include/mpc83xx/gtm.h                        | 8 +-------
 bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h             | 4 ++--
 bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h             | 4 ++--
 bsps/powerpc/mpc55xxevb/clock/clock-config.c              | 6 ------
 bsps/powerpc/mpc55xxevb/console/console-config.c          | 6 ------
 bsps/powerpc/mpc55xxevb/console/console-esci.c            | 6 ------
 bsps/powerpc/mpc55xxevb/console/console-generic.c         | 6 ------
 bsps/powerpc/mpc55xxevb/console/console-linflex.c         | 6 ------
 bsps/powerpc/mpc55xxevb/dev/dspi.c                        | 8 +-------
 bsps/powerpc/mpc55xxevb/i2c/i2c_init.c                    | 4 ++--
 bsps/powerpc/mpc55xxevb/include/bsp.h                     | 6 ------
 bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h        | 6 ------
 bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h     | 6 ------
 bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h     | 6 ------
 bsps/powerpc/mpc55xxevb/include/bsp/irq.h                 | 6 ------
 bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h      | 6 ------
 bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h           | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h            | 8 +-------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h            | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h           | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h     | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h    | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h     | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h         | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h        | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h       | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h        | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h            | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h             | 6 ------
 bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h        | 8 +-------
 bsps/powerpc/mpc55xxevb/start/bspreset.c                  | 6 ------
 bsps/powerpc/mpc55xxevb/start/bspstart.c                  | 6 ------
 bsps/powerpc/mpc55xxevb/start/copy.S                      | 8 +-------
 bsps/powerpc/mpc55xxevb/start/edma.c                      | 6 ------
 bsps/powerpc/mpc55xxevb/start/emios.c                     | 6 ------
 bsps/powerpc/mpc55xxevb/start/exc-vector-base.S           | 6 ------
 bsps/powerpc/mpc55xxevb/start/get-system-clock.c          | 6 ------
 bsps/powerpc/mpc55xxevb/start/idle-thread.c               | 6 ------
 bsps/powerpc/mpc55xxevb/start/irq.c                       | 6 ------
 bsps/powerpc/mpc55xxevb/start/restart.c                   | 6 ------
 bsps/powerpc/mpc55xxevb/start/sd-card-init.c              | 8 +-------
 bsps/powerpc/mpc55xxevb/start/siu.c                       | 7 +------
 bsps/powerpc/mpc55xxevb/start/start-cache.S               | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-clock.c               | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-clock.c        | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c   | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c       | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-ebi.c          | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c    | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-mmu.c          | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c      | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-early.c               | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-flash.S               | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-prologue.c            | 6 ------
 bsps/powerpc/mpc55xxevb/start/start-watchdog.c            | 6 ------
 bsps/powerpc/mpc55xxevb/start/start.S                     | 6 ------
 bsps/powerpc/qemuppc/irq/irq_init.c                       | 4 ++--
 bsps/powerpc/qoriq/btimer/btimer.c                        | 6 ------
 bsps/powerpc/qoriq/clock/clock-config.c                   | 6 ------
 bsps/powerpc/qoriq/console/console-config.c               | 6 ------
 bsps/powerpc/qoriq/console/uart-bridge-master.c           | 6 ------
 bsps/powerpc/qoriq/console/uart-bridge-slave.c            | 6 ------
 bsps/powerpc/qoriq/include/bsp.h                          | 6 ------
 bsps/powerpc/qoriq/include/bsp/intercom.h                 | 6 ------
 bsps/powerpc/qoriq/include/bsp/irq.h                      | 6 ------
 bsps/powerpc/qoriq/include/bsp/mmu.h                      | 6 ------
 bsps/powerpc/qoriq/include/bsp/qoriq.h                    | 6 ------
 bsps/powerpc/qoriq/include/bsp/tsec-config.h              | 6 ------
 bsps/powerpc/qoriq/include/bsp/uart-bridge.h              | 6 ------
 bsps/powerpc/qoriq/include/tm27.h                         | 6 ------
 bsps/powerpc/qoriq/irq/irq.c                              | 6 ------
 bsps/powerpc/qoriq/mpci/intercom-mpci.c                   | 6 ------
 bsps/powerpc/qoriq/mpci/intercom.c                        | 6 ------
 bsps/powerpc/qoriq/mpci/lock.S                            | 6 ------
 bsps/powerpc/qoriq/rtc/rtc-config.c                       | 6 ------
 bsps/powerpc/qoriq/start/bspreset.c                       | 6 ------
 bsps/powerpc/qoriq/start/bsprestart.c                     | 6 ------
 bsps/powerpc/qoriq/start/bspsmp.c                         | 6 ------
 bsps/powerpc/qoriq/start/bspstart.c                       | 6 ------
 bsps/powerpc/qoriq/start/epapr_hcalls.S                   | 6 ------
 bsps/powerpc/qoriq/start/l1cache.S                        | 6 ------
 bsps/powerpc/qoriq/start/l2cache.S                        | 6 ------
 bsps/powerpc/qoriq/start/mmu-config.c                     | 6 ------
 bsps/powerpc/qoriq/start/mmu-tlb1.S                       | 6 ------
 bsps/powerpc/qoriq/start/mmu.c                            | 6 ------
 bsps/powerpc/qoriq/start/portal.c                         | 6 ------
 bsps/powerpc/qoriq/start/restart.S                        | 6 ------
 bsps/powerpc/qoriq/start/start.S                          | 6 ------
 bsps/powerpc/shared/clock/clock.c                         | 6 ------
 bsps/powerpc/shared/exceptions/ppc-code-copy.c            | 7 +------
 bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c    | 6 ------
 bsps/powerpc/shared/exceptions/ppc_exc_alignment.c        | 6 ------
 bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S     | 6 ------
 bsps/powerpc/shared/exceptions/ppc_exc_fatal.S            | 6 ------
 bsps/powerpc/shared/exceptions/ppc_exc_naked.S            | 7 +------
 bsps/powerpc/shared/start/bsp-start-zero.S                | 6 ------
 bsps/powerpc/shared/start/linkcmds.base                   | 6 ------
 bsps/powerpc/shared/start/memcpy.c                        | 6 ------
 bsps/powerpc/shared/start/rtems_crti.S                    | 6 ------
 bsps/powerpc/shared/start/rtems_crtn.S                    | 6 ------
 bsps/powerpc/shared/start/tictac.c                        | 8 +-------
 bsps/powerpc/t32mppc/clock/clock-config.c                 | 6 ------
 bsps/powerpc/t32mppc/console/console.c                    | 6 ------
 bsps/powerpc/t32mppc/include/bsp.h                        | 6 ------
 bsps/powerpc/t32mppc/include/bsp/irq.h                    | 6 ------
 bsps/powerpc/t32mppc/irq/irq.c                            | 6 ------
 bsps/powerpc/t32mppc/start/bspreset.c                     | 6 ------
 bsps/powerpc/t32mppc/start/bspstart.c                     | 6 ------
 bsps/powerpc/t32mppc/start/start.S                        | 6 ------
 bsps/powerpc/tqm8xx/btimer/btimer.c                       | 4 ++--
 bsps/powerpc/tqm8xx/console/console.c                     | 4 ++--
 bsps/powerpc/tqm8xx/include/bsp.h                         | 4 ++--
 bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h               | 4 ++--
 bsps/powerpc/tqm8xx/include/bsp/irq.h                     | 4 ++--
 bsps/powerpc/tqm8xx/include/bsp/spi.h                     | 4 ++--
 bsps/powerpc/tqm8xx/include/bsp/tqm.h                     | 4 ++--
 bsps/powerpc/tqm8xx/irq/irq.c                             | 4 ++--
 bsps/powerpc/tqm8xx/spi/spi.c                             | 4 ++--
 bsps/powerpc/tqm8xx/start/bspstart.c                      | 8 +-------
 bsps/powerpc/tqm8xx/start/mmutlbtab.c                     | 4 ++--
 bsps/powerpc/tqm8xx/start/start.S                         | 4 ++--
 bsps/powerpc/virtex/include/bsp/irq.h                     | 4 ++--
 bsps/powerpc/virtex/irq/irq_init.c                        | 4 ++--
 bsps/powerpc/virtex/start/start.S                         | 6 ------
 bsps/powerpc/virtex4/include/bsp/irq.h                    | 4 ++--
 bsps/powerpc/virtex4/irq/irq_init.c                       | 4 ++--
 bsps/powerpc/virtex5/include/bsp/irq.h                    | 4 ++--
 bsps/powerpc/virtex5/irq/irq_init.c                       | 4 ++--
 188 files changed, 135 insertions(+), 906 deletions(-)

diff --git a/bsps/powerpc/gen5200/ata/ata-dma-pio-single.c b/bsps/powerpc/gen5200/ata/ata-dma-pio-single.c
index e621febbb0..8ad6b9de5b 100644
--- a/bsps/powerpc/gen5200/ata/ata-dma-pio-single.c
+++ b/bsps/powerpc/gen5200/ata/ata-dma-pio-single.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/ata/ata-instance.c b/bsps/powerpc/gen5200/ata/ata-instance.c
index df753a5e58..7dd5dc5731 100644
--- a/bsps/powerpc/gen5200/ata/ata-instance.c
+++ b/bsps/powerpc/gen5200/ata/ata-instance.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/ata/idecfg.c b/bsps/powerpc/gen5200/ata/idecfg.c
index 8cd26beef3..8f274f3ce1 100644
--- a/bsps/powerpc/gen5200/ata/idecfg.c
+++ b/bsps/powerpc/gen5200/ata/idecfg.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/ata/pcmcia_ide.c b/bsps/powerpc/gen5200/ata/pcmcia_ide.c
index 9683ae383c..ca1c98d250 100644
--- a/bsps/powerpc/gen5200/ata/pcmcia_ide.c
+++ b/bsps/powerpc/gen5200/ata/pcmcia_ide.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/ata/pcmcia_ide.h b/bsps/powerpc/gen5200/ata/pcmcia_ide.h
index 8cd74729a5..31569b324a 100644
--- a/bsps/powerpc/gen5200/ata/pcmcia_ide.h
+++ b/bsps/powerpc/gen5200/ata/pcmcia_ide.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/bestcomm/bestcomm_glue.c b/bsps/powerpc/gen5200/bestcomm/bestcomm_glue.c
index 9e0d946ed0..9971faec2b 100644
--- a/bsps/powerpc/gen5200/bestcomm/bestcomm_glue.c
+++ b/bsps/powerpc/gen5200/bestcomm/bestcomm_glue.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2004-2005                      |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/console/console.c b/bsps/powerpc/gen5200/console/console.c
index d7325032c4..7b7a704ee4 100644
--- a/bsps/powerpc/gen5200/console/console.c
+++ b/bsps/powerpc/gen5200/console/console.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/dev/mpc5200-ata.c b/bsps/powerpc/gen5200/dev/mpc5200-ata.c
index de7ee27fb3..85c8f3c677 100644
--- a/bsps/powerpc/gen5200/dev/mpc5200-ata.c
+++ b/bsps/powerpc/gen5200/dev/mpc5200-ata.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/i2c/i2cdrv.c b/bsps/powerpc/gen5200/i2c/i2cdrv.c
index 2c20b3dbdc..c1a5a93764 100644
--- a/bsps/powerpc/gen5200/i2c/i2cdrv.c
+++ b/bsps/powerpc/gen5200/i2c/i2cdrv.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/i2c/mpc5200mbus.c b/bsps/powerpc/gen5200/i2c/mpc5200mbus.c
index aa926bc8d9..ed5fe573c6 100644
--- a/bsps/powerpc/gen5200/i2c/mpc5200mbus.c
+++ b/bsps/powerpc/gen5200/i2c/mpc5200mbus.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/i2c/mpc5200mbus.h b/bsps/powerpc/gen5200/i2c/mpc5200mbus.h
index e68b564e2f..8e9ad21531 100644
--- a/bsps/powerpc/gen5200/i2c/mpc5200mbus.h
+++ b/bsps/powerpc/gen5200/i2c/mpc5200mbus.h
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp.h b/bsps/powerpc/gen5200/include/bsp.h
index 57e50ad2bb..67047ba09d 100644
--- a/bsps/powerpc/gen5200/include/bsp.h
+++ b/bsps/powerpc/gen5200/include/bsp.h
@@ -13,9 +13,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/ata.h b/bsps/powerpc/gen5200/include/bsp/ata.h
index 4b31ade091..25f5ef9bcc 100644
--- a/bsps/powerpc/gen5200/include/bsp/ata.h
+++ b/bsps/powerpc/gen5200/include/bsp/ata.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/include/bsp/bestcomm.h b/bsps/powerpc/gen5200/include/bsp/bestcomm.h
index 2c379d4bbe..aea7bf4f24 100644
--- a/bsps/powerpc/gen5200/include/bsp/bestcomm.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
index 18827b77c7..7c5f12ea68 100644
--- a/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm/bestcomm_glue.h
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2004-2005                      |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
index 2b74adf366..fd4c4674f0 100644
--- a/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
+++ b/bsps/powerpc/gen5200/include/bsp/bestcomm_ops.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/include/bsp/irq.h b/bsps/powerpc/gen5200/include/bsp/irq.h
index d54f98a2af..61f9cdb8ea 100644
--- a/bsps/powerpc/gen5200/include/bsp/irq.h
+++ b/bsps/powerpc/gen5200/include/bsp/irq.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005, 2010                     |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/mpc5200.h b/bsps/powerpc/gen5200/include/bsp/mpc5200.h
index 263e66fb9e..5d72652989 100644
--- a/bsps/powerpc/gen5200/include/bsp/mpc5200.h
+++ b/bsps/powerpc/gen5200/include/bsp/mpc5200.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/mscan-base.h b/bsps/powerpc/gen5200/include/bsp/mscan-base.h
index be4c0d73b1..cf50c0c576 100644
--- a/bsps/powerpc/gen5200/include/bsp/mscan-base.h
+++ b/bsps/powerpc/gen5200/include/bsp/mscan-base.h
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/include/bsp/mscan.h b/bsps/powerpc/gen5200/include/bsp/mscan.h
index 9cb7fd44e7..797e4d7e58 100644
--- a/bsps/powerpc/gen5200/include/bsp/mscan.h
+++ b/bsps/powerpc/gen5200/include/bsp/mscan.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/nvram.h b/bsps/powerpc/gen5200/include/bsp/nvram.h
index b05c35986f..8a44b2fc9c 100644
--- a/bsps/powerpc/gen5200/include/bsp/nvram.h
+++ b/bsps/powerpc/gen5200/include/bsp/nvram.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/slicetimer.h b/bsps/powerpc/gen5200/include/bsp/slicetimer.h
index e089dbc8ad..8702f5b871 100644
--- a/bsps/powerpc/gen5200/include/bsp/slicetimer.h
+++ b/bsps/powerpc/gen5200/include/bsp/slicetimer.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/include/bsp/u-boot-config.h b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
index 2fee83bce9..b749aa709e 100644
--- a/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
+++ b/bsps/powerpc/gen5200/include/bsp/u-boot-config.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/irq/irq.c b/bsps/powerpc/gen5200/irq/irq.c
index 4ae79e58a9..d412f46961 100644
--- a/bsps/powerpc/gen5200/irq/irq.c
+++ b/bsps/powerpc/gen5200/irq/irq.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/mscan/mscan-base.c b/bsps/powerpc/gen5200/mscan/mscan-base.c
index 2044bb3917..5109cf6020 100644
--- a/bsps/powerpc/gen5200/mscan/mscan-base.c
+++ b/bsps/powerpc/gen5200/mscan/mscan-base.c
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/mscan/mscan.c b/bsps/powerpc/gen5200/mscan/mscan.c
index ef1809ecdf..2d94e29012 100644
--- a/bsps/powerpc/gen5200/mscan/mscan.c
+++ b/bsps/powerpc/gen5200/mscan/mscan.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC5200 BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/mscan/mscan_int.h b/bsps/powerpc/gen5200/mscan/mscan_int.h
index 7bac194f86..65ce2dc869 100644
--- a/bsps/powerpc/gen5200/mscan/mscan_int.h
+++ b/bsps/powerpc/gen5200/mscan/mscan_int.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/nvram/m93cxx.h b/bsps/powerpc/gen5200/nvram/m93cxx.h
index a5643dae45..ab88eb1bf9 100644
--- a/bsps/powerpc/gen5200/nvram/m93cxx.h
+++ b/bsps/powerpc/gen5200/nvram/m93cxx.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/nvram/nvram.c b/bsps/powerpc/gen5200/nvram/nvram.c
index 99192ac3c4..11f22f82ab 100644
--- a/bsps/powerpc/gen5200/nvram/nvram.c
+++ b/bsps/powerpc/gen5200/nvram/nvram.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/rtc/pcf8563.c b/bsps/powerpc/gen5200/rtc/pcf8563.c
index e41e3b48d2..046dfda5d8 100644
--- a/bsps/powerpc/gen5200/rtc/pcf8563.c
+++ b/bsps/powerpc/gen5200/rtc/pcf8563.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/rtc/pcf8563.h b/bsps/powerpc/gen5200/rtc/pcf8563.h
index f46b03e531..9599935354 100644
--- a/bsps/powerpc/gen5200/rtc/pcf8563.h
+++ b/bsps/powerpc/gen5200/rtc/pcf8563.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/rtc/todcfg.c b/bsps/powerpc/gen5200/rtc/todcfg.c
index 076de70b28..e657c7daa0 100644
--- a/bsps/powerpc/gen5200/rtc/todcfg.c
+++ b/bsps/powerpc/gen5200/rtc/todcfg.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/slicetimer/slicetimer.c b/bsps/powerpc/gen5200/slicetimer/slicetimer.c
index adbd70602b..66c7f09720 100644
--- a/bsps/powerpc/gen5200/slicetimer/slicetimer.c
+++ b/bsps/powerpc/gen5200/slicetimer/slicetimer.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/start/bestcomm.c b/bsps/powerpc/gen5200/start/bestcomm.c
index ef59adcfd8..dbcb19ab2e 100644
--- a/bsps/powerpc/gen5200/start/bestcomm.c
+++ b/bsps/powerpc/gen5200/start/bestcomm.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen5200/start/bspstart.c b/bsps/powerpc/gen5200/start/bspstart.c
index e52119fe67..b21ec488e0 100644
--- a/bsps/powerpc/gen5200/start/bspstart.c
+++ b/bsps/powerpc/gen5200/start/bspstart.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/start/cpuinit.c b/bsps/powerpc/gen5200/start/cpuinit.c
index 77787c4956..3f278dbe34 100644
--- a/bsps/powerpc/gen5200/start/cpuinit.c
+++ b/bsps/powerpc/gen5200/start/cpuinit.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen5200/start/start.S b/bsps/powerpc/gen5200/start/start.S
index fbb58cdfb1..e506bc6fc2 100644
--- a/bsps/powerpc/gen5200/start/start.S
+++ b/bsps/powerpc/gen5200/start/start.S
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/console/console-config.c b/bsps/powerpc/gen83xx/console/console-config.c
index d0071cd220..5336799a8c 100644
--- a/bsps/powerpc/gen83xx/console/console-config.c
+++ b/bsps/powerpc/gen83xx/console/console-config.c
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2008-2014 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/dev/gtm.c b/bsps/powerpc/gen83xx/dev/gtm.c
index 2f13a1d8cd..65708141ed 100644
--- a/bsps/powerpc/gen83xx/dev/gtm.c
+++ b/bsps/powerpc/gen83xx/dev/gtm.c
@@ -5,13 +5,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c b/bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
index b4c3d477f7..51c36eea01 100644
--- a/bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
+++ b/bsps/powerpc/gen83xx/dev/mpc83xx_i2cdrv.c
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c b/bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
index 5534b4b72a..4261e23040 100644
--- a/bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
+++ b/bsps/powerpc/gen83xx/dev/mpc83xx_spidrv.c
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/i2c/i2c_init.c b/bsps/powerpc/gen83xx/i2c/i2c_init.c
index 7fdd6bbd4c..40a88fda54 100644
--- a/bsps/powerpc/gen83xx/i2c/i2c_init.c
+++ b/bsps/powerpc/gen83xx/i2c/i2c_init.c
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/include/bsp.h b/bsps/powerpc/gen83xx/include/bsp.h
index db9a763cb5..3ae5f71549 100644
--- a/bsps/powerpc/gen83xx/include/bsp.h
+++ b/bsps/powerpc/gen83xx/include/bsp.h
@@ -10,9 +10,9 @@
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h b/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
index bbe070c637..876d79f11c 100644
--- a/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
+++ b/bsps/powerpc/gen83xx/include/bsp/hwreg_vals.h
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/include/bsp/irq.h b/bsps/powerpc/gen83xx/include/bsp/irq.h
index 5d896d2609..25922f2976 100644
--- a/bsps/powerpc/gen83xx/include/bsp/irq.h
+++ b/bsps/powerpc/gen83xx/include/bsp/irq.h
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007, 2010                     |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/include/bsp/tsec-config.h b/bsps/powerpc/gen83xx/include/bsp/tsec-config.h
index 5ec0ccbad1..c405b29c56 100644
--- a/bsps/powerpc/gen83xx/include/bsp/tsec-config.h
+++ b/bsps/powerpc/gen83xx/include/bsp/tsec-config.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h b/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
index c2271c965b..f032a15fe2 100644
--- a/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
+++ b/bsps/powerpc/gen83xx/include/bsp/u-boot-config.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/include/tm27.h b/bsps/powerpc/gen83xx/include/tm27.h
index 3728e7d87d..90d26f1729 100644
--- a/bsps/powerpc/gen83xx/include/tm27.h
+++ b/bsps/powerpc/gen83xx/include/tm27.h
@@ -5,13 +5,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/irq/irq.c b/bsps/powerpc/gen83xx/irq/irq.c
index 4ebea21c60..c9d360a975 100644
--- a/bsps/powerpc/gen83xx/irq/irq.c
+++ b/bsps/powerpc/gen83xx/irq/irq.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/spi/spi_init.c b/bsps/powerpc/gen83xx/spi/spi_init.c
index a2a2683d59..1dcfbe63df 100644
--- a/bsps/powerpc/gen83xx/spi/spi_init.c
+++ b/bsps/powerpc/gen83xx/spi/spi_init.c
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/start/bspreset.c b/bsps/powerpc/gen83xx/start/bspreset.c
index ebaf9f129f..ad79a361bd 100644
--- a/bsps/powerpc/gen83xx/start/bspreset.c
+++ b/bsps/powerpc/gen83xx/start/bspreset.c
@@ -1,11 +1,5 @@
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  *  The license and distribution terms for this file may be
  *  found in the file LICENSE in this distribution or at
  *  http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/start/bsprestart.c b/bsps/powerpc/gen83xx/start/bsprestart.c
index 4a2d298de0..2768577adf 100644
--- a/bsps/powerpc/gen83xx/start/bsprestart.c
+++ b/bsps/powerpc/gen83xx/start/bsprestart.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2008-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/start/bspstart.c b/bsps/powerpc/gen83xx/start/bspstart.c
index 733f43e8ec..336ac281bb 100644
--- a/bsps/powerpc/gen83xx/start/bspstart.c
+++ b/bsps/powerpc/gen83xx/start/bspstart.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2014 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/gen83xx/start/cpuinit.c b/bsps/powerpc/gen83xx/start/cpuinit.c
index ad8fe98456..aad72cd6ee 100644
--- a/bsps/powerpc/gen83xx/start/cpuinit.c
+++ b/bsps/powerpc/gen83xx/start/cpuinit.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2005                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/gen83xx/start/start.S b/bsps/powerpc/gen83xx/start/start.S
index 943ced4d59..6c5ab556a0 100644
--- a/bsps/powerpc/gen83xx/start/start.S
+++ b/bsps/powerpc/gen83xx/start/start.S
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/include/bsp/linker-symbols.h b/bsps/powerpc/include/bsp/linker-symbols.h
index 75783dc080..af8929a2e6 100644
--- a/bsps/powerpc/include/bsp/linker-symbols.h
+++ b/bsps/powerpc/include/bsp/linker-symbols.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2016 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/include/bsp/start.h b/bsps/powerpc/include/bsp/start.h
index b0c174cac0..cf3875ce0b 100644
--- a/bsps/powerpc/include/bsp/start.h
+++ b/bsps/powerpc/include/bsp/start.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/include/bsp/tictac.h b/bsps/powerpc/include/bsp/tictac.h
index e66d63950c..dd367c06bf 100644
--- a/bsps/powerpc/include/bsp/tictac.h
+++ b/bsps/powerpc/include/bsp/tictac.h
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/include/bsp/tsec.h b/bsps/powerpc/include/bsp/tsec.h
index 4efbfa2ab0..6e774ebbb8 100644
--- a/bsps/powerpc/include/bsp/tsec.h
+++ b/bsps/powerpc/include/bsp/tsec.h
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/include/libcpu/powerpc-utility.h b/bsps/powerpc/include/libcpu/powerpc-utility.h
index d1cfe23d89..407020717d 100644
--- a/bsps/powerpc/include/libcpu/powerpc-utility.h
+++ b/bsps/powerpc/include/libcpu/powerpc-utility.h
@@ -10,12 +10,6 @@
 /*
  * Copyright (c) 2008-2015 embedded brains GmbH.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * access function for Device Control Registers inspired by "ppc405common.h"
  * from Michael Hamel ADInstruments May 2008
  *
diff --git a/bsps/powerpc/include/mpc83xx/gtm.h b/bsps/powerpc/include/mpc83xx/gtm.h
index a17510ed10..54db867f3c 100644
--- a/bsps/powerpc/include/mpc83xx/gtm.h
+++ b/bsps/powerpc/include/mpc83xx/gtm.h
@@ -5,13 +5,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
index 206cb87cb4..8758568876 100644
--- a/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
+++ b/bsps/powerpc/include/mpc83xx/mpc83xx_i2cdrv.h
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
index 92fe66831a..9fcffb114d 100644
--- a/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
+++ b/bsps/powerpc/include/mpc83xx/mpc83xx_spidrv.h
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC83xx                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/mpc55xxevb/clock/clock-config.c b/bsps/powerpc/mpc55xxevb/clock/clock-config.c
index f43bc97389..98cdf1c061 100644
--- a/bsps/powerpc/mpc55xxevb/clock/clock-config.c
+++ b/bsps/powerpc/mpc55xxevb/clock/clock-config.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2009-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/console/console-config.c b/bsps/powerpc/mpc55xxevb/console/console-config.c
index d0ea250917..e1c1c58c0a 100644
--- a/bsps/powerpc/mpc55xxevb/console/console-config.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-config.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/console/console-esci.c b/bsps/powerpc/mpc55xxevb/console/console-esci.c
index 9e6646fb65..d6097d6f42 100644
--- a/bsps/powerpc/mpc55xxevb/console/console-esci.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-esci.c
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/console/console-generic.c b/bsps/powerpc/mpc55xxevb/console/console-generic.c
index 71385adf2b..5026996e31 100644
--- a/bsps/powerpc/mpc55xxevb/console/console-generic.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-generic.c
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/console/console-linflex.c b/bsps/powerpc/mpc55xxevb/console/console-linflex.c
index 02978be524..1dcfce2a22 100644
--- a/bsps/powerpc/mpc55xxevb/console/console-linflex.c
+++ b/bsps/powerpc/mpc55xxevb/console/console-linflex.c
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2011-2014 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/dev/dspi.c b/bsps/powerpc/mpc55xxevb/dev/dspi.c
index 505cd703e7..da0bd4c86f 100644
--- a/bsps/powerpc/mpc55xxevb/dev/dspi.c
+++ b/bsps/powerpc/mpc55xxevb/dev/dspi.c
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/i2c/i2c_init.c b/bsps/powerpc/mpc55xxevb/i2c/i2c_init.c
index 49fd8cad9e..dfcc621a31 100644
--- a/bsps/powerpc/mpc55xxevb/i2c/i2c_init.c
+++ b/bsps/powerpc/mpc55xxevb/i2c/i2c_init.c
@@ -2,9 +2,9 @@
 | Project: RTEMS support for GWLCFM                               |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2010                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp.h b/bsps/powerpc/mpc55xxevb/include/bsp.h
index 6af987cacc..48410cf5d1 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
index 4be6788141..3f8617f052 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/console-esci.h
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
index c3f7a4628f..4cab244af1 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/console-generic.h
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h b/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
index c70f36d13b..3bf16a5ca2 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/console-linflex.h
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/irq.h b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h
index f6688bff86..bf107a72dc 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp/irq.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/irq.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h b/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
index 5354df2729..9b1c439695 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/mpc55xx-config.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h b/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
index 5ec64df710..38949196e0 100644
--- a/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
+++ b/bsps/powerpc/mpc55xxevb/include/bsp/smsc9218i.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2009-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h
index eab6dad36c..17cab76b69 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/dspi.h
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h
index 8b7d65d3b6..5a1a4c8c5b 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/edma.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h
index 3e37556818..a605fb9f31 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/emios.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2009-2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h
index dec0b4cf73..2f03065641 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc551x.h
@@ -3,12 +3,6 @@
  *
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <info at embedded-brains.de>
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h
index 61217ac656..a786db1079 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc564xL.h
@@ -4,12 +4,6 @@
  *
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <info at embedded-brains.de>
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h
index b7a1793dca..30c3d3ebfd 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/fsl-mpc5668.h
@@ -3,12 +3,6 @@
  *
  * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info at embedded-brains.de>
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h
index 508e3f274a..9c8c5cfc6f 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/mpc55xx.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h
index ef893ac5ca..3de023d6cb 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/reg-defs.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2014 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h
index fda47dc1e6..48bf77666c 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-edma.h
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h
index 1a0d7eedb1..a687335feb 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs-mmu.h
@@ -7,12 +7,6 @@
 /*
  * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h
index 6b8891a078..804b8d3e6b 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/regs.h
@@ -10,12 +10,6 @@
 /*
  * Copyright (c) 2008-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h
index 17f85d9290..9a61bf6761 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/siu.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h b/bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h
index 8a878d2d41..9acf39f523 100644
--- a/bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h
+++ b/bsps/powerpc/mpc55xxevb/include/mpc55xx/watchdog.h
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/bspreset.c b/bsps/powerpc/mpc55xxevb/start/bspreset.c
index 39ac37d5fe..1fbd08adf1 100644
--- a/bsps/powerpc/mpc55xxevb/start/bspreset.c
+++ b/bsps/powerpc/mpc55xxevb/start/bspreset.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/bspstart.c b/bsps/powerpc/mpc55xxevb/start/bspstart.c
index 1618f1e82a..27a3be3259 100644
--- a/bsps/powerpc/mpc55xxevb/start/bspstart.c
+++ b/bsps/powerpc/mpc55xxevb/start/bspstart.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/copy.S b/bsps/powerpc/mpc55xxevb/start/copy.S
index f993936752..17d641f869 100644
--- a/bsps/powerpc/mpc55xxevb/start/copy.S
+++ b/bsps/powerpc/mpc55xxevb/start/copy.S
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/edma.c b/bsps/powerpc/mpc55xxevb/start/edma.c
index c34624ed10..631c4ef6dd 100644
--- a/bsps/powerpc/mpc55xxevb/start/edma.c
+++ b/bsps/powerpc/mpc55xxevb/start/edma.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/emios.c b/bsps/powerpc/mpc55xxevb/start/emios.c
index 5b8e960a60..eeed46244e 100644
--- a/bsps/powerpc/mpc55xxevb/start/emios.c
+++ b/bsps/powerpc/mpc55xxevb/start/emios.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2009-2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/exc-vector-base.S b/bsps/powerpc/mpc55xxevb/start/exc-vector-base.S
index 3ba9ce4df4..afd574d7d9 100644
--- a/bsps/powerpc/mpc55xxevb/start/exc-vector-base.S
+++ b/bsps/powerpc/mpc55xxevb/start/exc-vector-base.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/get-system-clock.c b/bsps/powerpc/mpc55xxevb/start/get-system-clock.c
index cd32b8a1e6..a7095c75e7 100644
--- a/bsps/powerpc/mpc55xxevb/start/get-system-clock.c
+++ b/bsps/powerpc/mpc55xxevb/start/get-system-clock.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/idle-thread.c b/bsps/powerpc/mpc55xxevb/start/idle-thread.c
index bf751b22bf..63d6c82e07 100644
--- a/bsps/powerpc/mpc55xxevb/start/idle-thread.c
+++ b/bsps/powerpc/mpc55xxevb/start/idle-thread.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/irq.c b/bsps/powerpc/mpc55xxevb/start/irq.c
index 5dee6d74c7..49ed613988 100644
--- a/bsps/powerpc/mpc55xxevb/start/irq.c
+++ b/bsps/powerpc/mpc55xxevb/start/irq.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/restart.c b/bsps/powerpc/mpc55xxevb/start/restart.c
index 495aa39a95..2c0a075398 100644
--- a/bsps/powerpc/mpc55xxevb/start/restart.c
+++ b/bsps/powerpc/mpc55xxevb/start/restart.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/sd-card-init.c b/bsps/powerpc/mpc55xxevb/start/sd-card-init.c
index 64ffc7e9f3..f83ca3b53a 100644
--- a/bsps/powerpc/mpc55xxevb/start/sd-card-init.c
+++ b/bsps/powerpc/mpc55xxevb/start/sd-card-init.c
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/siu.c b/bsps/powerpc/mpc55xxevb/start/siu.c
index 8dc756b635..4f0a11a52b 100644
--- a/bsps/powerpc/mpc55xxevb/start/siu.c
+++ b/bsps/powerpc/mpc55xxevb/start/siu.c
@@ -7,12 +7,7 @@
  */
 
 /*
- * Copyright (c) 2010
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
+ * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
diff --git a/bsps/powerpc/mpc55xxevb/start/start-cache.S b/bsps/powerpc/mpc55xxevb/start/start-cache.S
index c30de57fc6..b106fcf0ea 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-cache.S
+++ b/bsps/powerpc/mpc55xxevb/start/start-cache.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-clock.c b/bsps/powerpc/mpc55xxevb/start/start-clock.c
index 6b4ce107da..b89a6d798f 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-clock.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-clock.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-clock.c b/bsps/powerpc/mpc55xxevb/start/start-config-clock.c
index e29f3366c3..f15d941916 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-clock.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-clock.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c
index 1e2f345d48..532570ea8e 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs-cal.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c
index 3167cd7973..dd84b65296 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-ebi-cs.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-ebi.c b/bsps/powerpc/mpc55xxevb/start/start-config-ebi.c
index 485e7855b3..053ec52a88 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-ebi.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-ebi.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c b/bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c
index ef82806429..e4fa292f36 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-mmu-early.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-mmu.c b/bsps/powerpc/mpc55xxevb/start/start-config-mmu.c
index 9475b3c816..a78622456c 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-mmu.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-mmu.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c b/bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c
index 65fddab42e..feb0948821 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-config-siu-pcr.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-early.c b/bsps/powerpc/mpc55xxevb/start/start-early.c
index e502645769..758c86fc28 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-early.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-early.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-flash.S b/bsps/powerpc/mpc55xxevb/start/start-flash.S
index 9c87d38a83..603e230baa 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-flash.S
+++ b/bsps/powerpc/mpc55xxevb/start/start-flash.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-prologue.c b/bsps/powerpc/mpc55xxevb/start/start-prologue.c
index 713c27ebaa..800826a38b 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-prologue.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-prologue.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start-watchdog.c b/bsps/powerpc/mpc55xxevb/start/start-watchdog.c
index d585829ff9..2aa3cb99d4 100644
--- a/bsps/powerpc/mpc55xxevb/start/start-watchdog.c
+++ b/bsps/powerpc/mpc55xxevb/start/start-watchdog.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/mpc55xxevb/start/start.S b/bsps/powerpc/mpc55xxevb/start/start.S
index ff38d619b2..d5179eb86c 100644
--- a/bsps/powerpc/mpc55xxevb/start/start.S
+++ b/bsps/powerpc/mpc55xxevb/start/start.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qemuppc/irq/irq_init.c b/bsps/powerpc/qemuppc/irq/irq_init.c
index cd85b06c47..2171a8d8dd 100644
--- a/bsps/powerpc/qemuppc/irq/irq_init.c
+++ b/bsps/powerpc/qemuppc/irq/irq_init.c
@@ -2,9 +2,9 @@
 | Project: RTEMS generic MPC83xx BSP                              |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/qoriq/btimer/btimer.c b/bsps/powerpc/qoriq/btimer/btimer.c
index 47ef6eedb9..bd6f425e1d 100644
--- a/bsps/powerpc/qoriq/btimer/btimer.c
+++ b/bsps/powerpc/qoriq/btimer/btimer.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/clock/clock-config.c b/bsps/powerpc/qoriq/clock/clock-config.c
index 2966636bc5..63501b6e34 100644
--- a/bsps/powerpc/qoriq/clock/clock-config.c
+++ b/bsps/powerpc/qoriq/clock/clock-config.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/console/console-config.c b/bsps/powerpc/qoriq/console/console-config.c
index c8f0b4119b..e4edeb121f 100644
--- a/bsps/powerpc/qoriq/console/console-config.c
+++ b/bsps/powerpc/qoriq/console/console-config.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/console/uart-bridge-master.c b/bsps/powerpc/qoriq/console/uart-bridge-master.c
index 3239bb0b99..f6668a6cbe 100644
--- a/bsps/powerpc/qoriq/console/uart-bridge-master.c
+++ b/bsps/powerpc/qoriq/console/uart-bridge-master.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/console/uart-bridge-slave.c b/bsps/powerpc/qoriq/console/uart-bridge-slave.c
index ea97bc5e83..1ec197bb07 100644
--- a/bsps/powerpc/qoriq/console/uart-bridge-slave.c
+++ b/bsps/powerpc/qoriq/console/uart-bridge-slave.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp.h b/bsps/powerpc/qoriq/include/bsp.h
index 75bf15cefb..7cb19c55f2 100644
--- a/bsps/powerpc/qoriq/include/bsp.h
+++ b/bsps/powerpc/qoriq/include/bsp.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp/intercom.h b/bsps/powerpc/qoriq/include/bsp/intercom.h
index c78d4c2ab0..c206e2ed07 100644
--- a/bsps/powerpc/qoriq/include/bsp/intercom.h
+++ b/bsps/powerpc/qoriq/include/bsp/intercom.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp/irq.h b/bsps/powerpc/qoriq/include/bsp/irq.h
index cd642fa00b..d4e35f3c30 100644
--- a/bsps/powerpc/qoriq/include/bsp/irq.h
+++ b/bsps/powerpc/qoriq/include/bsp/irq.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp/mmu.h b/bsps/powerpc/qoriq/include/bsp/mmu.h
index 8c8822f901..d6a1b413a2 100644
--- a/bsps/powerpc/qoriq/include/bsp/mmu.h
+++ b/bsps/powerpc/qoriq/include/bsp/mmu.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp/qoriq.h b/bsps/powerpc/qoriq/include/bsp/qoriq.h
index 361dbed2f1..d731cb4c29 100644
--- a/bsps/powerpc/qoriq/include/bsp/qoriq.h
+++ b/bsps/powerpc/qoriq/include/bsp/qoriq.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp/tsec-config.h b/bsps/powerpc/qoriq/include/bsp/tsec-config.h
index 24f7e7611b..540972d581 100644
--- a/bsps/powerpc/qoriq/include/bsp/tsec-config.h
+++ b/bsps/powerpc/qoriq/include/bsp/tsec-config.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/bsp/uart-bridge.h b/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
index 3233cf5bef..0101003217 100644
--- a/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
+++ b/bsps/powerpc/qoriq/include/bsp/uart-bridge.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/include/tm27.h b/bsps/powerpc/qoriq/include/tm27.h
index 5753d6b049..d02bd42fc9 100644
--- a/bsps/powerpc/qoriq/include/tm27.h
+++ b/bsps/powerpc/qoriq/include/tm27.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/irq/irq.c b/bsps/powerpc/qoriq/irq/irq.c
index dbc6ef2a78..a510b8e996 100644
--- a/bsps/powerpc/qoriq/irq/irq.c
+++ b/bsps/powerpc/qoriq/irq/irq.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/mpci/intercom-mpci.c b/bsps/powerpc/qoriq/mpci/intercom-mpci.c
index f0b48e589d..1665546633 100644
--- a/bsps/powerpc/qoriq/mpci/intercom-mpci.c
+++ b/bsps/powerpc/qoriq/mpci/intercom-mpci.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/mpci/intercom.c b/bsps/powerpc/qoriq/mpci/intercom.c
index 7f31d38c71..1d03c62b38 100644
--- a/bsps/powerpc/qoriq/mpci/intercom.c
+++ b/bsps/powerpc/qoriq/mpci/intercom.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/mpci/lock.S b/bsps/powerpc/qoriq/mpci/lock.S
index 4b33b4baf1..c5f2e74a84 100644
--- a/bsps/powerpc/qoriq/mpci/lock.S
+++ b/bsps/powerpc/qoriq/mpci/lock.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/rtc/rtc-config.c b/bsps/powerpc/qoriq/rtc/rtc-config.c
index 3d47a04a44..2ee60ff4ea 100644
--- a/bsps/powerpc/qoriq/rtc/rtc-config.c
+++ b/bsps/powerpc/qoriq/rtc/rtc-config.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/bspreset.c b/bsps/powerpc/qoriq/start/bspreset.c
index 26d7614719..62062fb70f 100644
--- a/bsps/powerpc/qoriq/start/bspreset.c
+++ b/bsps/powerpc/qoriq/start/bspreset.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/bsprestart.c b/bsps/powerpc/qoriq/start/bsprestart.c
index 3dc9d6ffce..325842be3d 100644
--- a/bsps/powerpc/qoriq/start/bsprestart.c
+++ b/bsps/powerpc/qoriq/start/bsprestart.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2016, 2018 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/bspsmp.c b/bsps/powerpc/qoriq/start/bspsmp.c
index f9da7ddce1..82dfbae5ee 100644
--- a/bsps/powerpc/qoriq/start/bspsmp.c
+++ b/bsps/powerpc/qoriq/start/bspsmp.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2013, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/bspstart.c b/bsps/powerpc/qoriq/start/bspstart.c
index 5abd651a27..fdbd4b4b0f 100644
--- a/bsps/powerpc/qoriq/start/bspstart.c
+++ b/bsps/powerpc/qoriq/start/bspstart.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/epapr_hcalls.S b/bsps/powerpc/qoriq/start/epapr_hcalls.S
index b019e5d710..a1d22968d1 100644
--- a/bsps/powerpc/qoriq/start/epapr_hcalls.S
+++ b/bsps/powerpc/qoriq/start/epapr_hcalls.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/l1cache.S b/bsps/powerpc/qoriq/start/l1cache.S
index bee3d28123..03fe4ee671 100644
--- a/bsps/powerpc/qoriq/start/l1cache.S
+++ b/bsps/powerpc/qoriq/start/l1cache.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2015, 2016 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/l2cache.S b/bsps/powerpc/qoriq/start/l2cache.S
index 1c57659aa1..e90c892338 100644
--- a/bsps/powerpc/qoriq/start/l2cache.S
+++ b/bsps/powerpc/qoriq/start/l2cache.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2015, 2016 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/mmu-config.c b/bsps/powerpc/qoriq/start/mmu-config.c
index 0f9eb0c677..767c4badba 100644
--- a/bsps/powerpc/qoriq/start/mmu-config.c
+++ b/bsps/powerpc/qoriq/start/mmu-config.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011, 2018 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/mmu-tlb1.S b/bsps/powerpc/qoriq/start/mmu-tlb1.S
index 1d60a0e459..46d112a53c 100644
--- a/bsps/powerpc/qoriq/start/mmu-tlb1.S
+++ b/bsps/powerpc/qoriq/start/mmu-tlb1.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/mmu.c b/bsps/powerpc/qoriq/start/mmu.c
index 558c49618a..d3e342c9e9 100644
--- a/bsps/powerpc/qoriq/start/mmu.c
+++ b/bsps/powerpc/qoriq/start/mmu.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011, 2018 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/portal.c b/bsps/powerpc/qoriq/start/portal.c
index f20eaf4d28..c75cecf364 100644
--- a/bsps/powerpc/qoriq/start/portal.c
+++ b/bsps/powerpc/qoriq/start/portal.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2016 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/restart.S b/bsps/powerpc/qoriq/start/restart.S
index 7dd9eb198d..e02e2c22d7 100644
--- a/bsps/powerpc/qoriq/start/restart.S
+++ b/bsps/powerpc/qoriq/start/restart.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2016 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/qoriq/start/start.S b/bsps/powerpc/qoriq/start/start.S
index 1d11301cdf..1e313d3817 100644
--- a/bsps/powerpc/qoriq/start/start.S
+++ b/bsps/powerpc/qoriq/start/start.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/clock/clock.c b/bsps/powerpc/shared/clock/clock.c
index 2130d73147..545636e195 100644
--- a/bsps/powerpc/shared/clock/clock.c
+++ b/bsps/powerpc/shared/clock/clock.c
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2008-2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/exceptions/ppc-code-copy.c b/bsps/powerpc/shared/exceptions/ppc-code-copy.c
index 3171972185..b324c49503 100644
--- a/bsps/powerpc/shared/exceptions/ppc-code-copy.c
+++ b/bsps/powerpc/shared/exceptions/ppc-code-copy.c
@@ -7,12 +7,7 @@
  */
 
 /*
- * Copyright (c) 2009
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems at embedded-brains.de>
+ * Copyright (c) 2009 embedded brains GmbH.  All rights reserved.
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
diff --git a/bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c b/bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c
index dbcfc0d29c..a52191ab80 100644
--- a/bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c
+++ b/bsps/powerpc/shared/exceptions/ppc-exc-handler-table.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c b/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c
index 732ff96b18..fd36551a14 100644
--- a/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c
+++ b/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S b/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S
index 4b318e5e16..87d7d2e028 100644
--- a/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S
+++ b/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S b/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S
index 1cb97e350a..afd516dff3 100644
--- a/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S
+++ b/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/exceptions/ppc_exc_naked.S b/bsps/powerpc/shared/exceptions/ppc_exc_naked.S
index 1c27575fea..b5762eef6c 100644
--- a/bsps/powerpc/shared/exceptions/ppc_exc_naked.S
+++ b/bsps/powerpc/shared/exceptions/ppc_exc_naked.S
@@ -7,12 +7,7 @@
  */
 
 /*
- * Copyright (c) 2009
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * <rtems at embedded-brains.de>
+ * Copyright (c) 2009 embedded brains GmbH.  All rights reserved.
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
diff --git a/bsps/powerpc/shared/start/bsp-start-zero.S b/bsps/powerpc/shared/start/bsp-start-zero.S
index b559dfb166..9347963a27 100644
--- a/bsps/powerpc/shared/start/bsp-start-zero.S
+++ b/bsps/powerpc/shared/start/bsp-start-zero.S
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2010-2014 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/start/linkcmds.base b/bsps/powerpc/shared/start/linkcmds.base
index 521d69af92..e24f5cf823 100644
--- a/bsps/powerpc/shared/start/linkcmds.base
+++ b/bsps/powerpc/shared/start/linkcmds.base
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2011, 2016 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/start/memcpy.c b/bsps/powerpc/shared/start/memcpy.c
index 23153858aa..2eaefa1799 100644
--- a/bsps/powerpc/shared/start/memcpy.c
+++ b/bsps/powerpc/shared/start/memcpy.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <info at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/start/rtems_crti.S b/bsps/powerpc/shared/start/rtems_crti.S
index a664ae2522..34c245d9fa 100644
--- a/bsps/powerpc/shared/start/rtems_crti.S
+++ b/bsps/powerpc/shared/start/rtems_crti.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/start/rtems_crtn.S b/bsps/powerpc/shared/start/rtems_crtn.S
index 747d83dbce..70b60f68ff 100644
--- a/bsps/powerpc/shared/start/rtems_crtn.S
+++ b/bsps/powerpc/shared/start/rtems_crtn.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/shared/start/tictac.c b/bsps/powerpc/shared/start/tictac.c
index 6673c805f1..6163a01f60 100644
--- a/bsps/powerpc/shared/start/tictac.c
+++ b/bsps/powerpc/shared/start/tictac.c
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/clock/clock-config.c b/bsps/powerpc/t32mppc/clock/clock-config.c
index 799de19a6b..c93f40dbe3 100644
--- a/bsps/powerpc/t32mppc/clock/clock-config.c
+++ b/bsps/powerpc/t32mppc/clock/clock-config.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2011, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/console/console.c b/bsps/powerpc/t32mppc/console/console.c
index 5fbd648765..eb709ab325 100644
--- a/bsps/powerpc/t32mppc/console/console.c
+++ b/bsps/powerpc/t32mppc/console/console.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012, 2015 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/include/bsp.h b/bsps/powerpc/t32mppc/include/bsp.h
index e7dfc7cb08..2df8eb3d12 100644
--- a/bsps/powerpc/t32mppc/include/bsp.h
+++ b/bsps/powerpc/t32mppc/include/bsp.h
@@ -9,12 +9,6 @@
 /*
  * Copyright (c) 2012, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/include/bsp/irq.h b/bsps/powerpc/t32mppc/include/bsp/irq.h
index dc3f55b296..86e0f6a422 100644
--- a/bsps/powerpc/t32mppc/include/bsp/irq.h
+++ b/bsps/powerpc/t32mppc/include/bsp/irq.h
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/irq/irq.c b/bsps/powerpc/t32mppc/irq/irq.c
index bbf97d25b1..71f048d9e9 100644
--- a/bsps/powerpc/t32mppc/irq/irq.c
+++ b/bsps/powerpc/t32mppc/irq/irq.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/start/bspreset.c b/bsps/powerpc/t32mppc/start/bspreset.c
index 9472192fab..d2e6f9fc51 100644
--- a/bsps/powerpc/t32mppc/start/bspreset.c
+++ b/bsps/powerpc/t32mppc/start/bspreset.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Obere Lagerstr. 30
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/start/bspstart.c b/bsps/powerpc/t32mppc/start/bspstart.c
index c3d03e789b..10bc227d6b 100644
--- a/bsps/powerpc/t32mppc/start/bspstart.c
+++ b/bsps/powerpc/t32mppc/start/bspstart.c
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/t32mppc/start/start.S b/bsps/powerpc/t32mppc/start/start.S
index ac7d6f5de7..16ce5d6acd 100644
--- a/bsps/powerpc/t32mppc/start/start.S
+++ b/bsps/powerpc/t32mppc/start/start.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2012, 2017 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/tqm8xx/btimer/btimer.c b/bsps/powerpc/tqm8xx/btimer/btimer.c
index 06c43c56be..bb90a11764 100644
--- a/bsps/powerpc/tqm8xx/btimer/btimer.c
+++ b/bsps/powerpc/tqm8xx/btimer/btimer.c
@@ -4,9 +4,9 @@
 | This file has been adapted to MPC8xx by                         |
 |    Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>         |
 |                    Copyright (c) 2008                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 |                                                                 |
diff --git a/bsps/powerpc/tqm8xx/console/console.c b/bsps/powerpc/tqm8xx/console/console.c
index 0746ba50b8..d5b0569707 100644
--- a/bsps/powerpc/tqm8xx/console/console.c
+++ b/bsps/powerpc/tqm8xx/console/console.c
@@ -4,9 +4,9 @@
 | This file has been adapted to MPC8xx by                         |
 |    Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>         |
 |                    Copyright (c) 2008                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 |                                                                 |
diff --git a/bsps/powerpc/tqm8xx/include/bsp.h b/bsps/powerpc/tqm8xx/include/bsp.h
index e934cf23ff..113570858f 100644
--- a/bsps/powerpc/tqm8xx/include/bsp.h
+++ b/bsps/powerpc/tqm8xx/include/bsp.h
@@ -15,9 +15,9 @@
  * This file has been adapted to MPC8xx by:
  *    Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>
  *    Copyright (c) 2008
- *    Embedded Brains GmbH
+ *    embedded brains GmbH
  *    Obere Lagerstr. 30
- *    D-82178 Puchheim
+ *    82178 Puchheim
  *    Germany
  *    rtems at embedded-brains.de
  *
diff --git a/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h b/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
index c1c414e25f..a352d2c2a7 100644
--- a/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/tqm8xx/include/bsp/irq.h b/bsps/powerpc/tqm8xx/include/bsp/irq.h
index c3dfbed0d1..60844d750d 100644
--- a/bsps/powerpc/tqm8xx/include/bsp/irq.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/irq.h
@@ -4,9 +4,9 @@
 | This file has been adapted to MPC8xx by                         |
 |    Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>         |
 |                    Copyright (c) 2008                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 |                                                                 |
diff --git a/bsps/powerpc/tqm8xx/include/bsp/spi.h b/bsps/powerpc/tqm8xx/include/bsp/spi.h
index e2af971c8d..bd6b3c2ab7 100644
--- a/bsps/powerpc/tqm8xx/include/bsp/spi.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/spi.h
@@ -2,9 +2,9 @@
 | Project: RTEMS support for MPC8xx                               |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2009                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/tqm8xx/include/bsp/tqm.h b/bsps/powerpc/tqm8xx/include/bsp/tqm.h
index 11f6001304..5a035b72a6 100644
--- a/bsps/powerpc/tqm8xx/include/bsp/tqm.h
+++ b/bsps/powerpc/tqm8xx/include/bsp/tqm.h
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/tqm8xx/irq/irq.c b/bsps/powerpc/tqm8xx/irq/irq.c
index 1c405037a3..065e355883 100644
--- a/bsps/powerpc/tqm8xx/irq/irq.c
+++ b/bsps/powerpc/tqm8xx/irq/irq.c
@@ -4,9 +4,9 @@
 | This file has been adapted to MPC8xx by                         |
 |    Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>         |
 |                    Copyright (c) 2008                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 |                                                                 |
diff --git a/bsps/powerpc/tqm8xx/spi/spi.c b/bsps/powerpc/tqm8xx/spi/spi.c
index 0b82242898..76a447239c 100644
--- a/bsps/powerpc/tqm8xx/spi/spi.c
+++ b/bsps/powerpc/tqm8xx/spi/spi.c
@@ -2,9 +2,9 @@
 | Project: RTEMS support for tqm8xx                               |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2009                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/tqm8xx/start/bspstart.c b/bsps/powerpc/tqm8xx/start/bspstart.c
index 09208ac1e6..1b1dd973bd 100644
--- a/bsps/powerpc/tqm8xx/start/bspstart.c
+++ b/bsps/powerpc/tqm8xx/start/bspstart.c
@@ -7,13 +7,7 @@
  */
 
 /*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems at embedded-brains.de
- *
+ * Copyright (c) 2008 embedded brains GmbH.  All rights reserved.
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/tqm8xx/start/mmutlbtab.c b/bsps/powerpc/tqm8xx/start/mmutlbtab.c
index 8b1ad90036..e13f8d521f 100644
--- a/bsps/powerpc/tqm8xx/start/mmutlbtab.c
+++ b/bsps/powerpc/tqm8xx/start/mmutlbtab.c
@@ -4,9 +4,9 @@
 | This file has been adapted to MPC8xx by                         |
 |    Thomas Doerfler <Thomas.Doerfler at embedded-brains.de>         |
 |                    Copyright (c) 2008                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 |                                                                 |
diff --git a/bsps/powerpc/tqm8xx/start/start.S b/bsps/powerpc/tqm8xx/start/start.S
index f134e336da..3f13cf1cc8 100644
--- a/bsps/powerpc/tqm8xx/start/start.S
+++ b/bsps/powerpc/tqm8xx/start/start.S
@@ -2,9 +2,9 @@
 | Project: RTEMS generic TQM8xx BSP                               |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2008                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/virtex/include/bsp/irq.h b/bsps/powerpc/virtex/include/bsp/irq.h
index 892f18be5e..57f6d7e7d8 100644
--- a/bsps/powerpc/virtex/include/bsp/irq.h
+++ b/bsps/powerpc/virtex/include/bsp/irq.h
@@ -2,9 +2,9 @@
 | Project: RTEMS virtex BSP                                       |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/virtex/irq/irq_init.c b/bsps/powerpc/virtex/irq/irq_init.c
index e18df51594..80b9e3b93b 100644
--- a/bsps/powerpc/virtex/irq/irq_init.c
+++ b/bsps/powerpc/virtex/irq/irq_init.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/virtex/start/start.S b/bsps/powerpc/virtex/start/start.S
index 3c9cd229d3..25d68b07f5 100644
--- a/bsps/powerpc/virtex/start/start.S
+++ b/bsps/powerpc/virtex/start/start.S
@@ -1,12 +1,6 @@
 /*
  * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
  *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
  * http://www.rtems.org/license/LICENSE.
diff --git a/bsps/powerpc/virtex4/include/bsp/irq.h b/bsps/powerpc/virtex4/include/bsp/irq.h
index 4db8b3551e..588a1e9c18 100644
--- a/bsps/powerpc/virtex4/include/bsp/irq.h
+++ b/bsps/powerpc/virtex4/include/bsp/irq.h
@@ -2,9 +2,9 @@
 | Project: RTEMS virtex BSP                                       |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/virtex4/irq/irq_init.c b/bsps/powerpc/virtex4/irq/irq_init.c
index 5feafaf4b6..95c07d668a 100644
--- a/bsps/powerpc/virtex4/irq/irq_init.c
+++ b/bsps/powerpc/virtex4/irq/irq_init.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/virtex5/include/bsp/irq.h b/bsps/powerpc/virtex5/include/bsp/irq.h
index a61a434236..b77c992c7c 100644
--- a/bsps/powerpc/virtex5/include/bsp/irq.h
+++ b/bsps/powerpc/virtex5/include/bsp/irq.h
@@ -2,9 +2,9 @@
 | Project: RTEMS virtex BSP                                       |
 +-----------------------------------------------------------------+
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
diff --git a/bsps/powerpc/virtex5/irq/irq_init.c b/bsps/powerpc/virtex5/irq/irq_init.c
index 1fea9214aa..fa55068724 100644
--- a/bsps/powerpc/virtex5/irq/irq_init.c
+++ b/bsps/powerpc/virtex5/irq/irq_init.c
@@ -5,9 +5,9 @@
 | Adaptions, modifications, enhancements and any recent parts of  |
 | the code are:                                                   |
 |                    Copyright (c) 2007                           |
-|                    Embedded Brains GmbH                         |
+|                    embedded brains GmbH                         |
 |                    Obere Lagerstr. 30                           |
-|                    D-82178 Puchheim                             |
+|                    82178 Puchheim                             |
 |                    Germany                                      |
 |                    rtems at embedded-brains.de                     |
 +-----------------------------------------------------------------+
-- 
2.34.1

