6 files changed, 14 insertions, 24 deletions
diff --git a/bsps/or1k/generic_or1k/clock/clockdrv.c b/bsps/or1k/generic_or1k/clock/clockdrv.c
index 7b8a07fd3d..4409b49ed4 100644
--- a/bsps/or1k/generic_or1k/clock/clockdrv.c
+++ b/bsps/or1k/generic_or1k/clock/clockdrv.c
@@ -1,14 +1,13 @@
 /**
  * @file
  *
- * @ingroup bsp_clock
+ * @ingroup RTEMSDriverClockImpl
  *
- * @brief or1k clock support.
+ * @brief This source file contains the implementation of the or1k Clock
+ *   Driver.
  */
 
 /*
- * generic_or1k Clock driver
- *
  * COPYRIGHT (c) 2014-2015 Hesham ALMatary <heshamelmatary@gmail.com>
  *
  * The license and distribution terms for this file may be
@@ -109,7 +108,7 @@ static void generic_or1k_clock_initialize(void)
   rtems_timecounter_install(&or1ksim_tc);
 }
 
-#define Clock_driver_support_at_tick() generic_or1k_clock_at_tick()
+#define Clock_driver_support_at_tick(arg) generic_or1k_clock_at_tick()
 
 #define Clock_driver_support_initialize_hardware() generic_or1k_clock_initialize()
 
diff --git a/bsps/or1k/generic_or1k/headers.am b/bsps/or1k/generic_or1k/headers.am
deleted file mode 100644
index 3576c64a9c..0000000000
--- a/bsps/or1k/generic_or1k/headers.am
+++ /dev/null
@@ -1,12 +0,0 @@
-## This file was generated by "./boostrap -H".
-
-include_HEADERS =
-include_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp.h
-include_HEADERS += include/bspopts.h
-include_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/tm27.h
-
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/generic_or1k.h
-include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/irq.h
-include_bsp_HEADERS += ../../../../../../bsps/or1k/generic_or1k/include/bsp/uart.h
diff --git a/bsps/or1k/generic_or1k/start/bsp_specs b/bsps/or1k/generic_or1k/start/bsp_specs
deleted file mode 100644
index e69de29bb2..0000000000
--- a/bsps/or1k/generic_or1k/start/bsp_specs
+++ /dev/null
diff --git a/bsps/or1k/headers.am b/bsps/or1k/headers.am
deleted file mode 100644
index 670c0c40ab..0000000000
--- a/bsps/or1k/headers.am
+++ /dev/null
@@ -1,5 +0,0 @@
-## This file was generated by "./boostrap -H".
-
-include_bspdir = $(includedir)/bsp
-include_bsp_HEADERS =
-include_bsp_HEADERS += ../../../../../bsps/or1k/include/bsp/linker-symbols.h
diff --git a/bsps/or1k/shared/doxygen.h b/bsps/or1k/shared/doxygen.h
index d380bfa744..2c1ce043de 100644
--- a/bsps/or1k/shared/doxygen.h
+++ b/bsps/or1k/shared/doxygen.h
@@ -1,4 +1,12 @@
 /**
+ * @file
+ *
+ * @ingroup RTEMSImplDoxygen
+ *
+ * @brief This header file defines or1k-specific groups.
+ */
+
+/**
  * @defgroup RTEMSBSPsOR1K OpenRISC 1000 (or1k)
  *
  * @ingroup RTEMSBSPs
diff --git a/bsps/or1k/shared/start/linkcmds.base b/bsps/or1k/shared/start/linkcmds.base
index c276e13cb2..d5b87debb6 100644
--- a/bsps/or1k/shared/start/linkcmds.base
+++ b/bsps/or1k/shared/start/linkcmds.base
@@ -152,7 +152,7 @@ SECTIONS {
        } > REGION_RODATA AT > REGION_RODATA_LOAD
        .data.rel.ro : ALIGN_WITH_INPUT {
                *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*)
-               *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*)
+               *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*)
        } > REGION_RODATA AT > REGION_RODATA_LOAD
        .jcr : ALIGN_WITH_INPUT {
                KEEP (*(.jcr))
@@ -287,7 +287,7 @@ SECTIONS {
 
   .noinit (NOLOAD) : ALIGN_WITH_INPUT {
     bsp_section_noinit_begin = .;
-    *(.noinit*)
+    *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
     bsp_section_noinit_end = .;
   } > REGION_BSS AT > REGION_BSS
   bsp_section_noinit_size = bsp_section_noinit_end - bsp_section_noinit_begin;