Skip to content

Commit 414c2f9

Browse files
jeplerjepler
committed
Always use python3
.. similar to micropython#4448
1 parent 4e7c1a4 commit 414c2f9

File tree

10 files changed

+23
-26
lines changed

10 files changed

+23
-26
lines changed

‎ports/atmel-samd/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,11 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
364364

365365
SRC_QSTR += $(HEADER_BUILD)/sdiodata.h
366366
$(HEADER_BUILD)/sdiodata.h: tools/mksdiodata.py | $(HEADER_BUILD)
367-
$(Q)$(PYTHON3) $< > $@
367+
$(Q)$(PYTHON) $< > $@
368368

369369
SRC_QSTR += $(HEADER_BUILD)/candata.h
370370
$(HEADER_BUILD)/candata.h: tools/mkcandata.py | $(HEADER_BUILD)
371-
$(Q)$(PYTHON3) $< > $@
371+
$(Q)$(PYTHON) $< > $@
372372

373373
SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED)
374374
# Sources that only hold QSTRs after pre-processing.
@@ -380,15 +380,15 @@ $(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
380380
$(STEPECHO) "LINK $@"
381381
$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
382382
$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
383-
$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)
383+
$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)
384384

385385
$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
386386
$(STEPECHO) "Create $@"
387387
$(Q)$(OBJCOPY) -O binary -j .vectors -j .text -j .data $^ $@
388388

389389
$(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
390390
$(STEPECHO) "Create $@"
391-
$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -c -o $@ $^
391+
$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -c -o $@ $^
392392

393393
include $(TOP)/py/mkrules.mk
394394

‎ports/espressif/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,14 +400,14 @@ $(BUILD)/firmware.elf: $(OBJ) | esp-idf-stamp
400400
$(BUILD)/circuitpython-firmware.bin: $(BUILD)/firmware.elf | tools/build_memory_info.py
401401
$(STEPECHO) "Create $@"
402402
$(Q)esptool.py --chip $(IDF_TARGET) elf2image $(FLASH_FLAGS) --elf-sha256-offset 0xb0 -o $@ $^
403-
$(Q)$(PYTHON3) tools/build_memory_info.py $< $(BUILD)/esp-idf/sdkconfig $@
403+
$(Q)$(PYTHON) tools/build_memory_info.py $< $(BUILD)/esp-idf/sdkconfig $@
404404

405405
$(BUILD)/firmware.bin: $(BUILD)/circuitpython-firmware.bin | esp-idf-stamp
406406
$(Q)$(PYTHON) ../../tools/join_bins.py $@ $(BOOTLOADER_OFFSET) $(BUILD)/esp-idf/bootloader/bootloader.bin $(PARTITION_TABLE_OFFSET) $(BUILD)/esp-idf/partition_table/partition-table.bin $(FIRMWARE_OFFSET) $(BUILD)/circuitpython-firmware.bin
407407

408408
$(BUILD)/firmware.uf2: $(BUILD)/circuitpython-firmware.bin
409409
$(STEPECHO) "Create $@"
410-
$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xbfdd4eee -b 0x0000 -c -o $@ $^
410+
$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xbfdd4eee -b 0x0000 -c -o $@ $^
411411

412412
flash: $(BUILD)/firmware.bin
413413
esptool.py --chip $(IDF_TARGET) -p $(PORT) $(ESPTOOL_FLAGS) write_flash $(FLASH_FLAGS) 0x0000 $^

‎ports/litex/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ all: $(BUILD)/firmware.bin $(BUILD)/firmware.dfu
169169
$(BUILD)/firmware.elf: $(OBJ)
170170
$(STEPECHO) "LINK $@"
171171
$(Q)$(CC) -o $@ $(LDFLAGS) $^ -Wl,--start-group $(LIBS) -Wl,--end-group
172-
$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(LD_FILE)
172+
$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LD_FILE)
173173

174174
$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
175175
$(STEPECHO) "Create $@"
@@ -183,7 +183,7 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
183183

184184
$(BUILD)/firmware.dfu: $(BUILD)/firmware.bin
185185
$(ECHO) "Create $@"
186-
$(PYTHON3) $(TOP)/tools/dfu.py -b $^ -D 0x1209:0x5bf0 "$(BUILD)/firmware.dfu"
186+
$(PYTHON) $(TOP)/tools/dfu.py -b $^ -D 0x1209:0x5bf0 "$(BUILD)/firmware.dfu"
187187

188188
include $(TOP)/py/mkrules.mk
189189

‎ports/mimxrt10xx/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ $(BUILD)/firmware.bin: $(BUILD)/firmware.elf
207207
$(BUILD)/firmware.uf2: $(BUILD)/firmware.elf
208208
$(STEPECHO) "Create $@"
209209
$(Q)$(OBJCOPY) -O binary -j .text -j .ARM.exidx -j .data -j .itcm -j .dtcm_data $^ $@-binpart
210-
$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -f MIMXRT10XX -c -o $@ $@-binpart
210+
$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -f MIMXRT10XX -c -o $@ $@-binpart
211211
$(Q)rm $@-binpart
212212

213213
$(BUILD)/firmware.hex: $(BUILD)/firmware.elf

‎ports/nrf/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ $(BUILD)/firmware.elf: $(OBJ) $(GENERATED_LD_FILE)
239239
$(STEPECHO) "LINK $@"
240240
$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
241241
$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
242-
$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)
242+
$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(GENERATED_LD_FILE)
243243

244244
$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
245245
$(STEPECHO) "Create $@"
@@ -257,7 +257,7 @@ $(BUILD)/firmware.combined.hex: $(BUILD)/firmware.hex $(SOFTDEV_HEX)
257257

258258
$(BUILD)/firmware.uf2: $(BUILD)/firmware.hex
259259
$(ECHO) "Create $@"
260-
$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/firmware.uf2" $^
260+
$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xADA52840 -c -o "$(BUILD)/firmware.uf2" $^
261261

262262

263263

‎ports/raspberrypi/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ $(BUILD)/boot2_padded_checksummed.o: $(BUILD)/boot2_padded_checksummed.S
249249

250250
$(BUILD)/boot2_padded_checksummed.S: $(BUILD)/boot2.bin
251251
$(STEPECHO) "PAD_CHECKSUM $<"
252-
$(Q)$(PYTHON3) sdk/src/rp2_common/boot_stage2/pad_checksum -s 0xffffffff $< $@
252+
$(Q)$(PYTHON) sdk/src/rp2_common/boot_stage2/pad_checksum -s 0xffffffff $< $@
253253

254254
$(BUILD)/boot2.bin: $(BUILD)/boot2.elf
255255
$(STEPECHO) "OBJCOPY $<"
@@ -258,11 +258,11 @@ $(BUILD)/boot2.bin: $(BUILD)/boot2.elf
258258

259259
$(BUILD)/stage2.c: stage2.c.jinja gen_stage2.py | $(BUILD)/
260260
$(STEPECHO) "GEN $<"
261-
$(Q)$(PYTHON3) gen_stage2.py $< $@ $(EXTERNAL_FLASH_DEVICES)
261+
$(Q)$(PYTHON) gen_stage2.py $< $@ $(EXTERNAL_FLASH_DEVICES)
262262

263263
$(HEADER_BUILD)/flash_info.h: flash_info.h.jinja gen_stage2.py | $(HEADER_BUILD)/
264264
$(STEPECHO) "GEN $<"
265-
$(Q)$(PYTHON3) gen_stage2.py $< $@ $(EXTERNAL_FLASH_DEVICES)
265+
$(Q)$(PYTHON) gen_stage2.py $< $@ $(EXTERNAL_FLASH_DEVICES)
266266

267267
$(BUILD)/supervisor/internal_flash.o: $(HEADER_BUILD)/flash_info.h
268268

@@ -280,15 +280,15 @@ $(BUILD)/firmware.elf: $(OBJ) link.ld
280280
$(Q)echo $(OBJ) > $(BUILD)/firmware.objs
281281
$(Q)echo $(PICO_LDFLAGS) > $(BUILD)/firmware.ldflags
282282
$(Q)$(CC) -o $@ $(CFLAGS) @$(BUILD)/firmware.ldflags -Wl,-T,link.ld -Wl,-Map=$@.map -Wl,-cref -Wl,--gc-sections @$(BUILD)/firmware.objs
283-
$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py link.ld
283+
$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py link.ld
284284

285285
$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
286286
$(STEPECHO) "Create $@"
287287
$(Q)$(OBJCOPY) -O binary -R .dtcm_bss $^ $@
288288

289289
$(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
290290
$(STEPECHO) "Create $@"
291-
$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xe48bff56 -b 0x10000000 -c -o $@ $^
291+
$(Q)$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f 0xe48bff56 -b 0x10000000 -c -o $@ $^
292292

293293
include $(TOP)/py/mkrules.mk
294294

‎ports/stm/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ $(BUILD)/firmware.elf: $(OBJ)
290290
$(STEPECHO) "LINK $@"
291291
$(Q)echo $^ > $(BUILD)/firmware.objs
292292
$(Q)$(CC) -o $@ $(LDFLAGS) @$(BUILD)/firmware.objs -Wl,--start-group $(LIBS) -Wl,--end-group
293-
$(Q)$(SIZE) $@ | $(PYTHON3) $(TOP)/tools/build_memory_info.py $(LD_FILE)
293+
$(Q)$(SIZE) $@ | $(PYTHON) $(TOP)/tools/build_memory_info.py $(LD_FILE)
294294

295295
$(BUILD)/firmware.bin: $(BUILD)/firmware.elf
296296
$(STEPECHO) "Create $@"
@@ -302,7 +302,7 @@ $(BUILD)/firmware.hex: $(BUILD)/firmware.elf
302302

303303
$(BUILD)/firmware.uf2: $(BUILD)/firmware.hex
304304
$(ECHO) "Create $@"
305-
$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -f 0x57755a57 -b $(BOOTLOADER_OFFSET) -c -o "$(BUILD)/firmware.uf2" $^
305+
$(PYTHON) $(TOP)/tools/uf2/utils/uf2conv.py -f 0x57755a57 -b $(BOOTLOADER_OFFSET) -c -o "$(BUILD)/firmware.uf2" $^
306306

307307
flash: $(BUILD)/firmware.bin
308308
$(ECHO) "Writing $< to the board"

‎py/circuitpy_defns.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,7 @@ GENERATED_LD_FILE = $(BUILD)/$(notdir $(patsubst %.template.ld,%.ld,$(LD_TEMPLAT
706706
# because it may include other template files.
707707
$(GENERATED_LD_FILE): $(BUILD)/ld_defines.pp boards/*.template.ld
708708
$(STEPECHO) "GEN $@"
709-
$(Q)$(PYTHON3) $(TOP)/tools/gen_ld_files.py --defines $< --out_dir $(BUILD) boards/*.template.ld
709+
$(Q)$(PYTHON) $(TOP)/tools/gen_ld_files.py --defines $< --out_dir $(BUILD) boards/*.template.ld
710710
endif
711711

712712
.PHONY: check-release-needs-clean-build

‎py/mkenv.mk

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,13 @@ CD = cd
4646
CP = cp
4747
FIND = find
4848
MKDIR = mkdir
49-
PYTHON = python
50-
# Set default python interpreters
51-
PYTHON2 ?= $(which python2 || which python2.7)
52-
PYTHON3 ?= python3
49+
PYTHON = python3
5350
RM = rm
5451
RSYNC = rsync
5552
SED = sed
5653
TOUCH = touch
5754
# Linux has 'nproc', macOS has 'sysctl -n hw.logicalcpu', this is cross-platform
58-
NPROC = $(PYTHON3) -c 'import multiprocessing as mp; print(mp.cpu_count())'
55+
NPROC = $(PYTHON) -c 'import multiprocessing as mp; print(mp.cpu_count())'
5956

6057
AS = $(CROSS_COMPILE)as
6158
CC = $(CROSS_COMPILE)gcc

‎supervisor/supervisor.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ else
6565
$(HEADER_BUILD)/devices.h : ../../supervisor/shared/external_flash/devices.h.jinja ../../tools/gen_nvm_devices.py | $(HEADER_BUILD)
6666
$(STEPECHO) "GEN $@"
6767
$(Q)install -d $(BUILD)/genhdr
68-
$(Q)$(PYTHON3) ../../tools/gen_nvm_devices.py $< $@
68+
$(Q)$(PYTHON) ../../tools/gen_nvm_devices.py $< $@
6969

7070
$(BUILD)/supervisor/shared/external_flash/external_flash.o: $(HEADER_BUILD)/devices.h
7171

@@ -185,7 +185,7 @@ CIRCUITPY_DISPLAY_FONT ?= "../../tools/fonts/ter-u12n.bdf"
185185
$(BUILD)/autogen_display_resources.c: ../../tools/gen_display_resources.py $(HEADER_BUILD)/qstrdefs.generated.h Makefile | $(HEADER_BUILD)
186186
$(STEPECHO) "GEN $@"
187187
$(Q)install -d $(BUILD)/genhdr
188-
$(Q)$(PYTHON3) ../../tools/gen_display_resources.py \
188+
$(Q)$(PYTHON) ../../tools/gen_display_resources.py \
189189
--font $(CIRCUITPY_DISPLAY_FONT) \
190190
--sample_file $(HEADER_BUILD)/qstrdefs.generated.h \
191191
--output_c_file $(BUILD)/autogen_display_resources.c

0 commit comments

Comments
 (0)