From 66b796a5600fe5bde3f9d6e65e7b226c305b74d4 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 19 Sep 2012 00:37:21 +0000 Subject: tegra: Rename Medcom to Medcom-Wide Medcom is the marketing name for an older, PXA-based version of the same device. In order to avoid confusion, rename the Tegra-based version to the new marketing name. Signed-off-by: Thierry Reding Acked-by: Stephen Warren Signed-off-by: Tom Warren --- MAINTAINERS | 2 +- board/avionic-design/dts/tegra20-medcom-wide.dts | 58 +++++++++++++++++ board/avionic-design/dts/tegra20-medcom.dts | 58 ----------------- board/avionic-design/medcom-wide/Makefile | 48 ++++++++++++++ board/avionic-design/medcom/Makefile | 48 -------------- boards.cfg | 2 +- include/configs/medcom-wide.h | 82 ++++++++++++++++++++++++ include/configs/medcom.h | 82 ------------------------ 8 files changed, 190 insertions(+), 190 deletions(-) create mode 100644 board/avionic-design/dts/tegra20-medcom-wide.dts delete mode 100644 board/avionic-design/dts/tegra20-medcom.dts create mode 100644 board/avionic-design/medcom-wide/Makefile delete mode 100644 board/avionic-design/medcom/Makefile create mode 100644 include/configs/medcom-wide.h delete mode 100644 include/configs/medcom.h diff --git a/MAINTAINERS b/MAINTAINERS index 8f737cfea2..a203f9f02a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -830,7 +830,7 @@ Sricharan R Thierry Reding plutux Tegra20 (ARM7 & A9 Dual Core) - medcom Tegra20 (ARM7 & A9 Dual Core) + medcom-wide Tegra20 (ARM7 & A9 Dual Core) tec Tegra20 (ARM7 & A9 Dual Core) Christian Riesch diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts b/board/avionic-design/dts/tegra20-medcom-wide.dts new file mode 100644 index 0000000000..f916122421 --- /dev/null +++ b/board/avionic-design/dts/tegra20-medcom-wide.dts @@ -0,0 +1,58 @@ +/dts-v1/; + +/include/ ARCH_CPU_DTS + +/ { + model = "Avionic Design Medcom-Wide"; + compatible = "ad,medcom-wide", "nvidia,tegra20"; + + aliases { + usb0 = "/usb@c5008000"; + }; + + memory { + reg = <0x00000000 0x20000000>; + }; + + clocks { + clk_32k: clk_32k { + clock-frequency = <32000>; + }; + + osc { + clock-frequency = <12000000>; + }; + }; + + clock@60006000 { + clocks = <&clk_32k &osc>; + }; + + serial@70006300 { + clock-frequency = <216000000>; + }; + + i2c@7000c000 { + status = "disabled"; + }; + + i2c@7000c400 { + status = "disabled"; + }; + + i2c@7000c500 { + status = "disabled"; + }; + + i2c@7000d000 { + status = "disabled"; + }; + + usb@c5000000 { + status = "disabled"; + }; + + usb@c5004000 { + status = "disabled"; + }; +}; diff --git a/board/avionic-design/dts/tegra20-medcom.dts b/board/avionic-design/dts/tegra20-medcom.dts deleted file mode 100644 index 02864fbc7c..0000000000 --- a/board/avionic-design/dts/tegra20-medcom.dts +++ /dev/null @@ -1,58 +0,0 @@ -/dts-v1/; - -/include/ ARCH_CPU_DTS - -/ { - model = "Avionic Design Medcom-Wide"; - compatible = "ad,medcom", "nvidia,tegra20"; - - aliases { - usb0 = "/usb@c5008000"; - }; - - memory { - reg = <0x00000000 0x20000000>; - }; - - clocks { - clk_32k: clk_32k { - clock-frequency = <32000>; - }; - - osc { - clock-frequency = <12000000>; - }; - }; - - clock@60006000 { - clocks = <&clk_32k &osc>; - }; - - serial@70006300 { - clock-frequency = <216000000>; - }; - - i2c@7000c000 { - status = "disabled"; - }; - - i2c@7000c400 { - status = "disabled"; - }; - - i2c@7000c500 { - status = "disabled"; - }; - - i2c@7000d000 { - status = "disabled"; - }; - - usb@c5000000 { - status = "disabled"; - }; - - usb@c5004000 { - status = "disabled"; - }; -}; diff --git a/board/avionic-design/medcom-wide/Makefile b/board/avionic-design/medcom-wide/Makefile new file mode 100644 index 0000000000..864bc0ec01 --- /dev/null +++ b/board/avionic-design/medcom-wide/Makefile @@ -0,0 +1,48 @@ +# +# (C) Copyright 2010,2011 +# NVIDIA Corporation +# (C) Copyright 2011,2012 +# Avionic Design GmbH +# +# 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 + +$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) + +LIB = $(obj)lib$(BOARD).o + +COBJS := ../../nvidia/common/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/medcom/Makefile b/board/avionic-design/medcom/Makefile deleted file mode 100644 index 864bc0ec01..0000000000 --- a/board/avionic-design/medcom/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# (C) Copyright 2010,2011 -# NVIDIA Corporation -# (C) Copyright 2011,2012 -# Avionic Design GmbH -# -# 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 - -$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) - -LIB = $(obj)lib$(BOARD).o - -COBJS := ../../nvidia/common/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/boards.cfg b/boards.cfg index 44c50fd297..f966c9b79b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -307,7 +307,7 @@ zipitz2 arm pxa colibri_pxa270 arm pxa - toradex jornada arm sa1100 plutux arm armv7:arm720t plutux avionic-design tegra20 -medcom arm armv7:arm720t medcom avionic-design tegra20 +medcom-wide arm armv7:arm720t medcom-wide avionic-design tegra20 tec arm armv7:arm720t tec avionic-design tegra20 paz00 arm armv7:arm720t paz00 compal tegra20 trimslice arm armv7:arm720t trimslice compulab tegra20 diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h new file mode 100644 index 0000000000..e852e3156d --- /dev/null +++ b/include/configs/medcom-wide.h @@ -0,0 +1,82 @@ +/* + * (C) Copyright 2010,2011 + * NVIDIA Corporation + * (C) Copyright 2011-2012 + * Avionic Design GmbH + * + * 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 "tegra20-common.h" + +/* Enable fdt support for Medcom-Wide. Flash the image in u-boot-dtb.bin */ +#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom-wide +#define CONFIG_OF_CONTROL +#define CONFIG_OF_SEPARATE + +/* High-level configuration options */ +#define V_PROMPT "Tegra20 (Medcom-Wide) # " +#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom-Wide" + +/* Board-specific serial config */ +#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ +#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE + +#define CONFIG_BOARD_EARLY_INIT_F + +#define CONFIG_ENV_IS_NOWHERE + +/* SD/MMC */ +#define CONFIG_MMC +#define CONFIG_GENERIC_MMC +#define CONFIG_TEGRA_MMC +#define CONFIG_CMD_MMC + +/* USB host support */ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_TEGRA +#define CONFIG_USB_STORAGE +#define CONFIG_CMD_USB + +/* USB networking support */ +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX + +/* General networking support */ +#define CONFIG_CMD_NET +#define CONFIG_CMD_DHCP + +#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" + +#include "tegra-common-post.h" + +#endif /* __CONFIG_H */ diff --git a/include/configs/medcom.h b/include/configs/medcom.h deleted file mode 100644 index 45c4fd2ff7..0000000000 --- a/include/configs/medcom.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation - * (C) Copyright 2011-2012 - * Avionic Design GmbH - * - * 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 "tegra20-common.h" - -/* Enable fdt support for Medcom. Flash the image in u-boot-dtb.bin */ -#define CONFIG_DEFAULT_DEVICE_TREE tegra20-medcom -#define CONFIG_OF_CONTROL -#define CONFIG_OF_SEPARATE - -/* High-level configuration options */ -#define V_PROMPT "Tegra20 (Medcom) # " -#define CONFIG_TEGRA_BOARD_STRING "Avionic Design Medcom" - -/* Board-specific serial config */ -#define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ -#define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE - -#define CONFIG_BOARD_EARLY_INIT_F - -#define CONFIG_ENV_IS_NOWHERE - -/* SD/MMC */ -#define CONFIG_MMC -#define CONFIG_GENERIC_MMC -#define CONFIG_TEGRA_MMC -#define CONFIG_CMD_MMC - -/* USB host support */ -#define CONFIG_USB_EHCI -#define CONFIG_USB_EHCI_TEGRA -#define CONFIG_USB_STORAGE -#define CONFIG_CMD_USB - -/* USB networking support */ -#define CONFIG_USB_HOST_ETHER -#define CONFIG_USB_ETHER_SMSC95XX - -/* General networking support */ -#define CONFIG_CMD_NET -#define CONFIG_CMD_DHCP - -#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" - -#include "tegra-common-post.h" - -#endif /* __CONFIG_H */ -- cgit v1.2.3