From 0dc1fc22af86d16993388d9ed9630dbaa2d51826 Mon Sep 17 00:00:00 2001 From: Rafal Jaworowski Date: Tue, 29 Jan 2008 16:57:38 +0100 Subject: API: Convert conditional building to the new scheme. This fixes a build breakage with CONFIG_API enabled, which appeared after the recent changes in the U-Boot build system. Signed-off-by: Rafal Jaworowski --- api_examples/Makefile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'api_examples') diff --git a/api_examples/Makefile b/api_examples/Makefile index cb49a9e..5666f48 100644 --- a/api_examples/Makefile +++ b/api_examples/Makefile @@ -30,19 +30,25 @@ endif include $(TOPDIR)/config.mk -ELF += demo -BIN += demo.bin +ELF-$(CONFIG_API) += demo +BIN-$(CONFIG_API) += demo.bin +ELF := $(ELF-y) +BIN := $(BIN-y) #CFLAGS += -v -COBJS := $(ELF:=.o) -SOBJS := crt0.o +COBJS-$(CONFIG_API) += $(ELF:=.o) +SOBJS-$(CONFIG_API) += crt0.o ifeq ($(ARCH),ppc) -SOBJS += ppcstring.o +SOBJS-$(CONFIG_API) += ppcstring.o endif +COBJS := $(COBJS-y) +SOBJS := $(SOBJS-y) LIB = $(obj)libglue.a -LIBCOBJS= glue.o crc32.o ctype.o string.o vsprintf.o libgenwrap.o +LIBCOBJS-$(CONFIG_API) += glue.o crc32.o ctype.o string.o vsprintf.o \ + libgenwrap.o +LIBCOBJS := $(LIBCOBJS-y) LIBOBJS = $(addprefix $(obj),$(SOBJS) $(LIBCOBJS)) @@ -55,7 +61,7 @@ gcclibdir := $(shell dirname `$(CC) -print-libgcc-file-name`) CPPFLAGS += -I.. -all: $(obj).depend $(OBJS) $(LIB) $(BIN) $(ELF) +all: $(obj).depend $(OBJS) $(LIB) $(ELF) $(BIN) ######################################################################### $(LIB): $(obj).depend $(LIBOBJS) -- cgit v1.1 From 63f732d3d3880feb531f48af247c025bf01462b0 Mon Sep 17 00:00:00 2001 From: Rafal Jaworowski Date: Tue, 29 Jan 2008 17:00:34 +0100 Subject: API: Provide dummy halt() in the glue layer. This fixes a demo app link failure on platforms configured with CONFIG_PANIC_HANG. Signed-off-by: Rafal Jaworowski --- api_examples/libgenwrap.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'api_examples') diff --git a/api_examples/libgenwrap.c b/api_examples/libgenwrap.c index df62633..2b62bad 100644 --- a/api_examples/libgenwrap.c +++ b/api_examples/libgenwrap.c @@ -84,7 +84,12 @@ void do_reset (void) ub_reset(); } -void *malloc(size_t len) +void *malloc (size_t len) { return NULL; } + +void hang (void) +{ + while (1) ; +} -- cgit v1.1