6 files changed, 26 insertions, 11 deletions

diff --git a/bsps/powerpc/mpc8260ads/start/brg.c b/bsps/powerpc/mpc8260ads/start/brg.c
index 741f131a8d..596a67fa93 100644
--- a/bsps/powerpc/mpc8260ads/start/brg.c
+++ b/bsps/powerpc/mpc8260ads/start/brg.c
@@ -21,11 +21,7 @@
  *    Author: Jay Monkman (jmonkman@frasca.com)
  *    Copyright (C) 1998 by Frasca International, Inc.
  *  and
- *    W. Eric Norum
- *    Saskatchewan Accelerator Laboratory
- *    University of Saskatchewan
- *    Saskatoon, Saskatchewan, CANADA
- *    eric@skatter.usask.ca
+ *    Eric Norum <eric.norum.ca>
  *
  *  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/mpc8260ads/start/bsp_specs b/bsps/powerpc/mpc8260ads/start/bsp_specs
deleted file mode 100644
index e69de29bb2..0000000000
--- a/bsps/powerpc/mpc8260ads/start/bsp_specs
+++ /dev/null
diff --git a/bsps/powerpc/mpc8260ads/start/bspstart.c b/bsps/powerpc/mpc8260ads/start/bspstart.c
index 2526cf0aca..4befa3cd5d 100644
--- a/bsps/powerpc/mpc8260ads/start/bspstart.c
+++ b/bsps/powerpc/mpc8260ads/start/bspstart.c
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
  *  This routine does the bulk of the system initialization.
  */
@@ -25,9 +27,26 @@
  *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
- *  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.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <bsp.h>
diff --git a/bsps/powerpc/mpc8260ads/start/cp.c b/bsps/powerpc/mpc8260ads/start/cp.c
index b8adf9feaf..76e6ae2f80 100644
--- a/bsps/powerpc/mpc8260ads/start/cp.c
+++ b/bsps/powerpc/mpc8260ads/start/cp.c
@@ -6,7 +6,7 @@
  * Based on code (alloc860.c in eth_comm port) by
  * Jay Monkman (jmonkman@frasca.com),
  * which, in turn, is based on code by
- * W. Eric Norum (eric@skatter.usask.ca).
+ * Eric Norum <eric.norum.ca>
  *
  * Modifications by Darlene Stewart (Darlene.Stewart@iit.nrc.ca):
  * Copyright (c) 1999, National Research Council of Canada
diff --git a/bsps/powerpc/mpc8260ads/start/dpram.c b/bsps/powerpc/mpc8260ads/start/dpram.c
index 8b74a9759c..fd0b6927eb 100644
--- a/bsps/powerpc/mpc8260ads/start/dpram.c
+++ b/bsps/powerpc/mpc8260ads/start/dpram.c
@@ -7,7 +7,7 @@
  * Based on code (alloc860.c in eth_comm port) by
  * Jay Monkman (jmonkman@frasca.com),
  * which, in turn, is based on code by
- * W. Eric Norum (eric@skatter.usask.ca).
+ * Eric Norum <eric.norum.ca>
  *
  *
  * Modifications :
diff --git a/bsps/powerpc/mpc8260ads/start/linkcmds b/bsps/powerpc/mpc8260ads/start/linkcmds
index 024fc34edc..78d799a0f4 100644
--- a/bsps/powerpc/mpc8260ads/start/linkcmds
+++ b/bsps/powerpc/mpc8260ads/start/linkcmds
@@ -290,7 +290,7 @@ SECTIONS
     clear_end = .;
 
     .noinit (NOLOAD) : {
-        *(.noinit*)
+        *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
     } >ram
 
     .rtemsstack (NOLOAD) : {