ARM: rename boards to more consistent naming

This renames the Freescale and Phytec board directories and defconfig
files to a common naming scheme. The board directories are named
<vendor>-<board> and the defconfig files are named
<vendor>-<board>_defconfig. Also the DataModul realq7 is renamed to its
Marketing Name eDM-QMX6.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

10 files changed, 379 insertions, 0 deletions

diff --git a/arch/arm/boards/freescale-mx27-ads/Makefile b/arch/arm/boards/freescale-mx27-ads/Makefile
new file mode 100644
index 0000000000..398db9b6b9
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/Makefile
@@ -0,0 +1,3 @@
+
+lwl-y += lowlevel_init.o
+obj-y += imx27ads.o
diff --git a/arch/arm/boards/freescale-mx27-ads/env/bin/_update b/arch/arm/boards/freescale-mx27-ads/env/bin/_update
new file mode 100644
index 0000000000..014bce3512
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/_update
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+if [ -z "$part" -o -z "$image" ]; then
+	echo "define \$part and \$image"
+	exit 1
+fi
+
+if [ ! -e "$part" ]; then
+	echo "Partition $part does not exist"
+	exit 1
+fi
+
+if [ $# = 1 ]; then
+	image=$1
+fi
+
+if [ x$ip = xdhcp ]; then
+	dhcp
+fi
+
+ping $eth0.serverip
+if [ $? -ne 0 ] ; then
+	echo "update aborted"
+	exit 1
+fi
+
+unprotect $part
+
+echo
+echo "erasing partition $part"
+erase $part
+
+echo
+echo "flashing $image to $part"
+echo
+tftp $image $part
diff --git a/arch/arm/boards/freescale-mx27-ads/env/bin/boot b/arch/arm/boards/freescale-mx27-ads/env/bin/boot
new file mode 100644
index 0000000000..3859dc113b
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/boot
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+. /env/config
+
+if [ x$1 = xflash ]; then
+	root=flash
+	kernel=flash
+fi
+
+if [ x$1 = xnet ]; then
+	root=net
+	kernel=net
+fi
+
+if [ x$ip = xdhcp ]; then
+	bootargs="$bootargs ip=dhcp"
+else
+	bootargs="$bootargs ip=$eth0.ipaddr:$eth0.serverip:$eth0.gateway:$eth0.netmask:::"
+fi
+
+if [ x$root = xflash ]; then
+	bootargs="$bootargs root=$rootpart rootfstype=jffs2"
+else
+	bootargs="$bootargs root=/dev/nfs nfsroot=$eth0.serverip:$nfsroot,v3,tcp"
+fi
+
+bootargs="$bootargs mtdparts=physmap-flash.0:$mtdparts"
+
+if [ $kernel = net ]; then
+	if [ x$ip = xdhcp ]; then
+		dhcp
+	fi
+	tftp $uimage uImage || exit 1
+	bootm uImage
+else
+	bootm /dev/nor0.kernel
+fi
+
diff --git a/arch/arm/boards/freescale-mx27-ads/env/bin/init b/arch/arm/boards/freescale-mx27-ads/env/bin/init
new file mode 100644
index 0000000000..48e2139f7d
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/init
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+PATH=/env/bin
+export PATH
+
+. /env/config
+addpart /dev/nor0 $mtdparts
+
+echo
+echo -n "Hit any key to stop autoboot: "
+timeout -a $autoboot_timeout
+if [ $? != 0 ]; then
+	echo
+	echo "type update_kernel [<imagename>] to update kernel into flash"
+	echo "type udate_root [<imagename>] to update rootfs into flash"
+	echo
+	exit
+fi
+
+boot
\ No newline at end of file
diff --git a/arch/arm/boards/freescale-mx27-ads/env/bin/update_kernel b/arch/arm/boards/freescale-mx27-ads/env/bin/update_kernel
new file mode 100644
index 0000000000..1ad95fc5d6
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/update_kernel
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+. /env/config
+
+image=$uimage
+part=/dev/nor0.kernel
+
+. /env/bin/_update $1
diff --git a/arch/arm/boards/freescale-mx27-ads/env/bin/update_root b/arch/arm/boards/freescale-mx27-ads/env/bin/update_root
new file mode 100644
index 0000000000..b757a5b922
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/env/bin/update_root
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+. /env/config
+
+image=$jffs2
+part=/dev/nor0.root
+
+. /env/bin/_update $1
diff --git a/arch/arm/boards/freescale-mx27-ads/env/config b/arch/arm/boards/freescale-mx27-ads/env/config
new file mode 100644
index 0000000000..f18a86b7c1
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/env/config
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# can be either 'net' or 'flash'
+kernel=net
+root=net
+
+# use 'dhcp' todo dhcp in barebox and in kernel
+ip=dhcp
+
+eth0.ipaddr=192.168.23.164
+eth0.netmask=255.255.255.0
+eth0.gateway=192.168.23.2
+eth0.serverip=192.168.23.2
+
+uimage=uImage-mx27ads
+jffs2=root-mx27ads.jffs2
+
+autoboot_timeout=3
+
+nfsroot="/tmp/imx27ads"
+bootargs="console=ttymxc0,115200"
+
+mtdparts="128k(barebox)ro,128k(bareboxenv),1536k(kernel),-(root)"
+rootpart="/dev/mtdblock3"
+
diff --git a/arch/arm/boards/freescale-mx27-ads/imx27ads.c b/arch/arm/boards/freescale-mx27-ads/imx27ads.c
new file mode 100644
index 0000000000..9fb1760602
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2007 Sascha Hauer, Pengutronix 
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ *
+ */
+
+#include <common.h>
+#include <net.h>
+#include <init.h>
+#include <environment.h>
+#include <mach/imx27-regs.h>
+#include <asm/armlinux.h>
+#include <io.h>
+#include <fec.h>
+#include <gpio.h>
+#include <mach/weim.h>
+#include <partition.h>
+#include <fs.h>
+#include <fcntl.h>
+#include <generated/mach-types.h>
+#include <mach/iomux-mx27.h>
+#include <mach/devices-imx27.h>
+
+static struct fec_platform_data fec_info = {
+	.xcv_type = PHY_INTERFACE_MODE_MII,
+	.phy_addr = 1,
+};
+
+static int imx27ads_timing_init(void)
+{
+	/* configure cpld on cs4 */
+	imx27_setup_weimcs(4, 0x0000DCF6, 0x444A4541, 0x44443302);
+
+	/* configure synchronous mode for
+	 * 16 bit nor flash on cs0 */
+	imx27_setup_weimcs(0, 0x0000CC03, 0xa0330D01, 0x00220800);
+
+	writew(0x00f0, 0xc0000000);
+	writew(0x00aa, 0xc0000aaa);
+	writew(0x0055, 0xc0000554);
+	writew(0x00d0, 0xc0000aaa);
+	writew(0x66ca, 0xc0000aaa);
+	writew(0x00f0, 0xc0000000);
+
+	imx27_setup_weimcs(0, 0x23524E80, 0x10000D03, 0x00720900);
+
+	/* Select FEC data through data path */
+	writew(0x0020, MX27_CS4_BASE_ADDR + 0x10);
+
+	/* Enable CPLD FEC data path */
+	writew(0x0010, MX27_CS4_BASE_ADDR + 0x14);
+
+	return 0;
+}
+
+core_initcall(imx27ads_timing_init);
+
+static int mx27ads_devices_init(void)
+{
+	int i;
+	unsigned int mode[] = {
+		PD0_AIN_FEC_TXD0,
+		PD1_AIN_FEC_TXD1,
+		PD2_AIN_FEC_TXD2,
+		PD3_AIN_FEC_TXD3,
+		PD4_AOUT_FEC_RX_ER,
+		PD5_AOUT_FEC_RXD1,
+		PD6_AOUT_FEC_RXD2,
+		PD7_AOUT_FEC_RXD3,
+		PD8_AF_FEC_MDIO,
+		PD9_AIN_FEC_MDC | GPIO_PUEN,
+		PD10_AOUT_FEC_CRS,
+		PD11_AOUT_FEC_TX_CLK,
+		PD12_AOUT_FEC_RXD0,
+		PD13_AOUT_FEC_RX_DV,
+		PD14_AOUT_FEC_RX_CLK,
+		PD15_AOUT_FEC_COL,
+		PD16_AIN_FEC_TX_ER,
+		PF23_AIN_FEC_TX_EN,
+		PE12_PF_UART1_TXD,
+		PE13_PF_UART1_RXD,
+		PE14_PF_UART1_CTS,
+		PE15_PF_UART1_RTS,
+	};
+
+	/* initizalize gpios */
+	for (i = 0; i < ARRAY_SIZE(mode); i++)
+		imx_gpio_mode(mode[i]);
+
+	add_cfi_flash_device(DEVICE_ID_DYNAMIC, 0xC0000000, 32 * 1024 * 1024, 0);
+
+	imx27_add_fec(&fec_info);
+	devfs_add_partition("nor0", 0x00000, 0x20000, DEVFS_PARTITION_FIXED, "self0");
+	devfs_add_partition("nor0", 0x20000, 0x20000, DEVFS_PARTITION_FIXED, "env0");
+	protect_file("/dev/env0", 1);
+
+	armlinux_set_architecture(MACH_TYPE_MX27ADS);
+
+	return 0;
+}
+
+device_initcall(mx27ads_devices_init);
+
+static int mx27ads_console_init(void)
+{
+	barebox_set_model("Freescale i.MX27 ADS");
+	barebox_set_hostname("mx27ads");
+
+	imx27_add_uart0();
+	return 0;
+}
+
+console_initcall(mx27ads_console_init);
+
diff --git a/arch/arm/boards/freescale-mx27-ads/imx27ads.dox b/arch/arm/boards/freescale-mx27-ads/imx27ads.dox
new file mode 100644
index 0000000000..e14d8e3fab
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.dox
@@ -0,0 +1,5 @@
+/** @page imx27ads Freescale i.MX27ads
+
+This is the Freescale evaluation board for the i.MX27 Processor
+
+*/
diff --git a/arch/arm/boards/freescale-mx27-ads/lowlevel_init.S b/arch/arm/boards/freescale-mx27-ads/lowlevel_init.S
new file mode 100644
index 0000000000..45f39921ec
--- /dev/null
+++ b/arch/arm/boards/freescale-mx27-ads/lowlevel_init.S
@@ -0,0 +1,112 @@
+/*
+ * For clock initialization, see chapter 3 of the "MCIMX27 Multimedia
+ * Applications Processor Reference Manual, Rev. 0.2".
+ *
+ */
+
+#include <config.h>
+#include <mach/imx27-regs.h>
+#include <asm/barebox-arm-head.h>
+
+#define writel(val, reg) \
+	ldr		r0,	=reg;	\
+	ldr		r1,	=val;	\
+	str		r1,   [r0];
+
+#define CRM_PLL_PCTL_PARAM(pd, fd, fi, fn)  (((pd-1)<<26) + ((fd-1)<<16) + (fi<<10) + (fn<<0))
+
+.macro sdram_init
+	/*
+	 * DDR on CSD0
+	 */
+	writel(0x00000008, 0xD8001010)
+	writel(0x55555555, 0x10027828)
+	writel(0x55555555, 0x10027830)
+	writel(0x55555555, 0x10027834)
+	writel(0x00005005, 0x10027838)
+	writel(0x15555555, 0x1002783C)
+	writel(0x00000004, 0xD8001010)
+	writel(0x006ac73a, 0xD8001004)
+	writel(0x92100000, 0xD8001000)
+	writel(0x00000000, 0xA0000F00)
+	writel(0xA2100000, 0xD8001000)
+	writel(0x00000000, 0xA0000F00)
+	writel(0x00000000, 0xA0000F00)
+	writel(0x00000000, 0xA0000F00)
+	writel(0x00000000, 0xA0000F00)
+	writel(0xA2200000, 0xD8001000)
+	writel(0x00000000, 0xA0000F00)
+	writel(0x00000000, 0xA0000F00)
+	writel(0x00000000, 0xA0000F00)
+	writel(0x00000000, 0xA0000F00)
+	writel(0xb2100000, 0xD8001000)
+	ldr		r0, =0xA0000033
+	mov		r1, #0xda
+	strb		r1, [r0]
+	ldr		r0, =0xA1000000
+	mov		r1, #0xff
+	strb		r1, [r0]
+	writel(0x82226080, 0xD8001000)
+.endm
+
+.globl barebox_arm_reset_vector
+barebox_arm_reset_vector:
+
+	bl arm_cpu_lowlevel_init
+
+	/* ahb lite ip interface */
+	writel(0x20040304, MX27_AIPI_BASE_ADDR + MX27_AIPI1_PSR0)
+	writel(0xDFFBFCFB, MX27_AIPI_BASE_ADDR + MX27_AIPI1_PSR1)
+	writel(0x00000000, MX27_AIPI_BASE_ADDR + MX27_AIPI2_PSR0)
+	writel(0xFFFFFFFF, MX27_AIPI_BASE_ADDR + MX27_AIPI2_PSR1)
+
+	/* disable mpll/spll */
+	ldr r0, =MX27_CCM_BASE_ADDR + MX27_CSCR
+	ldr r1, [r0]
+	bic r1, r1, #0x03
+	str r1, [r0]
+
+	/*
+	 * pll clock initialization - see section 3.4.3 of the i.MX27 manual
+	 *
+	 * FIXME: Using the 399*2 MHz values from table 3-8 doens't work
+	 *        with 1.2 V core voltage! Find out if this is
+	 *        documented somewhere.
+	 */
+	writel(0x00191403, MX27_CCM_BASE_ADDR + MX27_MPCTL0)	/* MPLL = 199.5*2 MHz               */
+	writel(0x040C2403, MX27_CCM_BASE_ADDR + MX27_SPCTL0)	/* SPLL = FIXME (needs review)      */
+
+	/*
+	 * ARM clock = (399 MHz / 2) / (ARM divider = 1) = 200 MHz
+	 * AHB clock = (399 MHz / 3) / (AHB divider = 2) = 66.5 MHz
+	 * System clock (HCLK) = 133 MHz
+	 */
+	writel(0x33F30307 | MX27_CSCR_MPLL_RESTART | MX27_CSCR_SPLL_RESTART,
+			MX27_CCM_BASE_ADDR + MX27_CSCR)
+
+	/* add some delay here */
+	mov r1, #0x1000
+1:	subs r1, r1, #0x1
+	bne 1b
+
+	/* clock gating enable */
+	writel(0x00050f08, MX27_SYSCTRL_BASE_ADDR + MX27_GPCR)
+
+	/* peripheral clock divider */
+	/* FIXME                            */
+	writel(0x23C8F403, MX27_CCM_BASE_ADDR + MX27_PCDR0)
+	/* PERDIV1=08 @133 MHz              */
+	/* PERDIV1=04 @266 MHz              */
+	writel(0x09030913, MX27_CCM_BASE_ADDR + MX27_PCDR1)
+	/* skip sdram initialization if we run from ram */
+	cmp	pc, #0xa0000000
+	bls	1f
+	cmp	pc, #0xc0000000
+	bhi	1f
+
+	b imx27_barebox_entry
+1:
+	sdram_init
+
+	b imx27_barebox_entry
+