Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only support building a single board at a time #415

Merged
merged 1 commit into from
Oct 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ ifneq ($(VERBOSE),1)
MAKEFLAGS += -s
endif

# Set build directory
BUILD = build

# Parameter for current board
ifeq ($(BOARD),)
all:
Expand All @@ -21,10 +24,6 @@ DATE=$(shell git show --format="%cs" --no-patch --no-show-signature)
REV=$(shell git describe --abbrev=7 --always --dirty)
VERSION?=$(DATE)_$(REV)

# Set build directory
obj = build
BUILD = $(obj)/$(BOARD)

# Default target - build the board's EC firmware
all: $(BUILD)/ec.rom
$(info Built $(VERSION) for $(BOARD))
Expand Down Expand Up @@ -72,7 +71,7 @@ docs:

.PHONY: clean
clean:
rm -rf $(obj)
rm -rf $(BUILD)

.PHONY: fmt
fmt:
Expand Down
8 changes: 4 additions & 4 deletions src/arch/8051/toolchain.mk
Original file line number Diff line number Diff line change
Expand Up @@ -31,25 +31,25 @@ sim: $(BUILD)/ec.rom

# Convert from Intel Hex file to binary file
$(BUILD)/ec.rom: $(BUILD)/ec.ihx
@echo " OBJCOPY $(subst $(obj)/,,$@)"
@echo " OBJCOPY $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
objcopy -I ihex -O binary --gap-fill=0xFF --pad-to=$(CONFIG_EC_FLASH_SIZE) $< $@

# Link object files into Intel Hex file
$(BUILD)/ec.ihx: $(OBJ)
@echo " LINK $(subst $(obj)/,,$@)"
@echo " LINK $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(CC) $(LDFLAGS) -o $@ $^

# Compile ASM files into object files
$(ASM_OBJ): $(BUILD)/%.rel: src/%.asm
@echo " AS $(subst $(obj)/,,$@)"
@echo " AS $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(AS) $(ASFLAGS) $@ $<

# Compile C files into object files
$(C_OBJ): $(BUILD)/%.rel: src/%.c $(INCLUDE)
@echo " CC $(subst $(obj)/,,$@)"
@echo " CC $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(CC) $(CFLAGS) -o $@ -c $<

Expand Down
8 changes: 4 additions & 4 deletions src/arch/avr/toolchain.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ sim: $(BUILD)/ec.elf

# Convert from Intel Hex file to binary file
$(BUILD)/ec.rom: $(BUILD)/ec.ihx
@echo " OBJCOPY $(subst $(obj)/,,$@)"
@echo " OBJCOPY $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(OBJCOPY) -I ihex -O binary --gap-fill 0xFF $< $@

# Convert from ELF file to Intel Hex file
$(BUILD)/ec.ihx: $(BUILD)/ec.elf
@echo " OBJCOPY $(subst $(obj)/,,$@)"
@echo " OBJCOPY $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(OBJCOPY) -j .text -j .data -O ihex $< $@

# Link object files into ELF file
$(BUILD)/ec.elf: $(OBJ)
@echo " LINK $(subst $(obj)/,,$@)"
@echo " LINK $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(CC) -o $@ $^

# Compile C files into object files
$(BUILD)/%.o: src/%.c $(INCLUDE)
@echo " CC $(subst $(obj)/,,$@)"
@echo " CC $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(CC) $(CFLAGS) -o $@ -c $<

Expand Down
8 changes: 4 additions & 4 deletions src/board/system76/common/flash/flash.mk
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,25 @@ FLASH_CC=\

# Convert from binary file to C header
$(BUILD)/include/flash.h: $(FLASH_BUILD)/flash.rom
@echo " XXD $(subst $(obj)/,,$@)"
@echo " XXD $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
xxd -include < $< > $@

# Convert from Intel Hex file to binary file
$(FLASH_BUILD)/flash.rom: $(FLASH_BUILD)/flash.ihx
@echo " OBJCOPY $(subst $(obj)/,,$@)"
@echo " OBJCOPY $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
objcopy -I ihex -O binary $< $@

# Link object files into Intel Hex file
$(FLASH_BUILD)/flash.ihx: $(FLASH_OBJ)
@echo " LINK $(subst $(obj)/,,$@)"
@echo " LINK $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(FLASH_CC) -o $@ $^

# Compile C files into object files
$(FLASH_OBJ): $(FLASH_BUILD)/%.rel: src/%.c $(FLASH_INCLUDE)
@echo " CC $(subst $(obj)/,,$@)"
@echo " CC $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(FLASH_CC) $(FLASH_CFLAGS) -o $@ -c $<

Expand Down
8 changes: 4 additions & 4 deletions src/board/system76/common/scratch/scratch.mk
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,25 @@ SCRATCH_CC=\

# Convert from binary file to C header
$(BUILD)/include/scratch.h: $(SCRATCH_BUILD)/scratch.rom
@echo " XXD $(subst $(obj)/,,$@)"
@echo " XXD $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
xxd -include < $< > $@

# Convert from Intel Hex file to binary file
$(SCRATCH_BUILD)/scratch.rom: $(SCRATCH_BUILD)/scratch.ihx
@echo " OBJCOPY $(subst $(obj)/,,$@)"
@echo " OBJCOPY $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
objcopy -I ihex -O binary $< $@

# Link object files into Intel Hex file
$(SCRATCH_BUILD)/scratch.ihx: $(SCRATCH_OBJ)
@echo " LINK $(subst $(obj)/,,$@)"
@echo " LINK $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(SCRATCH_CC) -o $@ $^

# Compile C files into object files
$(SCRATCH_OBJ): $(SCRATCH_BUILD)/%.rel: src/%.c $(SCRATCH_INCLUDE)
@echo " CC $(subst $(obj)/,,$@)"
@echo " CC $(subst $(BUILD)/,,$@)"
mkdir -p $(@D)
$(SCRATCH_CC) $(SCRATCH_CFLAGS) -o $@ -c $<

Expand Down