X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=examples%2Fstandalone%2FMakefile;h=0841c758ff9660e33123ef00ab234bf85d32de65;hb=e6fe4bd989b93b1f37a25771fc14478dd33aa0df;hp=bc98120a51fe3abb16b0f66196ad03104b172696;hpb=262ae0a6193f10b6a94e86d2f752e7f5510416fa;p=karo-tx-uboot.git

diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
index bc98120a51..0841c758ff 100644
--- a/examples/standalone/Makefile
+++ b/examples/standalone/Makefile
@@ -2,104 +2,44 @@
 # (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
-# 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
+# SPDX-License-Identifier:	GPL-2.0+
 #
 
 include $(TOPDIR)/config.mk
 
-ELF	= hello_world
-SREC	= hello_world.srec
-BIN	= hello_world.bin
-
-ELF	+= atmel_df_pow2
-SREC	+= atmel_df_pow2.srec
-BIN	+= atmel_df_pow2.bin
-
-ifeq ($(CPU),mpc8xx)
-ELF	+= test_burst
-SREC	+= test_burst.srec
-BIN	+= test_burst.bin
-endif
-
-ifeq ($(ARCH),i386)
-ELF	+= 82559_eeprom
-SREC	+= 82559_eeprom.srec
-BIN	+= 82559_eeprom.bin
-endif
-
-ifeq ($(ARCH),ppc)
-ELF	+= sched
-SREC	+= sched.srec
-BIN	+= sched.bin
-endif
-
-ifeq ($(ARCH),blackfin)
-BFIN_BIN = smc91111_eeprom smc911x_eeprom
-ELF	+= $(BFIN_BIN)
-SREC	+= $(addsuffix .srec,$(BFIN_BIN))
-BIN	+= $(addsuffix .bin,$(BFIN_BIN))
-endif
+ELF-y        := hello_world
 
-# The following example is pretty 8xx specific...
-ifeq ($(CPU),mpc8xx)
-ELF	+= timer
-SREC	+= timer.srec
-BIN	+= timer.bin
-endif
+ELF-$(CONFIG_SMC91111)           += smc91111_eeprom
+ELF-$(CONFIG_SMC911X)            += smc911x_eeprom
+ELF-$(CONFIG_SPI_FLASH_ATMEL)    += atmel_df_pow2
+ELF-$(CONFIG_MPC5xxx)            += interrupt
+ELF-$(CONFIG_8xx)                += test_burst timer
+ELF-$(CONFIG_8260)               += mem_to_mem_idma2intr
+ELF-$(CONFIG_PPC)                += sched
 
-# The following example is 8260 specific...
-ifeq ($(CPU),mpc8260)
-ELF	+= mem_to_mem_idma2intr
-SREC	+= mem_to_mem_idma2intr.srec
-BIN	+= mem_to_mem_idma2intr.bin
-endif
+#
+# Some versions of make do not handle trailing white spaces properly;
+# leading to build failures. The problem was found with GNU Make 3.80.
+# Using 'strip' as a workaround for the problem.
+#
+ELF := $(strip $(ELF-y))
 
-# Demo for 52xx IRQs
-ifeq ($(CPU),mpc5xxx)
-ELF	+= interrupt
-SREC	+= interrupt.srec
-BIN	+= interrupt.bin
-endif
+SREC := $(addsuffix .srec,$(ELF))
+BIN  := $(addsuffix .bin,$(ELF))
 
-# Utility for resetting i82559 EEPROM
-ifeq ($(BOARD),oxc)
-ELF	+= eepro100_eeprom
-SREC	+= eepro100_eeprom.srec
-BIN	+= eepro100_eeprom.bin
-endif
+COBJS	:= $(ELF:=.o)
 
+LIB	= $(obj)libstubs.o
 
-COBJS	:= $(SREC:.srec=.o)
+LIBAOBJS-$(CONFIG_PPC) += ppc_longjmp.o ppc_setjmp.o
+LIBAOBJS-$(CONFIG_8xx) += test_burst_lib.o
+LIBAOBJS := $(LIBAOBJS-y)
 
-LIB	= $(obj)libstubs.a
-LIBAOBJS=
-ifeq ($(ARCH),ppc)
-LIBAOBJS+= $(ARCH)_longjmp.o $(ARCH)_setjmp.o
-endif
-ifeq ($(CPU),mpc8xx)
-LIBAOBJS+= test_burst_lib.o
-endif
-LIBCOBJS= stubs.o
+LIBCOBJS = stubs.o
 
 LIBOBJS	= $(addprefix $(obj),$(LIBAOBJS) $(LIBCOBJS))
 
-SRCS	:= $(COBJS:.o=.c) $(LIBCOBJS:.o=.c) $(if $(LIBAOBJS),$(LIBAOBJS:.o=.S))
+SRCS	:= $(COBJS:.o=.c) $(LIBCOBJS:.o=.c) $(LIBAOBJS:.o=.S)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 ELF	:= $(addprefix $(obj),$(ELF))
 BIN	:= $(addprefix $(obj),$(BIN))
@@ -107,17 +47,31 @@ SREC	:= $(addprefix $(obj),$(SREC))
 
 gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`)
 
-CPPFLAGS += -I..
+# For PowerPC there's no need to compile standalone applications as a
+# relocatable executable.  The relocation data is not needed, and
+# also causes the entry point of the standalone application to be
+# inconsistent.
+ifeq ($(ARCH),powerpc)
+AFLAGS := $(filter-out $(RELFLAGS),$(AFLAGS))
+CFLAGS := $(filter-out $(RELFLAGS),$(CFLAGS))
+CPPFLAGS := $(filter-out $(RELFLAGS),$(CPPFLAGS))
+endif
+
+# We don't want gcc reordering functions if possible.  This ensures that an
+# application's entry point will be the first function in the application's
+# source file.
+CFLAGS_NTR := $(call cc-option,-fno-toplevel-reorder)
+CFLAGS += $(CFLAGS_NTR)
 
 all:	$(obj).depend $(OBJS) $(LIB) $(SREC) $(BIN) $(ELF)
 
 #########################################################################
 $(LIB):	$(obj).depend $(LIBOBJS)
-		$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+	$(call cmd_link_o_target, $(LIBOBJS))
 
 $(ELF):
 $(obj)%:	$(obj)%.o $(LIB)
-		$(LD) -g -Ttext $(STANDALONE_LOAD_ADDR) \
+		$(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \
 			-o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \
 			-L$(gcclibdir) -lgcc