Move ARM supplied dev boards to new board/armltd directory
Subsystems (2)
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
This patch will allow code common to all ARM supplied development boards to be shared.
This patch is also available for test fromgit://linux-arm.org/u-boot-armdev.git as branch 080312_move
The patch is made against u-boot commite95bcc3661a78ccc094c365ecd2484d00a60f97d:
Wolfgang Denk (1):
Merge branch 'master' of git
+ssh://10.10.0.7/home/wd/git/u-boot/master
---
Move ARM supplied dev boards to new board/armltd directory Signed-off-by Peter Pearse <[email protected]>
---
Makefile +3 -3
@@ -2330,7 +2330,7 @@ ap720t_config \ ap920t_config \ ap926ejs_config \ ap946es_config: unconfig - @board/integratorap/split_by_variant.sh $@ + @board/armltd/integratorap/split_by_variant.sh $@ integratorcp_config \ cp_config \
@@ -2342,7 +2342,7 @@ cp966_config \ cp922_config \ cp922_XA10_config \ cp1026_config: unconfig - @board/integratorcp/split_by_variant.sh $@ + @board/armltd/integratorcp/split_by_variant.sh $@ kb9202_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm920t kb9202 NULL at91rm9200
@@ -2459,7 +2459,7 @@ VCMA9_config : unconfig versatile_config \ versatileab_config \ versatilepb_config : unconfig - @board/versatile/split_by_variant.sh $@ + @board/armltd/versatile/split_by_variant.sh $@ voiceblue_config: unconfig @$(MKCONFIG) $(@:_config=) arm arm925t voiceblue
board/armltd/asm.S renamed from cpu/arm926ejs/versatile/reset.S +10 -19
@@ -1,15 +1,7 @@ /* - * armboot - Startup Code for ARM926EJS CPU-core + * armltd.S - Assembler code common to development boards supplied by ARM Ltd. * - * Copyright (c) 2003 Texas Instruments - * - * ----- Adapted for OMAP1610 OMAP730 from ARM925t code ------ - * - * Copyright (c) 2001 Marius Gr?ger <[email protected]> - * Copyright (c) 2002 Alex Z?pke <[email protected]> - * Copyright (c) 2002 Gary Jennejohn <[email protected]> - * Copyright (c) 2003 Richard Woodruff <[email protected]> - * Copyright (c) 2003 Kshitij <[email protected]> + * Copyright (c) 2008 ARM Ltd. * * See file CREDITS for list of people who contributed to this * project.
@@ -30,16 +22,15 @@ * MA 02111-1307 USA */ +/* + * Whilst some cores and/or core mocules may provide explicit + * software reset, these are not used because they may have unwanted + * side effects. For U-Boot's purposes calling the reset vector suffices. + * If necessary, we could set some registers, update the MMU, etc. + */ + .align 5 .globl reset_cpu reset_cpu: - ldr r1, rstctl1 /* get clkm1 reset ctl */ - mov r3, #0x0 - strh r3, [r1] /* clear it */ - mov r3, #0x8 - strh r3, [r1] /* force dsp+arm reset */ -_loop_forever: - b _loop_forever + b 0 -rstctl1: - .word 0xfffece10
board/armltd/integratorap/Makefile renamed from board/integratorap/Makefile +0 -0
board/armltd/integratorap/config.mk renamed from board/integratorap/config.mk +0 -0
board/armltd/integratorap/flash.c renamed from board/integratorap/flash.c +0 -0
board/armltd/integratorap/integratorap.c renamed from board/integratorap/integratorap.c +0 -0
board/armltd/integratorap/lowlevel_init.S renamed from board/integratorap/lowlevel_init.S +0 -0
board/armltd/integratorap/memsetup.S renamed from board/integratorap/memsetup.S +0 -0
board/armltd/integratorap/split_by_variant.sh renamed from board/integratorap/split_by_variant.sh +19 -18
@@ -12,32 +12,32 @@ echo " 1 /* Integrator/AP */" >> tmp.fil # Set the core module defines according to Core Module # --------------------------------------------------------- cpu="arm_intcm" -variant="unknown core module" +variant="generic core module" if [ "$1" = "" ] then - echo "$0:: No parameters - using arm_intcm" + echo "$0:: No parameters - using core arm_unknown" else case "$1" in ap7_config) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM7TDMI" ;; ap966) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM966E-S" ;; ap922_config) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM922T" ;; integratorap_config | \ ap_config) - cpu="arm_intcm" - variant="unspecified core module" + cpu="arm_unknown" + variant="generic core module" ;; ap720t_config)
@@ -48,7 +48,7 @@ else ;; ap922_XA10_config) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM922T_XA10" echo -n "#define CONFIG_CM922T_XA10" >> tmp.fil echo " 1 /* CPU core is ARM922T_XA10 */" >> tmp.fil
@@ -76,18 +76,18 @@ else ;; *) - echo "$0:: Unknown core module" - variant="unknown core module" - cpu="arm_intcm" + echo "$0:: Unknown core, generic core module" + variant="generic core module" + cpu="arm_unknown" ;; esac fi -if [ "$cpu" = "arm_intcm" ] +if [ "$cpu" = "arm_unknown" ] then - echo "/* Core module undefined/not ported */" >> tmp.fil - echo "#define CONFIG_ARM_INTCM 1" >> tmp.fil + echo "/* Core unknown/not ported */" >> tmp.fil + echo "#define CONFIG_arm_unknown 1" >> tmp.fil echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM" >> tmp.fil echo -n " /* CM may not have " >> tmp.fil echo "multiple SSRAM mapping */" >> tmp.fil
@@ -105,15 +105,16 @@ then fi mkdir -p ${obj}include -mkdir -p ${obj}board/integratorap +mkdir -p ${obj}board/armltd/integratorap mv tmp.fil ${obj}include/config.h # --------------------------------------------------------- # Ensure correct core object loaded first in U-Boot image # --------------------------------------------------------- -sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/integratorap/u-boot.lds.template > ${obj}board/integratorap/u-boot.lds +sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' \ +${src}board/armltd/integratorap/u-boot.lds.template > \ +${obj}board/armltd/integratorap/u-boot.lds # --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- -$MKCONFIG -a integratorap arm $cpu integratorap; +$MKCONFIG -a integratorap arm $cpu integratorap armltd NULL; echo "Variant:: $variant with core $cpu" -
board/armltd/integratorap/u-boot.lds.template renamed from board/integratorap/u-boot.lds.template +0 -0
board/armltd/integratorcp/Makefile renamed from board/integratorcp/Makefile +0 -0
board/armltd/integratorcp/config.mk renamed from board/integratorcp/config.mk +0 -0
board/armltd/integratorcp/flash.c renamed from board/integratorcp/flash.c +0 -0
board/armltd/integratorcp/integratorcp.c renamed from board/integratorcp/integratorcp.c +0 -0
board/armltd/integratorcp/lowlevel_init.S renamed from board/integratorcp/lowlevel_init.S +0 -0
board/armltd/integratorcp/memsetup.S renamed from board/integratorcp/memsetup.S +0 -0
board/armltd/integratorcp/split_by_variant.sh renamed from board/integratorcp/split_by_variant.sh +17 -17
@@ -9,32 +9,32 @@ echo " /* Integrator board */" >> tmp.fil echo -n "#define CONFIG_ARCH_CINTEGRATOR" >> tmp.fil echo " 1 /* Integrator/CP */" >> tmp.fil -cpu="arm_intcm" -variant="unknown core module" +cpu="arm_unknown" +variant="generic core module" if [ "$1" = "" ] then - echo "$0:: No parameters - using arm_intcm" + echo "$0:: No parameters - using arm_unknown" else case "$1" in ap966) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM966E-S" ;; ap922_config) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM922T" ;; integratorcp_config | \ cp_config) - cpu="arm_intcm" + cpu="arm_unknown" variant="unspecified core module" ;; cp922_XA10_config) - cpu="arm_intcm" + cpu="arm_unknown" variant="unported core module CM922T_XA10" echo -n "#define CONFIG_CM922T_XA10" >> tmp.fil echo " 1 /* CPU core is ARM922T_XA10 */" >> tmp.fil
@@ -54,7 +54,6 @@ else echo " 1 /* CPU core is ARM926EJ-S */ " >> tmp.fil ;; - cp946es_config) cpu="arm946es" variant="Core module CM946E-S"
@@ -70,19 +69,19 @@ else ;; *) - echo "$0:: Unknown core module" - variant="unknown core module" - cpu="arm_intcm" + echo "$0:: Unknown core" + variant="generic core module" + cpu="arm_unknown" ;; esac fi -if [ "$cpu" = "arm_intcm" ] +if [ "$cpu" = "arm_unknown" ] then echo "/* Core module undefined/not ported */" >> tmp.fil - echo "#define CONFIG_ARM_INTCM 1" >> tmp.fil + echo "#define CONFIG_arm_unknown 1" >> tmp.fil echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM" >> tmp.fil echo -n " /* CM may not have " >> tmp.fil echo "multiple SSRAM mapping */" >> tmp.fil
@@ -100,15 +99,16 @@ then fi mkdir -p ${obj}include -mkdir -p ${obj}board/integratorcp +mkdir -p ${obj}board/armltd/integratorcp mv tmp.fil ${obj}include/config.h # --------------------------------------------------------- # Ensure correct core object loaded first in U-Boot image # --------------------------------------------------------- -sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/integratorcp/u-boot.lds.template > ${obj}board/integratorcp/u-boot.lds +sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' \ +${src}board/armltd/integratorcp/u-boot.lds.template > \ +${obj}board/armltd/integratorcp/u-boot.lds # --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- -$MKCONFIG -a integratorcp arm $cpu integratorcp; +$MKCONFIG -a integratorcp arm $cpu integratorcp armltd NULL; echo "Variant:: $variant with core $cpu" -
board/armltd/integratorcp/u-boot.lds.template renamed from board/integratorcp/u-boot.lds.template +0 -0
board/armltd/src.c renamed from cpu/arm926ejs/versatile/timer.c +58 -42
166 lines not on this page · raw message
board/armltd/versatile/Makefile renamed from board/versatile/Makefile +2 -2
@@ -25,8 +25,8 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a -COBJS := versatile.o flash.o -SOBJS := lowlevel_init.o +COBJS := versatile.o flash.o ../src.o +SOBJS := lowlevel_init.o ../asm.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS))
board/armltd/versatile/config.mk renamed from board/versatile/config.mk +0 -0
board/armltd/versatile/flash.c renamed from board/versatile/flash.c +0 -0
board/armltd/versatile/lowlevel_init.S renamed from board/versatile/lowlevel_init.S +0 -0
board/armltd/versatile/split_by_variant.sh renamed from board/versatile/split_by_variant.sh +1 -2
@@ -25,7 +25,6 @@ else variant=AB926EJ-S ;; - *) echo "$0:: Unrecognised config - using versatilepb_config" echo "#define CONFIG_ARCH_VERSATILE_PB" > ${obj}include/config.h
@@ -38,5 +37,5 @@ fi # --------------------------------------------------------- # Complete the configuration # --------------------------------------------------------- -$MKCONFIG -a versatile arm arm926ejs versatile NULL versatile +$MKCONFIG -a versatile arm arm926ejs versatile armltd NULL echo "Variant:: $variant"
board/armltd/versatile/u-boot.lds renamed from board/versatile/u-boot.lds +0 -0
board/armltd/versatile/versatile.c renamed from board/versatile/versatile.c +0 -0
cpu/arm926ejs/versatile/Makefile deleted +0 -47
47 lines not on this page · raw message
cpu/arm_unknown/Makefile renamed from cpu/arm_intcm/Makefile +0 -0
cpu/arm_unknown/config.mk renamed from cpu/arm_intcm/config.mk +0 -0
cpu/arm_unknown/cpu.c renamed from cpu/arm_intcm/cpu.c +0 -0
cpu/arm_unknown/start.S renamed from cpu/arm_intcm/start.S +0 -0
---
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 2 lines · In message <[email protected]> you wrote:
This patch will allow code common to all ARM supplied development boards to be shared.
...
Makefile ap720t_config \ · line 2333
Quoted 2 lines
Makefile +1
-1- @board/integratorap/split_by_variant.sh $@ + @board/armltd/integratorap/split_by_variant.sh $@
I really dislike the "armltd" name. Is there any specific reason for not just using "arm" here?
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de At the source of every error which is blamed on the computer you will find at least two human errors, including the error of blaming it on the computer.
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 12 lines
-----Original Message-----
From: wd at denx.de [mailto:wd at denx.de]
Sent: 18 March 2008 16:22
To: Peter Pearse
Cc: U-Boot-Users
Subject: Re: [U-Boot-Users] [PATCH] [ARM] Move ARM supplied dev boards to new board/armltd directoryIn message
Quoted 2 lines · <[email protected]> you wrote:
This patch will allow code common to all ARM supplied development boards to be shared.
Quoted 7 lines
...
Makefile ap720t_config \ · line 2333
Quoted 2 lines
Makefile +1
-1- @board/integratorap/split_by_variant.sh $@ + @board/armltd/integratorap/split_by_variant.sh $@I really dislike the "armltd" name. Is there any specific reason for not just using "arm" here?
I thought that would be too confusing with the architecture name. All the boards with ARM architecture cores are arm boards in that sense.
This is a board sub-directory for the ARM Ltd supplied development boards i.e. VENDOR=armltd.
I really dont mind what it's called, or whether it has the word arm in it.
How about vendor001 to allow other vendor sub-directories, whatever their architecture?
Regards
Peter
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 9 lines · In message <[email protected]> you wrote:
Quoted 6 lines
Makefile ap720t_config \ · line 2333
Quoted 3 lines
Makefile +1
-1- @board/integratorap/split_by_variant.sh $@ + @board/armltd/integratorap/split_by_variant.sh $@I really dislike the "armltd" name. Is there any specific reason for not just using "arm" here?
I thought that would be too confusing with the architecture name. All the boards with ARM architecture cores are arm boards in that sense.
The convention is that names in board/ are vendor names, not architectures, so board/arm/ should be clear enough.
Quoted 2 lines
This is a board sub-directory for the ARM Ltd supplied development boards i.e. VENDOR=armltd.
Yes, I understood your intention, btu armltd is ugly and nobody else uses it.
Quoted 1 line
I really dont mind what it's called, or whether it has the word arm in it.
Let's call it arm, please.
Best regards,
Wolfgang Denk
Signature · 4 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de If all you have is a hammer, everything looks like a nail.
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 8 lines
-----Original Message-----
From: wd at denx.de [mailto:wd at denx.de]
Sent: 19 March 2008 12:10
To: Peter Pearse
Cc: u-boot-users at lists.sourceforge.net
Subject: Re: [U-Boot-Users] [PATCH] [ARM] Move ARM supplied dev boards to new board/armltd directory
--snip---
Quoted 5 lines
Let's call it arm, please.
Best regards,
Wolfgang Denk
OK - I'll resubmit
Regards
Peter
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
In reply to Wolfgang DenkRepost - apologies for Outlook incorrect character encoding
Quoted 12 lines
-----Original Message-----
From: wd at denx.de [mailto:wd at denx.de]
Sent: 18 March 2008 16:22
To: Peter Pearse
Cc: U-Boot-Users
Subject: Re: [U-Boot-Users] [PATCH] [ARM] Move ARM supplied dev boards to new board/armltd directoryIn message
Quoted 2 lines · <[email protected]> you wrote:
This patch will allow code common to all ARM supplied development boards to be shared.
Quoted 7 lines
...
Makefile ap720t_config \ · line 2333
Quoted 2 lines
Makefile +1
-1- @board/integratorap/split_by_variant.sh $@ + @board/armltd/integratorap/split_by_variant.sh $@I really dislike the "armltd" name. Is there any specific reason for not just using "arm" here?
I thought that would be too confusing with the architecture name. All the boards with ARM architecture cores are arm boards in that sense.
This is a board sub-directory for the ARM Ltd supplied development boards i.e. VENDOR=armltd.
I really dont mind what it's called, or whether it has the word arm in it.
How about vendor001 to allow other vendor sub-directories, whatever their architecture?
Regards
Peter
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 6 lines · Peter Pearse
Quoted 6 lines
Quoted 2 lines · <[email protected]> you wrote:
This patch will allow code common to all ARM supplied development boards to be shared.
...
Quoted 8 lines
Quoted 5 lines
Makefile ap720t_config \ · line 2333
Quoted 2 lines
Makefile +1
-1- @board/integratorap/split_by_variant.sh $@ + @board/armltd/integratorap/split_by_variant.sh $@I really dislike the "armltd" name. Is there any specific reason for not just using "arm" here?
I thought that would be too confusing with the architecture name. All the boards with ARM architecture cores are arm boards in that sense.
Right.
Quoted 2 lines
This is a board sub-directory for the ARM Ltd supplied development boards i.e. VENDOR=armltd.
I think it makes sense to call this directory "armltd". Just my 2 cents.
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 2 lines · In message <[email protected]> you wrote:
I think it makes sense to call this directory "armltd". Just my 2 cents.
Linux does not use this, and no other code I am aware of uses this. And here it's not necessary either. If we introduce such a name, we'd probably have to change all other vendoe names to include the respective Ltd., Inc., Corp., GmbH, AG, SARL, ... parts as well.
Please don't.
Best regards,
Wolfgang Denk
Signature · 6 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de When properly administered, vacations do not diminish productivity: for every week you're away and get nothing done, there's another when your boss is away and you get twice as much done. -- Daniel B. Luten
PATCH 1/1 Move ARM supplied dev boards to new board/armltd directory
Quoted 4 lines · Wolfgang Denk
Quoted 1 line · In message <[email protected]> you wrote:
I think it makes sense to call this directory "armltd". Just my 2 cents..
Linux does not use this,
Linux has no vendor specific (board) directory.
Quoted 6 lines
and no other code I am aware of uses this.
And here it's not necessary either. If we introduce such a name, we'd probably have to change all other vendoe names to include the respective Ltd., Inc., Corp., GmbH, AG, SARL, ... parts as well.Please don't.
Fine with me. I just wanted to express, that calling it "arm" might be a little misleading as Peter already mentioned. But it shouldn't be a big deal, so let's just call it "arm".
Best regards,
Stefan
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================