diff options
author | Wolfgang Denk <wd@denx.de> | 2011-02-04 20:38:27 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-02-04 20:38:27 +0100 |
commit | 4bfa18fb99e4ffa9451d9ec95375a5e970847bf8 (patch) | |
tree | f282cf36e32c60c4fce716c1e7ce236f7d19f5ae /board/renesas/sh7785lcr | |
parent | 42d44f631c4e8e5359775bdc098f2fffde4e5c05 (diff) | |
parent | e72f46787f44c1104a8df18511ab230b6072a1f0 (diff) | |
download | u-boot-imx-4bfa18fb99e4ffa9451d9ec95375a5e970847bf8.zip u-boot-imx-4bfa18fb99e4ffa9451d9ec95375a5e970847bf8.tar.gz u-boot-imx-4bfa18fb99e4ffa9451d9ec95375a5e970847bf8.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'board/renesas/sh7785lcr')
-rw-r--r-- | board/renesas/sh7785lcr/Makefile | 8 | ||||
-rw-r--r-- | board/renesas/sh7785lcr/config.mk | 31 |
2 files changed, 6 insertions, 33 deletions
diff --git a/board/renesas/sh7785lcr/Makefile b/board/renesas/sh7785lcr/Makefile index b5c496f..e404fa6 100644 --- a/board/renesas/sh7785lcr/Makefile +++ b/board/renesas/sh7785lcr/Makefile @@ -23,8 +23,12 @@ LIB = $(obj)lib$(BOARD).o COBJS := sh7785lcr.o selfcheck.o rtl8169_mac.o SOBJS := lowlevel_init.o -$(LIB): $(obj).depend $(COBJS) $(SOBJS) - $(call cmd_link_o_target, $(COBJS) $(SOBJS)) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk deleted file mode 100644 index 6853d2b..0000000 --- a/board/renesas/sh7785lcr/config.mk +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) 2007 -# Nobuhiro Iwamatsu <iwamatsu@nigauri.org> -# -# 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 - -# -# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation. -# -# NOTE: Must match value used in u-boot.lds (in this directory). -# -sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp - -ifdef CONFIG_SH_32BIT -CONFIG_SYS_TEXT_BASE = 0x8FF80000 -else -CONFIG_SYS_TEXT_BASE = 0x0ff80000 -endif |