From c0997c6fb37322cabdaa24d9aa954f9b78a6dd22 Mon Sep 17 00:00:00 2001 From: Gerard Swiderski Date: Tue, 29 Aug 2023 16:22:18 +0200 Subject: [PATCH] makes: change indentation to spaces Changes indentation (tabs) to spaces, so they don't conflict with the recipe prefix and unifies the style of variable setting/assignments. JIRA: RTOS-575 --- hal/armv7m/Makefile | 4 ++-- hal/armv7m/imxrt/10xx/Makefile | 8 ++++---- hal/armv7m/imxrt/117x/Makefile | 8 ++++---- hal/armv7m/imxrt/Makefile | 12 ++++++------ hal/armv7m/stm32/l4/Makefile | 8 ++++---- hal/armv8m/Makefile | 2 +- hal/armv8m/nrf/91/Makefile | 8 ++++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hal/armv7m/Makefile b/hal/armv7m/Makefile index 66136ee1..a8e3d6bc 100644 --- a/hal/armv7m/Makefile +++ b/hal/armv7m/Makefile @@ -7,11 +7,11 @@ # ifneq (, $(findstring imxrt, $(TARGET_SUBFAMILY))) - include hal/armv7m/imxrt/Makefile + include hal/armv7m/imxrt/Makefile endif ifneq (, $(findstring stm32, $(TARGET_SUBFAMILY))) - include hal/armv7m/stm32/Makefile + include hal/armv7m/stm32/Makefile endif OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/, cpu.o exceptions.o interrupts.o mpu.o string.o) diff --git a/hal/armv7m/imxrt/10xx/Makefile b/hal/armv7m/imxrt/10xx/Makefile index 4bfb657d..3884d3b7 100644 --- a/hal/armv7m/imxrt/10xx/Makefile +++ b/hal/armv7m/imxrt/10xx/Makefile @@ -6,11 +6,11 @@ # %LICENSE% # -LDFLAGS:=$(filter-out -Tbss% , $(LDFLAGS)) -LDFLAGS:=$(filter-out -Tdata% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tbss% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tdata% , $(LDFLAGS)) -CFLAGS:=$(filter-out -mfloat-abi% , $(CFLAGS)) -CFLAGS+= -mfloat-abi=soft +CFLAGS := $(filter-out -mfloat-abi% , $(CFLAGS)) +CFLAGS += -mfloat-abi=soft GCCLIB := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) diff --git a/hal/armv7m/imxrt/117x/Makefile b/hal/armv7m/imxrt/117x/Makefile index 1dc09326..eef4afff 100644 --- a/hal/armv7m/imxrt/117x/Makefile +++ b/hal/armv7m/imxrt/117x/Makefile @@ -6,11 +6,11 @@ # %LICENSE% # -LDFLAGS:=$(filter-out -Tbss% , $(LDFLAGS)) -LDFLAGS:=$(filter-out -Tdata% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tbss% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tdata% , $(LDFLAGS)) -CFLAGS:=$(filter-out -mfloat-abi% , $(CFLAGS)) -CFLAGS+= -mfloat-abi=soft +CFLAGS := $(filter-out -mfloat-abi% , $(CFLAGS)) +CFLAGS += -mfloat-abi=soft GCCLIB := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) diff --git a/hal/armv7m/imxrt/Makefile b/hal/armv7m/imxrt/Makefile index 83e77986..248033f8 100644 --- a/hal/armv7m/imxrt/Makefile +++ b/hal/armv7m/imxrt/Makefile @@ -8,14 +8,14 @@ ifneq (, $(findstring imxrt117x, $(TARGET_SUBFAMILY))) - include hal/armv7m/imxrt/117x/Makefile - CFLAGS += -Ihal/armv7m/imxrt/117x + include hal/armv7m/imxrt/117x/Makefile + CFLAGS += -Ihal/armv7m/imxrt/117x else ifneq (, $(findstring imxrt106x, $(TARGET_SUBFAMILY))) - include hal/armv7m/imxrt/10xx/Makefile - CFLAGS += -Ihal/armv7m/imxrt/10xx + include hal/armv7m/imxrt/10xx/Makefile + CFLAGS += -Ihal/armv7m/imxrt/10xx else ifneq (, $(findstring imxrt105x, $(TARGET_SUBFAMILY))) - include hal/armv7m/imxrt/10xx/Makefile - CFLAGS += -Ihal/armv7m/imxrt/10xx + include hal/armv7m/imxrt/10xx/Makefile + CFLAGS += -Ihal/armv7m/imxrt/10xx endif OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/imxrt/, hal.o) diff --git a/hal/armv7m/stm32/l4/Makefile b/hal/armv7m/stm32/l4/Makefile index 9e14dd6a..e625db1d 100644 --- a/hal/armv7m/stm32/l4/Makefile +++ b/hal/armv7m/stm32/l4/Makefile @@ -6,11 +6,11 @@ # %LICENSE% # -LDFLAGS:=$(filter-out -Tbss% , $(LDFLAGS)) -LDFLAGS:=$(filter-out -Tdata% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tbss% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tdata% , $(LDFLAGS)) -CFLAGS:=$(filter-out -mfloat-abi% , $(CFLAGS)) -CFLAGS+= -mfloat-abi=soft +CFLAGS := $(filter-out -mfloat-abi% , $(CFLAGS)) +CFLAGS += -mfloat-abi=soft GCCLIB := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) diff --git a/hal/armv8m/Makefile b/hal/armv8m/Makefile index ff8fe117..57951714 100644 --- a/hal/armv8m/Makefile +++ b/hal/armv8m/Makefile @@ -7,7 +7,7 @@ # ifneq (, $(findstring nrf, $(TARGET_SUBFAMILY))) - include hal/armv8m/nrf/Makefile + include hal/armv8m/nrf/Makefile endif OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/, cpu.o interrupts.o mpu.o string.o) diff --git a/hal/armv8m/nrf/91/Makefile b/hal/armv8m/nrf/91/Makefile index eb9db2b8..5dcd568e 100644 --- a/hal/armv8m/nrf/91/Makefile +++ b/hal/armv8m/nrf/91/Makefile @@ -6,11 +6,11 @@ # %LICENSE% # -LDFLAGS:=$(filter-out -Tbss% , $(LDFLAGS)) -LDFLAGS:=$(filter-out -Tdata% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tbss% , $(LDFLAGS)) +LDFLAGS := $(filter-out -Tdata% , $(LDFLAGS)) -CFLAGS:=$(filter-out -mfloat-abi% , $(CFLAGS)) -CFLAGS+= -mfloat-abi=soft +CFLAGS := $(filter-out -mfloat-abi% , $(CFLAGS)) +CFLAGS += -mfloat-abi=soft GCCLIB := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name)