diff options
| author | vetch <vetch97@gmail.com> | 2019-12-17 17:16:40 +0100 |
|---|---|---|
| committer | vetch <vetch97@gmail.com> | 2019-12-17 17:16:40 +0100 |
| commit | 5cb10bcc7d0c6d4159103f05ba228a09ca365fac (patch) | |
| tree | d248f2a519e7b2b4707b6889a971165c75c4af48 /Makefile | |
| parent | 90d208f074626521118984902ca8d3ebfd17e62f (diff) | |
| parent | 7dbdf1ee0a064e9b2c5fedd7bd4e2b67f0532b09 (diff) | |
| download | rpi-MMU-example-5cb10bcc7d0c6d4159103f05ba228a09ca365fac.tar.gz rpi-MMU-example-5cb10bcc7d0c6d4159103f05ba228a09ca365fac.zip | |
Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice
# Conflicts:
# kernel.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -47,9 +47,9 @@ qemu-elf : kernel.elf qemu-bin : loader.elf kernel.img pipe_image ./pipe_image --stdout | qemu-system-arm -m 256 -M raspi2 -serial stdio -kernel $< -run-on-rpi : kernel7.img pipe_image +run-on-rpi : kernel.img pipe_image ./pipe_image --stdout | sudo socat FILE:/dev/ttyUSB0,b115200,raw - -# screen /dev/ttyUSB0 115200,cs8,-parenb,-cstopb,-hupcl + screen /dev/ttyUSB0 115200,cs8,-parenb,-cstopb,-hupcl pipe_image : pipe_image.c lib/rs232/rs232.c gcc -Wall -std=gnu99 -O3 $^ -o $@ |