diff options
Diffstat (limited to 'arch/arm/cpu/armv7/tegra2')
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/Makefile | 8 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot_avp.c | 8 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/tegra2/warmboot_avp.lds | 37 |
3 files changed, 9 insertions, 44 deletions
diff --git a/arch/arm/cpu/armv7/tegra2/Makefile b/arch/arm/cpu/armv7/tegra2/Makefile index b42a6b31b2..cb5c261107 100644 --- a/arch/arm/cpu/armv7/tegra2/Makefile +++ b/arch/arm/cpu/armv7/tegra2/Makefile @@ -37,17 +37,11 @@ COBJS-y := board.o pinmux.o sys_info.o COBJS-$(CONFIG_VIDEO_TEGRA) += display.o COBJS-$(CONFIG_TEGRA2_WARMBOOT) += warmboot.o warmboot_avp.o -ifeq ($(CONFIG_TEGRA2_WARMBOOT),y) - LDSCRIPT= warmboot_avp.lds -else - LDSCRIPT= -endif - SOBJS := $(SOBJS-y) COBJS := $(COBJS-y) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS) $(LDSCRIPT)) +OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS)) all: $(obj).depend $(LIB) diff --git a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c index 121425ba23..bb1872fe12 100644 --- a/arch/arm/cpu/armv7/tegra2/warmboot_avp.c +++ b/arch/arm/cpu/armv7/tegra2/warmboot_avp.c @@ -303,3 +303,11 @@ do_reset: goto do_reset; } +/* + * wb_end() is a dummy function, and must be directly following wb_start(), + * and is used to calculate the size of wb_start(). + */ +void wb_end(void) +{ +} + diff --git a/arch/arm/cpu/armv7/tegra2/warmboot_avp.lds b/arch/arm/cpu/armv7/tegra2/warmboot_avp.lds deleted file mode 100644 index 8fc377292b..0000000000 --- a/arch/arm/cpu/armv7/tegra2/warmboot_avp.lds +++ /dev/null @@ -1,37 +0,0 @@ -/* - * (C) Copyright 2010 - 2011 - * NVIDIA Corporation <www.nvidia.com> - * - * 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 - */ - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) - -SECTIONS -{ - . = 0x00000000; - . = ALIGN(4); - - .text : - { - warmboot_avp.o (.text) - __wb_end = .; - } -} |