From 3b25a1cabcf61bd2f95f752392492eb7f1927453 Mon Sep 17 00:00:00 2001 From: cbuilder Date: Wed, 16 Jun 2021 18:18:00 +0300 Subject: [PATCH] Formatting and automate executing src and lib targets sequentially --- components/hw/RISC-V/RV32I/hw_cpu.S | 12 ++++++------ cores/production/standard-cortex-m3/Makefile | 4 ++++ .../standard-riscv32i-GD32-GNU-tools/Makefile | 4 ++++ .../production/standard-riscv32i-GNU-tools/Makefile | 4 ++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/components/hw/RISC-V/RV32I/hw_cpu.S b/components/hw/RISC-V/RV32I/hw_cpu.S index 337771f..8c4efec 100644 --- a/components/hw/RISC-V/RV32I/hw_cpu.S +++ b/components/hw/RISC-V/RV32I/hw_cpu.S @@ -84,11 +84,11 @@ ASM_ENTRY1(hw_cpu_atomic_add) ret ASM_ENTRY1(hw_cpu_clz) - mv a1, a0 - li a2, 0x80000000 + mv a1, a0 + li a2, 0x80000000 li a0, 0 1: - and a3, a2, a1 + and a3, a2, a1 bnez a3, 2f addi a0, a0, 1 srli a2, a2, 1 @@ -97,11 +97,11 @@ ASM_ENTRY1(hw_cpu_clz) ret ASM_ENTRY1(hw_cpu_ctz) - mv a1, a0 - li a2, 1 + mv a1, a0 + li a2, 1 li a0, 0 1: - and a3, a2, a1 + and a3, a2, a1 bnez a3, 2f addi a0, a0, 1 slli a2, a2, 1 diff --git a/cores/production/standard-cortex-m3/Makefile b/cores/production/standard-cortex-m3/Makefile index 867fcb8..8892875 100644 --- a/cores/production/standard-cortex-m3/Makefile +++ b/cores/production/standard-cortex-m3/Makefile @@ -17,6 +17,10 @@ ASFLAGS=-include includes.inc -mcpu=cortex-m3 -Isrc MAP_FILE ?= lite.map +all: + ${MAKE} src + ${MAKE} lib + lib: $(OBJS) $(GCC_PREFIX)ar rcs libfxrtos.a $(OBJS) echo '#define FX_INTERFACE(hdr) ' > FXRTOS.h diff --git a/cores/production/standard-riscv32i-GD32-GNU-tools/Makefile b/cores/production/standard-riscv32i-GD32-GNU-tools/Makefile index a5e3c27..783a3a7 100644 --- a/cores/production/standard-riscv32i-GD32-GNU-tools/Makefile +++ b/cores/production/standard-riscv32i-GD32-GNU-tools/Makefile @@ -17,6 +17,10 @@ ASFLAGS=-include includes.inc -march=rv32i -mabi=ilp32 -Isrc MAP_FILE ?= lite.map +all: + ${MAKE} src + ${MAKE} lib + lib: $(OBJS) $(GCC_PREFIX)ar rcs libfxrtos.a $(OBJS) echo '#define FX_INTERFACE(hdr) ' > FXRTOS.h diff --git a/cores/production/standard-riscv32i-GNU-tools/Makefile b/cores/production/standard-riscv32i-GNU-tools/Makefile index a5e3c27..783a3a7 100644 --- a/cores/production/standard-riscv32i-GNU-tools/Makefile +++ b/cores/production/standard-riscv32i-GNU-tools/Makefile @@ -17,6 +17,10 @@ ASFLAGS=-include includes.inc -march=rv32i -mabi=ilp32 -Isrc MAP_FILE ?= lite.map +all: + ${MAKE} src + ${MAKE} lib + lib: $(OBJS) $(GCC_PREFIX)ar rcs libfxrtos.a $(OBJS) echo '#define FX_INTERFACE(hdr) ' > FXRTOS.h