bsps: Move startup files to bsps

Adjust build support files to new directory layout.

This patch is a part of the BSP source reorganization.

Update #3285.

9 files changed, 9 insertions, 751 deletions

diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index 0dc1b30f96..b1dd9067ef 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal
 include $(top_srcdir)/../../../../automake/compile.am
 include $(top_srcdir)/../../bsp.am
 
-dist_project_lib_DATA = startup/bsp_specs
+dist_project_lib_DATA = ../../../../../../bsps/arm/imx/start/bsp_specs
 
 ###############################################################################
 #                  Header                                                     #
@@ -18,7 +18,7 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S
 project_lib_DATA = start.$(OBJEXT)
 
 project_lib_DATA += linkcmds
-dist_project_lib_DATA += startup/linkcmds.imx7
+dist_project_lib_DATA += ../../../../../../bsps/arm/imx/start/linkcmds.imx7
 
 ###############################################################################
 #                  LibBSP                                                     #
@@ -37,18 +37,18 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/sbrk.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/dev/btimer/btimer-stub.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/bsp-fdt.c
 librtemsbsp_a_SOURCES += ../../../../../../bsps/shared/start/stackalloc.c
-librtemsbsp_a_SOURCES += ../shared/startup/bsp-start-memcpy.S
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/start/bsp-start-memcpy.S
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-exception-handler.c
 librtemsbsp_a_SOURCES += ../shared/arm-cp15-set-ttb-entries.c
 
 # Startup
-librtemsbsp_a_SOURCES += startup/bspreset.c
-librtemsbsp_a_SOURCES += startup/bspstart.c
-librtemsbsp_a_SOURCES += startup/ccm.c
-librtemsbsp_a_SOURCES += startup/imx_iomux.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspreset.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspstart.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/ccm.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/imx_iomux.c
 if HAS_SMP
 librtemsbsp_a_SOURCES += ../shared/arm-a9mpcore-smp.c
-librtemsbsp_a_SOURCES += startup/bspsmp.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspsmp.c
 endif
 
 # IRQ
@@ -72,7 +72,7 @@ librtemsbsp_a_SOURCES += i2c/imx-i2c.c
 librtemsbsp_a_SOURCES += spi/imx-ecspi.c
 
 # Start hooks
-librtemsbsp_a_SOURCES += startup/bspstarthooks.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/start/bspstarthooks.c
 
 ###############################################################################
 #                  Special Rules                                              #
diff --git a/c/src/lib/libbsp/arm/imx/startup/bsp_specs b/c/src/lib/libbsp/arm/imx/startup/bsp_specs
deleted file mode 100644
index 47dd31d46b..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/bsp_specs
+++ /dev/null
@@ -1,9 +0,0 @@
-%rename endfile old_endfile
-%rename startfile old_startfile
-
-*startfile:
-%{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
-
-*endfile:
-%{!qrtems: %(old_endfiles)} %{qrtems: crtend.o%s crtn.o%s}
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspreset.c b/c/src/lib/libbsp/arm/imx/startup/bspreset.c
deleted file mode 100644
index c3c9f69566..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/bspreset.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@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.
- */
-
-#include <bsp/bootcard.h>
-#include <bsp.h>
-#include <arm/freescale/imx/imx_wdogreg.h>
-
-void bsp_reset(void)
-{
-  volatile uint16_t *pcr;
-
-  imx_uart_console_drain();
-
-  pcr = (volatile uint16_t *) 0x30280000;
-  *pcr = WDOG_CR_WDE;
-  *pcr = WDOG_CR_WDE;
-  *pcr = WDOG_CR_WDE;
-
-  while (true) {
-    /* Wait */
-  }
-}
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspsmp.c b/c/src/lib/libbsp/arm/imx/startup/bspsmp.c
deleted file mode 100644
index 51c7aef12a..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/bspsmp.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@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.
- */
-
-#include <rtems/score/smpimpl.h>
-
-#include <arm/freescale/imx/imx_srcreg.h>
-#include <arm/freescale/imx/imx_gpcreg.h>
-
-#include <bsp/start.h>
-
-bool _CPU_SMP_Start_processor(uint32_t cpu_index)
-{
-  bool started;
-
-  if (cpu_index == 1) {
-    volatile imx_src *src = (volatile imx_src *) 0x30390000;
-    volatile imx_gpc *gpc = (volatile imx_gpc *) 0x303a0000;
-
-    src->gpr3 = (uint32_t) _start;
-    gpc->pgc_a7core0_ctrl |= IMX_GPC_PGC_CTRL_PCR;
-    gpc->cpu_pgc_sw_pup_req |= IMX_GPC_CPU_PGC_CORE1_A7;
-
-    while ((gpc->cpu_pgc_pup_status1 & IMX_GPC_CPU_PGC_CORE1_A7) != 0) {
-      /* Wait */
-    }
-
-    gpc->pgc_a7core0_ctrl &= ~IMX_GPC_PGC_CTRL_PCR;
-    src->a7rcr1 |= IMX_SRC_A7RCR1_A7_CORE1_ENABLE;
-
-    started = true;
-  } else {
-    started = false;
-  }
-
-  return started;
-}
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspstart.c b/c/src/lib/libbsp/arm/imx/startup/bspstart.c
deleted file mode 100644
index 046336655b..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/bspstart.c
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@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.
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-#include <bsp/fatal.h>
-#include <bsp/fdt.h>
-#include <bsp/irq-generic.h>
-#include <bsp/linker-symbols.h>
-
-#include <libfdt.h>
-
-#define MAGIC_IRQ_OFFSET 32
-
-void *imx_get_reg_of_node(const void *fdt, int node)
-{
-  int len;
-  const uint32_t *val;
-
-  val = fdt_getprop(fdt, node, "reg", &len);
-  if (val == NULL || len < 4) {
-    return NULL;
-  }
-
-  return (void *) fdt32_to_cpu(val[0]);
-}
-
-rtems_vector_number imx_get_irq_of_node(
-  const void *fdt,
-  int node,
-  size_t index
-)
-{
-  int len;
-  const uint32_t *val;
-
-  val = fdt_getprop(fdt, node, "interrupts", &len);
-  if (val == NULL || len < (int) ((index + 1) * 12)) {
-    return UINT32_MAX;
-  }
-
-  return fdt32_to_cpu(val[index * 3 + 1]) + MAGIC_IRQ_OFFSET;
-}
-
-uint32_t bsp_fdt_map_intr(const uint32_t *intr, size_t icells)
-{
-  return intr[1] + MAGIC_IRQ_OFFSET;
-}
-
-void arm_generic_timer_get_config(
-  uint32_t *frequency,
-  uint32_t *irq
-)
-{
-  const void *fdt;
-  int node;
-  int len;
-  const uint32_t *val;
-
-  fdt = bsp_fdt_get();
-  node = fdt_path_offset(fdt, "/timer");
-
-  val = fdt_getprop(fdt, node, "clock-frequency", &len);
-  if (val != NULL && len >= 4) {
-    *frequency = fdt32_to_cpu(val[0]);
-  } else {
-    bsp_fatal(IMX_FATAL_GENERIC_TIMER_FREQUENCY);
-  }
-
-  /* FIXME: Figure out how Linux gets a proper IRQ number */
-  *irq = imx_get_irq_of_node(fdt, node, 0) - 16;
-}
-
-void bsp_start(void)
-{
-  bsp_interrupt_initialize();
-  rtems_cache_coherent_add_area(
-    bsp_section_nocacheheap_begin,
-    (uintptr_t) bsp_section_nocacheheap_size
-  );
-}
diff --git a/c/src/lib/libbsp/arm/imx/startup/bspstarthooks.c b/c/src/lib/libbsp/arm/imx/startup/bspstarthooks.c
deleted file mode 100644
index c75b03415b..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/bspstarthooks.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2013, 2017 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@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.
- */
-
-#define ARM_CP15_TEXT_SECTION BSP_START_TEXT_SECTION
-
-#include <bsp.h>
-#include <bsp/start.h>
-#include <bsp/arm-cp15-start.h>
-#include <bsp/arm-a9mpcore-start.h>
-
-BSP_START_DATA_SECTION static const arm_cp15_start_section_config
-imx_mmu_config_table[] = {
-  ARMV7_CP15_START_DEFAULT_SECTIONS,
-  {
-    .begin = 0x07000000U,
-    .end = 0x70000000U,
-    .flags = ARMV7_MMU_DEVICE
-  }
-};
-
-BSP_START_TEXT_SECTION static void setup_mmu_and_cache(void)
-{
-  uint32_t ctrl = arm_cp15_start_setup_mmu_and_cache(
-    ARM_CP15_CTRL_A,
-    ARM_CP15_CTRL_AFE | ARM_CP15_CTRL_Z
-  );
-
-  arm_cp15_start_setup_translation_table_and_enable_mmu_and_cache(
-    ctrl,
-    (uint32_t *) bsp_translation_table_base,
-    ARM_MMU_DEFAULT_CLIENT_DOMAIN,
-    &imx_mmu_config_table[0],
-    RTEMS_ARRAY_SIZE(imx_mmu_config_table)
-  );
-}
-
-BSP_START_TEXT_SECTION void bsp_start_hook_0(void)
-{
-#ifdef RTEMS_SMP
-  uint32_t cpu_id = arm_cortex_a9_get_multiprocessor_cpu_id();
-
-  arm_a9mpcore_start_enable_smp_in_auxiliary_control();
-
-  if (cpu_id != 0) {
-    arm_a9mpcore_start_on_secondary_processor();
-  }
-#endif
-}
-
-BSP_START_TEXT_SECTION void bsp_start_hook_1(void)
-{
-  arm_a9mpcore_start_set_vector_base();
-  bsp_start_copy_sections();
-  setup_mmu_and_cache();
-  bsp_start_clear_bss();
-}
diff --git a/c/src/lib/libbsp/arm/imx/startup/ccm.c b/c/src/lib/libbsp/arm/imx/startup/ccm.c
deleted file mode 100644
index bbb72db639..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/ccm.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2017 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <info@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.
- */
-
-#include <stdint.h>
-#include <bspopts.h>
-
-#include <arm/freescale/imx/imx_ccmvar.h>
-
-uint32_t imx_ccm_ipg_hz(void)
-{
-  return IMX_CCM_IPG_HZ;
-}
-
-uint32_t imx_ccm_uart_hz(void)
-{
-  return IMX_CCM_UART_HZ;
-}
-
-uint32_t imx_ccm_ahb_hz(void)
-{
-  return IMX_CCM_AHB_HZ;
-}
diff --git a/c/src/lib/libbsp/arm/imx/startup/imx_iomux.c b/c/src/lib/libbsp/arm/imx/startup/imx_iomux.c
deleted file mode 100644
index cd4591fa6f..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/imx_iomux.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/*-
- * Copyright (c) 2014 Ian Lepore
- * All rights reserved.
- *
- * 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 AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD: head/sys/arm/freescale/imx/imx_iomux.c 321938 2017-08-02 18:28:06Z ian $
- */
-
-/*
- * Pin mux and pad control driver for imx5 and imx6.
- *
- * This driver implements the fdt_pinctrl interface for configuring the gpio and
- * peripheral pins based on fdt configuration data.
- *
- * When the driver attaches, it walks the entire fdt tree and automatically
- * configures the pins for each device which has a pinctrl-0 property and whose
- * status is "okay".  In addition it implements the fdt_pinctrl_configure()
- * method which any other driver can call at any time to reconfigure its pins.
- *
- * The nature of the fsl,pins property in fdt data makes this driver's job very
- * easy.  Instead of representing each pin and pad configuration using symbolic
- * properties such as pullup-enable="true" and so on, the data simply contains
- * the addresses of the registers that control the pins, and the raw values to
- * store in those registers.
- *
- * The imx5 and imx6 SoCs also have a small number of "general purpose
- * registers" in the iomuxc device which are used to control an assortment
- * of completely unrelated aspects of SoC behavior.  This driver provides other
- * drivers with direct access to those registers via simple accessor functions.
- */
-
-#include <sys/param.h>
-#ifndef __rtems__
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/module.h>
-#include <sys/malloc.h>
-#include <sys/rman.h>
-
-#include <machine/bus.h>
-
-#include <dev/ofw/openfirm.h>
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/fdt/fdt_pinctrl.h>
-#endif /* __rtems__ */
-
-#include <arm/freescale/imx/imx_iomuxvar.h>
-#ifndef __rtems__
-#include <arm/freescale/imx/imx_machdep.h>
-#else /* __rtems__ */
-#include <bsp.h>
-#include <bsp/fdt.h>
-#include <rtems/sysinit.h>
-#include <errno.h>
-#include <libfdt.h>
-#include <stdlib.h>
-
-typedef size_t bus_size_t;
-typedef int phandle_t;
-#endif /* __rtems__ */
-
-struct iomux_softc {
-#ifndef __rtems__
-	device_t	dev;
-	struct resource	*mem_res;
-	u_int		last_gpregaddr;
-#else /* __rtems__ */
-	volatile uint32_t *regs;
-#endif /* __rtems__ */
-};
-
-#ifndef __rtems__
-static struct iomux_softc *iomux_sc;
-
-static struct ofw_compat_data compat_data[] = {
-	{"fsl,imx6dl-iomuxc",	true},
-	{"fsl,imx6q-iomuxc",	true},
-	{"fsl,imx6sl-iomuxc",	true},
-	{"fsl,imx6ul-iomuxc",	true},
-	{"fsl,imx6sx-iomuxc",	true},
-	{"fsl,imx53-iomuxc",	true},
-	{"fsl,imx51-iomuxc",	true},
-	{NULL,			false},
-};
-#else /* __rtems__ */
-static struct iomux_softc iomux_sc_instance;
-
-#define iomux_sc (&iomux_sc_instance);
-
-static void
-imx_iomux_init(void)
-{
-	const void *fdt;
-	int node;
-	struct iomux_softc *sc;
-
-	fdt = bsp_fdt_get();
-	node = fdt_node_offset_by_compatible(fdt, -1, "fsl,imx7d-iomuxc");
-	sc = iomux_sc;
-	sc->regs = imx_get_reg_of_node(fdt, node);
-}
-
-RTEMS_SYSINIT_ITEM(imx_iomux_init, RTEMS_SYSINIT_BSP_START,
-    RTEMS_SYSINIT_ORDER_MIDDLE);
-
-#define	OF_node_from_xref(phandle) fdt_node_offset_by_phandle(fdt, phandle)
-
-static int
-imx_iomux_getencprop_alloc(const char *fdt, int node, const char *name,
-    size_t elsz, void **buf)
-{
-	int len;
-	const uint32_t *val;
-	int i;
-	uint32_t *cell;
-
-	val = fdt_getprop(fdt, node, "fsl,pins", &len);
-	if (val == NULL || len < 0 || len % elsz != 0) {
-		return (-1);
-	}
-
-	cell = malloc((size_t)len);
-	*buf = cell;
-	if (cell == NULL) {
-		return (-1);
-	}
-
-	for (i = 0; i < len / 4; ++i) {
-		cell[i] = fdt32_to_cpu(val[i]);
-	}
-
-	return (len / (int)elsz);
-}
-
-#define	OF_getencprop_alloc(node, name, elsz, buf) \
-    imx_iomux_getencprop_alloc(fdt, node, name, elsz, buf)
-
-#define	OF_prop_free(buf) free(buf)
-#endif /* __rtems__ */
-
-/*
- * Each tuple in an fsl,pins property contains these fields.
- */
-struct pincfg {
-	uint32_t mux_reg;
-	uint32_t padconf_reg;
-	uint32_t input_reg;
-	uint32_t mux_val;
-	uint32_t input_val;
-	uint32_t padconf_val;
-};
-
-#define	PADCONF_NONE	(1U << 31)	/* Do not configure pad. */
-#define	PADCONF_SION	(1U << 30)	/* Force SION bit in mux register. */
-#define	PADMUX_SION	(1U <<  4)	/* The SION bit in the mux register. */
-
-static inline uint32_t
-RD4(struct iomux_softc *sc, bus_size_t off)
-{
-
-#ifndef __rtems__
-	return (bus_read_4(sc->mem_res, off));
-#else /* __rtems__ */
-	return (sc->regs[off / 4]);
-#endif /* __rtems__ */
-}
-
-static inline void
-WR4(struct iomux_softc *sc, bus_size_t off, uint32_t val)
-{
-
-#ifndef __rtems__
-	bus_write_4(sc->mem_res, off, val);
-#else /* __rtems__ */
-	sc->regs[off / 4] = val;
-#endif /* __rtems__ */
-}
-
-static void
-iomux_configure_input(struct iomux_softc *sc, uint32_t reg, uint32_t val)
-{
-	u_int select, mask, shift, width;
-
-	/* If register and value are zero, there is nothing to configure. */
-	if (reg == 0 && val == 0)
-		return;
-
-	/*
-	 * If the config value has 0xff in the high byte it is encoded:
-	 * 	31     23      15      7        0
-	 *      | 0xff | shift | width | select |
-	 * We need to mask out the old select value and OR in the new, using a
-	 * mask of the given width and shifting the values up by shift.
-	 */
-	if ((val & 0xff000000) == 0xff000000) {
-		select = val & 0x000000ff;
-		width = (val & 0x0000ff00) >> 8;
-		shift = (val & 0x00ff0000) >> 16;
-		mask  = ((1u << width) - 1) << shift;
-		val = (RD4(sc, reg) & ~mask) | (select << shift);
-	}
-	WR4(sc, reg, val);
-}
-
-#ifndef __rtems__
-static int
-iomux_configure_pins(device_t dev, phandle_t cfgxref)
-#else /* __rtems__ */
-int imx_iomux_configure_pins(const void *fdt, uint32_t cfgxref)
-#endif /* __rtems__ */
-{
-	struct iomux_softc *sc;
-	struct pincfg *cfgtuples, *cfg;
-	phandle_t cfgnode;
-	int i, ntuples;
-	uint32_t sion;
-
-#ifndef __rtems__
-	sc = device_get_softc(dev);
-#else /* __rtems__ */
-	sc = iomux_sc;
-#endif /* __rtems__ */
-	cfgnode = OF_node_from_xref(cfgxref);
-	ntuples = OF_getencprop_alloc(cfgnode, "fsl,pins", sizeof(*cfgtuples),
-	    (void **)&cfgtuples);
-	if (ntuples < 0)
-		return (ENOENT);
-	if (ntuples == 0)
-		return (0); /* Empty property is not an error. */
-	for (i = 0, cfg = cfgtuples; i < ntuples; i++, cfg++) {
-		sion = (cfg->padconf_val & PADCONF_SION) ? PADMUX_SION : 0;
-		WR4(sc, cfg->mux_reg, cfg->mux_val | sion);
-		iomux_configure_input(sc, cfg->input_reg, cfg->input_val);
-		if ((cfg->padconf_val & PADCONF_NONE) == 0)
-			WR4(sc, cfg->padconf_reg, cfg->padconf_val);
-#ifndef __rtems__
-		if (bootverbose) {
-			char name[32]; 
-			OF_getprop(cfgnode, "name", &name, sizeof(name));
-			printf("%16s: muxreg 0x%04x muxval 0x%02x "
-			    "inpreg 0x%04x inpval 0x%02x "
-			    "padreg 0x%04x padval 0x%08x\n",
-			    name, cfg->mux_reg, cfg->mux_val | sion,
-			    cfg->input_reg, cfg->input_val,
-			    cfg->padconf_reg, cfg->padconf_val);
-		}
-#endif /* __rtems__ */
-	}
-	OF_prop_free(cfgtuples);
-	return (0);
-}
-
-#ifndef __rtems__
-static int
-iomux_probe(device_t dev)
-{
-
-	if (!ofw_bus_status_okay(dev))
-		return (ENXIO);
-
-	if (!ofw_bus_search_compatible(dev, compat_data)->ocd_data)
-		return (ENXIO);
-
-	device_set_desc(dev, "Freescale i.MX pin configuration");
-	return (BUS_PROBE_DEFAULT);
-}
-
-static int
-iomux_detach(device_t dev)
-{
-
-        /* This device is always present. */
-	return (EBUSY);
-}
-
-static int
-iomux_attach(device_t dev)
-{
-	struct iomux_softc * sc;
-	int rid;
-
-	sc = device_get_softc(dev);
-	sc->dev = dev;
-
-	switch (imx_soc_type()) {
-	case IMXSOC_51:
-		sc->last_gpregaddr = 1 * sizeof(uint32_t);
-		break;
-	case IMXSOC_53:
-		sc->last_gpregaddr = 2 * sizeof(uint32_t);
-		break;
-	case IMXSOC_6DL:
-	case IMXSOC_6S:
-	case IMXSOC_6SL:
-	case IMXSOC_6Q:
-		sc->last_gpregaddr = 13 * sizeof(uint32_t);
-		break;
-	case IMXSOC_6UL:
-		sc->last_gpregaddr = 14 * sizeof(uint32_t);
-		break;
-	default:
-		device_printf(dev, "Unknown SoC type\n");
-		return (ENXIO);
-	}
-
-	rid = 0;
-	sc->mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
-	    RF_ACTIVE);
-	if (sc->mem_res == NULL) {
-		device_printf(dev, "Cannot allocate memory resources\n");
-		return (ENXIO);
-	}
-
-	iomux_sc = sc;
-
-	/*
-	 * Register as a pinctrl device, and call the convenience function that
-	 * walks the entire device tree invoking FDT_PINCTRL_CONFIGURE() on any
-	 * pinctrl-0 property cells whose xref phandle refers to a configuration
-	 * that is a child node of our node in the tree.
-	 *
-	 * The pinctrl bindings documentation specifically mentions that the
-	 * pinctrl device itself may have a pinctrl-0 property which contains
-	 * static configuration to be applied at device init time.  The tree
-	 * walk will automatically handle this for us when it passes through our
-	 * node in the tree.
-	 */
-	fdt_pinctrl_register(dev, "fsl,pins");
-	fdt_pinctrl_configure_tree(dev);
-
-	return (0);
-}
-
-uint32_t
-imx_iomux_gpr_get(u_int regaddr)
-{
-	struct iomux_softc * sc;
-
-	sc = iomux_sc;
-	KASSERT(sc != NULL, ("%s called before attach", __FUNCTION__));
-	KASSERT(regaddr >= 0 && regaddr <= sc->last_gpregaddr, 
-	    ("%s bad regaddr %u, max %u", __FUNCTION__, regaddr,
-	    sc->last_gpregaddr));
-
-	return (RD4(iomux_sc, regaddr));
-}
-
-void
-imx_iomux_gpr_set(u_int regaddr, uint32_t val)
-{
-	struct iomux_softc * sc;
-
-	sc = iomux_sc;
-	KASSERT(sc != NULL, ("%s called before attach", __FUNCTION__));
-	KASSERT(regaddr >= 0 && regaddr <= sc->last_gpregaddr, 
-	    ("%s bad regaddr %u, max %u", __FUNCTION__, regaddr,
-	    sc->last_gpregaddr));
-
-	WR4(iomux_sc, regaddr, val);
-}
-
-void
-imx_iomux_gpr_set_masked(u_int regaddr, uint32_t clrbits, uint32_t setbits)
-{
-	struct iomux_softc * sc;
-	uint32_t val;
-
-	sc = iomux_sc;
-	KASSERT(sc != NULL, ("%s called before attach", __FUNCTION__));
-	KASSERT(regaddr >= 0 && regaddr <= sc->last_gpregaddr, 
-	    ("%s bad regaddr %u, max %u", __FUNCTION__, regaddr,
-	    sc->last_gpregaddr));
-
-	val = RD4(iomux_sc, regaddr * 4);
-	val = (val & ~clrbits) | setbits;
-	WR4(iomux_sc, regaddr, val);
-}
-
-static device_method_t imx_iomux_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,         iomux_probe),
-	DEVMETHOD(device_attach,        iomux_attach),
-	DEVMETHOD(device_detach,        iomux_detach),
-
-        /* fdt_pinctrl interface */
-	DEVMETHOD(fdt_pinctrl_configure,iomux_configure_pins),
-
-	DEVMETHOD_END
-};
-
-static driver_t imx_iomux_driver = {
-	"imx_iomux",
-	imx_iomux_methods,
-	sizeof(struct iomux_softc),
-};
-
-static devclass_t imx_iomux_devclass;
-
-EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver, 
-    imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE);
-
-#endif /* __rtems__ */
diff --git a/c/src/lib/libbsp/arm/imx/startup/linkcmds.imx7 b/c/src/lib/libbsp/arm/imx/startup/linkcmds.imx7
deleted file mode 100644
index 750e1def1d..0000000000
--- a/c/src/lib/libbsp/arm/imx/startup/linkcmds.imx7
+++ /dev/null
@@ -1,37 +0,0 @@
-MEMORY {
-	RAM_MMU : ORIGIN = 0x80000000, LENGTH = 16k
-	NOCACHE : ORIGIN = 0x80100000, LENGTH = 1M
-	RAM : ORIGIN = 0x80200000, LENGTH = 512M - 2M
-}
-
-REGION_ALIAS ("REGION_START", RAM);
-REGION_ALIAS ("REGION_VECTOR", RAM);
-REGION_ALIAS ("REGION_TEXT", RAM);
-REGION_ALIAS ("REGION_TEXT_LOAD", RAM);
-REGION_ALIAS ("REGION_RODATA", RAM);
-REGION_ALIAS ("REGION_RODATA_LOAD", RAM);
-REGION_ALIAS ("REGION_DATA", RAM);
-REGION_ALIAS ("REGION_DATA_LOAD", RAM);
-REGION_ALIAS ("REGION_FAST_TEXT", RAM);
-REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM);
-REGION_ALIAS ("REGION_FAST_DATA", RAM);
-REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM);
-REGION_ALIAS ("REGION_BSS", RAM);
-REGION_ALIAS ("REGION_WORK", RAM);
-REGION_ALIAS ("REGION_STACK", RAM);
-REGION_ALIAS ("REGION_NOCACHE", NOCACHE);
-REGION_ALIAS ("REGION_NOCACHE_LOAD", NOCACHE);
-
-bsp_processor_count = DEFINED (bsp_processor_count) ? bsp_processor_count : 2;
-
-bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096;
-bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024;
-
-bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M;
-
-bsp_vector_table_in_start_section = 1;
-
-bsp_translation_table_base = ORIGIN (RAM_MMU);
-bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU);
-
-INCLUDE linkcmds.armv4