summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2008-12-22 17:36:06 +0000
committerMyles Watson <mylesgw@gmail.com>2008-12-22 17:36:06 +0000
commit93ced1cbd1d27c7a87b0c42648400df353aa52df (patch)
treeaeede262fdd33309143952db9fd5cc4d36a5c6d0
parenta94ea6f062afd14a398f007a19c790c6b5742084 (diff)
downloadcoreboot-93ced1cbd1d27c7a87b0c42648400df353aa52df.tar.gz
coreboot-93ced1cbd1d27c7a87b0c42648400df353aa52df.tar.bz2
coreboot-93ced1cbd1d27c7a87b0c42648400df353aa52df.zip
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 <phueper@hueper.net> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://coreboot.org/repository/coreboot-v3@1082 f3766cd6-281f-0410-b1cd-43a5c92072e9
-rw-r--r--util/x86emu/yabel/Makefile38
-rw-r--r--util/x86emu/yabel/debug.c4
2 files changed, 2 insertions, 40 deletions
diff --git a/util/x86emu/yabel/Makefile b/util/x86emu/yabel/Makefile
deleted file mode 100644
index 3a07ada31f69..000000000000
--- 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 722944c18c31..3dff857f8a25 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();