diff options
| author | wdenk <wdenk> | 2005-04-06 13:52:31 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2005-04-06 13:52:31 +0000 |
| commit | a85f9f21aab7ee586cabe1773a02e9d04caa65fa (patch) | |
| tree | b7af0d5289bc6c1bc3b8cb3662071efa5b57024f /board | |
| parent | 20787e23b8501f11c83599d1a2e38bb1204ac961 (diff) | |
| download | u-boot-a85f9f21aab7ee586cabe1773a02e9d04caa65fa.zip u-boot-a85f9f21aab7ee586cabe1773a02e9d04caa65fa.tar.gz u-boot-a85f9f21aab7ee586cabe1773a02e9d04caa65fa.tar.bz2 | |
Patch by Steven Scholz, 06 Apr 2005:
- creating SoC subdir for Atmel AT91RM9200 cpu/arm920t/at91rm9200
- moving code out of cpu/at91rm9200 into cpu/arm920t/at91rm9200
Diffstat (limited to 'board')
| -rw-r--r-- | board/adsvix/Makefile | 2 | ||||
| -rw-r--r-- | board/adsvix/lowlevel_init.S (renamed from board/adsvix/memsetup.S) | 12 | ||||
| -rw-r--r-- | board/adsvix/pxavoltage.S | 1 | ||||
| -rw-r--r-- | board/at91rm9200dk/u-boot.lds | 2 | ||||
| -rw-r--r-- | board/cmc_pu2/u-boot.lds | 2 |
5 files changed, 8 insertions, 11 deletions
diff --git a/board/adsvix/Makefile b/board/adsvix/Makefile index ae514aa..24d5d06 100644 --- a/board/adsvix/Makefile +++ b/board/adsvix/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk LIB = lib$(BOARD).a OBJS := adsvix.o pcmcia.o -SOBJS := memsetup.o pxavoltage.o +SOBJS := lowlevel_init.o pxavoltage.o $(LIB): $(OBJS) $(SOBJS) $(AR) crv $@ $(OBJS) $(SOBJS) diff --git a/board/adsvix/memsetup.S b/board/adsvix/lowlevel_init.S index 7b6abd6..8dea71c 100644 --- a/board/adsvix/memsetup.S +++ b/board/adsvix/lowlevel_init.S @@ -5,7 +5,7 @@ * * NOTE: I haven't clean this up considerably, just enough to get it * running. See hal_platform_setup.h for the source. See - * board/cradle/memsetup.S for another PXA250 setup that is + * board/cradle/lowlevel_init.S for another PXA250 setup that is * much cleaner. * * See file CREDITS for list of people who contributed to this @@ -43,8 +43,8 @@ * Memory setup */ -.globl memsetup -memsetup: +.globl lowlevel_init +lowlevel_init: /* Set up GPIO pins first ----------------------------------------- */ @@ -445,7 +445,6 @@ initclks: str r1, [r0] /* FIXME */ -// #define NODEBUG #ifdef NODEBUG /*Disable software and data breakpoints */ mov r0,#0 @@ -456,13 +455,12 @@ initclks: /*Enable all debug functionality */ mov r0,#0x80000000 mcr p14,0,r0,c10,c0,0 /* dcsr */ - #endif /* ---------------------------------------------------------------- */ - /* End memsetup */ + /* End lowlevel_init */ /* ---------------------------------------------------------------- */ -endmemsetup: +endlowlevel_init: mov pc, lr diff --git a/board/adsvix/pxavoltage.S b/board/adsvix/pxavoltage.S index 5a0359c..2fe1cab 100644 --- a/board/adsvix/pxavoltage.S +++ b/board/adsvix/pxavoltage.S @@ -228,4 +228,3 @@ setleds: bne 1b mov pc, lr - diff --git a/board/at91rm9200dk/u-boot.lds b/board/at91rm9200dk/u-boot.lds index 0282898..76df6b2 100644 --- a/board/at91rm9200dk/u-boot.lds +++ b/board/at91rm9200dk/u-boot.lds @@ -32,7 +32,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/at91rm9200/start.o (.text) + cpu/arm920t/start.o (.text) *(.text) } diff --git a/board/cmc_pu2/u-boot.lds b/board/cmc_pu2/u-boot.lds index 0282898..76df6b2 100644 --- a/board/cmc_pu2/u-boot.lds +++ b/board/cmc_pu2/u-boot.lds @@ -32,7 +32,7 @@ SECTIONS . = ALIGN(4); .text : { - cpu/at91rm9200/start.o (.text) + cpu/arm920t/start.o (.text) *(.text) } |