Update Makefile

replaced detecting pi version using /proc/device-tree/model w/ a prompt asking you to select your pi's arm architecture.
This commit is contained in:
Tom 2024-04-15 19:23:44 -04:00 committed by GitHub
parent dc5d94be02
commit 06f437e61e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 27 additions and 34 deletions

View File

@ -1,71 +1,64 @@
CC = gcc CC = gcc
STD_CFLAGS = -Wall -std=gnu99 -c -g STD_CFLAGS = -Wall -std=gnu99 -c -g
# Enable ARM-specific options only on ARM, and compilation of the app only on ARM # Prompt user to select architecture
UNAME := $(shell uname -m) ARCH_PROMPT := "Select the architecture (1 for armv6l, 2 for armv7l, 3 for aarch64): "
ARCH_CHOICE := $(shell read -p $(ARCH_PROMPT) arch && echo $$arch)
# Determine Raspberry Pi version (if 2 or greater) # Determine hardware platform and set proper compilation flags based on user choice
RPI_VERSION := $(shell cat /proc/device-tree/model | grep -a -o "Raspberry\sPi\s[0-9]" | grep -o "[0-9]") ifeq ($(ARCH_CHOICE), 1)
# Determine the hardware platform and set proper compilation flags
ifeq ($(UNAME), armv6l)
ARCH_CFLAGS = -march=armv6 -O3 -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -ffast-math ARCH_CFLAGS = -march=armv6 -O3 -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -ffast-math
TARGET = 1 TARGET = 1
else ifeq ($(shell expr $(RPI_VERSION) \> 1), 1) else ifeq ($(ARCH_CHOICE), 2)
ifeq ($(UNAME), armv7l) ARCH_CFLAGS = -march=armv7-a -O3 -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -ffast-math
ARCH_CFLAGS = -march=armv7-a -O3 -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -ffast-math TARGET = 2
else ifeq ($(UNAME), aarch64) else ifeq ($(ARCH_CHOICE), 3)
ARCH_CFLAGS = -march=armv8-a -O2 -pipe -fstack-protector-strong -fno-plt -ffast-math ARCH_CFLAGS = -march=armv8-a -O2 -pipe -fstack-protector-strong -fno-plt -ffast-math
endif TARGET = 3
ifeq ($(shell expr $(RPI_VERSION) \>= 4), 1)
TARGET = 4
else
TARGET = 2
endif
else else
ARCH_CFLAGS = -O3 $(error Invalid architecture choice. Please choose 1 for armv6l, 2 for armv7l, or 3 for aarch64.)
TARGET = other
endif endif
CFLAGS = $(STD_CFLAGS) $(ARCH_CFLAGS) -DRASPI=$(TARGET) CFLAGS = $(STD_CFLAGS) $(ARCH_CFLAGS) -DRASPI=$(TARGET)
ifneq ($(TARGET), other) ifneq ($(TARGET), 4)
app: rds.o waveforms.o pi_fm_rds.o rds_strings.o fm_mpx.o control_pipe.o mailbox.o app: rds.o waveforms.o pi_fm_rds.o rds_strings.o fm_mpx.o control_pipe.o mailbox.o
$(CC) $(LDFLAGS) -o pi_fm_rds rds.o rds_strings.o waveforms.o mailbox.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm $(CC) $(LDFLAGS) -o pi_fm_rds rds.o rds_strings.o waveforms.o mailbox.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm
endif endif
rds_wav: rds.o rds_strings.o waveforms.o rds_wav.o fm_mpx.o rds_wav: rds.o rds_strings.o waveforms.o rds_wav.o fm_mpx.o
$(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o rds_strings.o waveforms.o fm_mpx.o -lsndfile -lm $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o rds_strings.o waveforms.o fm_mpx.o -lsndfile -lm
rds_strings.o: rds_strings.c rds_strings.h rds_strings.o: rds_strings.c rds_strings.h
$(CC) $(CFLAGS) rds_strings.c $(CC) $(CFLAGS) rds_strings.c
rds_strings_test: rds_strings.o rds_strings_test.c rds_strings_test: rds_strings.o rds_strings_test.c
$(CC) -Wall -std=gnu99 -o rds_strings_test rds_strings.o rds_strings_test.c $(CC) -Wall -std=gnu99 -o rds_strings_test rds_strings.o rds_strings_test.c
./rds_strings_test ./rds_strings_test
rds.o: rds.c waveforms.h rds_strings.o rds.o: rds.c waveforms.h rds_strings.o
$(CC) $(CFLAGS) rds.c $(CC) $(CFLAGS) rds.c
control_pipe.o: control_pipe.c control_pipe.h rds.h control_pipe.o: control_pipe.c control_pipe.h rds.h
$(CC) $(CFLAGS) control_pipe.c $(CC) $(CFLAGS) control_pipe.c
waveforms.o: waveforms.c waveforms.h waveforms.o: waveforms.c waveforms.h
$(CC) $(CFLAGS) waveforms.c $(CC) $(CFLAGS) waveforms.c
mailbox.o: mailbox.c mailbox.h mailbox.o: mailbox.c mailbox.h
$(CC) $(CFLAGS) mailbox.c $(CC) $(CFLAGS) mailbox.c
pi_fm_rds.o: pi_fm_rds.c control_pipe.h fm_mpx.h rds.h mailbox.h pi_fm_rds.o: pi_fm_rds.c control_pipe.h fm_mpx.h rds.h mailbox.h
$(CC) $(CFLAGS) pi_fm_rds.c $(CC) $(CFLAGS) pi_fm_rds.c
rds_wav.o: rds_wav.c rds_wav.o: rds_wav.c
$(CC) $(CFLAGS) rds_wav.c $(CC) $(CFLAGS) rds_wav.c
fm_mpx.o: fm_mpx.c fm_mpx.h fm_mpx.o: fm_mpx.c fm_mpx.h
$(CC) $(CFLAGS) fm_mpx.c $(CC) $(CFLAGS) fm_mpx.c
clean: clean:
rm -f *.o *_test rm -f *.o *_test