Patchwork [U-Boot] Tegra: T30: Beaver: Fix board/board_name env vars, s/b beaver, not cardhu

login
register
mail settings
Submitter Tom Warren
Date April 17, 2013, 3:22 p.m.
Message ID <1366212139-30881-1-git-send-email-twarren@nvidia.com>
Download mbox | patch
Permalink /patch/237268/
State Accepted
Delegated to: Tom Warren
Headers show

Comments

Tom Warren - April 17, 2013, 3:22 p.m.
Did a 'strings u-boot-dtb-tegra.bin | less' and saw that both
board and board_name == beaver. Didn't test as I have no T30
Beaver board here.

Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 board/nvidia/beaver/Makefile | 38 ++++++++++++++++++++++++++++++++++++++
 boards.cfg                   |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 board/nvidia/beaver/Makefile
Stephen Warren - April 17, 2013, 3:50 p.m.
On 04/17/2013 09:22 AM, Tom Warren wrote:
> Did a 'strings u-boot-dtb-tegra.bin | less' and saw that both
> board and board_name == beaver. Didn't test as I have no T30
> Beaver board here.

Tested-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>

I guess this is about the only way to do it; I checked
include/autoconf.mk and, and there's no variable that says "beaver" when
the beaver entry in boards.cfg is based on cardhu, and I'm sure we'll
need some separate code later anyway, so there's no harm adding the
makefile now.

Patch

diff --git a/board/nvidia/beaver/Makefile b/board/nvidia/beaver/Makefile
new file mode 100644
index 0000000..9510f60
--- /dev/null
+++ b/board/nvidia/beaver/Makefile
@@ -0,0 +1,38 @@ 
+#
+# Copyright (c) 2010-2013, NVIDIA CORPORATION.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope 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, see <http://www.gnu.org/licenses/>.
+#
+
+include $(TOPDIR)/config.mk
+
+$(shell mkdir -p $(obj)../cardhu)
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	= ../cardhu/cardhu.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 31483d6..bcc4e78 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -311,7 +311,7 @@  seaboard                     arm         armv7:arm720t seaboard          nvidia
 ventana                      arm         armv7:arm720t ventana           nvidia         tegra20
 whistler                     arm         armv7:arm720t whistler          nvidia         tegra20
 cardhu                       arm         armv7:arm720t cardhu            nvidia         tegra30
-beaver                       arm         armv7:arm720t cardhu            nvidia         tegra30
+beaver                       arm         armv7:arm720t beaver            nvidia         tegra30
 dalmore                      arm         armv7:arm720t dalmore           nvidia         tegra114
 colibri_t20_iris             arm         armv7:arm720t colibri_t20_iris  toradex        tegra20
 u8500_href                   arm         armv7       u8500               st-ericsson    u8500