diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-11-18 01:26:14 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-11-18 01:26:14 +0100 |
| commit | 0b20335015945cc9aedf27356e51aa3a0b0cdc48 (patch) | |
| tree | 145c1e3568ba01f151e9ece4b2d10a710c692388 /board/pb1x00 | |
| parent | 7e14fc65368cbd2861b1207453da55a4fc7b3f81 (diff) | |
| parent | 7e1d884b7cb602007329c517ec1c453e3a6a5d9c (diff) | |
| download | u-boot-imx-0b20335015945cc9aedf27356e51aa3a0b0cdc48.zip u-boot-imx-0b20335015945cc9aedf27356e51aa3a0b0cdc48.tar.gz u-boot-imx-0b20335015945cc9aedf27356e51aa3a0b0cdc48.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-mips
Diffstat (limited to 'board/pb1x00')
| -rw-r--r-- | board/pb1x00/Makefile | 2 | ||||
| -rw-r--r-- | board/pb1x00/lowlevel_init.S (renamed from board/pb1x00/memsetup.S) | 4 | ||||
| -rw-r--r-- | board/pb1x00/u-boot.lds | 8 |
3 files changed, 8 insertions, 6 deletions
diff --git a/board/pb1x00/Makefile b/board/pb1x00/Makefile index f7d5841..afe02c2 100644 --- a/board/pb1x00/Makefile +++ b/board/pb1x00/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS = $(BOARD).o flash.o -SOBJS = memsetup.o +SOBJS = lowlevel_init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/pb1x00/memsetup.S b/board/pb1x00/lowlevel_init.S index 44f02b9..e851e2f 100644 --- a/board/pb1x00/memsetup.S +++ b/board/pb1x00/lowlevel_init.S @@ -15,8 +15,8 @@ .set noreorder .set mips32 - .globl memsetup -memsetup: + .globl lowlevel_init +lowlevel_init: /* * Step 1) Establish CPU endian mode. * NOTE: A fair amount of code is necessary on the Pb1000 to diff --git a/board/pb1x00/u-boot.lds b/board/pb1x00/u-boot.lds index 363d974..8618732 100644 --- a/board/pb1x00/u-boot.lds +++ b/board/pb1x00/u-boot.lds @@ -54,9 +54,11 @@ SECTIONS .sdata : { *(.sdata) } - __u_boot_cmd_start = .; - .u_boot_cmd : { *(.u_boot_cmd) } - __u_boot_cmd_end = .; + .u_boot_cmd : { + __u_boot_cmd_start = .; + *(.u_boot_cmd) + __u_boot_cmd_end = .; + } uboot_end_data = .; num_got_entries = (__got_end - __got_start) >> 2; |