samd/boards/make-pins.py: Update to use tools/boardgen.py.

This replaces the previous make-pin-table.py with an implementation based
on boardgen.py.

- MICROPY_PY_MACHINE_PIN_BOARD_CPU macro is removed. This isn't optional
  on other ports, so no need for it to be optional on SAMD.
- pin_af_table is removed, and lookups just search the cpu dict instead
  (this saves N*wordsize bytes of firmware size to have this extra table).
- pins.csv is now BOARD,CPU to match other ports.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <[email protected]>

Author: jimmo

ports/samd/Makefile

@@ -56,10 +56,12 @@ INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include
 INC += -I$(TOP)/lib/asf4/$(MCU_SERIES_LOWER)/include/pio
 INC += -I$(TOP)/lib/tinyusb/src
 
-MAKE_PIN_AF = boards/make-pin-table.py
-PIN_AF_TABLE_CSV = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
+MAKE_PINS = boards/make-pins.py
 BOARD_PINS = $(BOARD_DIR)/pins.csv
-GEN_PIN_AF = pin_af_table.c
+PREFIX_FILE = boards/pins_prefix.c
+AF_FILE = mcu/$(MCU_SERIES_LOWER)/pin-af-table.csv
+GEN_PINS_SRC = $(BUILD)/pins_$(BOARD).c
+GEN_PINS_HDR = $(HEADER_BUILD)/pins.h
 
 CFLAGS += $(INC) -Wall -Werror -std=c99 -nostdlib -mthumb $(CFLAGS_MCU) -fsingle-precision-constant -Wdouble-promotion
 CFLAGS += -DMCU_$(MCU_SERIES) -D__$(CMSIS_MCU)__
@@ -179,7 +181,7 @@ DRIVERS_SRC_C += \
 	drivers/bus/softspi.c \
 
 # List of sources for qstr extraction
-SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX)
+SRC_QSTR += $(SRC_C) $(SHARED_SRC_C) $(SRC_CXX) $(GEN_PINS_SRC)
 
 OBJ += $(PY_O)
 OBJ += $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
@@ -190,6 +192,7 @@ OBJ += $(addprefix $(BUILD)/, $(ASF4_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(LIBM_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(TINYUSB_SRC_C:.c=.o))
+OBJ += $(GEN_PINS_SRC:.c=.o)
 
 all: $(BUILD)/firmware.uf2
 
@@ -203,10 +206,14 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
 $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 	$(Q)$(PYTHON) $(UF2CONV) -b $(TEXT0) -c -o $@ $<
 
-pin_af.c: $(BUILD)/$(GEN_PIN_AF) | $(HEADER_BUILD)
+# pin_af.c: $(BUILD)/$(GEN_PIN_AF) | $(HEADER_BUILD)
 
-$(BUILD)/$(GEN_PIN_AF): $(PIN_AF_TABLE_CSV) $(BOARD_PINS) | $(HEADER_BUILD)
-	$(ECHO) "Create $@"
-	$(Q)$(PYTHON) $(MAKE_PIN_AF) --csv $(PIN_AF_TABLE_CSV) --board $(BOARD_PINS) --table $(BUILD)/$(GEN_PIN_AF) --mcu $(MCU_SERIES)
+# Use a pattern rule here so that make will only call make-pins.py once to make
+# both pins_$(BOARD).c and pins.h
+$(BUILD)/%_$(BOARD).c $(HEADER_BUILD)/%.h: $(BOARD_DIR)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE) | $(HEADER_BUILD)
+	$(ECHO) "GEN $@"
+	$(Q)$(PYTHON) $(MAKE_PINS) --board-csv $(BOARD_PINS) --af-csv $(AF_FILE) --prefix $(PREFIX_FILE) \
+	    --output-source $(GEN_PINS_SRC) --output-header $(GEN_PINS_HDR) \
+	    --mcu $(MCU_SERIES)
 
 include $(TOP)/py/mkrules.mk

ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv

@@ -1,43 +1,38 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines starting with # are ignored
+LED_TX,PA27
+LED_RX,PB03
 
-PIN_PA27,LED_TX
-PIN_PB03,LED_RX
+D0,PA11
+D1,PA10
+FLASH_MOSI,PA08
+FLASH_MISO,PA14
+FLASH_SCK,PA09
+D5,PA15
+D6,PA20
+D7,PA21
+D8,PA06
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+TX,PB22
+RX,PB23
+SCL,PA23
+SDA,PA22
+MOSI,PB10
+MISO,PA12
+SCK,PB11
+NEOPIXEL,PA06
+FLASH_CS,PA13
 
-PIN_PA11,D0
-PIN_PA10,D1
-PIN_PA08,FLASH_MOSI
-PIN_PA14,FLASH_MISO
-PIN_PA09,FLASH_SCK
-PIN_PA15,D5
-PIN_PA20,D6
-PIN_PA21,D7
-PIN_PA06,D8
-PIN_PA07,D9
-PIN_PA18,D10
-PIN_PA16,D11
-PIN_PA19,D12
-PIN_PA17,D13
-PIN_PA02,A0
-PIN_PB08,A1
-PIN_PB09,A2
-PIN_PA04,A3
-PIN_PA05,A4
-PIN_PB02,A5
-PIN_PB22,TX
-PIN_PB23,RX
-PIN_PA23,SCL
-PIN_PA22,SDA
-PIN_PB10,MOSI
-PIN_PA12,MISO
-PIN_PB11,SCK
-PIN_PA06,NEOPIXEL
-PIN_PA13,FLASH_CS
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31

ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv

@@ -1,44 +1,39 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PB17
+D1,PB16
+D4,PA14
+D5,PA16
+D6,PA18
+D8,PB03
+D9,PA19
+D10,PA20
+D11,PA21
+D12,PA22
+D13,PA23
+A0,PA02
+A1,PA05
+A2,PB08
+A3,PB09
+A4,PA04
+A5,PB06
+SCL,PA13
+SDA,PA12
+MOSI,PB23
+MISO,PB22
+SCK,PA17
+VDIV,PB01
+AREF,PA03
+NEOPIXEL,PB03
 
-PIN_PB17,D0
-PIN_PB16,D1
-PIN_PA14,D4
-PIN_PA16,D5
-PIN_PA18,D6
-PIN_PB03,D8
-PIN_PA19,D9
-PIN_PA20,D10
-PIN_PA21,D11
-PIN_PA22,D12
-PIN_PA23,D13
-PIN_PA02,A0
-PIN_PA05,A1
-PIN_PB08,A2
-PIN_PB09,A3
-PIN_PA04,A4
-PIN_PB06,A5
-PIN_PA13,SCL
-PIN_PA12,SDA
-PIN_PB23,MOSI
-PIN_PB22,MISO
-PIN_PA17,SCK
-PIN_PB01,VDIV
-PIN_PA03,AREF
-PIN_PB03,NEOPIXEL
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31

ports/samd/boards/ADAFRUIT_ITSYBITSY_M0_EXPRESS/pins.csv

@@ -1,40 +1,35 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PA11
+D1,PA10
+D2,PA14
+D3,PA09
+D4,PA08
+D5,PA15
+D7,PA21
+D9,PA07
+D10,PA18
+D11,PA16
+D12,PA19
+D13,PA17
+A0,PA02
+A1,PB08
+A2,PB09
+A3,PA04
+A4,PA05
+A5,PB02
+SDA,PA22
+SCL,PA23
+MOSI,PB10
+MISO,PA12
+SCK,PB11
+DOTSTAR_CLK,PA00
+DOTSTAR_DATA,PA01
+FLASH_MOSI,PB22
+FLASH_MISO,PB03
+FLASH_SCK,PB23
+FLASH_CS,PA27
 
-PIN_PA11,D0
-PIN_PA10,D1
-PIN_PA14,D2
-PIN_PA09,D3
-PIN_PA08,D4
-PIN_PA15,D5
-PIN_PA21,D7
-PIN_PA07,D9
-PIN_PA18,D10
-PIN_PA16,D11
-PIN_PA19,D12
-PIN_PA17,D13
-PIN_PA02,A0
-PIN_PB08,A1
-PIN_PB09,A2
-PIN_PA04,A3
-PIN_PA05,A4
-PIN_PB02,A5
-PIN_PA22,SDA
-PIN_PA23,SCL
-PIN_PB10,MOSI
-PIN_PA12,MISO
-PIN_PB11,SCK
-PIN_PA00,DOTSTAR_CLK
-PIN_PA01,DOTSTAR_DATA
-PIN_PB22,FLASH_MOSI
-PIN_PB03,FLASH_MISO
-PIN_PB23,FLASH_SCK
-PIN_PA27,FLASH_CS
+USB_DM,PA24
+USB_DP,PA25
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31

ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv

@@ -1,44 +1,39 @@
-# Pin rows contain Pin number and pin name.
-# Pin rows start with PIN_
-# If the pin name is omitted, the pin number is added as name.
-# Empty lines and lines not starting with PIN_ are ignored
+D0,PA16
+D1,PA17
+D2,PA07
+D3,PB22
+D4,PA14
+D5,PA15
+D7,PA18
+D9,PA19
+D10,PA20
+D11,PA21
+D12,PA23
+D13,PA22
+A0,PA02
+A1,PA05
+A2,PB08
+A3,PB09
+A4,PA04
+A5,PA06
+SDA,PA12
+SCL,PA13
+MOSI,PA00
+MISO,PB23
+SCK,PA01
+DOTSTAR_CLK,PB02
+DOTSTAR_DATA,PB03
 
-PIN_PA16,D0
-PIN_PA17,D1
-PIN_PA07,D2
-PIN_PB22,D3
-PIN_PA14,D4
-PIN_PA15,D5
-PIN_PA18,D7
-PIN_PA19,D9
-PIN_PA20,D10
-PIN_PA21,D11
-PIN_PA23,D12
-PIN_PA22,D13
-PIN_PA02,A0
-PIN_PA05,A1
-PIN_PB08,A2
-PIN_PB09,A3
-PIN_PA04,A4
-PIN_PA06,A5
-PIN_PA12,SDA
-PIN_PA13,SCL
-PIN_PA00,MOSI
-PIN_PB23,MISO
-PIN_PA01,SCK
-PIN_PB02,DOTSTAR_CLK
-PIN_PB03,DOTSTAR_DATA
+QSPI_CS,PB11
+QSPI_SCK,PB10
+QSPI_D0,PA08
+QSPI_D1,PA09
+QSPI_D2,PA10
+QSPI_D3,PA11
 
-PIN_PB11,QSPI_CS
-PIN_PB10,QSPI_SCK
-PIN_PA08,QSPI_D0
-PIN_PA09,QSPI_D1
-PIN_PA10,QSPI_D2
-PIN_PA11,QSPI_D3
+USB_DM,PA24
+USB_DP,PA25
+USB_SOF,PA23
 
-PIN_PA24,USB_DM
-PIN_PA25,USB_DP
-PIN_PA26,USB_SOF
-
-PIN_PA30,SWCLK
-PIN_PA31,SWDIO
+SWCLK,PA30
+SWDIO,PA31