From c943016f54c6b68191def9acd5862dbf12e45b6c Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 15 Oct 2019 16:58:45 +0200 Subject: remove redundand 'qemu-loader' target --- Makefile | 3 --- 1 file changed, 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7632283..0a10ab6 100644 --- a/Makefile +++ b/Makefile @@ -44,9 +44,6 @@ qemu-elf : kernel.elf qemu-bin : loader.img kernel7.img pipe_image ./pipe_image | qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $< -qemu-loader : loader.img - qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $^ - pipe_image : pipe_image.c gcc -Wall -std=gnu99 -O3 $^ -o $@ -- cgit v1.2.3 From 1e7a473c66acc37f25420f17e1f26a3ffbaa0439 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 15 Oct 2019 17:00:30 +0200 Subject: make sure qemu-bin command works even with loader compiled for other load address than qemu uses --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 0a10ab6..4c3567e 100644 --- a/Makefile +++ b/Makefile @@ -41,7 +41,7 @@ loader.img : loader.elf qemu-elf : kernel.elf qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $^ -qemu-bin : loader.img kernel7.img pipe_image +qemu-bin : loader.elf kernel7.img pipe_image ./pipe_image | qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $< pipe_image : pipe_image.c -- cgit v1.2.3 From 4f8c9071fade1755793de63b015a13323254ffc7 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Tue, 15 Oct 2019 17:23:41 +0200 Subject: add Makefile rule for booting through uart on real rpi --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 4c3567e..f031d7c 100644 --- a/Makefile +++ b/Makefile @@ -44,6 +44,11 @@ qemu-elf : kernel.elf qemu-bin : loader.elf kernel7.img pipe_image ./pipe_image | qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $< +run-on-rpi : kernel7.img pipe_image + ./pipe_image | socat FILE:/dev/ttyUSB0,b115200,raw - + sleep 1 + screen /dev/ttyUSB0 115200,cs8,-parenb,-cstopb,-hupcl + pipe_image : pipe_image.c gcc -Wall -std=gnu99 -O3 $^ -o $@ -- cgit v1.2.3