Skip to content

Commit 2c63fb2

Browse files
committed
nrf: Remove the random hal and module
Thus getting rid of the whole old hal! The module is not needed because the common-hal nRF implementation uses HW RNG anyway.
1 parent 1163462 commit 2c63fb2

11 files changed

Lines changed: 2 additions & 410 deletions

File tree

ports/nrf/Makefile

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ INC += -I$(BUILD)
4343
INC += -I$(BUILD)/genhdr
4444
INC += -I./../../lib/cmsis/inc
4545
INC += -I./boards/$(BOARD)
46-
INC += -I./hal
4746
INC += -I./modules/ubluepy
48-
INC += -I./modules/random
4947
INC += -I./modules/ble
5048
INC += -I./nrfx
5149
INC += -I./nrfx/hal
@@ -63,7 +61,6 @@ CFLAGS += $(INC) -Wall -Werror -ansi -std=gnu99 -nostdlib $(COPT) $(NRF_DEFINES)
6361
CFLAGS += -fno-strict-aliasing
6462
CFLAGS += -fstack-usage -fno-builtin -fshort-enums
6563
CFLAGS += -fdata-sections -ffunction-sections
66-
CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
6764
CFLAGS += -D__START=main
6865

6966
LDFLAGS = $(CFLAGS)
@@ -89,10 +86,6 @@ LIBS := -L $(dir $(LIBM_FILE_NAME)) -lm
8986
LIBS += -L $(dir $(LIBC_FILE_NAME)) -lc
9087
LIBS += -L $(dir $(LIBGCC_FILE_NAME)) -lgcc
9188

92-
SRC_HAL = $(addprefix hal/,\
93-
hal_rng.c \
94-
)
95-
9689
SRC_NRFX = $(addprefix nrfx/,\
9790
drivers/src/nrfx_spim.c \
9891
drivers/src/nrfx_twim.c \
@@ -135,7 +128,6 @@ DRIVERS_SRC_C += $(addprefix modules/,\
135128
ubluepy/ubluepy_scanner.c \
136129
ubluepy/ubluepy_scan_entry.c \
137130
ble/modble.c \
138-
random/modrandom.c \
139131
)
140132

141133
SRC_COMMON_HAL += \
@@ -201,7 +193,8 @@ SRC_SHARED_BINDINGS = \
201193
bitbangio/__init__.c \
202194
bitbangio/I2C.c \
203195
bitbangio/SPI.c \
204-
bitbangio/OneWire.c
196+
bitbangio/OneWire.c \
197+
random/__init__.c
205198

206199

207200
SRC_SHARED_MODULE_EXPANDED = $(addprefix shared-bindings/, $(SRC_SHARED_BINDINGS)) \
@@ -212,7 +205,6 @@ FROZEN_MPY_MPY_FILES := $(addprefix $(BUILD)/,$(FROZEN_MPY_PY_FILES:.py=.mpy))
212205

213206
OBJ += $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
214207
OBJ += $(BUILD)/pins_gen.o
215-
OBJ += $(addprefix $(BUILD)/, $(SRC_HAL:.c=.o))
216208
OBJ += $(addprefix $(BUILD)/, $(SRC_NRFX:.c=.o))
217209
OBJ += $(addprefix $(BUILD)/, $(DRIVERS_SRC_C:.c=.o))
218210
OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))

ports/nrf/boards/feather52832/nrf52_hal_conf.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

ports/nrf/boards/feather52840/nrf52_hal_conf.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

ports/nrf/boards/pca10040/nrf52_hal_conf.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

ports/nrf/boards/pca10056/nrf52_hal_conf.h

Lines changed: 0 additions & 18 deletions
This file was deleted.

ports/nrf/hal/hal_rng.c

Lines changed: 0 additions & 76 deletions
This file was deleted.

ports/nrf/hal/hal_rng.h

Lines changed: 0 additions & 34 deletions
This file was deleted.

ports/nrf/hal/nrf52_hal.h

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)