colibri_vf50: integrate config block handling

Integrate factory configuration block handling for hardware version,
MAC address and serial number to be passed to Linux.
The U-Boot environment is stored in NAND flash.

Default is to boot out of NAND flash using the UBI abstraction.
Optional NFS as well as MMC/SD boot variants are also available.

This brings the configuration more in-line with our Tegra based
versions.

While at it enable board size limit check set to 512 KB related to the
gfxRAM area of the OCRAM.

Please note that a boot delay of zero did not quite work the same way
as on the Tegras where one was still able to interrupt the boot process
by continuously hitting a key. Therefore set it to one second for now.

2 files changed, 446 insertions, 221 deletions

diff --git a/board/toradex/colibri_vf50/colibri_vf50.c b/board/toradex/colibri_vf50/colibri_vf50.c
index ace9b55254..5043929d84 100644
--- a/board/toradex/colibri_vf50/colibri_vf50.c
+++ b/board/toradex/colibri_vf50/colibri_vf50.c
@@ -20,121 +20,182 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h>
-#include <asm/io.h>
-#include <asm/fec.h>
-#include <asm/gpio.h>
-#include <asm/arch/vybrid-regs.h>
-#include <asm/arch/vybrid-pins.h>
-#include <asm/arch/iomux.h>
-#include <asm/errno.h>
-#include <asm/arch/sys_proto.h>
+#include <common.h> /* do not change order of include file */
+
 #include <asm/arch/crm_regs.h>
+#include <asm/arch/iomux.h>
 #include <asm/arch/scsc_regs.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/arch/vybrid-pins.h>
+#include <asm/arch/vybrid-regs.h>
+#include <asm/errno.h>
+#include <asm/fec.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <fsl_esdhc.h>
 #include <i2c.h>
+#include <malloc.h>
 #include <mmc.h>
-#include <fsl_esdhc.h>
+#include <nand.h>
 #include <usb/ehci-fsl.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#if defined(CONFIG_BOARD_LATE_INIT) && (defined(CONFIG_TRDX_CFG_BLOCK) || \
+		defined(CONFIG_REVISION_TAG) || defined(CONFIG_SERIAL_TAG))
+static unsigned char *config_block = NULL;
+#endif
+
 #ifdef CONFIG_FSL_ESDHC
 struct fsl_esdhc_cfg esdhc_cfg[] = {
 	{CONFIG_SYS_ESDHC1_BASE, 1},
 };
+#endif /* CONFIG_FSL_ESDHC */
+
+void ddr_phy_init(void);
+void setup_iomux_ddr(void);
+void setup_iomux_nfc(void);
+void setup_iomux_uart(void);
+
+int board_early_init_f(void)
+{
+	setup_iomux_uart();
+
+#ifdef CONFIG_NAND_FSL_NFC
+	setup_iomux_nfc();
 #endif
 
-void setup_iomux_ddr(void)
+	return 0;
+}
+
+int board_init(void)
 {
-#define DDR_IOMUX	0x00000180
-#define DDR_IOMUX1	0x00010180
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A15);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A14);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A13);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A12);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A11);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A10);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A9);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A8);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A7);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A6);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A5);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A4);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A3);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A2);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A1);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_BA2);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_BA1);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_BA0);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_CAS);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_CKE);
-	__raw_writel(DDR_IOMUX1, IOMUXC_DDR_CLK);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_CS);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D15);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D14);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D13);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D12);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D11);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D10);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D9);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D8);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D7);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D6);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D5);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D4);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D3);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D2);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D1);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D0);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_DQM1);	/* UDM */
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_DQM0);	/* LDM */
-	__raw_writel(DDR_IOMUX1, IOMUXC_DDR_DQS1);	/* UDQS */
-	__raw_writel(DDR_IOMUX1, IOMUXC_DDR_DQS0);	/* LDQS */
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_RAS);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_WE);
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_ODT1);	/* ? */
-	__raw_writel(DDR_IOMUX, IOMUXC_DDR_ODT0);
+	u32 temp;
+	struct vybrid_scsc_reg *scsc = (struct vybrid_scsc_reg *)SCSCM_BASE_ADDR;
+
+	/* address of boot parameters */
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+
+	/*
+	 * Enable external 32K Oscillator
+	 *
+	 * The internal clock experiences significant drift
+         * so we must use the external oscillator in order
+	 * to maintain correct time in the hwclock
+	 */
+	temp = __raw_readl(&scsc->sosc_ctr);
+	temp |= VYBRID_SCSC_SICR_CTR_SOSC_EN;
+	__raw_writel(temp, &scsc->sosc_ctr);
+
+	return 0;
 }
 
-void ddr_phy_init(void)
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
 {
-#define PHY_DQ_TIMING		0x00002613
-#define PHY_DQS_TIMING		0x00002615
-#define PHY_CTRL		0x01210080
-#define PHY_MASTER_CTRL		0x0001012a
-#define PHY_SLAVE_CTRL		0x00012020
+	char env_str[256];
 
-	/* phy_dq_timing_reg freq set 0 */
-	__raw_writel(PHY_DQ_TIMING, DDR_PHY000);
-	__raw_writel(PHY_DQ_TIMING, DDR_PHY016);
-	__raw_writel(PHY_DQ_TIMING, DDR_PHY032);
-	__raw_writel(PHY_DQ_TIMING, DDR_PHY048);
+	int i;
 
-	/* phy_dqs_timing_reg freq set 0 */
-	__raw_writel(PHY_DQS_TIMING, DDR_PHY001);
-	__raw_writel(PHY_DQS_TIMING, DDR_PHY017);
-	__raw_writel(PHY_DQS_TIMING, DDR_PHY033);
-	__raw_writel(PHY_DQS_TIMING, DDR_PHY049);
+	char *addr_str, *end;
+	unsigned char bi_enetaddr[6]	= {0, 0, 0, 0, 0, 0}; /* Ethernet address */
+	unsigned char *mac_addr;
+	unsigned char mac_addr00[6]	= {0, 0, 0, 0, 0, 0};
 
-	/* phy_gate_lpbk_ctrl_reg freq set 0 */
-	__raw_writel(PHY_CTRL, DDR_PHY002);	/* read delay bit21:19 */
-	__raw_writel(PHY_CTRL, DDR_PHY018);	/* phase_detect_sel bit18:16 */
-	__raw_writel(PHY_CTRL, DDR_PHY034);	/* bit lpbk_ctrl bit12 */
-	__raw_writel(PHY_CTRL, DDR_PHY050);
+	size_t size			= 4096;
+	unsigned char toradex_oui[3]	= { 0x00, 0x14, 0x2d };
+	int valid			= 0;
 
-	/* phy_dll_master_ctrl_reg freq set 0 */
-	__raw_writel(PHY_MASTER_CTRL, DDR_PHY003);
-	__raw_writel(PHY_MASTER_CTRL, DDR_PHY019);
-	__raw_writel(PHY_MASTER_CTRL, DDR_PHY035);
-	__raw_writel(PHY_MASTER_CTRL, DDR_PHY051);
+        int ret;
 
-	/* phy_dll_slave_ctrl_reg freq set 0 */
-	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY004);
-	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY020);
-	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY036);
-	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY052);
+	/* Allocate RAM area for config block */
+	config_block = malloc(size);
+	if (!config_block) {
+		printf("Not enough malloc space available!\n");
+		return -1;
+	}
 
-	__raw_writel(0x00001105, DDR_PHY050);
+	/* Clear it */
+	memset((void *)config_block, 0, size);
+
+	/* Read production parameter config block from NAND */
+	ret = nand_read_skip_bad(&nand_info[0], CONFIG_TRDX_CFG_BLOCK_OFFSET, &size,
+			(unsigned char *)config_block);
+
+	/* Check validity */
+	if ((ret == 0) && (size > 0)) {
+		mac_addr = config_block + 8;
+		if (!(memcmp(mac_addr, toradex_oui, 3))) {
+			valid = 1;
+		}
+	}
+
+	if (!valid) {
+		printf("Missing Colibri config block\n");
+		memset((void *)config_block, 0, size);
+	} else {
+		/* Get MAC address from environment */
+		if ((addr_str = getenv("ethaddr")) != NULL) {
+			for (i = 0; i < 6; i++) {
+				bi_enetaddr[i] = addr_str ? simple_strtoul(addr_str, &end, 16) : 0;
+				if (addr_str) {
+					addr_str = (*end) ? end + 1 : end;
+				}
+			}
+		}
+
+		/* Set Ethernet MAC address from config block if not already set */
+		if (memcmp(mac_addr00, bi_enetaddr, 6) == 0) {
+			sprintf(env_str, "%02x:%02x:%02x:%02x:%02x:%02x",
+				mac_addr[0], mac_addr[1], mac_addr[2],
+				mac_addr[3], mac_addr[4], mac_addr[5]);
+			setenv("ethaddr", env_str);
+#ifndef CONFIG_ENV_IS_NOWHERE
+			saveenv();
+#endif
+		}
+	}
+
+#ifdef CONFIG_MXC_SPI
+	setup_iomux_spi();
+#endif
+
+	return 0;
+}
+#endif /* CONFIG_BOARD_LATE_INIT */
+
+#ifdef CONFIG_FSL_ESDHC
+int board_mmc_getcd(struct mmc *mmc)
+{
+	/*struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;*/
+	int ret;
+
+	__raw_writel(0x005031ef, IOMUXC_PAD_014);	/* clk */
+	__raw_writel(0x005031ef, IOMUXC_PAD_015);	/* cmd */
+	__raw_writel(0x005031ef, IOMUXC_PAD_016);	/* dat0 */
+	__raw_writel(0x005031ef, IOMUXC_PAD_017);	/* dat1 */
+	__raw_writel(0x005031ef, IOMUXC_PAD_018);	/* dat2 */
+	__raw_writel(0x005031ef, IOMUXC_PAD_019);	/* dat3 */
+
+	ret = 1;
+	return ret;
+}
+
+int board_mmc_init(bd_t *bis)
+{
+	u32 index = 0;
+	s32 status = 0;
+
+	status |= fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
+	return status;
+}
+#endif /* CONFIG_FSL_ESDHC */
+
+int checkboard(void)
+{
+	puts("Board: Colibri VF50\n");
+
+	return 0;
 }
 
 unsigned long ddr_ctrl_init(void)
@@ -245,7 +306,6 @@ unsigned long ddr_ctrl_init(void)
 
 	__raw_writel(0x00002819, DDR_CR096);	/* wlmrd, wldqsen */
 
-
 	/* AXI ports */
 	__raw_writel(0x00202000, DDR_CR105);
 	__raw_writel(0x20200000, DDR_CR106);
@@ -301,26 +361,53 @@ unsigned long ddr_ctrl_init(void)
 	return dram_size;
 }
 
+void ddr_phy_init(void)
+{
+#define PHY_DQ_TIMING		0x00002613
+#define PHY_DQS_TIMING		0x00002615
+#define PHY_CTRL		0x01210080
+#define PHY_MASTER_CTRL		0x0001012a
+#define PHY_SLAVE_CTRL		0x00012020
+
+	/* phy_dq_timing_reg freq set 0 */
+	__raw_writel(PHY_DQ_TIMING, DDR_PHY000);
+	__raw_writel(PHY_DQ_TIMING, DDR_PHY016);
+	__raw_writel(PHY_DQ_TIMING, DDR_PHY032);
+	__raw_writel(PHY_DQ_TIMING, DDR_PHY048);
+
+	/* phy_dqs_timing_reg freq set 0 */
+	__raw_writel(PHY_DQS_TIMING, DDR_PHY001);
+	__raw_writel(PHY_DQS_TIMING, DDR_PHY017);
+	__raw_writel(PHY_DQS_TIMING, DDR_PHY033);
+	__raw_writel(PHY_DQS_TIMING, DDR_PHY049);
+
+	/* phy_gate_lpbk_ctrl_reg freq set 0 */
+	__raw_writel(PHY_CTRL, DDR_PHY002);	/* read delay bit21:19 */
+	__raw_writel(PHY_CTRL, DDR_PHY018);	/* phase_detect_sel bit18:16 */
+	__raw_writel(PHY_CTRL, DDR_PHY034);	/* bit lpbk_ctrl bit12 */
+	__raw_writel(PHY_CTRL, DDR_PHY050);
+
+	/* phy_dll_master_ctrl_reg freq set 0 */
+	__raw_writel(PHY_MASTER_CTRL, DDR_PHY003);
+	__raw_writel(PHY_MASTER_CTRL, DDR_PHY019);
+	__raw_writel(PHY_MASTER_CTRL, DDR_PHY035);
+	__raw_writel(PHY_MASTER_CTRL, DDR_PHY051);
+
+	/* phy_dll_slave_ctrl_reg freq set 0 */
+	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY004);
+	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY020);
+	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY036);
+	__raw_writel(PHY_SLAVE_CTRL, DDR_PHY052);
+
+	__raw_writel(0x00001105, DDR_PHY050);
+}
+
 int dram_init(void)
 {
 	setup_iomux_ddr();
-#ifdef CONFIG_SYS_UBOOT_IN_GPURAM
-	gd->ram_size = 0x80000;
-	ddr_ctrl_init();
-#else
 	gd->ram_size = ddr_ctrl_init();
-#endif
-	return 0;
-}
 
-void setup_iomux_uart(void)
-{
-	__raw_writel(0x002011a2, IOMUXC_PAD_026);	/* UART_C_TXD: SCI1_TX */
-	__raw_writel(0x002011a1, IOMUXC_PAD_027);	/* UART_C_RXD: SCI1_RX */
-	__raw_writel(0x001011a2, IOMUXC_PAD_032);	/* UART_A_TXD: SCI0_TX */
-	__raw_writel(0x001011a1, IOMUXC_PAD_033);	/* UART_A_RXD: SCI0_RX */
-	__raw_writel(0x001011a2, IOMUXC_PAD_079);	/* UART_B_TXD: SCI2_TX */
-	__raw_writel(0x001011a1, IOMUXC_PAD_080);	/* UART_B_RXD: SCI2_RX */
+	return 0;
 }
 
 #if defined(CONFIG_CMD_NET)
@@ -359,40 +446,137 @@ int fecpin_setclear(struct eth_device *dev, int setclear)
 
 	return 0;
 }
-#endif
+#endif /* CONFIG_CMD_NET */
 
-#ifdef CONFIG_MXC_SPI
-void setup_iomux_spi(void)
+#ifdef CONFIG_REVISION_TAG
+u32 get_board_rev(void)
 {
+#ifdef CONFIG_BOARD_LATE_INIT
+	int i;
+	unsigned short major = 0, minor = 0, release = 0;
+	size_t size = 4096;
+
+	if(config_block == NULL) {
+		return 0;
+	}
+
+	/* Parse revision information in config block */
+	for (i = 0; i < (size - 8); i++) {
+		if (config_block[i] == 0x02 && config_block[i+1] == 0x40 &&
+				config_block[i+2] == 0x08) {
+			break;
+		}
+	}
+
+	major = (config_block[i+3] << 8) | config_block[i+4];
+	minor = (config_block[i+5] << 8) | config_block[i+6];
+	release = (config_block[i+7] << 8) | config_block[i+8];
+
+	/* Check validity */
+	if (major)
+		return ((major & 0xff) << 8) | ((minor & 0xf) << 4) | ((release & 0xf) + 0xa);
+	else
+		return 0;
+#else
+	return 0;
+#endif /* CONFIG_BOARD_LATE_INIT */
 }
-#endif
+#endif /* CONFIG_REVISION_TAG */
 
-#ifdef CONFIG_FSL_ESDHC
-int board_mmc_getcd(struct mmc *mmc)
+#ifdef CONFIG_SERIAL_TAG
+void get_board_serial(struct tag_serialnr *serialnr)
 {
-	/*struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv;*/
-	int ret;
+#ifdef CONFIG_BOARD_LATE_INIT
+	int array[8];
+	int i;
+	unsigned int serial		= 0;
+	unsigned int serial_offset	= 11;
+
+	if(config_block == NULL) {
+		serialnr->low = 0;
+		serialnr->high = 0;
+		return;
+	}
 
-	__raw_writel(0x005031ef, IOMUXC_PAD_014);	/* clk */
-	__raw_writel(0x005031ef, IOMUXC_PAD_015);	/* cmd */
-	__raw_writel(0x005031ef, IOMUXC_PAD_016);	/* dat0 */
-	__raw_writel(0x005031ef, IOMUXC_PAD_017);	/* dat1 */
-	__raw_writel(0x005031ef, IOMUXC_PAD_018);	/* dat2 */
-	__raw_writel(0x005031ef, IOMUXC_PAD_019);	/* dat3 */
+	/* Get MAC address from config block */
+	memcpy(&serial, config_block + serial_offset, 3);
+	serial = ntohl(serial);
+	serial >>= 8;
+
+	/* Check validity */
+	if (serial) {
+		/* Convert to Linux serial number format (hexadecimal coded decimal) */
+		i = 7;
+		while (serial) {
+			array[i--] = serial % 10;
+			serial /= 10;
+		}
+		serial = array[0];
+		for (i = 1; i < 8; i++) {
+			serial *= 16;
+			serial += array[i];
+		}
+	}
 
-	ret = 1;
-	return ret;
+	serialnr->low = serial;
+#else
+	serialnr->low = 0;
+#endif /* CONFIG_BOARD_LATE_INIT */
+	serialnr->high = 0;
 }
+#endif /* CONFIG_SERIAL_TAG */
 
-int board_mmc_init(bd_t *bis)
+void setup_iomux_ddr(void)
 {
-	u32 index = 0;
-	s32 status = 0;
-
-	status |= fsl_esdhc_initialize(bis, &esdhc_cfg[index]);
-	return status;
+#define DDR_IOMUX	0x00000180
+#define DDR_IOMUX1	0x00010180
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A15);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A14);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A13);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A12);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A11);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A10);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A9);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A8);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A7);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A6);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A5);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A4);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A3);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A2);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_A1);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_BA2);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_BA1);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_BA0);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_CAS);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_CKE);
+	__raw_writel(DDR_IOMUX1, IOMUXC_DDR_CLK);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_CS);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D15);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D14);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D13);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D12);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D11);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D10);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D9);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D8);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D7);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D6);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D5);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D4);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D3);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D2);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D1);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_D0);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_DQM1);	/* UDM */
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_DQM0);	/* LDM */
+	__raw_writel(DDR_IOMUX1, IOMUXC_DDR_DQS1);	/* UDQS */
+	__raw_writel(DDR_IOMUX1, IOMUXC_DDR_DQS0);	/* LDQS */
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_RAS);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_WE);
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_ODT1);	/* ? */
+	__raw_writel(DDR_IOMUX, IOMUXC_DDR_ODT0);
 }
-#endif
 
 #ifdef CONFIG_NAND_FSL_NFC
 void setup_iomux_nfc(void)
@@ -412,51 +596,20 @@ void setup_iomux_nfc(void)
 	__raw_writel(0x006038d2, IOMUXC_PAD_100);
 	__raw_writel(0x006038d2, IOMUXC_PAD_101);
 }
-#endif
-int board_early_init_f(void)
-{
-	setup_iomux_uart();
-#ifdef CONFIG_NAND_FSL_NFC
-	setup_iomux_nfc();
-#endif
-	return 0;
-}
-
-int board_init(void)
-{
-	u32 temp;
-	struct vybrid_scsc_reg *scsc = (struct vybrid_scsc_reg *)SCSCM_BASE_ADDR;
-
-	/* address of boot parameters */
-	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-
-	/*
-	 * Enable external 32K Oscillator
-	 *
-	 * The internal clock experiences significant drift
-         * so we must use the external oscillator in order
-	 * to maintain correct time in the hwclock
-	 */
-	temp = __raw_readl(&scsc->sosc_ctr);
-	temp |= VYBRID_SCSC_SICR_CTR_SOSC_EN;
-	__raw_writel(temp, &scsc->sosc_ctr);
+#endif /* CONFIG_NAND_FSL_NFC */
 
-	return 0;
-}
-
-#ifdef CONFIG_BOARD_LATE_INIT
-int board_late_init(void)
-{
 #ifdef CONFIG_MXC_SPI
-	setup_iomux_spi();
-#endif
-	return 0;
+void setup_iomux_spi(void)
+{
 }
-#endif
+#endif /* CONFIG_MXC_SPI */
 
-int checkboard(void)
+void setup_iomux_uart(void)
 {
-	puts("Board: Colibri VF50\n");
-
-	return 0;
+	__raw_writel(0x002011a2, IOMUXC_PAD_026);	/* UART_C_TXD: SCI1_TX */
+	__raw_writel(0x002011a1, IOMUXC_PAD_027);	/* UART_C_RXD: SCI1_RX */
+	__raw_writel(0x001011a2, IOMUXC_PAD_032);	/* UART_A_TXD: SCI0_TX */
+	__raw_writel(0x001011a1, IOMUXC_PAD_033);	/* UART_A_RXD: SCI0_RX */
+	__raw_writel(0x001011a2, IOMUXC_PAD_079);	/* UART_B_TXD: SCI2_TX */
+	__raw_writel(0x001011a1, IOMUXC_PAD_080);	/* UART_B_RXD: SCI2_RX */
 }
diff --git a/include/configs/colibri_vf50.h b/include/configs/colibri_vf50.h
index c8faadf1d9..1531ea4065 100644
--- a/include/configs/colibri_vf50.h
+++ b/include/configs/colibri_vf50.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 Toradex, Inc.
  *
- * Configuration settings for the vybrid Board
+ * Configuration settings for the Colibri VF50 module.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -22,6 +22,9 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/* We now boot from the gfxRAM area of the OCRAM. */
+#define CONFIG_BOARD_SIZE_LIMIT		524288
+
  /* High Level Configuration Options */
 
 #define CONFIG_VYBRID
@@ -49,10 +52,16 @@
 
 #define CONFIG_MACH_TYPE		MACH_TYPE_COLIBRI_VF50
 /* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 2 * 1024 * 1024)
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + 4 * 1024 * 1024)
 
 #define CONFIG_BOARD_LATE_INIT
 
+#define CONFIG_REVISION_TAG		1
+#define CONFIG_SERIAL_TAG		1
+
+#define CONFIG_TRDX_CFG_BLOCK
+#define CONFIG_TRDX_CFG_BLOCK_OFFSET	0x40000
+
 /* Hardware drivers */
 #define CONFIG_VYBRID_UART
 #define CONFIG_VYBRID_UART_BASE		UART0_BASE
@@ -67,11 +76,15 @@
 /* Command definition */
 #include <config_cmd_default.h>
 
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DIAG
 #define CONFIG_CMD_BDI		/* bdinfo */
 #define CONFIG_CMD_BOOTD
 #define CONFIG_CMD_CONSOLE	/* coninfo */
 #define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
+#undef CONFIG_CMD_FLASH
+#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_MEMORY	/* md mm nm mw cp cmp crc base loop mtest */
 #define CONFIG_CMD_MISC
 #define CONFIG_CMD_MII
@@ -79,31 +92,23 @@
 #undef CONFIG_CMD_NFS		/* NFS support			*/
 #define CONFIG_CMD_PING
 #define	CONFIG_CMD_NAND
+#define CONFIG_RBTREE
+#define CONFIG_LZO
+#define CONFIG_CMD_UBI
+//#define CONFIG_CMD_UBIFS	/* increases size by almost 60 KB */
 #undef CONFIG_CMD_DATE
-#undef CONFIG_CMD_IMI		/* iminfo */
+#define CONFIG_CMD_IMI		/* iminfo */
 #undef CONFIG_CMD_IMLS
 #undef CONFIG_CMD_LOADB		/* loadb */
 #undef CONFIG_CMD_LOADS		/* loads */
 
-#define CONFIG_MMC
-#ifdef CONFIG_MMC
-#define CONFIG_SYS_ESDHC1_BASE		ESDHC2_BASE_ADDR
-#define CONFIG_FSL_ESDHC
-#define CONFIG_SYS_FSL_ESDHC_ADDR	0
-#define CONFIG_SYS_FSL_ESDHC_NUM	1
-#define CONFIG_ESDHC_NO_SNOOP		1
-/*#define CONFIG_MMC_TRACE*/
+#define CONFIG_BOOTDELAY		1
 
-/*#define CONFIG_ESDHC_DETECT_USE_EXTERN_IRQ1*/
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC135
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
-#define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
+#define CONFIG_BZIP2
+#define CONFIG_CRC32_VERIFY
+#define CONFIG_TIMESTAMP
 
-#define CONFIG_CMD_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_CMD_FAT
-#define CONFIG_DOS_PARTITION
-#endif
+#define CONFIG_AUTO_COMPLETE
 
 /*
  * NAND FLASH
@@ -117,7 +122,7 @@
 #define NAND_MAX_CHIPS			CONFIG_SYS_MAX_NAND_DEVICE
 #define CONFIG_SYS_NAND_SELECT_DEVICE
 #define	CONFIG_SYS_64BIT_VSPRINTF	/* needed for nand_util.c */
-#endif
+#endif /* CONFIG_CMD_NAND */
 
 /* Network configuration */
 #define CONFIG_MCFFEC
@@ -134,26 +139,98 @@
 #	define MCFFEC_TOUT_LOOP 50000
 #	undef CONFIG_HAS_ETH1
 
-#	define CONFIG_ETHADDR		00:e0:0c:bc:e5:60
 #	define CONFIG_ETHPRIME		"FEC1"
 #	define CONFIG_IPADDR		192.168.10.2
 #	define CONFIG_NETMASK		255.255.255.0
 #	define CONFIG_SERVERIP		192.168.10.1
-#	define CONFIG_GATEWAYIP		192.168.10.1
-#	define CONFIG_OVERWRITE_ETHADDR_ONCE
-
-/* If CONFIG_SYS_DISCOVER_PHY is not defined - hardcoded */
-#	ifndef CONFIG_SYS_DISCOVER_PHY
-#		define FECDUPLEX	FULL
-#		define FECSPEED		_100BASET
-#	else
-#		ifndef CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#			define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
-#		endif
-#	endif			/* CONFIG_SYS_DISCOVER_PHY */
-#endif
-
-#define CONFIG_BOOTDELAY		3
+#endif /* CONFIG_MCFFEC */
+
+#define DEFAULT_BOOTCOMMAND					\
+	"run ubiboot; run nfsboot"
+
+#define MMC_BOOTCMD						\
+	"run setup; "						\
+	"setenv bootargs ${defargs} ${mmcargs} ${mtdparts} ${setupargs}; " \
+	"echo Booting from MMC/SD card...; "			\
+	"fatload mmc 0:1 ${loadaddr} uImage && bootm"
+
+#define NFS_BOOTCMD						\
+	"run setup; "						\
+	"setenv bootargs ${defargs} ${nfsargs} ${mtdparts} ${setupargs}; " \
+	"echo Booting from NFS...; "				\
+	"dhcp && bootm"
+
+#define UBI_BOOTCMD						\
+	"run setup; "						\
+	"setenv bootargs ${defargs} ${ubiargs} ${mtdparts} ${setupargs}; " \
+	"echo Booting from NAND...; "				\
+	"ubi part kernel-ubi && ubi read ${loadaddr} kernel && bootm"
+
+#define CONFIG_BOOTCOMMAND	DEFAULT_BOOTCOMMAND
+#define CONFIG_NFSBOOTCOMMAND	NFS_BOOTCMD
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+	"defargs=vmalloc=64M mem=128M usb_high_speed=1\0" \
+	"mmcargs=root=/dev/mmcblk0p2 rw rootwait\0" \
+	"mmcboot=" MMC_BOOTCMD "\0" \
+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
+	"nfsargs=ip=:::::eth0: root=/dev/nfs\0" \
+	"setup=setenv setupargs " \
+	"fec_mac=${ethaddr} no_console_suspend=1 console=tty1 console=ttymxc0" \
+		",${baudrate}n8\0" \
+	"ubiargs=ubi.mtd=5 root=ubi0:rootfs rootfstype=ubifs\0" \
+	"ubiboot=" UBI_BOOTCMD "\0" \
+	""
+
+/* Dynamic MTD partition support */
+#define CONFIG_CMD_MTDPARTS	/* Enable 'mtdparts' command line support */
+#define CONFIG_MTD_PARTITIONS	/* ??? */
+#define CONFIG_MTD_DEVICE	/* needed for mtdparts commands */
+#define MTDIDS_DEFAULT		"nand0=NAND"
+#define MTDPARTS_DEFAULT	"mtdparts=NAND:"		\
+				"256k(fcb)ro,"			\
+				"256k@256k(config-block)ro,"	\
+				"512k@512k(u-boot)ro,"		\
+				"1m(u-boot-env)ro,"		\
+				"8m(kernel-ubi),"		\
+				"-(rootfs-ubi)"
+
+/* SD/MMC */
+#define CONFIG_MMC
+#ifdef CONFIG_MMC
+#define CONFIG_SYS_ESDHC1_BASE		ESDHC2_BASE_ADDR
+#define CONFIG_FSL_ESDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR	0
+#define CONFIG_SYS_FSL_ESDHC_NUM	1
+#define CONFIG_ESDHC_NO_SNOOP		1
+//#define CONFIG_MMC_TRACE
+
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC135
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC111
+#define CONFIG_SYS_FSL_ERRATUM_ESDHC_A001
+
+#define CONFIG_CMD_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#define CONFIG_DOS_PARTITION
+#endif /* CONFIG_MMC */
+
+/* FLASH and environment organization */
+#define CONFIG_SYS_NO_FLASH
+
+/* Environment not stored */
+//#define CONFIG_ENV_IS_NOWHERE
+#ifndef CONFIG_ENV_IS_NOWHERE
+/* Environment stored in NAND flash */
+#define CONFIG_ENV_IS_IN_NAND		1 /* use NAND for environment vars */
+#if defined(CONFIG_ENV_IS_IN_NAND)
+#define CONFIG_ENV_OFFSET		0x100000
+#define CONFIG_ENV_RANGE		0x100000
+#endif /* CONFIG_ENV_IS_IN_NAND */
+#endif /* !CONFIG_ENV_IS_NOWHERE */
+#define CONFIG_ENV_SIZE			(8 * 1024)
+
 #define CONFIG_LOADADDR			0x80010000	/* loadaddr env var */
 #define CONFIG_ARP_TIMEOUT		200UL
 
@@ -162,7 +239,6 @@
 #define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser */
 #define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
 #define CONFIG_SYS_PROMPT		"Colibri VF50 # "
-#undef CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_CBSIZE		256	/* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE		\
@@ -221,6 +297,10 @@
 #define CONFIG_SYS_CLKCTL_CCGR11	0xFFFFFFFF
 
 #define CONFIG_SYS_CLKCTRL_CCR		0x00010005
+/* 10.2.3 CCM Clock Switcher Register (CCM_CCSR) */
+//DDRC_CLK_SEL: PLL2 PFD2 clk
+//PLL2 (PLL 528 MHz)
+//PFD2 396 MHz
 #define CONFIG_SYS_CLKCTRL_CCSR		0x0003FF24
 #define CONFIG_SYS_CLKCTRL_CACRR	0x00000810
 #define CONFIG_SYS_CLKCTRL_CSCMR1	0x03CA0000
@@ -244,8 +324,8 @@
 #define CONFIG_SYS_ANADIG_VID_NUM	0x00000000
 #define CONFIG_SYS_ANADIG_VID_DENOM	0x00000012
 /* 11.21.13 PLL5 Control register (ANADIG_PLL5_CTRL) */
-#define CONFIG_SYS_ANADIG_ENET_CTRL	0x00002001	/* !POWERDOWN, ENABLE,
-							   !BYPASS */
+#define CONFIG_SYS_ANADIG_ENET_CTRL	0x00002001	/* !BYPASS, !POWERDOWN,
+							   ENABLE */
 #define CONFIG_SYS_ANADIG_PFD_USB1	0x1B1D1A1C
 #define CONFIG_SYS_ANADIG_PFD_528	0x171C1813
 #define CONFIG_SYS_ANADIG_USB1_MISC	0x00000002
@@ -259,12 +339,4 @@
 #define CONFIG_SYS_ANADIG_SYS_PFD_528	0x00000000
 #define CONFIG_SYS_ANADIG_SYS_PLL_LOCK	0x00000000
 
-/* FLASH and environment organization */
-#define CONFIG_SYS_NO_FLASH
-
-#define CONFIG_ENV_OFFSET		(6 * 64 * 1024)
-#define CONFIG_ENV_SIZE			(8 * 1024)
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV		0
-
-#endif
+#endif /* __CONFIG_H */