Skip to content

Commit

Permalink
makes: change indentation to spaces
Browse files Browse the repository at this point in the history
Changes indentation (tabs) to spaces (2x), so they don't conflict
with the default recipe prefix (tab), change additionally unifies
the style of variable setting/assignments.

JIRA: RTOS-575
  • Loading branch information
gerard5 committed Aug 29, 2023
1 parent 8b999ce commit 14bef44
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 44 deletions.
6 changes: 3 additions & 3 deletions devices/flash-flexspi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
FLEXSPI_OBJS := fspi/fspi.o

ifneq (, $(findstring imxrt117x, $(TARGET_SUBFAMILY)))
FLEXSPI_OBJS += flashdrv.o nor/nor.o nor/nor_mx.o
FLEXSPI_OBJS += flashdrv.o nor/nor.o nor/nor_mx.o
else ifneq (, $(findstring imxrt106x, $(TARGET_SUBFAMILY)))
FLEXSPI_OBJS += flashdrv.o nor/nor.o nor/nor_mx.o
FLEXSPI_OBJS += flashdrv.o nor/nor.o nor/nor_mx.o
else ifneq (, $(findstring imxrt105x, $(TARGET_SUBFAMILY)))
FLEXSPI_OBJS += flashdrv.o nor/nor.o hyperbus/hyper.o
FLEXSPI_OBJS += flashdrv.o nor/nor.o hyperbus/hyper.o
endif

OBJS += $(addprefix $(PREFIX_O)devices/flash-flexspi/, $(FLEXSPI_OBJS))
8 changes: 4 additions & 4 deletions hal/armv7a/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
#

ifneq (, $(findstring zynq7000, $(TARGET_SUBFAMILY)))
include hal/armv7a/zynq7000/Makefile
CFLAGS += -Ihal/armv7a/zynq7000
include hal/armv7a/zynq7000/Makefile
CFLAGS += -Ihal/armv7a/zynq7000
else ifneq (, $(findstring imx6ull, $(TARGET_SUBFAMILY)))
include hal/armv7a/imx6ull/Makefile
CFLAGS += -Ihal/armv7a/imx6ull
include hal/armv7a/imx6ull/Makefile
CFLAGS += -Ihal/armv7a/imx6ull
endif

OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/, exceptions.o cpu.o string.o mmu.o _cache.o)
10 changes: 5 additions & 5 deletions hal/armv7a/imx6ull/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ PLO_COMMANDS = alias app call console copy dump echo erase go help jffs2 kernel
test-dev test-ddr wait

ifeq ($(PLO_NAND), y)
include devices/nand-imx6ull/Makefile
include devices/nand-imx6ull/Makefile
endif
ifeq ($(PLO_NOR), y)
include devices/flash-imx6ull/Makefile
include devices/flash-imx6ull/Makefile
endif
ifeq ($(PLO_NOR_BOOT), y)
CFLAGS += -DPLO_NOR_BOOT
CFLAGS += -DPLO_NOR_BOOT
endif
include devices/uart-imx6ull/Makefile
include devices/usbc-cdc/Makefile

OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/$(TARGET_SUBFAMILY)/, _init.o imx6ull.o hal.o timer.o\
interrupts.o console.o)
OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/$(TARGET_SUBFAMILY)/, _init.o imx6ull.o hal.o timer.o \
interrupts.o console.o)
12 changes: 6 additions & 6 deletions hal/armv7a/zynq7000/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:=$(filter-out -mfpu% , $(CFLAGS))
CFLAGS := $(filter-out -mfloat-abi% , $(CFLAGS))
CFLAGS := $(filter-out -mfpu% , $(CFLAGS))

CFLAGS += -DVADDR_KERNEL_INIT=$(VADDR_KERNEL_INIT)

Expand All @@ -24,5 +24,5 @@ include devices/usbc-cdc/Makefile
include devices/uart-zynq7000/Makefile
include devices/flash-zynq7000/Makefile

OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/$(TARGET_SUBFAMILY)/, _init.o hal.o zynq.o timer.o\
interrupts.o console.o)
OBJS += $(addprefix $(PREFIX_O)hal/$(TARGET_SUFF)/$(TARGET_SUBFAMILY)/, _init.o hal.o zynq.o timer.o \
interrupts.o console.o)
4 changes: 2 additions & 2 deletions hal/armv7m/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions hal/armv7m/imxrt/10xx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions hal/armv7m/imxrt/117x/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
12 changes: 6 additions & 6 deletions hal/armv7m/imxrt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions hal/armv7m/stm32/l4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion hal/armv8m/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions hal/armv8m/nrf/91/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion hal/ia32/efi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LD := $(CROSS)ld
OBJCOPY := $(CROSS)objcopy

CFLAGS = -m32 -march=i586 -g -Os -Wall -DHAL=\"hal.h\" \
-fpie -ffreestanding -fomit-frame-pointer -fno-asynchronous-unwind-tables -fshort-wchar
-fpie -ffreestanding -fomit-frame-pointer -fno-asynchronous-unwind-tables -fshort-wchar

LDFLAGS = -T plo.lds -static

Expand Down

0 comments on commit 14bef44

Please sign in to comment.