Pull request: u-boot-freebsd

U-Boot-Users New Rafal Jaworowski 2 participants 4 messages Jan 29, 2008 – Feb 11, 2008 Kbuild

Share & tools

Rafal Jaworowski

author

2008-01-29 16:28 UTC #0 lore raw

Dear Wolfgang,

The following are two fixes which are needed in this release. Without these the build breaks when CONFIG_API is enabled.

kind regards,
Rafal

The following changes since commit 98b742489c09780be6a832eeaa4e5eff824792bb:
Wolfgang Denk (1):
inka4x0: remove dead code

are available in the git repository at:

git://denx.de/git/u-boot-freebsd.git master

Rafal Jaworowski (2):
API: Convert conditional building to the new scheme.
API: Provide dummy halt() in the glue layer.

 Makefile                  |    9 ++-------
 api/Makefile              |    5 ++---
 api_examples/Makefile     |   20 +++++++++++++-------
 api_examples/libgenwrap.c |    7 ++++++-
 4 files changed, 23 insertions(+), 18 deletions(-)

Rafal Jaworowski

author

2008-01-29 17:18 UTC #1 lore raw

PATCH 1/1 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 <[email protected]>

---

These patches should probably be sent before the pull request :) But here they are for review and reference.

 Makefile              |    9 ++-------
 api/Makefile          |    5 ++---
 api_examples/Makefile |   20 +++++++++++++-------
 3 files changed, 17 insertions(+), 17 deletions(-)

Makefile +2 -7

index 0f6cc59..3e7cffc 100644
@@ -253,9 +253,7 @@ LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
 	"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
 LIBS += common/libcommon.a
 LIBS += libfdt/libfdt.a
-ifeq ($(CONFIG_API),y)
 LIBS += api/libapi.a
-endif
 
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS)

@@ -266,11 +264,8 @@ PLATFORM_LIBS += -L $(shell dirname `$(CC) $(CFLAGS) -print-libgcc-file-name`) -
 # The "tools" are needed early, so put this first
 # Don't include stuff already done in $(LIBS)
 SUBDIRS	= tools \
-	  examples
-
-ifeq ($(CONFIG_API),y)
-SUBDIRS += api_examples
-endif
+	  examples \
+	  api_examples
 
 .PHONY : $(SUBDIRS)

api/Makefile +2 -3

index 94de3dc..4216892 100644
@@ -24,13 +24,12 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)libapi.a
 
-COBJS	= api.o api_net.o api_storage.o api_platform-$(ARCH).o
+COBJS-$(CONFIG_API) += api.o api_net.o api_storage.o api_platform-$(ARCH).o
 
+COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
-all:	$(LIB)
-
 $(LIB):	$(obj).depend $(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)

api_examples/Makefile +13 -7

index cb49a9e..5666f48 100644
@@ -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)

Signature · 1 line

1.5.2.2

Rafal Jaworowski

author

2008-01-29 17:19 UTC #2 lore raw

PATCH 1/1 API: Provide dummy halt() in the glue layer.

In reply to Rafal Jaworowski

This fixes a demo app link failure on platforms configured with CONFIG_PANIC_HANG.

Signed-off-by Rafal Jaworowski <[email protected]>

---
 api_examples/libgenwrap.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

api_examples/libgenwrap.c +6 -1

index df62633..2b62bad 100644
@@ -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) ;
+}

Signature · 1 line

1.5.2.2

Wolfgang Denk

Applied

2008-02-11 23:51 UTC #3 lore raw

In reply to Rafal Jaworowski

Quoted 12 lines · In message <[email protected]> you wrote:

The following are two fixes which are needed in this release. Without these the build breaks when CONFIG_API is enabled.
kind regards,
Rafal
The following changes since commit 98b742489c09780be6a832eeaa4e5eff824792bb:
Wolfgang Denk (1):
inka4x0: remove dead code

Quoted 7 lines

are available in the git repository at:
git://denx.de/git/u-boot-freebsd.git master
Rafal Jaworowski (2):
API: Convert conditional building to the new scheme.
API: Provide dummy halt() in the glue layer.

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Only a fool fights in a burning house.
	-- Kank the Klingon, "Day of the Dove", stardate unknown