qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup warnings for cpu/arm720t & cpu/arm1136 files. 

sed the linker scripts, rather than pre-process them.
Patch by Peter Pearse, 07 Oct 2005
This commit is contained in:
Wolfgang Denk 2005-10-09 00:22:48 +02:00
parent b8e16a3450
commit 96782c63d3
14 changed files with 182 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -2,6 +2,10 @@
Changes for U-Boot 1.1.4:
======================================================================
* Cleanup warnings for cpu/arm720t & cpu/arm1136 files.
sed the linker scripts, rather than pre-process them.
Patch by Peter Pearse, 07 Oct 2005
* Update make target for ARM supported boards.
Use lowlevel_init() instead of platformsetup() [rename].
Patch by Peter Pearse, 06 Oct 2005

6
Makefile
View File

@ -1409,7 +1409,7 @@ ap720t_config \
ap920t_config \
ap926ejs_config \
ap946es_config: unconfig
@board/integratorap/split_by_variant.sh $@ $(CC)
@board/integratorap/split_by_variant.sh $@
integratorcp_config \
cp_config \
@ -1421,7 +1421,7 @@ cp966_config \
cp922_config \
cp922_XA10_config \
cp1026_config: unconfig
@board/integratorcp/split_by_variant.sh $@ $(CC)
@board/integratorcp/split_by_variant.sh $@
kb9202_config : unconfig
@./mkconfig $(@:_config=) arm arm920t kb9202 NULL at91rm9200
@ -1520,7 +1520,7 @@ VCMA9_config : unconfig
versatile_config \
versatileab_config \
versatilepb_config : unconfig
@board/versatile/split_by_variant.sh $@ $(CC)
@board/versatile/split_by_variant.sh $@
voiceblue_smallflash_config \
voiceblue_config: unconfig

48
board/integratorap/split_by_variant.sh
View File

@ -11,68 +11,77 @@ echo " 1 /* Integrator/AP */" >> tmp.fil
# ---------------------------------------------------------
# Set the core module defines according to Core Module
# ---------------------------------------------------------
CC=${CROSS_COMPILE}gcc
cpu="arm_intcm"
if [ "$2" == "" ]
then
echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
else
CC=$2
fi
variant="unknown core module"
if [ "$1" == "" ]
then
echo "$0:: No parameters - using ${CROSS_COMPILE}gcc arm_intcm"
echo "$0:: No parameters - using arm_intcm"
else
case "$1" in
ap7_config | \
ap966_config | \
ap922_config | \
ap7_config)
cpu="arm_intcm"
variant="unported core module CM7TDMI"
;;
ap966)
cpu="arm_intcm"
variant="unported core module CM966E-S"
;;
ap922_config)
cpu="arm_intcm"
variant="unported core module CM922T"
;;
integratorap_config | \
ap_config)
cpu="arm_intcm"
variant="unspecified core module"
;;
ap720t_config)
cpu="arm720t"
echo -n "#define CONFIG_CM720T" >> tmp.fil
echo " 1 /* CPU core is ARM720T */ " >> tmp.fil
variant="Core module CM720T"
;;
ap922_XA10_config)
cpu="arm_intcm"
variant="unported core module CM922T_XA10"
echo -n "#define CONFIG_CM922T_XA10" >> tmp.fil
echo " 1 /* CPU core is ARM922T_XA10 */" >> tmp.fil
cpu="arm_intcm"
;;
ap920t_config)
cpu="arm920t"
variant="Core module CM920T"
echo -n "#define CONFIG_CM920T" >> tmp.fil
echo " 1 /* CPU core is ARM920T */" >> tmp.fil
;;
ap926ejs_config)
cpu="arm926ejs"
variant="Core module CM926EJ-S"
echo -n "#define CONFIG_CM926EJ_S" >> tmp.fil
echo " 1 /* CPU core is ARM926EJ-S */ " >> tmp.fil
;;
ap946es_config)
cpu="arm946es"
variant="Core module CM946E-S"
echo -n "#define CONFIG_CM946E_S" >> tmp.fil
echo " 1 /* CPU core is ARM946E-S */ " >> tmp.fil
;;
*)
echo "$0:: Unrecognised target - using arm_intcm"
echo "$0:: Unknown core module"
variant="unknown core module"
cpu="arm_intcm"
;;
esac
fi
if [ "$cpu" == "arm_intcm" ]
@ -98,9 +107,10 @@ mv tmp.fil ./include/config.h
# ---------------------------------------------------------
# Ensure correct core object loaded first in U-Boot image
# ---------------------------------------------------------
$CC -E -P -C -D CPU_FILE=cpu/$cpu/start.o \
-o board/integratorap/u-boot.lds board/integratorap/u-boot.lds.S
sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' board/integratorap/u-boot.lds.template > board/integratorap/u-boot.lds
# ---------------------------------------------------------
# Complete the configuration
# ---------------------------------------------------------
./mkconfig -a integratorap arm $cpu integratorap;
echo "Variant:: $variant with core $cpu"

4
board/integratorap/u-boot.lds.S → board/integratorap/u-boot.lds.template
View File

@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
/* Preprocessed during configuration to emsure the core module processor code,
from CPU_FILE, is placed at the start of the image */
# Template used during configuration to emsure the core module processor code,
# from CPU_FILE, is placed at the start of the image */
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)

45
board/integratorcp/split_by_variant.sh
View File

@ -8,47 +8,48 @@ echo -n "#define CONFIG_INTEGRATOR" >> tmp.fil
echo " /* Integrator board */" >> tmp.fil
echo -n "#define CONFIG_ARCH_CINTEGRATOR" >> tmp.fil
echo " 1 /* Integrator/CP */" >> tmp.fil
# ---------------------------------------------------------
# Set the core module defines according to Core Module
# ---------------------------------------------------------
CC=${CROSS_COMPILE}gcc
cpu="arm_intcm"
if [ "$2" == "" ]
then
echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
else
CC=$2
fi
variant="unknown core module"
if [ "$1" == "" ]
then
echo "$0:: No parameters - using ${CROSS_COMPILE}gcc arm_intcm"
echo "$0:: No parameters - using arm_intcm"
else
case "$1" in
cp966_config | \
cp922_config | \
cp1026_config | \
ap966)
cpu="arm_intcm"
variant="unported core module CM966E-S"
;;
ap922_config)
cpu="arm_intcm"
variant="unported core module CM922T"
;;
integratorcp_config | \
cp_config)
cpu="arm_intcm"
variant="unspecified core module"
;;
cp922_XA10_config)
cpu="arm_intcm"
variant="unported core module CM922T_XA10"
echo -n "#define CONFIG_CM922T_XA10" >> tmp.fil
echo " 1 /* CPU core is ARM922T_XA10 */" >> tmp.fil
cpu="arm_intcm"
;;
cp920t_config)
cpu="arm920t"
variant="Core module CM920T"
echo -n "#define CONFIG_CM920T" >> tmp.fil
echo " 1 /* CPU core is ARM920T */" >> tmp.fil
;;
cp926ejs_config)
cpu="arm926ejs"
variant="Core module CM926EJ-S"
echo -n "#define CONFIG_CM926EJ_S" >> tmp.fil
echo " 1 /* CPU core is ARM926EJ-S */ " >> tmp.fil
;;
@ -56,18 +57,21 @@ else
cp946es_config)
cpu="arm946es"
variant="Core module CM946E-S"
echo -n "#define CONFIG_CM946E_S" >> tmp.fil
echo " 1 /* CPU core is ARM946E-S */ " >> tmp.fil
;;
cp1136_config)
cpu="arm1136"
variant="Core module CM1136EJF-S"
echo -n "#define CONFIG_CM1136EJF_S" >> tmp.fil
echo " 1 /* CPU core is ARM1136JF-S */ " >> tmp.fil
;;
*)
echo "$0:: Unrecognised target - using arm_intcm"
echo "$0:: Unknown core module"
variant="unknown core module"
cpu="arm_intcm"
;;
@ -98,9 +102,10 @@ mv tmp.fil ./include/config.h
# ---------------------------------------------------------
# Ensure correct core object loaded first in U-Boot image
# ---------------------------------------------------------
$CC -E -P -C -D CPU_FILE=cpu/$cpu/start.o \
-o board/integratorcp/u-boot.lds board/integratorcp/u-boot.lds.S
sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' board/integratorcp/u-boot.lds.template > board/integratorcp/u-boot.lds
# ---------------------------------------------------------
# Complete the configuration
# ---------------------------------------------------------
./mkconfig -a integratorcp arm $cpu integratorcp;
echo "Variant:: $variant with core $cpu"

4
board/integratorcp/u-boot.lds.S → board/integratorcp/u-boot.lds.template
View File

@ -20,8 +20,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
/* Preprocessed during configuration to emsure the core module processor code,
from CPU_FILE, is placed at the start of the image */
# Template used during configuration to emsure the core module processor code,
# from CPU_FILE, is placed at the start of the image */
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)

23
board/versatile/split_by_variant.sh
View File

@ -2,26 +2,17 @@
# ---------------------------------------------------------
# Set the core module defines according to Core Module
# ---------------------------------------------------------
CC=${CROSS_COMPILE}gcc
config="versatilepb_config"
if [ "$2" == "" ]
then
echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
else
CC=$2
fi
# ---------------------------------------------------------
# Set up the Versatile type define
# ---------------------------------------------------------
variant=PB926EJ-S
if [ "$1" == "" ]
then
echo "$0:: No parameters - using ${CROSS_COMPILE}gcc versatilepb_config"
echo "$0:: No parameters - using versatilepb_config"
echo "#define CONFIG_ARCH_VERSATILE_PB" > ./include/config.h
variant=PB926EJ-S
else
case "$config" in
case "$1" in
versatilepb_config | \
versatile_config)
echo "#define CONFIG_ARCH_VERSATILE_PB" > ./include/config.h
@ -29,11 +20,14 @@ else
versatileab_config)
echo "#define CONFIG_ARCH_VERSATILE_AB" > ./include/config.h
variant=AB926EJ-S
;;
*)
echo "$0:: Unrecognised config - using versatilepb_config"
echo "#define CONFIG_ARCH_VERSATILE_PB" > ./include/config.h
variant=PB926EJ-S
;;
esac
@ -43,3 +37,4 @@ fi
# Complete the configuration
# ---------------------------------------------------------
./mkconfig -a versatile arm arm926ejs versatile
echo "Variant:: $variant"

2
cpu/arm1136/cpu.c
View File

@ -33,7 +33,9 @@
#include <common.h>
#include <command.h>
#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
#include <asm/arch/omap2420.h>
#endif
/* read co-processor 15, register #1 (control register) */
static unsigned long read_p15_c1 (void)

9
cpu/arm1136/interrupts.c
View File

@ -33,7 +33,7 @@
#include <common.h>
#include <asm/arch/bits.h>
#if !defined(CONFIG_INTEGRATOR) || ! defined(CONFIG_ARCH_CINTEGRATOR)
#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
# include <asm/arch/omap2420.h>
#endif
@ -176,12 +176,13 @@ void do_irq (struct pt_regs *pt_regs)
bad_mode ();
}
static ulong timestamp;
static ulong lastinc;
#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_CINTEGRATOR)
/* Use the IntegratorCP function from board/integratorcp.c */
#else
static ulong timestamp;
static ulong lastinc;
/* nothing really to do with interrupts, just starts up a counter. */
int interrupt_init (void)
{

3
cpu/arm1136/start.S
View File

@ -30,8 +30,9 @@
#include <config.h>
#include <version.h>
#if !defined(CONFIG_INTEGRATOR) && ! defined(CONFIG_ARCH_CINTEGRATOR)
#include <asm/arch/omap2420.h>
#endif
.globl _start
_start: b reset
ldr pc, _undefined_instruction

6
cpu/arm720t/interrupts.c
View File

@ -218,13 +218,13 @@ static void timer_isr( void *data) {
}
#endif
static ulong timestamp;
static ulong lastdec;
#if defined(CONFIG_INTEGRATOR) && defined(CONFIG_ARCH_INTEGRATOR)
/* Use IntegratorAP routines in board/integratorap.c */
#else
static ulong timestamp;
static ulong lastdec;
int interrupt_init (void)
{