remove Makefile in yabel directory, since it is not needed (leftover
 from SLOF biosemu)
 fix dump() function output to not include \r

Signed-off-by: Pattrick Hueper <[email protected]>
---
 util/x86emu/yabel/Makefile |   38 --------------------------------------
 util/x86emu/yabel/debug.c  |    4 ++--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 util/x86emu/yabel/Makefile

diff --git a/util/x86emu/yabel/Makefile b/util/x86emu/yabel/Makefile
deleted file mode 100644
index 3a07ada..0000000
--- a/util/x86emu/yabel/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
-# * All rights reserved.
-# * This program and the accompanying materials
-# * are made available under the terms of the BSD License
-# * which accompanies this distribution, and is available at
-# * http://www.opensource.org/licenses/bsd-license.php
-# *
-# * Contributors:
-# *     IBM Corporation - initial implementation
-# ****************************************************************************/
-
-ifndef TOP
-  TOP = $(shell while ! test -e make.rules; do cd ..  ; done; pwd)
-  export TOP
-endif
-include $(TOP)/make.rules
-
-CFLAGS += -I$(ROOTDIR)/other-licence/x86emu
-I$(ROOTDIR)/other-licence/x86emu/include
-
-OBJS    = biosemu.o debug.o device.o mem.o io.o interrupt.o vbe.o
-LIBX86EMU = $(ROOTDIR)/other-licence/x86emu/libx86emu.a
-
-.PHONY: $(LIBX86EMU)
-
-all: biosemu_app.o
-
-# special rule for libx86emu.a
-$(LIBX86EMU):
-       $(MAKE) -C $(dir $@)
-
-biosemu_app.o: $(OBJS) $(LIBX86EMU)
-       $(LD) $(LDFLAGS) $^ -o $@ -r
-       
-clean: 
-               $(RM) -f *.o *.a *.i *.s
-
-include $(TOP)/make.depend
diff --git a/util/x86emu/yabel/debug.c b/util/x86emu/yabel/debug.c
index 722944c..3dff857 100644
--- a/util/x86emu/yabel/debug.c
+++ b/util/x86emu/yabel/debug.c
@@ -19,13 +19,13 @@ u32 debug_flags = 0;
 void
 dump(u8 * addr, u32 len)
 {
-       printf("\n\r%s(%p, %x):\n", __FUNCTION__, addr, len);
+       printf("\n%s(%p, %x):\n", __FUNCTION__, addr, len);
        while (len) {
                unsigned int tmpCnt = len;
                unsigned char x;
                if (tmpCnt > 8)
                        tmpCnt = 8;
-               printf("\n\r%p: ", addr);
+               printf("\n%p: ", addr);
                // print hex
                while (tmpCnt--) {
                        set_ci();
-- 
1.6.0.4
From fe424e5a6a97f37f1111a3ca3d7d8b4573960c36 Mon Sep 17 00:00:00 2001
From: Pattrick Hueper <[email protected]>
Date: Mon, 22 Dec 2008 10:09:51 +0100
Subject: [PATCH] YABEL: small cleanup fixes
 remove Makefile in yabel directory, since it is not needed (leftover
 from SLOF biosemu)
 fix dump() function output to not include \r

Signed-off-by: Pattrick Hueper <[email protected]>
---
 util/x86emu/yabel/Makefile |   38 --------------------------------------
 util/x86emu/yabel/debug.c  |    4 ++--
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 util/x86emu/yabel/Makefile

diff --git a/util/x86emu/yabel/Makefile b/util/x86emu/yabel/Makefile
deleted file mode 100644
index 3a07ada..0000000
--- a/util/x86emu/yabel/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-# *****************************************************************************
-# * Copyright (c) 2004, 2008 IBM Corporation
-# * All rights reserved.
-# * This program and the accompanying materials
-# * are made available under the terms of the BSD License
-# * which accompanies this distribution, and is available at
-# * http://www.opensource.org/licenses/bsd-license.php
-# *
-# * Contributors:
-# *     IBM Corporation - initial implementation
-# ****************************************************************************/
-
-ifndef TOP
-  TOP = $(shell while ! test -e make.rules; do cd ..  ; done; pwd)
-  export TOP
-endif
-include $(TOP)/make.rules
-
-CFLAGS += -I$(ROOTDIR)/other-licence/x86emu -I$(ROOTDIR)/other-licence/x86emu/include
-
-OBJS    = biosemu.o debug.o device.o mem.o io.o interrupt.o vbe.o
-LIBX86EMU = $(ROOTDIR)/other-licence/x86emu/libx86emu.a 
-
-.PHONY: $(LIBX86EMU)
-
-all: biosemu_app.o
-
-# special rule for libx86emu.a
-$(LIBX86EMU):
-	$(MAKE) -C $(dir $@)
-
-biosemu_app.o: $(OBJS) $(LIBX86EMU)
-	$(LD) $(LDFLAGS) $^ -o $@ -r
-	
-clean:	
-		$(RM) -f *.o *.a *.i *.s
-
-include $(TOP)/make.depend
diff --git a/util/x86emu/yabel/debug.c b/util/x86emu/yabel/debug.c
index 722944c..3dff857 100644
--- a/util/x86emu/yabel/debug.c
+++ b/util/x86emu/yabel/debug.c
@@ -19,13 +19,13 @@ u32 debug_flags = 0;
 void
 dump(u8 * addr, u32 len)
 {
-	printf("\n\r%s(%p, %x):\n", __FUNCTION__, addr, len);
+	printf("\n%s(%p, %x):\n", __FUNCTION__, addr, len);
 	while (len) {
 		unsigned int tmpCnt = len;
 		unsigned char x;
 		if (tmpCnt > 8)
 			tmpCnt = 8;
-		printf("\n\r%p: ", addr);
+		printf("\n%p: ", addr);
 		// print hex
 		while (tmpCnt--) {
 			set_ci();
-- 
1.6.0.4

--
coreboot mailing list: [email protected]
http://www.coreboot.org/mailman/listinfo/coreboot

Reply via email to