diff mbox

[U-Boot,v3,3/4] tegra2: Add Avionic Design Plutux support.

Message ID 1321524626-6000-4-git-send-email-thierry.reding@avionic-design.de
State Accepted
Headers show

Commit Message

Thierry Reding Nov. 17, 2011, 10:10 a.m. UTC
The Plutux is a set-top box device based on the Tamonten processor
module. It can be connected to a display via an HDMI output.

Changes in v3:
  * Remove unused implementation of gpio_config_uart().
  * Implement MMC/SD card detection.
  * Drop board_mmc_getcd() which is now implemented by common Tegra2
    code.
  * Add MAINTAINERS entry.

Changes in v2:
  * No longer override the default CONFIG_SYS_TEXT_BASE setting.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
---
 MAINTAINERS                          |    4 ++
 board/avionic-design/plutux/Makefile |   50 +++++++++++++++++++++++++++
 board/avionic-design/plutux/plutux.c |   45 ++++++++++++++++++++++++
 boards.cfg                           |    1 +
 include/configs/plutux.h             |   62 ++++++++++++++++++++++++++++++++++
 5 files changed, 162 insertions(+), 0 deletions(-)
 create mode 100644 board/avionic-design/plutux/Makefile
 create mode 100644 board/avionic-design/plutux/plutux.c
 create mode 100644 include/configs/plutux.h

Comments

Simon Glass Nov. 17, 2011, 11:17 p.m. UTC | #1
On Thu, Nov 17, 2011 at 2:10 AM, Thierry Reding
<thierry.reding@avionic-design.de> wrote:
> The Plutux is a set-top box device based on the Tamonten processor
> module. It can be connected to a display via an HDMI output.
>
> Changes in v3:
>  * Remove unused implementation of gpio_config_uart().
>  * Implement MMC/SD card detection.
>  * Drop board_mmc_getcd() which is now implemented by common Tegra2
>    code.
>  * Add MAINTAINERS entry.
>
> Changes in v2:
>  * No longer override the default CONFIG_SYS_TEXT_BASE setting.
>
> Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
>  MAINTAINERS                          |    4 ++
>  board/avionic-design/plutux/Makefile |   50 +++++++++++++++++++++++++++
>  board/avionic-design/plutux/plutux.c |   45 ++++++++++++++++++++++++
>  boards.cfg                           |    1 +
>  include/configs/plutux.h             |   62 ++++++++++++++++++++++++++++++++++
>  5 files changed, 162 insertions(+), 0 deletions(-)
>  create mode 100644 board/avionic-design/plutux/Makefile
>  create mode 100644 board/avionic-design/plutux/plutux.c
>  create mode 100644 include/configs/plutux.h
>
diff mbox

Patch

diff --git a/MAINTAINERS b/MAINTAINERS
index d24d7ad..bb92ad9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -782,6 +782,10 @@  Stelian Pop <stelian.pop@leadtechdesign.com>
 	at91sam9263ek	ARM926EJS (AT91SAM9263 SoC)
 	at91sam9rlek	ARM926EJS (AT91SAM9RL SoC)
 
+Thierry Reding <thierry.reding@avionic-design.de>
+
+	plutux		Tegra2 (ARM7 & A9 Dual Core)
+
 Tom Rini <trini@ti.com>
 
 	omap3_evm	ARM ARMV7 (OMAP3xx SoC)
diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile
new file mode 100644
index 0000000..b0c318c
--- /dev/null
+++ b/board/avionic-design/plutux/Makefile
@@ -0,0 +1,50 @@ 
+#
+#  (C) Copyright 2010,2011
+#  NVIDIA Corporation <www.nvidia.com>
+#  (C) Copyright 2011
+#  Avionic Design GmbH <www.avionic-design.de>
+#
+#  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	:= $(BOARD).o
+COBJS	+= ../common/tamonten.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/board/avionic-design/plutux/plutux.c b/board/avionic-design/plutux/plutux.c
new file mode 100644
index 0000000..42c8094
--- /dev/null
+++ b/board/avionic-design/plutux/plutux.c
@@ -0,0 +1,45 @@ 
+/*
+ *  (C) Copyright 2010,2011
+ *  NVIDIA Corporation <www.nvidia.com>
+ *  (C) Copyright 2011
+ *  Avionic Design GmbH <www.avionic-design.de>
+ *
+ * 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 <common.h>
+#include <asm/io.h>
+#include <asm/gpio.h>
+#include <asm/arch/tegra2.h>
+#ifdef CONFIG_TEGRA2_MMC
+#include <mmc.h>
+#endif
+
+#ifdef CONFIG_TEGRA2_MMC
+/*
+ * Routine: gpio_config_mmc
+ * Description: Set GPIOs for SD card
+ */
+void gpio_config_mmc(void)
+{
+	/* configure pin as input for card detect */
+	gpio_request(GPIO_PH2, "SD4 CD");
+	gpio_direction_input(GPIO_PH2);
+}
+#endif
diff --git a/boards.cfg b/boards.cfg
index 5c2e01b..e6a4a41 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -232,6 +232,7 @@  xaeniax                      arm         pxa
 xm250                        arm         pxa
 zipitz2                      arm         pxa
 jornada                      arm         sa1100
+plutux                       arm         armv7       plutux              avionic-design tegra2
 atngw100                     avr32       at32ap      -                   atmel          at32ap700x
 atstk1002                    avr32       at32ap      atstk1000           atmel          at32ap700x
 atstk1003                    avr32       at32ap      atstk1000           atmel          at32ap700x
diff --git a/include/configs/plutux.h b/include/configs/plutux.h
new file mode 100644
index 0000000..033eda0
--- /dev/null
+++ b/include/configs/plutux.h
@@ -0,0 +1,62 @@ 
+/*
+ *  (C) Copyright 2010,2011
+ *  NVIDIA Corporation <www.nvidia.com>
+ *  (C) Copyright 2011
+ *  Avionic Design GmbH <www.avionic-design.de>
+ *
+ * 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 "tegra2-common.h"
+
+/* High-level configuration options */
+#define TEGRA2_SYSMEM			"mem=384M@0M nvmem=128M@384M"
+#define V_PROMPT			"Tegra2 (Plutux) # "
+#define CONFIG_TEGRA2_BOARD_STRING	"Avionic Design Plutux"
+#define CONFIG_SYS_BOARD_ODMDATA	0x2b2d8011
+
+/* Board-specific serial config */
+#define CONFIG_SERIAL_MULTI
+#define CONFIG_TEGRA2_ENABLE_UARTD	/* UARTD: debug UART */
+#define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
+
+#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
+
+#define CONFIG_FIT
+
+#define CONFIG_BOOTCOMMAND				\
+	"mmc rescan;"					\
+	"ext2load mmc 0 0x17000000 /boot/uImage;"	\
+	"bootm"
+
+#endif /* __CONFIG_H */