From 555d683353a636ac6ded0e5b9eacda429d7bd87c Mon Sep 17 00:00:00 2001 From: Yu Chen Date: Sat, 2 Jul 2022 23:38:01 +0800 Subject: [PATCH] upate os4/Makefile, os[345678]-ref/Makefile for make run OR test --- os3-ref/Makefile | 2 +- os4-ref/Makefile | 2 +- os4/Makefile | 5 ++++- os5-ref/Makefile | 2 +- os6-ref/Makefile | 2 +- os7-ref/Makefile | 2 +- os8-ref/Makefile | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/os3-ref/Makefile b/os3-ref/Makefile index ef0c7d6..f68b3ee 100644 --- a/os3-ref/Makefile +++ b/os3-ref/Makefile @@ -17,7 +17,7 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -oP 'ch\K[0-9]') +CHAPTER ?= 3 TEST ?= $(CHAPTER) BASE ?= 1 diff --git a/os4-ref/Makefile b/os4-ref/Makefile index ab4b02b..bc3f19b 100644 --- a/os4-ref/Makefile +++ b/os4-ref/Makefile @@ -17,7 +17,7 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -o 'ch[0-9]' | grep -o '[0-9]') +CHAPTER ?= 4 TEST ?= $(CHAPTER) BASE ?= 1 diff --git a/os4/Makefile b/os4/Makefile index a6f3982..1380f3f 100644 --- a/os4/Makefile +++ b/os4/Makefile @@ -16,7 +16,10 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -TEST ?= 0 +CHAPTER ?= 4 +TEST ?= $(CHAPTER) +BASE ?= 1 + build: env $(KERNEL_BIN) env: diff --git a/os5-ref/Makefile b/os5-ref/Makefile index f476572..0fd7fbe 100644 --- a/os5-ref/Makefile +++ b/os5-ref/Makefile @@ -17,7 +17,7 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -o 'ch[0-9]' | grep -o '[0-9]') +CHAPTER ?= 5 TEST ?= $(CHAPTER) BASE ?= 1 diff --git a/os6-ref/Makefile b/os6-ref/Makefile index b90f596..98e8087 100644 --- a/os6-ref/Makefile +++ b/os6-ref/Makefile @@ -19,7 +19,7 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -o 'ch[0-9]' | grep -o '[0-9]') +CHAPTER ?= 6 TEST ?= $(CHAPTER) BASE ?= 1 diff --git a/os7-ref/Makefile b/os7-ref/Makefile index b90f596..facaf77 100644 --- a/os7-ref/Makefile +++ b/os7-ref/Makefile @@ -19,7 +19,7 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -o 'ch[0-9]' | grep -o '[0-9]') +CHAPTER ?= 7 TEST ?= $(CHAPTER) BASE ?= 1 diff --git a/os8-ref/Makefile b/os8-ref/Makefile index b90f596..7c3c6eb 100644 --- a/os8-ref/Makefile +++ b/os8-ref/Makefile @@ -19,7 +19,7 @@ KERNEL_ENTRY_PA := 0x80200000 OBJDUMP := rust-objdump --arch-name=riscv64 OBJCOPY := rust-objcopy --binary-architecture=riscv64 -CHAPTER ?= $(shell git rev-parse --abbrev-ref HEAD | grep -o 'ch[0-9]' | grep -o '[0-9]') +CHAPTER ?= 8 TEST ?= $(CHAPTER) BASE ?= 1