Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

toolchain: make toochain include path available to zephyr #8944

Closed
wants to merge 5 commits into from
Closed

toolchain: make toochain include path available to zephyr #8944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b52c963
toolchain: make toochain include path available to zephyr
nashif Jul 16, 2018
8dd14ac
libc: minimal: remove headers available through toolchain
nashif Jul 18, 2018
564e8be
tests: mesh: fix int type
nashif Jul 18, 2018
a5020ad
tests: benchmarks: fix type in console message
nashif Jul 20, 2018
967bd01
samples: soc_flash_nrf: fix format specifier
nashif Jul 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cmake/toolchain/zephyr.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ elseif("${ARCH}" STREQUAL "x86")

elseif("${ARCH}" STREQUAL "xtensa")
set(SYSROOT_DIR ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${SYSROOT_TARGET}/usr)
set(TOOLCHAIN_INCLUDES
list(APPEND TOOLCHAIN_INCLUDES
${SYSROOT_DIR}/include/arch/include
${SYSROOT_DIR}/include
)

LIST(APPEND TOOLCHAIN_LIBS hal)
Expand All @@ -35,5 +34,8 @@ endif()

set(CROSS_COMPILE ${TOOLCHAIN_HOME}/usr/bin/${CROSS_COMPILE_TARGET}/${CROSS_COMPILE_TARGET}-)
set(SYSROOT_DIR ${ZEPHYR_SDK_INSTALL_DIR}/sysroots/${SYSROOT_TARGET}/usr)
list(APPEND TOOLCHAIN_INCLUDES
${SYSROOT_DIR}/include
)

list(APPEND TOOLCHAIN_C_FLAGS --sysroot ${SYSROOT_DIR})
49 changes: 0 additions & 49 deletions lib/libc/minimal/include/inttypes.h
View file
Open in desktop

This file was deleted.

57 changes: 0 additions & 57 deletions lib/libc/minimal/include/limits.h
View file
Open in desktop

This file was deleted.

79 changes: 0 additions & 79 deletions lib/libc/minimal/include/stdint.h
View file
Open in desktop

This file was deleted.

Empty file removed lib/libc/minimal/include/sys/cdefs.h
View file
Open in desktop
Empty file.
41 changes: 0 additions & 41 deletions lib/libc/minimal/include/sys/types.h
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions lib/libc/minimal/include/time.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions samples/drivers/soc_flash_nrf/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void main(void)

if (!rc) {
printf(" Offset 0x%08x:\n", FLASH_TEST_OFFSET2);
printf(" belongs to the page %u of start offset 0x%08x\n",
printf(" belongs to the page %u of start offset 0x%08ld\n",
info.index, info.start_offset);
printf(" and the size of 0x%08x B.\n", info.size);
} else {
Expand All @@ -166,7 +166,7 @@ void main(void)
rc = flash_get_page_info_by_idx(flash_dev, FLASH_TEST_PAGE_IDX, &info);

if (!rc) {
printf(" Page of number %u has start offset 0x%08x\n",
printf(" Page of number %u has start offset 0x%08ld\n",
FLASH_TEST_PAGE_IDX,
info.start_offset);
printf(" and size of 0x%08x B.\n", info.size);
Expand Down
6 changes: 3 additions & 3 deletions tests/benchmarks/timing_info/src/timing_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@
#define NANOSECS_PER_SEC (1000000000)
#define CYCLES_PER_SEC (16000000/(1 << NRF_TIMER2->PRESCALER))

#define CYCLES_TO_NS(x) ((x) * (NANOSECS_PER_SEC/CYCLES_PER_SEC))
#define PRINT_STATS(x, y, z) PRINT_F(x, (y*((SystemCoreClock)/ \
CYCLES_PER_SEC)), z)
#define CYCLES_TO_NS(x) ((x) * (NANOSECS_PER_SEC/CYCLES_PER_SEC))
#define PRINT_STATS(x, y, z) PRINT_F(x, (u32_t)(y*((SystemCoreClock)/ \
CYCLES_PER_SEC)), z)

/* Configure Timer parameters */
static inline void benchmark_timer_init(void)
Expand Down
2 changes: 1 addition & 1 deletion tests/bluetooth/mesh/src/microbit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ static void configure_button(void)
gpio_add_callback(gpio, &button_cb);
}

void board_output_number(bt_mesh_output_action_t action, uint32_t number)
void board_output_number(bt_mesh_output_action_t action, u32_t number)
{
struct mb_display *disp = mb_display_get();
struct mb_image arrow = MB_IMAGE({ 0, 0, 1, 0, 0 },
Expand Down