Skip to contentSkip to conversation

fpga: add definition for Xilinx Spartan-6 XC6SLX4

PATCH New Stefano Babic 4 participants 18 messages Dec 28, 2011 – Feb 8, 2012 FPGA manager framework

lore
Share & tools
lore

Stefano Babic

author
#0 lore raw

PATCH 1/4 fpga: add definition for Xilinx Spartan-6 XC6SLX4

Signed-off-by Stefano Babic <[email protected]>
---
 include/spartan3.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
include/spartan3.h +9 -0
index 67ede4b..89f1156 100644
@@ -80,6 +80,12 @@ typedef struct {
 #define	XILINX_XC3S1200E_SIZE	3841184/8
 #define	XILINX_XC3S1600E_SIZE	5969696/8
 
+/*
+ * Spartan-6 : the Spartan-6 family can be programmed
+ * exactly as the Spartan-3
+ */
+#define XILINK_XC6SLX4_SIZE	(3713568/8)
+
 /* Descriptor Macros
  *********************************************************************/
 /* Spartan-III devices */

@@ -123,4 +129,7 @@ typedef struct {
 #define XILINX_XC3S1600E_DESC(iface, fn_table, cookie) \
 { Xilinx_Spartan3, iface, XILINX_XC3S1600E_SIZE, fn_table, cookie }
 
+#define XILINX_XC6SLX4_DESC(iface, fn_table, cookie) \
+{ Xilinx_Spartan3, iface, XILINK_XC6SLX4_SIZE, fn_table, cookie }
+
 #endif /* _SPARTAN3_H_ */
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 2/4 FPGA: use debug() instead of module debug printf

Replace also __FUNCTION__ with standard __func__

Signed-off-by Stefano Babic <[email protected]>
---
 common/cmd_fpga.c |   59 +++++++++++++++++++++++++---------------------------
 1 files changed, 28 insertions(+), 31 deletions(-)
common/cmd_fpga.c +28 -31
index 8946345..915a5c0 100644
@@ -33,16 +33,6 @@
 #include <fpga.h>
 #include <malloc.h>
 
-#if 0
-#define	FPGA_DEBUG
-#endif
-
-#ifdef	FPGA_DEBUG
-#define	PRINTF(fmt,args...)	printf (fmt ,##args)
-#else
-#define PRINTF(fmt,args...)
-#endif
-
 /* Local functions */
 static int fpga_get_op (char *opstr);
 

@@ -76,8 +66,9 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 	length = (*dataptr << 8) + *(dataptr+1);
 	dataptr+=2;
 	if (*dataptr++ != 0x61) {
-		PRINTF ("%s: Design name identifier not recognized in bitstream\n",
-			__FUNCTION__ );
+		debug("%s: Design name identifier not recognized "
+			"in bitstream\n",
+			__func__);
 		return FPGA_FAIL;
 	}
 

@@ -90,8 +81,9 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 
 	/* get part number (identifier, length, string) */
 	if (*dataptr++ != 0x62) {
-		printf("%s: Part number identifier not recognized in bitstream\n",
-			__FUNCTION__ );
+		printf("%s: Part number identifier not recognized "
+			"in bitstream\n",
+			__func__);
 		return FPGA_FAIL;
 	}
 

@@ -104,7 +96,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 	/* get date (identifier, length, string) */
 	if (*dataptr++ != 0x63) {
 		printf("%s: Date identifier not recognized in bitstream\n",
-		       __FUNCTION__);
+		       __func__);
 		return FPGA_FAIL;
 	}
 

@@ -116,7 +108,8 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 
 	/* get time (identifier, length, string) */
 	if (*dataptr++ != 0x64) {
-		printf("%s: Time identifier not recognized in bitstream\n",__FUNCTION__);
+		printf("%s: Time identifier not recognized in bitstream\n",
+			__func__);
 		return FPGA_FAIL;
 	}
 

@@ -129,7 +122,7 @@ int fpga_loadbitstream(unsigned long dev, char* fpgadata, size_t size)
 	/* get fpga data length (identifier, length) */
 	if (*dataptr++ != 0x65) {
 		printf("%s: Data length identifier not recognized in bitstream\n",
-			__FUNCTION__);
+			__func__);
 		return FPGA_FAIL;
 	}
 	swapsize = ((unsigned int) *dataptr     <<24) +

@@ -183,39 +176,43 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 		if (fit_parse_subimage (argv[3], (ulong)fpga_data,
 					&fit_addr, &fit_uname)) {
 			fpga_data = (void *)fit_addr;
-			debug ("*  fpga: subimage '%s' from FIT image@0x%08lx\n",
-					fit_uname, fit_addr);
+			debug("*  fpga: subimage '%s' from FIT image "
+				"at 0x%08lx\n",
+				fit_uname, fit_addr);
 		} else
 #endif
 		{
 			fpga_data = (void *) simple_strtoul (argv[3], NULL, 16);
-			debug ("*  fpga: cmdline image address = 0x%08lx\n", (ulong)fpga_data);
+			debug("*  fpga: cmdline image address = 0x%08lx\n",
+				(ulong)fpga_data);
 		}
-		PRINTF ("%s: fpga_data = 0x%x\n", __FUNCTION__, (uint) fpga_data);
+		debug("%s: fpga_data = 0x%x\n", __func__, (uint) fpga_data);
 
 	case 3:		/* fpga <op> <dev | data addr> */
 		dev = (int) simple_strtoul (argv[2], NULL, 16);
-		PRINTF ("%s: device = %d\n", __FUNCTION__, dev);
+		debug("%s: device = %d\n", __func__, dev);
 		/* FIXME - this is a really weak test */
 		if ((argc == 3) && (dev > fpga_count ())) {	/* must be buffer ptr */
-			PRINTF ("%s: Assuming buffer pointer in arg 3\n",
-				__FUNCTION__);
+			debug("%s: Assuming buffer pointer in arg 3\n",
+				__func__);
 
 #if defined(CONFIG_FIT)
 			if (fit_parse_subimage (argv[2], (ulong)fpga_data,
 						&fit_addr, &fit_uname)) {
 				fpga_data = (void *)fit_addr;
-				debug ("*  fpga: subimage '%s' from FIT image at 0x%08lx\n",
-						fit_uname, fit_addr);
+				debug("*  fpga: subimage '%s' from FIT image "
+					"at 0x%08lx\n",
+					fit_uname, fit_addr);
 			} else
 #endif
 			{
 				fpga_data = (void *) dev;
-				debug ("*  fpga: cmdline image address = 0x%08lx\n", (ulong)fpga_data);
+				debug("*  fpga: cmdline image address = "
+					"0x%08lx\n", (ulong)fpga_data);
 			}
 
-			PRINTF ("%s: fpga_data = 0x%x\n",
-				__FUNCTION__, (uint) fpga_data);
+			debug("%s: fpga_data = 0x%x\n",
+				__func__, (uint) fpga_data);
 			dev = FPGA_INVALID_DEVICE;	/* reset device num */
 		}
 

@@ -224,8 +221,8 @@ int do_fpga (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
 		break;
 
 	default:
-		PRINTF ("%s: Too many or too few args (%d)\n",
-			__FUNCTION__, argc);
+		debug("%s: Too many or too few args (%d)\n",
+			__func__, argc);
 		op = FPGA_NONE;	/* force usage display */
 		break;
 	}
Signature · 1 line
1.7.5.4
Applied
#2 lore raw

PATCH 2/4 FPGA: use debug() instead of module debug printf

Dear Stefano Babic,

Quoted 6 lines · In message <[email protected]> you wrote:

Replace also __FUNCTION__ with standard __func__

Signed-off-by Stefano Babic <[email protected]>
---
 common/cmd_fpga.c |   59 +++++++++++++++++++++++++---------------------------
 1 files changed, 28 insertions(+), 31 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 6 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"Don't try to outweird me, three-eyes. I get stranger things than you
free with my breakfast cereal."
           - Zaphod Beeblebrox in  "Hitchhiker's Guide to the Galaxy"
author
#3 lore raw

PATCH 3/4 fpga: Spartan-3: let print the progress if configured

In reply to Stefano Babic

CONFIG_SYS_FPGA_PROG_FEEDBACK was already introduced to print the current status of FPGA loading - an undef in the code made this CONFIG_ useless.

Signed-off-by Stefano Babic <[email protected]>
---
 drivers/fpga/spartan3.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/fpga/spartan3.c +0 -1
index 9207391..1633a70 100644
@@ -38,7 +38,6 @@
 #endif
 
 #undef CONFIG_SYS_FPGA_CHECK_BUSY
-#undef CONFIG_SYS_FPGA_PROG_FEEDBACK
 
 /* Note: The assumption is that we cannot possibly run fast enough to
  * overrun the device (the Slave Parallel mode can free run at 50MHz).
Signature · 1 line
1.7.5.4
Applied
#4 lore raw

PATCH 3/4 fpga: Spartan-3: let print the progress if configured

Dear Stefano Babic,

Quoted 8 lines · In message <[email protected]> you wrote:

CONFIG_SYS_FPGA_PROG_FEEDBACK was already introduced to print the current status of FPGA loading - an undef in the code made this CONFIG_ useless.

Signed-off-by Stefano Babic <[email protected]>
---
 drivers/fpga/spartan3.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 4 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
This is now.  Later is later.
author
#5 lore raw

PATCH 4/4 ARM: omap3: Added Teejet mt_ventoux

In reply to Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
---
 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   44 ++++
 board/teejet/mt_ventoux/mt_ventoux.c |  235 +++++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   61 +++++
 6 files changed, 771 insertions(+), 0 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 4e3246d..d680eaf 100644
@@ -558,6 +558,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +44 -0

44 lines not on this page · raw message

board/teejet/mt_ventoux/mt_ventoux.c new file +235 -0

235 lines not on this page · raw message

board/teejet/mt_ventoux/mt_ventoux.h new file +429 -0

429 lines not on this page · raw message

boards.cfg +1 -0
index 7826e29..7a3088b 100644
@@ -195,6 +195,7 @@ omap3_evm_quick_nand         arm         armv7       evm                 ti
 omap3_sdp3430                arm         armv7       sdp3430             ti             omap3
 devkit8000                   arm         armv7       devkit8000          timll          omap3
 mcx                          arm         armv7       mcx                 htkw           omap3
+mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
 twister                      arm         armv7       twister             technexion     omap3
 omap4_panda                  arm         armv7       panda               ti             omap4
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
include/configs/mt_ventoux.h new file +61 -0

61 lines not on this page · raw message

Signature · 1 line
1.7.5.4
#6 lore raw

PATCH 4/4 ARM: omap3: Added Teejet mt_ventoux

Hi Stefano,

Isn't Ilya is author of these?
I would expect you (at least) to put him in Cc, no?

Quoted 62 lines · Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
---
 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   44 ++++
 board/teejet/mt_ventoux/mt_ventoux.c |  235 +++++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   61 +++++
 6 files changed, 771 insertions(+), 0 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 4e3246d..d680eaf 100644
@@ -558,6 +558,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +27 -0
new file mode 100644
index 0000000..ce20ec7
@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2011 Ilya Yanok, Emcraft Systems
+#
+# Based on ti/evm/Makefile
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)

board/teejet/mt_ventoux/Makefile line 37

Quoted 10 lines
board/teejet/mt_ventoux/Makefile new file +10 -0
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+clean:
+	rm -f $(OBJS)
+
+distclean:	clean
+	rm -f $(LIB) core *.bak $(obj).depend

Please, remove these...

Quoted 41 lines
board/teejet/mt_ventoux/Makefile new file +7 -0
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
board/teejet/mt_ventoux/mt_ventoux.c new file +28 -0
new file mode 100644
index 0000000..dd8e244
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2011
+ * Stefano Babic, DENX Software Engineering, sbabic at denx.de.
+ *
+ * Copyright (C) 2009 TechNexion Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+#include <common.h>
+#include <netdev.h>
+#include <fpga.h>
+#include <asm/io.h>
+#include <asm/arch/mem.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/sys_proto.h>

board/teejet/mt_ventoux/mt_ventoux.c line 38

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+#include <asm/omap_gpio.h>
+#include <asm/arch/mmc_host_def.h>
+#include <i2c.h>
+#include <spartan3.h>
+#include <asm/gpio.h>
+#include "mt_ventoux.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if defined(CONFIG_FPGA)

Probably #ifdef would be better or
see the comment in the end of this section...

Quoted 15 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +15 -0
+
+#define FPGA_RESET	62
+#define FPGA_PROG	116
+#define FPGA_CCLK	117
+#define FPGA_DIN	118
+#define FPGA_INIT	119
+#define FPGA_DONE	154
+
+/* Timing definitions for FPGA */
+static const u32 gpmc_fpga[] = {
+	FPGA_GPMC_CONFIG1,
+	FPGA_GPMC_CONFIG2,
+	FPGA_GPMC_CONFIG3,
+	FPGA_GPMC_CONFIG4,
+	FPGA_GPMC_CONFIG5,

board/teejet/mt_ventoux/mt_ventoux.c line 63

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+	FPGA_GPMC_CONFIG6,
+};
+
+static void fpga_reset(int nassert)
+{
+	if (nassert)
+		gpio_set_value(FPGA_RESET, 0);
+	else
+		gpio_set_value(FPGA_RESET, 1);
+}

Isn't this just:
gpio_set_value(FPGA_RESET, !nassert);

Also, this function is called once, may be just inline it instead?

Quoted 5 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +5 -0
+
+int fpga_pgm_fn(int nassert, int nflush, int cookie)
+{
+	debug("%s:%d: FPGA PROGRAM ", __func__, __LINE__);
+

board/teejet/mt_ventoux/mt_ventoux.c line 78

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+	if (nassert) {
+		gpio_set_value(FPGA_PROG, 0);
+		debug("asserted\n");
+	} else {
+		gpio_set_value(FPGA_PROG, 1);
+		debug("deasserted\n");
+	}
+
+	return nassert;
+}

This function look very similar to the fpga_reset(), may they can be consolidated in some way?

board/teejet/mt_ventoux/mt_ventoux.c line 85

Quoted 7 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +7 -0
+
+int fpga_init_fn(int cookie)
+{
+	u32 val = gpio_get_value(FPGA_INIT);
+
+	return (val == 0);
+}

Isn't this just:
return !gpio_get_value(FPGA_INIT);
?

board/teejet/mt_ventoux/mt_ventoux.c line 95

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+
+int fpga_done_fn(int cookie)
+{
+	u32 val = gpio_get_value(FPGA_DONE);
+
+	if (val)
+		return 1;
+
+	return 0;
+}

return gpio_get_value(FPGA_DONE);
?

board/teejet/mt_ventoux/mt_ventoux.c line 99

Quoted 4 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +4 -0
+
+int fpga_pre_config_fn(int cookie)
+{
+

needless empty line?

Quoted 16 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +16 -0
+	debug("%s:%d: FPGA pre-configuration\n", __func__, __LINE__);
+
+	/* Setting GPIOs for programming Mode */
+	gpio_request(FPGA_RESET, "FPGA_RESET");
+	gpio_direction_output(FPGA_RESET, 1);
+	gpio_request(FPGA_PROG, "FPGA_PROG");
+	gpio_direction_output(FPGA_PROG, 1);
+	gpio_request(FPGA_CCLK, "FPGA_CCLK");
+	gpio_direction_output(FPGA_CCLK, 1);
+	gpio_request(FPGA_DIN, "FPGA_DIN");
+	gpio_direction_output(FPGA_DIN, 0);
+	gpio_request(FPGA_INIT, "FPGA_INIT");
+	gpio_direction_input(FPGA_INIT);
+	gpio_request(FPGA_DONE, "FPGA_DONE");
+	gpio_direction_input(FPGA_DONE);
+

board/teejet/mt_ventoux/mt_ventoux.c line 125

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+	/* Be sure that signal are deasserted */
+	gpio_set_value(FPGA_RESET, 1);
+	gpio_set_value(FPGA_PROG, 1);
+
+	return 0;
+}
+
+int fpga_post_config_fn(int cookie)
+{
+

same here

Quoted 9 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +9 -0
+	debug("%s:%d: FPGA post-configuration\n", __func__, __LINE__);
+
+	fpga_reset(TRUE);
+	udelay(100);
+	fpga_reset(FALSE);
+
+	return 0;
+}
+

board/teejet/mt_ventoux/mt_ventoux.c line 144

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+/* Write program to the FPGA */
+int fpga_wr_fn(int nassert_write, int flush, int cookie)
+{
+	if (nassert_write)
+		gpio_set_value(FPGA_DIN, 1);
+	else
+		gpio_set_value(FPGA_DIN, 0);
+
+	return nassert_write;
+}

gpio_set_value(FPGA_DIN, nassert_write);
return nassert_write;
?

And also below?

Quoted 27 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +27 -0
+
+int fpga_clk_fn(int assert_clk, int flush, int cookie)
+{
+	if (assert_clk)
+		gpio_set_value(FPGA_CCLK, 1);
+	else
+		gpio_set_value(FPGA_CCLK, 0);
+
+	return assert_clk;
+}
+
+Xilinx_Spartan3_Slave_Serial_fns mt_ventoux_fpga_fns = {
+	fpga_pre_config_fn,
+	fpga_pgm_fn,
+	fpga_clk_fn,
+	fpga_init_fn,
+	fpga_done_fn,
+	fpga_wr_fn,
+	fpga_post_config_fn,
+};
+
+Xilinx_desc fpga = XILINX_XC6SLX4_DESC(slave_serial,
+			(void *)&mt_ventoux_fpga_fns, 0);
+
+/* Initialize the FPGA */
+static void mt_ventoux_init_fpga(void)
+{

board/teejet/mt_ventoux/mt_ventoux.c line 181

Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+	fpga_pre_config_fn(0);
+
+	/* Setting CS1 for FPGA access */
+	enable_gpmc_cs_config(gpmc_fpga, &gpmc_cfg->cs[1],
+		FPGA_BASE_ADDR, GPMC_SIZE_128M);
+
+	fpga_init();
+	fpga_add(fpga_xilinx, &fpga);
+}
+#endif

I would also recommend to put all this fpga handling code in a separate file and tweak the Makefile to compile it out if !CONFIG_FPGA instead of the #ifdefs here.
This can also spare you the need for #ifdef around mt_ventoux_init_fpga(); below (if you stub it in a .h file).

Quoted 18 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +18 -0
+
+/*
+ * Routine: board_init
+ * Description: Early hardware init.
+ */
+int board_init(void)
+{
+	gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
+
+	/* boot param addr */
+	gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
+
+#if defined(CONFIG_FPGA)
+	mt_ventoux_init_fpga();
+#endif
+
+	return 0;
+}

[...]

Quoted 26 lines
include/configs/mt_ventoux.h new file +20 -0
new file mode 100644
index 0000000..f588558
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2011
+ * Stefano Babic, DENX Software Engineering, sbabic at denx.de.
+ *
+ * Copyright (C) 2009 TechNexion Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */

include/configs/mt_ventoux.h line 30

Quoted 10 lines
include/configs/mt_ventoux.h new file +10 -0
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include "tam3517-common.h"
+
+#define MACH_TYPE_AM3517_MT_VENTOUX	3832
+#define CONFIG_MACH_TYPE	MACH_TYPE_AM3517_MT_VENTOUX
+
+#define	CONFIG_CMD_FPGA

Can it be space instead of tab after define, like all others?

Quoted 13 lines
include/configs/mt_ventoux.h new file +13 -0
+
+#define CONFIG_BOOTDELAY	10
+#define CONFIG_BOOTFILE		"uImage"
+#define CONFIG_AUTO_COMPLETE
+
+#define CONFIG_HOSTNAME mt_ventoux
+
+/*
+ * Miscellaneous configurable options
+ */
+#define V_PROMPT			"mt_ventoux => "
+#define CONFIG_SYS_PROMPT		V_PROMPT
+

include/configs/mt_ventoux.h line 53

Quoted 10 lines
include/configs/mt_ventoux.h new file +10 -0
+/*
+ * FPGA
+ */
+#ifdef	CONFIG_CMD_FPGA
+#define	CONFIG_FPGA
+#define	CONFIG_FPGA_XILINX
+#define	CONFIG_FPGA_SPARTAN3
+#define	CONFIG_SYS_FPGA_PROG_FEEDBACK
+#define	CONFIG_SYS_FPGA_WAIT	10000
+#define	CONFIG_MAX_FPGA_DEVICES	1

Can it be space after the define, like all others?

include/configs/mt_ventoux.h line 58

Quoted 5 lines
include/configs/mt_ventoux.h new file +5 -0
+#define CONFIG_FPGA_DELAY() udelay(1)
+#define CONFIG_SYS_FPGA_PROG_FEEDBACK
+#endif
+
+#define	CONFIG_EXTRA_ENV_SETTINGS	CONFIG_TAM3517_SETTINGS \

same here

Quoted 3 lines
include/configs/mt_ventoux.h new file +3 -0
+	"bootcmd=run net_nfs\0"
+
+#endif /* __CONFIG_H */
Signature · 2 lines
Regards,
Igor.
author
#7 lore raw

PATCH 4/4 ARM: omap3: Added Teejet mt_ventoux

Quoted 2 lines · Igor Grinberg

Hi Stefano,

Hi Igor,

Quoted 2 lines

Isn't Ilya is author of these?
I would expect you (at least) to put him in Cc, no?

No, he's not, but these patches rely on Ilya's patches for AM3517. It is sure a good idea to add him in CC

Quoted 4 lines

board/teejet/mt_ventoux/Makefile line 37

Quoted 2 lines
board/teejet/mt_ventoux/Makefile new file +2 -0
+distclean:	clean
+	rm -f $(LIB) core *.bak $(obj).depend

Please, remove these...

Sure, bad cut&paste..

Quoted 8 lines

board/teejet/mt_ventoux/mt_ventoux.c line 38

Quoted 5 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +5 -0
+#include "mt_ventoux.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#if defined(CONFIG_FPGA)

Probably #ifdef would be better or
see the comment in the end of this section...

ok

Quoted 19 lines
Quoted 19 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +19 -0
+#define FPGA_RESET	62
+#define FPGA_PROG	116
+#define FPGA_CCLK	117
+#define FPGA_DIN	118
+#define FPGA_INIT	119
+#define FPGA_DONE	154
+
+/* Timing definitions for FPGA */
+static const u32 gpmc_fpga[] = {
+	FPGA_GPMC_CONFIG1,
+	FPGA_GPMC_CONFIG2,
+	FPGA_GPMC_CONFIG3,
+	FPGA_GPMC_CONFIG4,
+	FPGA_GPMC_CONFIG5,
+	FPGA_GPMC_CONFIG6,
+};
+
+static void fpga_reset(int nassert)
+{
Quoted 8 lines

board/teejet/mt_ventoux/mt_ventoux.c line 63

Quoted 5 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +5 -0
+	if (nassert)
+		gpio_set_value(FPGA_RESET, 0);
+	else
+		gpio_set_value(FPGA_RESET, 1);
+}

Isn't this just:
gpio_set_value(FPGA_RESET, !nassert);

Yes, and it is a cleaner way - got it, I will fix it.

Quoted 3 lines

Also, this function is called once, may be just inline it instead?

Agree.

Quoted 10 lines
Quoted 10 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +10 -0
+
+int fpga_pgm_fn(int nassert, int nflush, int cookie)
+{
+	debug("%s:%d: FPGA PROGRAM ", __func__, __LINE__);
+
+	if (nassert) {
+		gpio_set_value(FPGA_PROG, 0);
+		debug("asserted\n");
+	} else {
+		gpio_set_value(FPGA_PROG, 1);
Quoted 8 lines

board/teejet/mt_ventoux/mt_ventoux.c line 78

Quoted 5 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +5 -0
+		debug("deasserted\n");
+	}
+
+	return nassert;
+}

This function look very similar to the fpga_reset(), may they can be consolidated in some way?

I check it

Quoted 9 lines

board/teejet/mt_ventoux/mt_ventoux.c line 85

Quoted 6 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +6 -0
+int fpga_init_fn(int cookie)
+{
+	u32 val = gpio_get_value(FPGA_INIT);
+
+	return (val == 0);
+}

Isn't this just:
return !gpio_get_value(FPGA_INIT);

Right - fixed in V2

Quoted 5 lines

board/teejet/mt_ventoux/mt_ventoux.c line 99

Quoted 3 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +3 -0
+int fpga_pre_config_fn(int cookie)
+{
+

needless empty line?

Thanks, I drop it

Quoted 6 lines

I would also recommend to put all this fpga handling code in a separate file and tweak the Makefile to compile it out if !CONFIG_FPGA instead of the #ifdefs here.
This can also spare you the need for #ifdef around mt_ventoux_init_fpga(); below (if you stub it in a .h file).

After checking the hardware again there is no reason to compile without FPGA support. The board relies on the FPGA itself and U-Boot should never compiled without a way to load the fpga. For this reason I can drop completely any #ifdef CONFIG_FPGA.

Quoted 11 lines

include/configs/mt_ventoux.h line 30

Quoted 9 lines
include/configs/mt_ventoux.h new file +9 -0
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include "tam3517-common.h"
+
+#define MACH_TYPE_AM3517_MT_VENTOUX	3832
+#define CONFIG_MACH_TYPE	MACH_TYPE_AM3517_MT_VENTOUX
+
+#define	CONFIG_CMD_FPGA

Can it be space instead of tab after define, like all others?

Sure, I check it in the whole file.

Thanks,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#8 lore raw

PATCH 4/4 ARM: omap3: Added Teejet mt_ventoux

In reply to Stefano Babic

Dear Stefano Babic,

Quoted 4 lines · In message <[email protected]> you wrote:

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
Quoted 12 lines
---
 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   44 ++++
 board/teejet/mt_ventoux/mt_ventoux.c |  235 +++++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   61 +++++
 6 files changed, 771 insertions(+), 0 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
Acked-by Wolfgang Denk <[email protected]>

Best regards,

Wolfgang Denk

Signature · 7 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
      Bugs are by far the largest and  most successful class of
      entity, with nearly a million known species. In this res-
      pect they outnumber all the other  known  creatures about
      four to one.  -- Professor Snope's Encyclopedia of Animal
#9 lore raw

PATCH 4/4 ARM: omap3: Added Teejet mt_ventoux

Quoted 20 lines · Wolfgang Denk

Dear Stefano Babic,

Quoted 11 lines · In message <[email protected]> you wrote:

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>

---

?MAINTAINERS ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1 +
?board/teejet/mt_ventoux/Makefile ? ? | ? 44 ++++
?board/teejet/mt_ventoux/mt_ventoux.c | ?235 +++++++++++++++++++
?board/teejet/mt_ventoux/mt_ventoux.h | ?429 ++++++++++++++++++++++++++++++++++
?boards.cfg ? ? ? ? ? ? ? ? ? ? ? ? ? | ? ?1 +
?include/configs/mt_ventoux.h ? ? ? ? | ? 61 +++++
Quoted 5 lines

?6 files changed, 771 insertions(+), 0 deletions(-) ?create mode 100644 board/teejet/mt_ventoux/Makefile ?create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c ?create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h ?create mode 100644 include/configs/mt_ventoux.h

Quoted 1 line
Acked-by Wolfgang Denk <[email protected]>

And I will apply this to u-boot-ti/master once the FPGA parts hit u-boot-arm.

Signature · 1 line
Tom
author
#10 lore raw

PATCH v2 4/4 ARM: omap3: Added Teejet mt_ventoux

In reply to Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>

---

Changes since V1:

- CONFIG_FPGA must be enabled (S. Babic)
- reworking fpga functions (Igor Grinberg)
- drop clean / distclean from Makefile (Igor Grinberg)
- TAB / Spaces issue (Igor Grinberg)

 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   38 +++
 board/teejet/mt_ventoux/mt_ventoux.c |  210 +++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   58 +++++
 6 files changed, 737 insertions(+), 0 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 4e3246d..d680eaf 100644
@@ -558,6 +558,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +38 -0
new file mode 100644
index 0000000..4c8db10
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2011 Ilya Yanok, Emcraft Systems
+#
+# Based on ti/evm/Makefile
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
board/teejet/mt_ventoux/mt_ventoux.c new file +210 -0

210 lines not on this page · raw message

board/teejet/mt_ventoux/mt_ventoux.h new file +429 -0

429 lines not on this page · raw message

boards.cfg +1 -0
index 7826e29..7a3088b 100644
@@ -195,6 +195,7 @@ omap3_evm_quick_nand         arm         armv7       evm                 ti
 omap3_sdp3430                arm         armv7       sdp3430             ti             omap3
 devkit8000                   arm         armv7       devkit8000          timll          omap3
 mcx                          arm         armv7       mcx                 htkw           omap3
+mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
 twister                      arm         armv7       twister             technexion     omap3
 omap4_panda                  arm         armv7       panda               ti             omap4
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
include/configs/mt_ventoux.h new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
1.7.5.4
#11 lore raw

PATCH v2 4/4 ARM: omap3: Added Teejet mt_ventoux

Quoted 6 lines · Stefano Babic

The mt_ventoux board is a custom board using the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>

[snip]

board/teejet/mt_ventoux/mt_ventoux.c line 210

Quoted 7 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +7 -0
+#if defined(CONFIG_GENERIC_MMC) && defined(CONFIG_OMAP_HSMMC) && \
+ ? ? ? !defined(CONFIG_SPL_BUILD)
+int board_mmc_init(bd_t *bis)
+{
+ ? ? ? return omap_mmc_init(0);
+}
+#endif

CONFIG_OMAP_HSMMC requires CONFIG_GENERIC_MMC, don't need to check for both, thanks.

Signature · 1 line
Tom
author
#12 lore raw

PATCH v2 4/4 ARM: omap3: Added Teejet mt_ventoux

Quoted 8 lines · Tom Rini
Quoted 6 lines · Stefano Babic

The mt_ventoux board is a custom board using the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>

[snip]

Quoted 10 lines

board/teejet/mt_ventoux/mt_ventoux.c line 210

Quoted 7 lines
board/teejet/mt_ventoux/mt_ventoux.c new file +7 -0
+#if defined(CONFIG_GENERIC_MMC) && defined(CONFIG_OMAP_HSMMC) && \
+       !defined(CONFIG_SPL_BUILD)
+int board_mmc_init(bd_t *bis)
+{
+       return omap_mmc_init(0);
+}
+#endif

CONFIG_OMAP_HSMMC requires CONFIG_GENERIC_MMC, don't need to check for both, thanks.

Right, I fix it.

Stefano

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
Applied
#13 lore raw

PATCH 1/4 fpga: add definition for Xilinx Spartan-6 XC6SLX4

In reply to Stefano Babic

Dear Stefano Babic,

Quoted 4 lines · In message <[email protected]> you wrote:
Signed-off-by Stefano Babic <[email protected]>
---
 include/spartan3.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Only in our dreams we are free.  The rest of the time we need  wages.
                                    - Terry Pratchett, _Wyrd Sisters_
author
#14 lore raw

PATCH v3 4/4 ARM: omap3: Added Teejet mt_ventoux

In reply to Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>
CC Tom Rini <[email protected]>

---

Changes since V2:
- CONFIG_OMAP_HSMMC requires CONFIG_GENERIC_MMC, do not check both (T. Rini)

Changes since V1:

- CONFIG_FPGA must be enabled (S. Babic)
- reworking fpga functions (Igor Grinberg)
- drop clean / distclean from Makefile (Igor Grinberg)
- TAB / Spaces issue (Igor Grinberg)

 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   38 +++
 board/teejet/mt_ventoux/mt_ventoux.c |  210 +++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   58 +++++
 6 files changed, 737 insertions(+), 0 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 4e3246d..d680eaf 100644
@@ -558,6 +558,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +38 -0
new file mode 100644
index 0000000..4c8db10
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2011 Ilya Yanok, Emcraft Systems
+#
+# Based on ti/evm/Makefile
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
board/teejet/mt_ventoux/mt_ventoux.c new file +210 -0

210 lines not on this page · raw message

board/teejet/mt_ventoux/mt_ventoux.h new file +429 -0

429 lines not on this page · raw message

boards.cfg +1 -0
index 7826e29..7a3088b 100644
@@ -195,6 +195,7 @@ omap3_evm_quick_nand         arm         armv7       evm                 ti
 omap3_sdp3430                arm         armv7       sdp3430             ti             omap3
 devkit8000                   arm         armv7       devkit8000          timll          omap3
 mcx                          arm         armv7       mcx                 htkw           omap3
+mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
 twister                      arm         armv7       twister             technexion     omap3
 omap4_panda                  arm         armv7       panda               ti             omap4
 omap4_sdp4430                arm         armv7       sdp4430             ti             omap4
include/configs/mt_ventoux.h new file +58 -0

58 lines not on this page · raw message

Signature · 1 line
1.7.5.4
author
#15 lore raw

PATCH v4 1/1 ARM: omap3: Added Teejet mt_ventoux

In reply to Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

The patch fixes also the mtdparts variable in the
TAM3517 common configuration file.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>
CC Tom Rini <[email protected]>
Cc Detlev Zundel <[email protected]>

---
Changes since V3:
- rebased on current u-boot-ti
- rebased on EHCI patches and add EHCI support
- fix mtdparts default value in common file

Changes since V2:
- CONFIG_OMAP_HSMMC requires CONFIG_GENERIC_MMC, do not check both (T. Rini)

Changes since V1:

- CONFIG_FPGA must be enabled (S. Babic)
- reworking fpga functions (Igor Grinberg)
- drop clean / distclean from Makefile (Igor Grinberg)
- TAB / Spaces issue (Igor Grinberg)

 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   38 +++
 board/teejet/mt_ventoux/mt_ventoux.c |  242 +++++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   58 +++++
 include/configs/tam3517-common.h     |    4 +-
 7 files changed, 771 insertions(+), 2 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 0a3b39d..a8e56bb 100644
@@ -574,6 +574,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +38 -0
new file mode 100644
index 0000000..4c8db10
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2011 Ilya Yanok, Emcraft Systems
+#
+# Based on ti/evm/Makefile
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
board/teejet/mt_ventoux/mt_ventoux.c new file +242 -0

242 lines not on this page · raw message

board/teejet/mt_ventoux/mt_ventoux.h new file +429 -0

429 lines not on this page · raw message

boards.cfg +1 -0
index 32a32f5..1f264b1 100644
@@ -202,6 +202,7 @@ dig297                       arm         armv7       dig297              comelit
 igep0020                     arm         armv7       igep0020            isee           omap3
 igep0030                     arm         armv7       igep0030            isee           omap3
 am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
+mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
 omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
 omap3_zoom2                  arm         armv7       zoom2               logicpd        omap3
 omap3_logic                  arm         armv7       omap3som            logicpd        omap3
include/configs/mt_ventoux.h new file +58 -0

58 lines not on this page · raw message

include/configs/tam3517-common.h +2 -2
index 13eeadb..254968f 100644
@@ -303,8 +303,8 @@
 /* Setup MTD for NAND on the SOM */
 #define MTDIDS_DEFAULT		"nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT	"mtdparts=omap2-nand.0:512k(MLO)," \
-				"512k(u-boot),128k(env1)," \
-				"128k(env2),6m(kernel),-(rootfs)"
+				"1m(u-boot),256k(env1)," \
+				"256k(env2),6m(kernel),-(rootfs)"
 
 #define xstr(s)	str(s)
 #define str(s)	#s
Signature · 1 line
1.7.5.4
author
#16 lore raw

PATCH v5 1/1 ARM: omap3: Added Teejet mt_ventoux

In reply to Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

The patch fixes also the mtdparts variable in the
TAM3517 common configuration file.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>
CC Tom Rini <[email protected]>
Cc Detlev Zundel <[email protected]>

---
Changes since V4:
- applied comments already sent for the twister board

Changes since V3:
- rebased on current u-boot-ti
- rebased on EHCI patches and add EHCI support
- fix mtdparts default value in common file

Changes since V2:
- CONFIG_OMAP_HSMMC requires CONFIG_GENERIC_MMC, do not check both (T. Rini)

Changes since V1:

- CONFIG_FPGA must be enabled (S. Babic)
- reworking fpga functions (Igor Grinberg)
- drop clean / distclean from Makefile (Igor Grinberg)
- TAB / Spaces issue (Igor Grinberg)

 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   38 +++
 board/teejet/mt_ventoux/mt_ventoux.c |  233 ++++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   58 +++++
 include/configs/tam3517-common.h     |    4 +-
 7 files changed, 762 insertions(+), 2 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 0a3b39d..a8e56bb 100644
@@ -574,6 +574,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +38 -0
new file mode 100644
index 0000000..4c8db10
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2011 Ilya Yanok, Emcraft Systems
+#
+# Based on ti/evm/Makefile
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
board/teejet/mt_ventoux/mt_ventoux.c new file +233 -0

233 lines not on this page · raw message

board/teejet/mt_ventoux/mt_ventoux.h new file +429 -0

429 lines not on this page · raw message

boards.cfg +1 -0
index 32a32f5..1f264b1 100644
@@ -202,6 +202,7 @@ dig297                       arm         armv7       dig297              comelit
 igep0020                     arm         armv7       igep0020            isee           omap3
 igep0030                     arm         armv7       igep0030            isee           omap3
 am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
+mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
 omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
 omap3_zoom2                  arm         armv7       zoom2               logicpd        omap3
 omap3_logic                  arm         armv7       omap3som            logicpd        omap3
include/configs/mt_ventoux.h new file +58 -0

58 lines not on this page · raw message

include/configs/tam3517-common.h +2 -2
index 13eeadb..254968f 100644
@@ -303,8 +303,8 @@
 /* Setup MTD for NAND on the SOM */
 #define MTDIDS_DEFAULT		"nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT	"mtdparts=omap2-nand.0:512k(MLO)," \
-				"512k(u-boot),128k(env1)," \
-				"128k(env2),6m(kernel),-(rootfs)"
+				"1m(u-boot),256k(env1)," \
+				"256k(env2),6m(kernel),-(rootfs)"
 
 #define xstr(s)	str(s)
 #define str(s)	#s
Signature · 1 line
1.7.5.4
#17 lore raw

PATCH v5 1/1 ARM: omap3: Added Teejet mt_ventoux

Quoted 11 lines · Stefano Babic

The mt_ventoux board is a custom board using
the Technexion TAM3517 module.

The patch fixes also the mtdparts variable in the
TAM3517 common configuration file.

Signed-off-by Stefano Babic <[email protected]>
CC Ilya Yanok <[email protected]>
CC Igor Grinberg <[email protected]>
CC Tom Rini <[email protected]>
Cc Detlev Zundel <[email protected]>
Acked-by Igor Grinberg <[email protected]>
Quoted 853 lines

---
Changes since V4:
- applied comments already sent for the twister board

Changes since V3:
- rebased on current u-boot-ti
- rebased on EHCI patches and add EHCI support
- fix mtdparts default value in common file

Changes since V2:
- CONFIG_OMAP_HSMMC requires CONFIG_GENERIC_MMC, do not check both (T. Rini)

Changes since V1:

- CONFIG_FPGA must be enabled (S. Babic)
- reworking fpga functions (Igor Grinberg)
- drop clean / distclean from Makefile (Igor Grinberg)
- TAB / Spaces issue (Igor Grinberg)

 MAINTAINERS                          |    1 +
 board/teejet/mt_ventoux/Makefile     |   38 +++
 board/teejet/mt_ventoux/mt_ventoux.c |  233 ++++++++++++++++++
 board/teejet/mt_ventoux/mt_ventoux.h |  429 ++++++++++++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/mt_ventoux.h         |   58 +++++
 include/configs/tam3517-common.h     |    4 +-
 7 files changed, 762 insertions(+), 2 deletions(-)
 create mode 100644 board/teejet/mt_ventoux/Makefile
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.c
 create mode 100644 board/teejet/mt_ventoux/mt_ventoux.h
 create mode 100644 include/configs/mt_ventoux.h
MAINTAINERS +1 -0
index 0a3b39d..a8e56bb 100644
@@ -574,6 +574,7 @@ Stefano Babic <[email protected]>
 
 	ea20		davinci
 	flea3		i.MX35
+	mt_ventoux	omap3
 	mx35pdk		i.MX35
 	mx51evk		i.MX51
 	polaris		xscale/pxa
board/teejet/mt_ventoux/Makefile new file +38 -0
new file mode 100644
index 0000000..4c8db10
@@ -0,0 +1,38 @@
+#
+# Copyright (C) 2011 Ilya Yanok, Emcraft Systems
+#
+# Based on ti/evm/Makefile
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc.
+#
+
+include $(TOPDIR)/config.mk
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	:= $(BOARD).o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
board/teejet/mt_ventoux/mt_ventoux.c new file +233 -0
new file mode 100644
index 0000000..c5eb42c
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2011
+ * Stefano Babic, DENX Software Engineering, sbabic at denx.de.
+ *
+ * Copyright (C) 2009 TechNexion Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+#include <common.h>
+#include <netdev.h>
+#include <fpga.h>
+#include <asm/io.h>
+#include <asm/arch/mem.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/sys_proto.h>
+#include <asm/omap_gpio.h>
+#include <asm/arch/mmc_host_def.h>
+#include <i2c.h>
+#include <spartan3.h>
+#include <asm/gpio.h>
+#ifdef CONFIG_USB_EHCI
+#include <usb.h>
+#include <asm/ehci-omap.h>
+#endif
+#include "mt_ventoux.h"
+
+DECLARE_GLOBAL_DATA_PTR;
+
+#ifndef CONFIG_FPGA
+#error "The Teejet mt_ventoux must have CONFIG_FPGA enabled"
+#endif
+
+#define FPGA_RESET	62
+#define FPGA_PROG	116
+#define FPGA_CCLK	117
+#define FPGA_DIN	118
+#define FPGA_INIT	119
+#define FPGA_DONE	154
+
+/* Timing definitions for FPGA */
+static const u32 gpmc_fpga[] = {
+	FPGA_GPMC_CONFIG1,
+	FPGA_GPMC_CONFIG2,
+	FPGA_GPMC_CONFIG3,
+	FPGA_GPMC_CONFIG4,
+	FPGA_GPMC_CONFIG5,
+	FPGA_GPMC_CONFIG6,
+};
+
+#ifdef CONFIG_USB_EHCI
+static struct omap_usbhs_board_data usbhs_bdata = {
+	.port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
+	.port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
+	.port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
+};
+
+int ehci_hcd_init(void)
+{
+	return omap_ehci_hcd_init(&usbhs_bdata);
+}
+
+int ehci_hcd_stop(void)
+{
+	return omap_ehci_hcd_stop();
+}
+#endif
+
+
+static inline void fpga_reset(int nassert)
+{
+	gpio_set_value(FPGA_RESET, !nassert);
+}
+
+int fpga_pgm_fn(int nassert, int nflush, int cookie)
+{
+	debug("%s:%d: FPGA PROGRAM ", __func__, __LINE__);
+
+	gpio_set_value(FPGA_PROG, !nassert);
+
+	return nassert;
+}
+
+int fpga_init_fn(int cookie)
+{
+	return !gpio_get_value(FPGA_INIT);
+}
+
+int fpga_done_fn(int cookie)
+{
+	return gpio_get_value(FPGA_DONE);
+}
+
+int fpga_pre_config_fn(int cookie)
+{
+	debug("%s:%d: FPGA pre-configuration\n", __func__, __LINE__);
+
+	/* Setting GPIOs for programming Mode */
+	gpio_request(FPGA_RESET, "FPGA_RESET");
+	gpio_direction_output(FPGA_RESET, 1);
+	gpio_request(FPGA_PROG, "FPGA_PROG");
+	gpio_direction_output(FPGA_PROG, 1);
+	gpio_request(FPGA_CCLK, "FPGA_CCLK");
+	gpio_direction_output(FPGA_CCLK, 1);
+	gpio_request(FPGA_DIN, "FPGA_DIN");
+	gpio_direction_output(FPGA_DIN, 0);
+	gpio_request(FPGA_INIT, "FPGA_INIT");
+	gpio_direction_input(FPGA_INIT);
+	gpio_request(FPGA_DONE, "FPGA_DONE");
+	gpio_direction_input(FPGA_DONE);
+
+	/* Be sure that signal are deasserted */
+	gpio_set_value(FPGA_RESET, 1);
+	gpio_set_value(FPGA_PROG, 1);
+
+	return 0;
+}
+
+int fpga_post_config_fn(int cookie)
+{
+	debug("%s:%d: FPGA post-configuration\n", __func__, __LINE__);
+
+	fpga_reset(TRUE);
+	udelay(100);
+	fpga_reset(FALSE);
+
+	return 0;
+}
+
+/* Write program to the FPGA */
+int fpga_wr_fn(int nassert_write, int flush, int cookie)
+{
+	gpio_set_value(FPGA_DIN, nassert_write);
+
+	return nassert_write;
+}
+
+int fpga_clk_fn(int assert_clk, int flush, int cookie)
+{
+	gpio_set_value(FPGA_CCLK, assert_clk);
+
+	return assert_clk;
+}
+
+Xilinx_Spartan3_Slave_Serial_fns mt_ventoux_fpga_fns = {
+	fpga_pre_config_fn,
+	fpga_pgm_fn,
+	fpga_clk_fn,
+	fpga_init_fn,
+	fpga_done_fn,
+	fpga_wr_fn,
+	fpga_post_config_fn,
+};
+
+Xilinx_desc fpga = XILINX_XC6SLX4_DESC(slave_serial,
+			(void *)&mt_ventoux_fpga_fns, 0);
+
+/* Initialize the FPGA */
+static void mt_ventoux_init_fpga(void)
+{
+	fpga_pre_config_fn(0);
+
+	/* Setting CS1 for FPGA access */
+	enable_gpmc_cs_config(gpmc_fpga, &gpmc_cfg->cs[1],
+		FPGA_BASE_ADDR, GPMC_SIZE_128M);
+
+	fpga_init();
+	fpga_add(fpga_xilinx, &fpga);
+}
+
+/*
+ * Routine: board_init
+ * Description: Early hardware init.
+ */
+int board_init(void)
+{
+	gpmc_init(); /* in SRAM or SDRAM, finish GPMC */
+
+	/* boot param addr */
+	gd->bd->bi_boot_params = (OMAP34XX_SDRC_CS0 + 0x100);
+
+	mt_ventoux_init_fpga();
+
+	return 0;
+}
+
+int misc_init_r(void)
+{
+	dieid_num_r();
+
+	return 0;
+}
+
+/*
+ * Routine: set_muxconf_regs
+ * Description: Setting up the configuration Mux registers specific to the
+ *		hardware. Many pins need to be moved from protect to primary
+ *		mode.
+ */
+void set_muxconf_regs(void)
+{
+	MUX_MT_VENTOUX();
+}
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+int board_eth_init(bd_t *bis)
+{
+	davinci_emac_initialize();
+	return 0;
+}
+
+#if defined(CONFIG_OMAP_HSMMC) && \
+	!defined(CONFIG_SPL_BUILD)
+int board_mmc_init(bd_t *bis)
+{
+	return omap_mmc_init(0);
+}
+#endif
board/teejet/mt_ventoux/mt_ventoux.h new file +429 -0
new file mode 100644
index 0000000..34c1ec5
@@ -0,0 +1,429 @@
+/*
+ * Copyright (C) 2011 Stefano Babic <[email protected]>
+ *
+ * Author: Hardy Weng <[email protected]>
+ *
+ * Copyright (C) 2010 TechNexion Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+#ifndef _MT_VENTOUX_H_
+#define _MT_VENTOUX_H_
+
+const omap3_sysinfo sysinfo = {
+	DDR_DISCRETE,
+	"Teejet MT_VENTOUX Board",
+	"NAND",
+};
+
+/* FPGA CS1 configuration */
+#define FPGA_GPMC_CONFIG1	0x00001200
+#define FPGA_GPMC_CONFIG2	0x00111a00
+#define FPGA_GPMC_CONFIG3	0x00010100
+#define FPGA_GPMC_CONFIG4	0x06041a04
+#define FPGA_GPMC_CONFIG5	0x0019101a
+#define FPGA_GPMC_CONFIG6	0x890503c0
+#define FPGA_GPMC_CONFIG7	0x00000860
+
+#define FPGA_BASE_ADDR		0x20000000
+
+/*
+ * IEN  - Input Enable
+ * IDIS - Input Disable
+ * PTD  - Pull type Down
+ * PTU  - Pull type Up
+ * DIS  - Pull type selection is inactive
+ * EN	- Pull type selection is active
+ * M0	- Mode 0
+ * The commented string gives the final mux configuration for that pin
+ */
+#define MUX_MT_VENTOUX() \
+	/* SDRC */\
+	MUX_VAL(CP(SDRC_D0),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D1),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D2),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D3),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D4),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D5),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D6),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D7),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D8),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D9),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D10),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D11),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D12),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D13),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D14),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D15),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D16),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D17),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D18),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D19),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D20),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D21),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D22),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D23),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D24),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D25),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D26),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D27),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D28),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D29),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D30),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_D31),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_CLK),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_DQS0),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_DQS1),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_DQS2),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_DQS3),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SDRC_DQS0N),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(SDRC_DQS1N),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(SDRC_DQS2N),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(SDRC_DQS3N),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(SDRC_CKE0),		(M0)) \
+	MUX_VAL(CP(SDRC_CKE1),		(M0)) \
+	MUX_VAL(CP(STRBEN_DLY0),	(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(STRBEN_DLY1),	(IEN  | PTD | EN  | M0)) \
+	/* GPMC */\
+	MUX_VAL(CP(GPMC_A1),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A2),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A3),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A4),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A5),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A6),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A7),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A8),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A9),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_A10),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D0),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D1),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D2),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D3),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D4),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D5),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D6),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D7),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D8),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D9),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D10),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D11),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D12),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D13),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D14),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_D15),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_NCS0),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_NCS1),		(IEN | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_NCS2),		(IDIS | PTD | EN  | M4))/* GPIO 53 */\
+	MUX_VAL(CP(GPMC_NCS3),		(IEN | PTU | EN | M4))	/* GPIO 54 */\
+	MUX_VAL(CP(GPMC_NCS4),		(IEN | PTD | EN | M4)) \
+			/* GPIO 55 : NFS */\
+	MUX_VAL(CP(GPMC_NCS5),		(IDIS | PTU | EN  | M4)) \
+	MUX_VAL(CP(GPMC_NCS6),		(IDIS  | PTD | EN | M3)) /*PWM11*/ \
+	MUX_VAL(CP(GPMC_NCS7),		(IDIS  | PTD | EN | M4)) /*GPIO_58*/ \
+	MUX_VAL(CP(GPMC_CLK),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_NADV_ALE),	(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(GPMC_NOE),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(GPMC_NWE),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(GPMC_NBE0_CLE),	(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_NBE1),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(GPMC_NWP),		(IEN  | PTD | DIS | M4)) \
+			/*GPIO_62: FPGA_RESET */ \
+	MUX_VAL(CP(GPMC_WAIT0),		(IEN  | PTU | EN  | M4)) \
+	MUX_VAL(CP(GPMC_WAIT1),		(IEN  | PTU | EN  | M4)) \
+	MUX_VAL(CP(GPMC_WAIT2),		(IEN  | PTU | EN  | M4)) /*GPIO_64*/ \
+	MUX_VAL(CP(GPMC_WAIT3),		(IEN  | PTU | EN  | M4)) \
+	/* DSS */\
+	MUX_VAL(CP(DSS_PCLK),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_HSYNC),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_VSYNC),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_ACBIAS),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA0),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA1),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA2),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA3),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA4),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA5),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA6),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA7),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA8),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA9),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA10),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA11),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA12),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA13),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA14),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA15),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA16),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA17),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA18),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA19),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA20),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA21),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA22),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(DSS_DATA23),		(IDIS | PTD | DIS | M0)) \
+	/* CAMERA */\
+	MUX_VAL(CP(CAM_HS),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(CAM_VS),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(CAM_XCLKA),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_PCLK),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(CAM_FLD),		(IDIS | PTD | DIS | M4)) /*GPIO_98*/\
+	MUX_VAL(CP(CAM_D0),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D1),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D2),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D3),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D4),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D5),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D6),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D7),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D8),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D9),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D10),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_D11),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_XCLKB),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(CAM_WEN),		(IEN  | PTD | DIS | M4)) /*GPIO_167*/\
+	MUX_VAL(CP(CAM_STROBE),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(CSI2_DX0),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CSI2_DY0),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CSI2_DX1),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CSI2_DY1),		(IEN  | PTD | DIS | M0)) \
+	/* MMC */\
+	MUX_VAL(CP(MMC1_CLK),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(MMC1_CMD),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(MMC1_DAT0),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(MMC1_DAT1),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(MMC1_DAT2),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(MMC1_DAT3),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTU | EN  | M4)) \
+			/* GPIO_126: CardDetect */\
+	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M4)) \
+	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M4)) \
+	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M4)) \
+	\
+	MUX_VAL(CP(MMC2_CLK),		(IEN  | PTU | EN | M0)) /*MMC2_CLK*/\
+	MUX_VAL(CP(MMC2_CMD),		(IEN  | PTU | DIS  | M0)) /*MMC2_CMD*/\
+	MUX_VAL(CP(MMC2_DAT0),		(IEN  | PTU | DIS  | M0)) /*MMC2_DAT0*/\
+	MUX_VAL(CP(MMC2_DAT1),		(IEN  | PTU | DIS  | M0)) /*MMC2_DAT1*/\
+	MUX_VAL(CP(MMC2_DAT2),		(IEN  | PTU | DIS  | M0)) /*MMC2_DAT2*/\
+	MUX_VAL(CP(MMC2_DAT3),		(IEN  | PTU | DIS  | M0)) /*MMC2_DAT3*/\
+	MUX_VAL(CP(MMC2_DAT4),		(IDIS  | PTU | EN  | M4)) \
+	MUX_VAL(CP(MMC2_DAT5),		(IDIS  | PTU | EN  | M4)) \
+	MUX_VAL(CP(MMC2_DAT6),		(IDIS  | PTU | EN  | M4)) \
+			/* GPIO_138: LCD_ENVD */\
+	MUX_VAL(CP(MMC2_DAT7),		(IDIS  | PTU | EN  | M4)) \
+			/* GPIO_139: LCD_PON */\
+	/* McBSP */\
+	MUX_VAL(CP(MCBSP_CLKS),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(MCBSP1_CLKR),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCBSP1_FSR),		(IDIS | PTU | EN  | M0)) \
+	MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCBSP1_FSX),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCBSP1_CLKX),	(IEN  | PTD | DIS | M0)) \
+	\
+	MUX_VAL(CP(MCBSP2_FSX),		(IEN | PTD | EN | M4)) \
+			/* GPIO_116: FPGA_PROG */ \
+	MUX_VAL(CP(MCBSP2_CLKX),	(IEN | PTD | EN | M4)) \
+			/* GPIO_117: FPGA_CCLK */ \
+	MUX_VAL(CP(MCBSP2_DR),		(IEN | PTD | EN | M4)) \
+			/* GPIO_118: FPGA_DIN */ \
+	MUX_VAL(CP(MCBSP2_DX),		(IEN | PTD | EN | M4)) \
+			/* GPIO_119: FPGA_INIT */ \
+	\
+	MUX_VAL(CP(MCBSP3_DX),		(IEN | PTU | EN | M4)) \
+			/* GPIO_140: speaker #mute */\
+	MUX_VAL(CP(MCBSP3_DR),		(IEN  | PTU | EN | M4)) \
+			/* GPIO_141: Buzz Hi */\
+	MUX_VAL(CP(MCBSP3_CLKX),	(IEN  | PTU | EN | M4)) \
+	MUX_VAL(CP(MCBSP3_FSX),		(IEN  | PTU | EN | M4)) \
+	\
+	MUX_VAL(CP(MCBSP4_CLKX),	(IEN | PTD | DIS | M4)) \
+			/*GPIO_152: Ignition Sense */ \
+	MUX_VAL(CP(MCBSP4_DR),		(IDIS | PTD | DIS | M4)) \
+			/*GPIO_153: Power Button Sense */ \
+	MUX_VAL(CP(MCBSP4_DX),		(IEN | PTU | DIS | M4)) \
+			/* GPIO_154: FPGA_DONE */ \
+	MUX_VAL(CP(MCBSP4_FSX),		(IEN | PTD | DIS | M4)) \
+			/* GPIO_155: CA8_irq */ \
+	/* UART */\
+	MUX_VAL(CP(UART1_TX),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(UART1_RTS),		(IEN | PTU | EN | M4)) \
+			/* GPIO_149: USB status 2 */\
+	MUX_VAL(CP(UART1_CTS),		(IEN | PTU | EN | M4)) \
+			/* GPIO_150: USB status 1 */\
+	\
+	MUX_VAL(CP(UART1_RX),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(UART2_CTS),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(UART2_RTS),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(UART2_TX),		(IDIS | PTD | DIS | M0)) \
+	MUX_VAL(CP(UART2_RX),		(IEN  | PTD | DIS | M0)) \
+	\
+	MUX_VAL(CP(UART3_CTS_RCTX),	(IDIS  | PTD | DIS | M4)) \
+			/*GPIO_163 : TS_PENIRQ*/ \
+	MUX_VAL(CP(UART3_RTS_SD),	(IEN | PTD | DIS | M4)) \
+			/*GPIO_164 : MMC */\
+	MUX_VAL(CP(UART3_RX_IRRX),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(UART3_TX_IRTX),	(IDIS | PTD | DIS | M0)) \
+	/* I2C */\
+	MUX_VAL(CP(I2C1_SCL),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C1_SDA),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C2_SCL),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C2_SDA),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C3_SCL),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C3_SDA),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C4_SCL),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(I2C4_SDA),		(IEN  | PTU | EN  | M0)) \
+	/* McSPI */\
+	MUX_VAL(CP(MCSPI1_CLK),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCSPI1_SIMO),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCSPI1_SOMI),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCSPI1_CS0),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(MCSPI1_CS1),		(IEN | PTD | EN | M4)) /*GPIO_175*/\
+	MUX_VAL(CP(MCSPI1_CS2),		(IEN | PTD | EN | M4)) /*GPIO_176*/\
+	MUX_VAL(CP(MCSPI1_CS3),		(IEN | PTD | EN | M4)) \
+	\
+	MUX_VAL(CP(MCSPI2_CLK),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCSPI2_SIMO),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCSPI2_SOMI),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(MCSPI2_CS0),		(IEN  | PTD | EN  | M4)) \
+	MUX_VAL(CP(MCSPI2_CS1),		(IEN  | PTD | EN  | M0)) \
+	/* CCDC */\
+	MUX_VAL(CP(CCDC_PCLK),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(CCDC_FIELD),		(IEN  | PTD | DIS | M4)) \
+			/* GPIO95: #Enable Output */\
+	MUX_VAL(CP(CCDC_HD),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(CCDC_VD),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(CCDC_WEN),		(IEN  | PTD | DIS | M4)) \
+			/* GPIO 99: #SOM_PWR_OFF */\
+	MUX_VAL(CP(CCDC_DATA0),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CCDC_DATA1),		(IEN  | PTD | DIS | M4)) \
+			/* GPIO_100: #power out */\
+	MUX_VAL(CP(CCDC_DATA2),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CCDC_DATA3),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CCDC_DATA4),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CCDC_DATA5),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CCDC_DATA6),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(CCDC_DATA7),		(IEN  | PTD | DIS | M0)) \
+	/* RMII */\
+	MUX_VAL(CP(RMII_MDIO_DATA),	(IEN  |  M0)) \
+	MUX_VAL(CP(RMII_MDIO_CLK),	(M0)) \
+	MUX_VAL(CP(RMII_RXD0)	,	(IEN  | PTD | M0)) \
+	MUX_VAL(CP(RMII_RXD1),		(IEN  | PTD | M0)) \
+	MUX_VAL(CP(RMII_CRS_DV),	(IEN  | PTD | M0)) \
+	MUX_VAL(CP(RMII_RXER),		(PTD | M0)) \
+	MUX_VAL(CP(RMII_TXD0),		(PTD | M0)) \
+	MUX_VAL(CP(RMII_TXD1),		(PTD | M0)) \
+	MUX_VAL(CP(RMII_TXEN),		(PTD | M0)) \
+	MUX_VAL(CP(RMII_50MHZ_CLK),	(IEN  | PTD | EN  | M0)) \
+	/* HECC */\
+	MUX_VAL(CP(HECC1_TXD),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(HECC1_RXD),		(IEN  | PTU | EN  | M0)) \
+	/* HSUSB */\
+	MUX_VAL(CP(HSUSB0_CLK),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_STP),		(IEN  | PTU | DIS  | M0)) \
+	MUX_VAL(CP(HSUSB0_DIR),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_NXT),		(IEN  | PTU | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA0),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA1),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA2),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA3),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA4),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA5),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA6),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(HSUSB0_DATA7),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(USB0_DRVBUS),	(IEN  | PTD | EN  | M0)) \
+	/* HDQ */\
+	MUX_VAL(CP(HDQ_SIO),		(IEN | PTD | EN | M4)) \
+			/* GPIO_170: auto update */\
+	/* Control and debug */\
+	MUX_VAL(CP(SYS_32K),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SYS_CLKREQ),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SYS_NIRQ),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(SYS_NRESWARM),	(IDIS | PTU | DIS | M4)) \
+			/* - GPIO30 */\
+	MUX_VAL(CP(SYS_BOOT0),		(IEN  | PTD | DIS | M4)) /*GPIO_2*/\
+	MUX_VAL(CP(SYS_BOOT1),		(IEN  | PTD | DIS | M4)) /*GPIO_3 */\
+	MUX_VAL(CP(SYS_BOOT2),		(IEN  | PTD | DIS | M4)) /*GPIO_4*/\
+	MUX_VAL(CP(SYS_BOOT3),		(IEN  | PTD | DIS | M4)) /*GPIO_5*/\
+	MUX_VAL(CP(SYS_BOOT4),		(IEN  | PTD | DIS | M4)) /*GPIO_6*/\
+	MUX_VAL(CP(SYS_BOOT5),		(IEN  | PTD | DIS | M4)) /*GPIO_7*/\
+	MUX_VAL(CP(SYS_BOOT6),		(IDIS | PTD | DIS | M4)) /*GPIO_8*/\
+	MUX_VAL(CP(SYS_BOOT7),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(SYS_BOOT8),		(IEN  | PTD | EN  | M0)) \
+	\
+	MUX_VAL(CP(SYS_OFF_MODE),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SYS_CLKOUT1),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(SYS_CLKOUT2),	(IEN  | PTU | EN  | M0)) \
+	/* JTAG */\
+	MUX_VAL(CP(JTAG_nTRST),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(JTAG_TCK),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(JTAG_TMS),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(JTAG_TDI),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(JTAG_EMU0),		(IDIS  | PTD | EN | M4)) /*GPIO_11*/ \
+	MUX_VAL(CP(JTAG_EMU1),		(IDIS  | PTD | EN | M4)) /*GPIO_31*/ \
+	/* ETK (ES2 onwards) */\
+	MUX_VAL(CP(ETK_CLK_ES2),	(IDIS | PTD | DIS  | M3)) \
+					/* hsusb1_stp */ \
+	MUX_VAL(CP(ETK_CTL_ES2),	(IDIS | PTD | DIS | M3)) \
+					/* hsusb1_clk */\
+	MUX_VAL(CP(ETK_D0_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D1_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D2_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D3_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D4_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D5_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D6_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D7_ES2),		(IEN  | PTU | EN  | M3)) \
+	MUX_VAL(CP(ETK_D8_ES2),		(IEN  | PTD | EN  | M3)) \
+	MUX_VAL(CP(ETK_D9_ES2),		(IEN  | PTD | EN  | M3)) \
+	MUX_VAL(CP(ETK_D10_ES2),	(IEN  | PTU | EN  | M4)) \
+	MUX_VAL(CP(ETK_D11_ES2),	(IDIS | PTD | DIS | M4)) \
+	MUX_VAL(CP(ETK_D12_ES2),	(IEN  | PTD | DIS | M3)) \
+	MUX_VAL(CP(ETK_D13_ES2),	(IEN  | PTD | DIS | M3)) \
+	MUX_VAL(CP(ETK_D14_ES2),	(IEN  | PTD | DIS | M3)) \
+	MUX_VAL(CP(ETK_D15_ES2),	(IEN  | PTD | DIS | M3)) \
+	/* Die to Die */\
+	MUX_VAL(CP(D2D_MCAD34),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_MCAD35),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_MCAD36),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_CLK26MI),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_NRESPWRON),	(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_NRESWARM),	(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(D2D_ARM9NIRQ),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_UMA2P6FIQ),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_SPINT),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_FRINT),		(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_DMAREQ0),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_DMAREQ1),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_DMAREQ2),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_DMAREQ3),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_N3GTRST),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_N3GTDI),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_N3GTDO),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_N3GTMS),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_N3GTCK),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_N3GRTCK),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_MSTDBY),		(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(D2D_SWAKEUP),	(IEN  | PTD | EN  | M0)) \
+	MUX_VAL(CP(D2D_IDLEREQ),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_IDLEACK),	(IEN  | PTU | EN  | M0)) \
+	MUX_VAL(CP(D2D_MWRITE),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_SWRITE),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_MREAD),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_SREAD),		(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_MBUSFLAG),	(IEN  | PTD | DIS | M0)) \
+	MUX_VAL(CP(D2D_SBUSFLAG),	(IEN  | PTD | DIS | M0)) \
+
+#endif
boards.cfg +1 -0
index 32a32f5..1f264b1 100644
@@ -202,6 +202,7 @@ dig297                       arm         armv7       dig297              comelit
 igep0020                     arm         armv7       igep0020            isee           omap3
 igep0030                     arm         armv7       igep0030            isee           omap3
 am3517_evm                   arm         armv7       am3517evm           logicpd        omap3
+mt_ventoux                   arm         armv7       mt_ventoux          teejet         omap3
 omap3_zoom1                  arm         armv7       zoom1               logicpd        omap3
 omap3_zoom2                  arm         armv7       zoom2               logicpd        omap3
 omap3_logic                  arm         armv7       omap3som            logicpd        omap3
include/configs/mt_ventoux.h new file +58 -0
new file mode 100644
index 0000000..2034b59
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2011
+ * Stefano Babic, DENX Software Engineering, sbabic at denx.de.
+ *
+ * Copyright (C) 2009 TechNexion Ltd.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include "tam3517-common.h"
+
+#define MACH_TYPE_AM3517_MT_VENTOUX	3832
+#define CONFIG_MACH_TYPE	MACH_TYPE_AM3517_MT_VENTOUX
+
+#define CONFIG_BOOTDELAY	10
+#define CONFIG_BOOTFILE		"uImage"
+#define CONFIG_AUTO_COMPLETE
+
+#define CONFIG_HOSTNAME mt_ventoux
+
+/*
+ * Miscellaneous configurable options
+ */
+#define V_PROMPT			"mt_ventoux => "
+#define CONFIG_SYS_PROMPT		V_PROMPT
+
+/*
+ * FPGA
+ */
+#define CONFIG_CMD_FPGA
+#define CONFIG_FPGA
+#define CONFIG_FPGA_XILINX
+#define CONFIG_FPGA_SPARTAN3
+#define CONFIG_SYS_FPGA_PROG_FEEDBACK
+#define CONFIG_SYS_FPGA_WAIT	10000
+#define CONFIG_MAX_FPGA_DEVICES	1
+#define CONFIG_FPGA_DELAY() udelay(1)
+#define CONFIG_SYS_FPGA_PROG_FEEDBACK
+
+#define	CONFIG_EXTRA_ENV_SETTINGS	CONFIG_TAM3517_SETTINGS \
+	"bootcmd=run net_nfs\0"
+
+#endif /* __CONFIG_H */
include/configs/tam3517-common.h +2 -2
index 13eeadb..254968f 100644
@@ -303,8 +303,8 @@
 /* Setup MTD for NAND on the SOM */
 #define MTDIDS_DEFAULT		"nand0=omap2-nand.0"
 #define MTDPARTS_DEFAULT	"mtdparts=omap2-nand.0:512k(MLO)," \
-				"512k(u-boot),128k(env1)," \
-				"128k(env2),6m(kernel),-(rootfs)"
+				"1m(u-boot),256k(env1)," \
+				"256k(env2),6m(kernel),-(rootfs)"
 
 #define xstr(s)	str(s)
 #define str(s)	#s
Signature · 2 lines
Regards,
Igor.