diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-01 00:06:05 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-01 00:06:05 +0200 |
| commit | a13b2d937941f6b525abfcfad96c034f94421188 (patch) | |
| tree | 56e5bdaf62397b2f8cc2be9b17a035d9b059bf8a /board/integratorap | |
| parent | e155c9e00b5f21a6de28479259c440ba71289d00 (diff) | |
| parent | d6e04258be8f2408845468d3cf722a4cf0433445 (diff) | |
| download | u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.zip u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.tar.gz u-boot-imx-a13b2d937941f6b525abfcfad96c034f94421188.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/integratorap')
| -rw-r--r-- | board/integratorap/Makefile | 2 | ||||
| -rw-r--r-- | board/integratorap/memsetup.S | 29 |
2 files changed, 1 insertions, 30 deletions
diff --git a/board/integratorap/Makefile b/board/integratorap/Makefile index f78de3a..79f501a 100644 --- a/board/integratorap/Makefile +++ b/board/integratorap/Makefile @@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).a COBJS := integratorap.o flash.o -SOBJS := lowlevel_init.o memsetup.o +SOBJS := lowlevel_init.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/integratorap/memsetup.S b/board/integratorap/memsetup.S deleted file mode 100644 index da43cb6..0000000 --- a/board/integratorap/memsetup.S +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Memory setup for integratorAP - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ -/* - * Memory setup - * - the reset defaults are assumed sufficient - */ - -.globl memsetup -memsetup: - mov pc,lr |