Patchwork [U-Boot,2/7] Tegra30: Add CPU (armv7) files

login
register
mail settings
Submitter Tom Warren
Date Oct. 2, 2012, 10:45 p.m.
Message ID <1349217955-8729-3-git-send-email-twarren@nvidia.com>
Download mbox | patch
Permalink /patch/188674/
State Superseded
Delegated to: Tom Warren
Headers show

Comments

Tom Warren - Oct. 2, 2012, 10:45 p.m.
These files are for code that runs on the CPU (A9) on T30 boards.
At this time, it's only the RCM (Recovery Mode) cmd file, which
is in tegra-common. As T30-specific run-time code is added, it'll
go here.

Signed-off-by: Tom Warren <twarren@nvidia.com>
---
 arch/arm/cpu/{arm720t => armv7}/tegra30/Makefile  |   13 ++++++-------
 arch/arm/cpu/{arm720t => armv7}/tegra30/config.mk |    2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)
 copy arch/arm/cpu/{arm720t => armv7}/tegra30/Makefile (86%)
 copy arch/arm/cpu/{arm720t => armv7}/tegra30/config.mk (95%)
Stephen Warren - Oct. 3, 2012, 6:26 p.m.
On 10/02/2012 04:45 PM, Tom Warren wrote:
> These files are for code that runs on the CPU (A9) on T30 boards.
> At this time, it's only the RCM (Recovery Mode) cmd file, which
> is in tegra-common. As T30-specific run-time code is added, it'll
> go here.

> diff --git a/arch/arm/cpu/arm720t/tegra30/Makefile b/arch/arm/cpu/armv7/tegra30/Makefile

> -LIB	= $(obj)lib$(SOC).o
> +LIB	=  $(obj)lib$(SOC).o

Looks like there are two spaces after the = there.

> -all:	$(obj).depend $(LIB)
> +all:	 $(obj).depend $(LIB)

And a space after the TAB there.

Does U-Boot compile at this point in the series? Hopefully "git bisect"
is maintained across the series. I suppose there aren't any boards.cfg
entries for Tegra30 yet, so the fact that e.g. CONFIG_ARCH_DEVICE_TREE
points at a file that doesn't yet exist is impossible to notice.
Tom Warren - Oct. 3, 2012, 8:03 p.m.
Stephen,

On Wed, Oct 3, 2012 at 11:26 AM, Stephen Warren <swarren@wwwdotorg.org> wrote:
> On 10/02/2012 04:45 PM, Tom Warren wrote:
>> These files are for code that runs on the CPU (A9) on T30 boards.
>> At this time, it's only the RCM (Recovery Mode) cmd file, which
>> is in tegra-common. As T30-specific run-time code is added, it'll
>> go here.
>
>> diff --git a/arch/arm/cpu/arm720t/tegra30/Makefile b/arch/arm/cpu/armv7/tegra30/Makefile
>
>> -LIB  = $(obj)lib$(SOC).o
>> +LIB  =  $(obj)lib$(SOC).o
>
> Looks like there are two spaces after the = there.
>
>> -all: $(obj).depend $(LIB)
>> +all:  $(obj).depend $(LIB)
>
> And a space after the TAB there.

Right on both counts. Despite what git format-patch said about the
origin of this file, it was really copied over from
armv7/tegra20/Makefile, and the spacing errors are in that file
originally. Guess checkpatch doesn't look at Makefiles.

I'll correct this on the next rev. Thanks.

>
> Does U-Boot compile at this point in the series? Hopefully "git bisect"
> is maintained across the series. I suppose there aren't any boards.cfg
> entries for Tegra30 yet, so the fact that e.g. CONFIG_ARCH_DEVICE_TREE
> points at a file that doesn't yet exist is impossible to notice.

I haven't done a git bisect on the series, but I did do individual git
am's on each patch with ./MAKEALL -s tegra20 between each, and saw no
problems when I did the first port. I did go in and rebase/amend a few
commits, though, during a final clean-up effort, so I may have broken
bisect.  I'll be sure to test each patch/bisect on the next rev.

Thanks,

Tom

Patch

diff --git a/arch/arm/cpu/arm720t/tegra30/Makefile b/arch/arm/cpu/armv7/tegra30/Makefile
similarity index 86%
copy from arch/arm/cpu/arm720t/tegra30/Makefile
copy to arch/arm/cpu/armv7/tegra30/Makefile
index bd96997..b04732d 100644
--- a/arch/arm/cpu/arm720t/tegra30/Makefile
+++ b/arch/arm/cpu/armv7/tegra30/Makefile
@@ -1,7 +1,7 @@ 
 #
 # Copyright (c) 2010-2012, NVIDIA CORPORATION.  All rights reserved.
 #
-# (C) Copyright 2000-2008
+# (C) Copyright 2000-2003
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # This program is free software; you can redistribute it and/or modify it
@@ -19,14 +19,13 @@ 
 
 include $(TOPDIR)/config.mk
 
-LIB	= $(obj)lib$(SOC).o
+LIB	=  $(obj)lib$(SOC).o
 
-COBJS-y	+= cpu.o
+COBJS	:= $(COBJS-y)
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
 
-SRCS	:= $(COBJS-y:.o=.c)
-OBJS	:= $(addprefix $(obj),$(COBJS-y))
-
-all:	$(obj).depend $(LIB)
+all:	 $(obj).depend $(LIB)
 
 $(LIB):	$(OBJS)
 	$(call cmd_link_o_target, $(OBJS))
diff --git a/arch/arm/cpu/arm720t/tegra30/config.mk b/arch/arm/cpu/armv7/tegra30/config.mk
similarity index 95%
copy from arch/arm/cpu/arm720t/tegra30/config.mk
copy to arch/arm/cpu/armv7/tegra30/config.mk
index 2388c56..719ca81 100644
--- a/arch/arm/cpu/arm720t/tegra30/config.mk
+++ b/arch/arm/cpu/armv7/tegra30/config.mk
@@ -16,4 +16,4 @@ 
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
-USE_PRIVATE_LIBGCC = yes
+CONFIG_ARCH_DEVICE_TREE := tegra30