7 files changed, 31 insertions, 10 deletions
diff --git a/bsps/m68k/gen68360/clock/clock.c b/bsps/m68k/gen68360/clock/clock.c
index 966b20dae4..07da6a034d 100644
--- a/bsps/m68k/gen68360/clock/clock.c
+++ b/bsps/m68k/gen68360/clock/clock.c
@@ -33,7 +33,7 @@ static unsigned long nsec;
  *        Application code can override this by
  *        setting M360DefaultWatchdogFeeder to zero.
  */
-#define Clock_driver_support_at_tick()  \
+#define Clock_driver_support_at_tick(arg)  \
     do {                                   \
         nsec += pit_nsec_per_tick;         \
         if (nsec >= rtems_nsec_per_tick)   \
diff --git a/bsps/m68k/gen68360/console/console.c b/bsps/m68k/gen68360/console/console.c
index 4d0f2bcb20..a2292dbab9 100644
--- a/bsps/m68k/gen68360/console/console.c
+++ b/bsps/m68k/gen68360/console/console.c
@@ -308,7 +308,7 @@ rtems_device_driver console_open(
     smc1SetAttributes,  /* setAttributes */
     NULL,      /* stopRemoteTx */
     NULL,      /* startRemoteTx */
-    1      /* outputUsesInterrupts */
+    TERMIOS_IRQ_DRIVEN      /* outputUsesInterrupts */
   };
   static const rtems_termios_callbacks pollCallbacks = {
     smc1Initialize,    /* firstOpen */
@@ -318,7 +318,7 @@ rtems_device_driver console_open(
     smc1SetAttributes,  /* setAttributes */
     NULL,      /* stopRemoteTx */
     NULL,      /* startRemoteTx */
-    0      /* outputUsesInterrupts */
+    TERMIOS_POLLED      /* outputUsesInterrupts */
   };
 
   /*
diff --git a/bsps/m68k/gen68360/include/tm27.h b/bsps/m68k/gen68360/include/tm27.h
index 5523a4a345..6134f15d68 100644
--- a/bsps/m68k/gen68360/include/tm27.h
+++ b/bsps/m68k/gen68360/include/tm27.h
@@ -29,6 +29,8 @@
 
 #define MUST_WAIT_FOR_INTERRUPT 0
 
+#define TM27_USE_VECTOR_HANDLER
+
 #define Install_tm27_vector( handler ) set_vector( (handler), 34, 1 )
 
 #define Cause_tm27_intr()	asm volatile ("trap #2");
diff --git a/bsps/m68k/gen68360/spi/m360_spi.h b/bsps/m68k/gen68360/spi/m360_spi.h
index 9e6bc5c9c1..a470f3786a 100644
--- a/bsps/m68k/gen68360/spi/m360_spi.h
+++ b/bsps/m68k/gen68360/spi/m360_spi.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /**
  *  @file
  *
@@ -7,11 +9,28 @@
  */
 
 /*
- * Copyright (c) 2008 embedded brains GmbH. All rights reserved.
+ * Copyright (c) 2008 embedded brains GmbH & Co. KG
+ *
+ * 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.
  *
- * 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.
+ * 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.
  */
 
 /**
diff --git a/bsps/m68k/gen68360/start/linkcmds b/bsps/m68k/gen68360/start/linkcmds
index 0bf9efa9ea..7376ce070c 100644
--- a/bsps/m68k/gen68360/start/linkcmds
+++ b/bsps/m68k/gen68360/start/linkcmds
@@ -154,7 +154,7 @@ SECTIONS {
         } >ram
 
         .noinit (NOLOAD) : {
-                *(.noinit*)
+                *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
         } > ram
 
         .rtemsstack (NOLOAD) : {
diff --git a/bsps/m68k/gen68360/start/linkcmds.bootp b/bsps/m68k/gen68360/start/linkcmds.bootp
index 422396f766..4bca5aab54 100644
--- a/bsps/m68k/gen68360/start/linkcmds.bootp
+++ b/bsps/m68k/gen68360/start/linkcmds.bootp
@@ -156,7 +156,7 @@ SECTIONS {
         } >myram
 
         .noinit (NOLOAD) : {
-                *(.noinit*)
+                *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
         } >mvram
 
         .rtemsstack (NOLOAD) : {
diff --git a/bsps/m68k/gen68360/start/linkcmds.prom b/bsps/m68k/gen68360/start/linkcmds.prom
index da8acdf376..c5c96228a4 100644
--- a/bsps/m68k/gen68360/start/linkcmds.prom
+++ b/bsps/m68k/gen68360/start/linkcmds.prom
@@ -154,7 +154,7 @@ SECTIONS {
         } >ram
 
         .noinit (NOLOAD) : {
-                *(.noinit*)
+                *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
         } > ram
 
         .rtemsstack (NOLOAD) : {