diff mbox

[U-Boot,v5,5/5] tegra2: Add support for Ventana

Message ID 1318441957-3312-5-git-send-email-swarren@nvidia.com
State Superseded
Headers show

Commit Message

Stephen Warren Oct. 12, 2011, 5:52 p.m. UTC 
Ventana is a board which is very similar to Seaboard. Support it by
re-using board/nvidia/seaboard/seaboard.c with minor run-time conditionals.

v5: Makefile: Use cmd_link_o_target, remove unused clean/distclean targets.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 board/nvidia/seaboard/seaboard.c |   11 ++++++-
 board/nvidia/ventana/Makefile    |   49 +++++++++++++++++++++++++++++++++
 boards.cfg                       |    1 +
 include/configs/ventana.h        |   55 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 board/nvidia/ventana/Makefile
 create mode 100644 include/configs/ventana.h

Comments

Mike Frysinger Oct. 12, 2011, 6:02 p.m. UTC | #1 
On Wednesday 12 October 2011 13:52:37 Stephen Warren wrote:
> --- a/board/nvidia/seaboard/seaboard.c
> +++ b/board/nvidia/seaboard/seaboard.c
> @@ -32,10 +32,10 @@
>  #include "../common/board.h"
> 
>  /*
> - * Routine: gpio_config_uart
> + * Routine: gpio_config_uart_seaboard
>   * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
>   */
> -void gpio_config_uart(void)
> +void gpio_config_uart_seaboard(void)
>  {
>  	int gp = GPIO_PI3;
>  	struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
> @@ -56,6 +56,13 @@ void gpio_config_uart(void)
>  	writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
>  }
> 
> +void gpio_config_uart(void)
> +{
> +	if (machine_is_ventana())
> +		return;
> +	gpio_config_uart_seaboard();
> +}

another way to address this would be to add "__weak" to the existing 
gpio_config_uart() function, and add a gpio_config_uart() stub to 
board/nvidia/ventana/ventana.c.

although, if machine_is_ventana() returns a constant, and you marked 
gpio_config_uart_seaboard() static (i think you want to do that anyways), the 
code should come out the same.
-mike
Mike Frysinger Oct. 12, 2011, 6:12 p.m. UTC | #2 
On Wednesday 12 October 2011 14:06:37 Stephen Warren wrote:
> Mike Frysinger wrote at Wednesday, October 12, 2011 12:02 PM:
> > On Wednesday 12 October 2011 13:52:37 Stephen Warren wrote:
> > > --- a/board/nvidia/seaboard/seaboard.c
> > > +++ b/board/nvidia/seaboard/seaboard.c
> > >
> > > -void gpio_config_uart(void)
> > > +void gpio_config_uart_seaboard(void)
> > >  {
> > >  ...
> > > +void gpio_config_uart(void)
> > > +{
> > > +	if (machine_is_ventana())
> > > +		return;
> > > +	gpio_config_uart_seaboard();
> > > +}
> > 
> > another way to address this would be to add "__weak" to the existing
> > gpio_config_uart() function, and add a gpio_config_uart() stub to
> > board/nvidia/ventana/ventana.c.
> 
> There are many boards that are very similar to Seaboard, and hence will
> probably use seaboard.c like Ventana does in this patch. I'm not sure
> exactly which subset of them need the GPIO twiddled to enable the UART
> output, but I suspect not all of them. I think it'll end up being simpler
> to simply list the boards that do/don't right in gpio_config_uart() as
> in this patch. I propose we stick with this style; we can always refactor
> the code as support for more boards are added if it becomes clear that
> one way is better than the other.

sure, you get to maintain this, not me, so whatever is easier for you since 
the code size will be the same (once you fix the static issue)

> > although, if machine_is_ventana() returns a constant, and you marked
> > gpio_config_uart_seaboard() static (i think you want to do that anyways),
> > the code should come out the same.
> 
> Yes, gpio_config_uart_seaboard() should be static. Do you want me to
> respin for that?

well, the current one is wrong, so you need to post an updated patch before 
it'll get merged :)
-mike
diff mbox

Patch

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 356d616..013f1d0 100644
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -32,10 +32,10 @@ 
 #include "../common/board.h"
 
 /*
- * Routine: gpio_config_uart
+ * Routine: gpio_config_uart_seaboard
  * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
  */
-void gpio_config_uart(void)
+void gpio_config_uart_seaboard(void)
 {
 	int gp = GPIO_PI3;
 	struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
@@ -56,6 +56,13 @@  void gpio_config_uart(void)
 	writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
 }
 
+void gpio_config_uart(void)
+{
+	if (machine_is_ventana())
+		return;
+	gpio_config_uart_seaboard();
+}
+
 #ifdef CONFIG_TEGRA2_MMC
 /*
  * Routine: pin_mux_mmc
diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile
new file mode 100644
index 0000000..9e5a87f
--- /dev/null
+++ b/board/nvidia/ventana/Makefile
@@ -0,0 +1,49 @@ 
+#
+#  (C) Copyright 2010,2011
+#  NVIDIA Corporation <www.nvidia.com>
+#
+#
+#  See file CREDITS for list of people who contributed to this
+#  project.
+#
+#  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., 59 Temple Place, Suite 330, Boston,
+#  MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	+= ../seaboard/seaboard.o
+COBJS	+= ../common/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
+
+#########################################################################
diff --git a/boards.cfg b/boards.cfg
index 65482ac..9211c0a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -192,6 +192,7 @@  s5pc210_universal            arm         armv7       universal_c210      samsung
 smdkv310		     arm	 armv7	     smdkv310		 samsung	s5pc2xx
 harmony                      arm         armv7       harmony             nvidia         tegra2
 seaboard                     arm         armv7       seaboard            nvidia         tegra2
+ventana                      arm         armv7       ventana             nvidia         tegra2
 u8500_href                   arm         armv7       u8500               st-ericsson    u8500
 actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
 actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
new file mode 100644
index 0000000..afd6ff6
--- /dev/null
+++ b/include/configs/ventana.h
@@ -0,0 +1,55 @@ 
+/*
+ *  (C) Copyright 2010,2011
+ *  NVIDIA Corporation <www.nvidia.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <asm/sizes.h>
+#include "tegra2-common.h"
+
+/* High-level configuration options */
+#define TEGRA2_SYSMEM		"mem=384M@0M nvmem=128M@384M mem=512M@512M"
+#define V_PROMPT		"Tegra2 (Ventana) # "
+#define CONFIG_TEGRA2_BOARD_STRING	"NVIDIA Ventana"
+
+/* Board-specific serial config */
+#define CONFIG_SERIAL_MULTI
+#define CONFIG_TEGRA2_ENABLE_UARTD
+#define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
+
+#define CONFIG_MACH_TYPE		MACH_TYPE_VENTANA
+#define CONFIG_SYS_BOARD_ODMDATA	0x300d8011 /* lp1, 1GB */
+
+#define CONFIG_BOARD_EARLY_INIT_F
+
+/* SD/MMC */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_TEGRA2_MMC
+#define CONFIG_CMD_MMC
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#endif /* __CONFIG_H */