Skip to content

Commit f545763

Browse files
committed
Remove cpu_regs. We're using the MP stuff now
1 parent c5066ab commit f545763

File tree

14 files changed

+3
-165
lines changed

14 files changed

+3
-165
lines changed

main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include "supervisor/cpu.h"
3232
#include "supervisor/filesystem.h"
3333
#include "supervisor/port.h"
34-
#include "supervisor/shared/cpu_regs.h"
3534
#include "supervisor/shared/reload.h"
3635
#include "supervisor/shared/safe_mode.h"
3736
#include "supervisor/shared/serial.h"

ports/analog/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ LINKERFILE = linking/$(MCU_VARIANT_LOWER)_cktpy.ld
154154
LDFLAGS += -nostartfiles -specs=nano.specs
155155
endif
156156

157-
SRC_S_UPPER = supervisor/shared/cpu_regs.S
158157
SRC_S += $(STARTUPFILE)
159158
SRC_S += shared/runtime/gchelper_thumb2.s
160159

@@ -255,7 +254,6 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
255254
endif
256255
OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
257256
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
258-
OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
259257
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
260258

261259
# List of sources for qstr extraction

ports/atmel-samd/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,6 @@ else
315315
SRC_S += shared/runtime/gchelper_thumb2.s
316316
endif
317317

318-
SRC_S_UPPER = supervisor/shared/cpu_regs.S
319-
320318
OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
321319
OBJ += $(addprefix $(BUILD)/, $(SRC_ASF:.c=.o))
322320
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
@@ -325,7 +323,6 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
325323
endif
326324
OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
327325
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
328-
OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
329326
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
330327

331328
QSTR_GLOBAL_REQUIREMENTS += $(HEADER_BUILD)/sdiodata.h

ports/cxd56/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ LDFLAGS = \
110110

111111
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_CXD56 -DCFG_TUD_MIDI_RX_BUFSIZE=512 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_MIDI_TX_BUFSIZE=512 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=512 $(CFLAGS_MOD)
112112

113-
SRC_S_UPPER = supervisor/shared/cpu_regs.S
114113
SRC_S = shared/runtime/gchelper_thumb2.s
115114

116115
SRC_C += shared/runtime/gchelper_native.c
@@ -124,7 +123,6 @@ SRC_C += \
124123

125124
OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
126125
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
127-
OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
128126
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
129127
ifeq ($(INTERNAL_LIBM),1)
130128
OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))

ports/espressif/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,6 @@ FROZEN_MPY_PY_FILES := $(shell find -L $(FROZEN_MPY_DIR) -type f -name '*.py')
591591
FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
592592
endif
593593

594-
SRC_S_UPPER = supervisor/shared/cpu_regs.S
595-
596594
OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
597595
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_SHARED_MODULE_EXPANDED:.c=.o))
598596
ifeq ($(INTERNAL_LIBM),1)
@@ -601,7 +599,6 @@ endif
601599
OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
602600
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
603601
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
604-
OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
605602

606603
$(BUILD)/$(FATFS_DIR)/ff.o: COPT += -Os
607604
$(filter $(PY_BUILD)/../extmod/vfs_fat_%.o, $(PY_O)): COPT += -Os

ports/litex/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@ SRC_C += lib/tinyusb/src/portable/valentyusb/eptri/dcd_eptri.c
7878
endif
7979

8080
SRC_S_UPPER = \
81-
crt0-vexriscv.S \
82-
supervisor/shared/cpu_regs.S
81+
crt0-vexriscv.S
8382

8483
SRC_S = shared/runtime/gchelper_rv32i.s
8584

ports/mimxrt10xx/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ SRC_C += \
162162
endif
163163

164164
SRC_S_UPPER = \
165-
sdk/devices/$(CHIP_FAMILY)/gcc/startup_$(CHIP_CORE).S \
166-
supervisor/shared/cpu_regs.S
165+
sdk/devices/$(CHIP_FAMILY)/gcc/startup_$(CHIP_CORE).S
167166

168167
SRC_S = shared/runtime/gchelper_thumb2.s
169168

ports/nordic/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ SRC_C += $(SRC_DCD)
146146
$(patsubst %.c,$(BUILD)/%.o,$(SRC_DCD)): CFLAGS += -Wno-missing-prototypes
147147
endif # CIRCUITPY_USB_DEVICE
148148

149-
SRC_S_UPPER = supervisor/shared/cpu_regs.S
150149
SRC_S = shared/runtime/gchelper_thumb2.s
151150

152151
SRC_C += shared/runtime/gchelper_native.c
@@ -159,7 +158,6 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
159158
endif
160159
OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
161160
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
162-
OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
163161
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
164162

165163
# nrfx uses undefined preprocessor variables quite casually, so we can't do

ports/raspberrypi/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -675,7 +675,6 @@ SRC_S_UPPER = sdk/src/rp2_common/hardware_irq/irq_handler_chain.S \
675675
sdk/src/rp2_common/pico_double/double_aeabi_$(DOUBLE_EABI).S \
676676
sdk/src/rp2_common/pico_int64_ops/pico_int64_ops_aeabi.S \
677677
sdk/src/rp2_common/pico_crt0/crt0.S \
678-
supervisor/shared/cpu_regs.S \
679678
$(SRC_S_UPPER_CHIP_VARIANT)
680679

681680
ifeq ($(CIRCUITPY_PICODVI),1)

ports/renode/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ SRC_C += \
4545
background.c \
4646
mphalport.c \
4747

48-
SRC_S_UPPER = supervisor/shared/cpu_regs.S
4948
SRC_S = shared/runtime/gchelper_thumb1.s
5049

5150
SRC_C += shared/runtime/gchelper_native.c
@@ -57,7 +56,6 @@ OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
5756
endif
5857
OBJ += $(addprefix $(BUILD)/, $(SRC_CIRCUITPY_COMMON:.c=.o))
5958
OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
60-
OBJ += $(addprefix $(BUILD)/, $(SRC_S_UPPER:.S=.o))
6159
OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
6260

6361
$(BUILD)/%.o: $(BUILD)/%.S

0 commit comments

Comments
 (0)