diff options
| -rwxr-xr-x | arch/riscv64/conf/mkimage.sh | 6 | ||||
| -rw-r--r-- | include/apos/debug.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/riscv64/conf/mkimage.sh b/arch/riscv64/conf/mkimage.sh index d097248..d791396 100755 --- a/arch/riscv64/conf/mkimage.sh +++ b/arch/riscv64/conf/mkimage.sh @@ -16,14 +16,14 @@ mount -o loop,offset=$((${SSIZE}*${OFFSET})) rootfs.img fs # not entirely pleased with this solution, although eventually I should probably # move `run` out of the kernel repo and into some `aposos` repo with a runtime # and proper initrd etc. so this is good enough for now -../u-boot-apos/tools/mkimage -f arch/riscv64/conf/apos.its fs/apos.itb -../u-boot-apos/tools/mkimage -A riscv -O apos -T script \ +../rv64/u-boot-apos/tools/mkimage -f arch/riscv64/conf/apos.its fs/apos.itb +../rv64/u-boot-apos/tools/mkimage -A riscv -O apos -T script \ -d arch/riscv64/conf/boot.cmd fs/boot.scr umount -l fs qemu-system-riscv64 -machine virt \ - -kernel ../u-boot-apos/u-boot \ + -kernel ../rv64/u-boot-apos/u-boot \ -bios /usr/lib/riscv64-linux-gnu/opensbi/generic/fw_jump.elf \ -device virtio-blk-device,drive=hd0 \ -drive file=rootfs.img,format=raw,id=hd0 \ diff --git a/include/apos/debug.h b/include/apos/debug.h index 6d428fe..e7172f5 100644 --- a/include/apos/debug.h +++ b/include/apos/debug.h @@ -357,13 +357,13 @@ void setup_io_dbg(struct vmem *vmem); * Format to append to helper debugging classes. * See \ref bug(), \ref warn(), \ref info() and \ref error(). */ -#define COMMON_FORMAT "[%s] %s:%d\n\t" +#define COMMON_FORMAT "[%s] %s: " /** * Helper for helper classes. * See \ref bug(), \ref warn(), \ref info(), \ref error(). */ -#define COMMON_ARGS(s) s, __FILE__, __LINE__ +#define COMMON_ARGS(s) s, __FILE__ ":" QUOTE( __LINE__) /** @} */ |