espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-10 04:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[nRF52840] minor platform refactoring (#2305)

Browse Source 
* Remove unnecessary source files in nRF52840 SDK libraries.

* Rename OT flash data section in nRF52840.
This commit is contained in:
Robert Lubos
2017-10-31 10:28:35 -07:00
committed by Jonathan Hui
parent baadfdf31d
commit 4329c0d2c4
3 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/nrf52840/Makefile.am
+22 -18
View File
@@ -126,9 +126,7 @@ PLATFORM_SOURCES
$(NULL)
endif
NORDICSEMI_SOURCES = \
@top_builddir@/third_party/NordicSemiconductor/hal/nrf_nvmc.c \
@top_builddir@/third_party/NordicSemiconductor/device/system_nrf52840.c \
RADIO_DRIVER_SOURCES = \
@top_builddir@/third_party/NordicSemiconductor/drivers/radio/nrf_drv_radio802154.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/radio/nrf_drv_radio802154_ack_pending_bit.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/radio/nrf_drv_radio802154_critical_section.c \
@@ -137,9 +135,24 @@ NORDICSEMI_SOURCES
@top_builddir@/third_party/NordicSemiconductor/drivers/radio/nrf_drv_radio802154_pib.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/radio/nrf_drv_radio802154_rx_buffer.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/radio/fem/nrf_fem_control_common.c \
@top_builddir@/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT.c \
@top_builddir@/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT_Conf.h \
$(NULL)
NORDICSEMI_SOURCES = \
@top_builddir@/third_party/NordicSemiconductor/dependencies/app_util_platform.c \
@top_builddir@/third_party/NordicSemiconductor/device/gcc_startup_nrf52840.S \
@top_builddir@/third_party/NordicSemiconductor/device/system_nrf52840.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/common/nrf_drv_common.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/clock/nrf_drv_clock.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/power/nrf_drv_power.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/systick/nrf_drv_systick.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/usbd/nrf_drv_usbd.c \
@top_builddir@/third_party/NordicSemiconductor/hal/nrf_nvmc.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/atfifo/nrf_atfifo.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_core.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_string_desc.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/class/cdc/acm/app_usbd_cdc_acm.c \
@top_builddir@/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT.c \
$(NULL)
libopenthread_nrf52840_a_CPPFLAGS = \
@@ -149,19 +162,9 @@ libopenthread_nrf52840_a_CPPFLAGS
libopenthread_nrf52840_a_SOURCES = \
$(PLATFORM_SOURCES) \
$(RADIO_DRIVER_SOURCES) \
$(NORDICSEMI_SOURCES) \
$(SINGLEPHY_SOURCES) \
@top_builddir@/third_party/NordicSemiconductor/dependencies/app_util_platform.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/common/nrf_drv_common.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/clock/nrf_drv_clock.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/power/nrf_drv_power.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/systick/nrf_drv_systick.c \
@top_builddir@/third_party/NordicSemiconductor/drivers/usbd/nrf_drv_usbd.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/atfifo/nrf_atfifo.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_core.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_string_desc.c \
@top_builddir@/third_party/NordicSemiconductor/libraries/usb/class/cdc/acm/app_usbd_cdc_acm.c \
$(NULL)
libopenthread_nrf52840_sdk_a_CPPFLAGS = \
@@ -171,7 +174,7 @@ libopenthread_nrf52840_sdk_a_CPPFLAGS
libopenthread_nrf52840_sdk_a_SOURCES = \
$(PLATFORM_SOURCES) \
$(NORDICSEMI_SOURCES) \
$(RADIO_DRIVER_SOURCES) \
$(SINGLEPHY_SOURCES) \
$(NULL)
@@ -182,7 +185,7 @@ libopenthread_nrf52840_softdevice_sdk_a_CPPFLAGS
libopenthread_nrf52840_softdevice_sdk_a_SOURCES = \
$(PLATFORM_SOURCES) \
$(NORDICSEMI_SOURCES) \
$(RADIO_DRIVER_SOURCES) \
$(SOFTDEVICE_SOURCES) \
$(NULL)
@@ -235,6 +238,7 @@ noinst_HEADERS
$(top_srcdir)/third_party/NordicSemiconductor/hal/nrf_rng.h \
$(top_srcdir)/third_party/NordicSemiconductor/hal/nrf_uart.h \
$(top_srcdir)/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT.h \
@top_builddir@/third_party/NordicSemiconductor/segger_rtt/SEGGER_RTT_Conf.h \
$(top_srcdir)/third_party/NordicSemiconductor/softdevice/s140/headers/ble.h \
$(top_srcdir)/third_party/NordicSemiconductor/softdevice/s140/headers/ble_err.h \
$(top_srcdir)/third_party/NordicSemiconductor/softdevice/s140/headers/ble_gap.h \
examples/platforms/nrf52840/flash.c
+4 -4
View File
@@ -71,11 +71,11 @@ otError utilsFlashInit(void)
sFlashDataStart = sFlashDataEnd - (pageSize * SETTINGS_CONFIG_PAGE_NUM);
#elif defined(__GNUC__) || defined(__ICCARM__)
extern uint32_t __flash_data_start;
extern uint32_t __flash_data_end;
extern uint32_t __start_ot_flash_data;
extern uint32_t __stop_ot_flash_data;
sFlashDataStart = (uint32_t)&__flash_data_start;
sFlashDataEnd = (uint32_t)&__flash_data_end;
sFlashDataStart = (uint32_t)&__start_ot_flash_data;
sFlashDataEnd = (uint32_t)&__stop_ot_flash_data;
#endif
examples/platforms/nrf52840/nrf52840.ld
+3 -3
View File
@@ -151,11 +151,11 @@ SECTIONS
KEEP(*(.stack*))
} > RAM
__flash_data_end = (ORIGIN(FLASH) + LENGTH(FLASH));
__flash_data_start = (__flash_data_end - (FLASH_PAGE_SIZE * FLASH_DATA_PAGES_USED));
__stop_ot_flash_data = (ORIGIN(FLASH) + LENGTH(FLASH));
__start_ot_flash_data = (__stop_ot_flash_data - (FLASH_PAGE_SIZE * FLASH_DATA_PAGES_USED));
/* Assure that code does not overlap flash data area.*/
ASSERT((__flash_data_start >= __etext + SIZEOF(.data)), "Error: Code overlaps flash data area.")
ASSERT((__start_ot_flash_data >= __etext + SIZEOF(.data)), "Error: Code overlaps flash data area.")
/* Set stack top to end of RAM, and stack limit move down by
* size of stack_dummy section */