Skip to content

make c5socarm project compatible with quartus16.1 #231

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

Open
ceisserer wants to merge 1 commit into
base: master
Choose a base branch
from
Open

make c5socarm project compatible with quartus16.1 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion apps/common/src/system/system-c5socarm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ static int initializeTimer(void)
// set the comparator value to the maximum global timer value even though we do not use it
// the 'alt_gpt_curtime_millisecs_get()' api uses this to determine current time
if ((alt_globaltmr_autoinc_set(1) != ALT_E_SUCCESS) ||
(alt_globaltmr_comp_set64(GLOBALTMR_MAX) != ALT_E_SUCCESS))
(alt_globaltmr_comp_set64(ALT_GLOBALTMR_MAX) != ALT_E_SUCCESS))
{
TRACE("Auto increment mode could not be enabled for this timer!\n");
}
Expand Down
2 changes: 1 addition & 1 deletion apps/demo_mn_embedded/c5socarm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ INCLUDE_DIRECTORIES(
################################################################################
# Set architecture specific definitions
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ALT_HOST_CFLAGS} -std=c99")
ADD_DEFINITIONS(-D__ALTERA_ARM__)
ADD_DEFINITIONS(-D__ALTERA_ARM__ -Dsoc_cv_av)

################################################################################
# Set architecture specific linker flags
Expand Down
4 changes: 2 additions & 2 deletions contrib/dualprocshm/cmake/configure-c5socarm.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ SET(LIB_ARCH_INCS
# Set architecture specific definitions

SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ALT_${PROC_INST_NAME}_FLAGS} -fmessage-length=0 -mcpu=${CFG_${PROC_INST_NAME}_CPU_VERSION} -ffunction-sections -fdata-sections -fno-inline")
ADD_DEFINITIONS(-D__C5SOC__ -D__ALTERA_ARM__)
ADD_DEFINITIONS(-D__C5SOC__ -D__ALTERA_ARM__ -Dsoc_cv_av)

################################################################################
# Set architecture specific installation files
Expand All @@ -67,4 +67,4 @@ GET_PROPERTY(FLAG_LIST DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY COMPILE_DE
GEN_ECLIPSE_FLAG_LIST("${FLAG_LIST}" ECLIPSE_FLAG_LIST)

CONFIGURE_FILE(${ARCH_TOOLS_DIR}/eclipse/libproject.in ${PROJECT_BINARY_DIR}/.project @ONLY)
CONFIGURE_FILE(${ARCH_TOOLS_DIR}/eclipse/libcproject.in ${PROJECT_BINARY_DIR}/.cproject @ONLY)
CONFIGURE_FILE(${ARCH_TOOLS_DIR}/eclipse/libcproject.in ${PROJECT_BINARY_DIR}/.cproject @ONLY)
13 changes: 7 additions & 6 deletions hardware/boards/altera-c5soc/mn-soc-shmem-gpio/cmake/configure-hal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,31 +36,32 @@
UNSET(LIB_HOST_ARCH_HAL_SRCS)
SET(LIB_HOST_ARCH_HAL_SRCS
src/hwmgr/alt_address_space.c
src/hwmgr/alt_bridge_manager.c
src/hwmgr/soc_cv_av/alt_bridge_manager.c
src/hwmgr/alt_cache.c
src/hwmgr/alt_clock_manager.c
src/hwmgr/soc_cv_av/alt_clock_manager.c
src/hwmgr/alt_dma_program.c
src/hwmgr/alt_dma.c

src/hwmgr/alt_fpga_manager.c
src/hwmgr/soc_cv_av/alt_fpga_manager.c
src/hwmgr/alt_generalpurpose_io.c
src/hwmgr/alt_globaltmr.c
src/hwmgr/alt_i2c.c
src/hwmgr/alt_interrupt.c
src/hwmgr/alt_mmu.c

src/hwmgr/alt_reset_manager.c
src/hwmgr/alt_system_manager.c
src/hwmgr/soc_cv_av/alt_reset_manager.c
src/hwmgr/soc_cv_av/alt_system_manager.c
src/hwmgr/alt_timers.c
src/hwmgr/alt_watchdog.c
)

UNSET(LIB_HOST_ARCH_HAL_INCS)
SET(LIB_HOST_ARCH_HAL_INCS
${HOST_HWLIB_PATH}/include
${HOST_HWLIB_PATH}/include/soc_cv_av
)

UNSET(LIB_HOST_ARCH_HAL_C_FLAGS)
SET(LIB_HOST_ARCH_HAL_C_FLAGS "-D__ALTERA_ARM__ -O3 -Ofast -g -Wall -std=c99 " )
SET(LIB_HOST_ARCH_HAL_C_FLAGS "-D__ALTERA_ARM__ -Dsoc_cv_av -O3 -Ofast -g -Wall -std=c99 " )
UNSET(ARCH_HOST_MODULE_NAME)
SET(ARCH_HOST_MODULE_NAME ${CFG_HOST_NAME}_arm_a9_0)
Loading