From 3f846431307c3ec135c789164273f4f28afeaa57 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Fri, 16 May 2025 17:50:22 -0400 Subject: [PATCH] stm32: Minor organizational change to Makefile This better matches the Klipper stm32 Makefile layout. Signed-off-by: Kevin O'Connor --- src/stm32/Makefile | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/src/stm32/Makefile b/src/stm32/Makefile index e8cf3fe..057761a 100644 --- a/src/stm32/Makefile +++ b/src/stm32/Makefile @@ -27,39 +27,28 @@ CFLAGS_katapult.elf += -T $(OUT)src/generic/armcm_link.ld $(OUT)katapult.elf: $(OUT)src/generic/armcm_link.ld # Add source files -mcu-y = stm32/gpio.c stm32/flash.c stm32/clockline.c stm32/dfu_reboot.c -mcu-y += generic/armcm_irq.c generic/crc16_ccitt.c -mcu-$(CONFIG_MACH_STM32F0) += ../lib/stm32f0/system_stm32f0xx.c -mcu-$(CONFIG_MACH_STM32F0) += stm32/stm32f0.c stm32/stm32f0_timer.c -mcu-$(CONFIG_MACH_STM32F0) += stm32/gpioperiph.c - -mcu-$(CONFIG_MACH_STM32F1) += ../lib/stm32f1/system_stm32f1xx.c -mcu-$(CONFIG_MACH_STM32F1) += stm32/stm32f1.c generic/armcm_timer.c - -mcu-$(CONFIG_MACH_STM32F2) += ../lib/stm32f2/system_stm32f2xx.c -mcu-$(CONFIG_MACH_STM32F2) += stm32/stm32f4.c generic/armcm_timer.c -mcu-$(CONFIG_MACH_STM32F2) += stm32/gpioperiph.c - -mcu-$(CONFIG_MACH_STM32F4) += ../lib/stm32f4/system_stm32f4xx.c -mcu-$(CONFIG_MACH_STM32F4) += stm32/stm32f4.c generic/armcm_timer.c -mcu-$(CONFIG_MACH_STM32F4) += stm32/gpioperiph.c - -mcu-$(CONFIG_MACH_STM32G0) += stm32/stm32f0_timer.c -mcu-$(CONFIG_MACH_STM32G0) += stm32/stm32g0.c stm32/gpioperiph.c - -mcu-$(CONFIG_MACH_STM32H7) += ../lib/stm32h7/system_stm32h7xx.c -mcu-$(CONFIG_MACH_STM32H7) += stm32/stm32h7.c generic/armcm_timer.c -mcu-$(CONFIG_MACH_STM32H7) += stm32/gpioperiph.c - -src-y += generic/armcm_canboot.c $(mcu-y) -usb-src-$(CONFIG_HAVE_STM32_USBFS) := stm32/usbfs.c -usb-src-$(CONFIG_HAVE_STM32_USBOTG) := stm32/usbotg.c -src-$(CONFIG_USBSERIAL) += $(usb-src-y) stm32/chipid.c generic/usb_cdc.c +src-y += stm32/flash.c stm32/clockline.c stm32/dfu_reboot.c +src-y += generic/armcm_irq.c generic/crc16_ccitt.c generic/armcm_canboot.c +src-$(CONFIG_MACH_STM32F0) += stm32/stm32f0.c ../lib/stm32f0/system_stm32f0xx.c +src-$(CONFIG_MACH_STM32F1) += stm32/stm32f1.c ../lib/stm32f1/system_stm32f1xx.c +src-$(CONFIG_MACH_STM32F2) += stm32/stm32f4.c ../lib/stm32f2/system_stm32f2xx.c +src-$(CONFIG_MACH_STM32F4) += stm32/stm32f4.c ../lib/stm32f4/system_stm32f4xx.c +src-$(CONFIG_MACH_STM32G0) += stm32/stm32g0.c +src-$(CONFIG_MACH_STM32H7) += stm32/stm32h7.c ../lib/stm32h7/system_stm32h7xx.c +timer-src-y := generic/armcm_timer.c +timer-src-$(CONFIG_MACH_STM32F0) := generic/timer_irq.c stm32/stm32f0_timer.c +timer-src-$(CONFIG_MACH_STM32G0) := generic/timer_irq.c stm32/stm32f0_timer.c +gpio-src-y := stm32/gpio.c stm32/gpioperiph.c +gpio-src-$(CONFIG_MACH_STM32F1) := stm32/gpio.c +src-y += $(timer-src-y) $(gpio-src-y) serial-src-y := stm32/serial.c serial-src-$(CONFIG_MACH_STM32F0) := stm32/stm32f0_serial.c serial-src-$(CONFIG_MACH_STM32G0) := stm32/stm32f0_serial.c serial-src-$(CONFIG_MACH_STM32H7) := stm32/stm32f0_serial.c src-$(CONFIG_SERIAL) += $(serial-src-y) generic/serial_irq.c +usb-src-$(CONFIG_HAVE_STM32_USBFS) := stm32/usbfs.c +usb-src-$(CONFIG_HAVE_STM32_USBOTG) := stm32/usbotg.c +src-$(CONFIG_USBSERIAL) += $(usb-src-y) stm32/chipid.c generic/usb_cdc.c canbus-src-y := generic/canserial.c ../lib/fast-hash/fasthash.c canbus-src-$(CONFIG_HAVE_STM32_CANBUS) += stm32/can.c canbus-src-$(CONFIG_HAVE_STM32_FDCANBUS) += stm32/fdcan.c