qieyuan/yb_arm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_ck_v2.1_feature#1613#' into 'dev_ck_v2.1'

Browse Source 
update feature#1613# to dev_ck_v2.1

See merge request ucp/driver/ucp4008_platform_arm!48
This commit is contained in:
Xianfeng Du 2024-01-25 03:15:30 +00:00
commit ff91c50dd1
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
osp/src/ospCfgToBin.c
View File

@ -30,11 +30,11 @@
/***************************************************************************/ /***************************************************************************/
/* ARM <---> ARM */ /* ARM <---> ARM */
#define ARM_SPE_CFG_PHY_SIZE (0x8000000) /* 改到系统内存，约定大小为128M */ //(0x1400000) /* 约定在20M以内 */ #define ARM_SPE_CFG_PHY_SIZE (0x3000000) /* 改到系统内存，约定大小为128M */ //(0x1400000) /* 约定在20M以内 */
#define ARM_SPE_CFG_INFO_ONE sizeof(osp_spe_cfg_file_reg) #define ARM_SPE_CFG_INFO_ONE sizeof(osp_spe_cfg_file_reg)
#define ARM_SPE_CFG_INFO_SIZE (ARM_SPE_CFG_INFO_ONE * APE_SPE_CFG_FILE_NUM) #define ARM_SPE_CFG_INFO_SIZE (ARM_SPE_CFG_INFO_ONE * APE_SPE_CFG_FILE_NUM)
#define ARM_SPE_CFG_FILE_SIZE (ARM_SPE_CFG_PHY_SIZE - ARM_SPE_CFG_INFO_SIZE - ARM_CFG_INDXN) /* 特殊配置文件总长度 */ #define ARM_SPE_CFG_FILE_SIZE (ARM_SPE_CFG_PHY_SIZE - ARM_SPE_CFG_INFO_SIZE - ARM_CFG_INDXN) /* 特殊配置文件总长度 */
#define ARM_SPE_CFG_OFFSET (0x8A000000) /* 目前改到APE_PHY段，从0x1000 0000开始，故需要偏移0x8A00 0000 */ #define ARM_SPE_CFG_OFFSET (0x89000000) /* 目前改到APE_PHY段，从0x1000 0000开始，故需要偏移0x8900 0000 */
#if 0 #if 0
#define ARM_SPE_CFG_PHY_ADDR (0xB8000000) /* 指定配置文件首地址 */ #define ARM_SPE_CFG_PHY_ADDR (0xB8000000) /* 指定配置文件首地址 */
@ -321,9 +321,9 @@ int32_t osp_spe_cfg_file_init()
{ {
memset(&g_spe_osp_cfg_file_reg, 0, sizeof(g_spe_osp_cfg_file_reg)); memset(&g_spe_osp_cfg_file_reg, 0, sizeof(g_spe_osp_cfg_file_reg));
g_spe_osp_cfg_file_idx = 0; g_spe_osp_cfg_file_idx = 0;
g_spe_static_mem_size = 0; //g_spe_static_mem_size = 0;
#if 1 #if 0
/* 改成从系统内存中分配128M */ /* 改成从系统内存中分配128M */
g_spe_ptr_static_mem = malloc(ARM_SPE_CFG_PHY_SIZE); g_spe_ptr_static_mem = malloc(ARM_SPE_CFG_PHY_SIZE);
if (NULL == g_spe_ptr_static_mem) if (NULL == g_spe_ptr_static_mem)
@ -331,11 +331,9 @@ int32_t osp_spe_cfg_file_init()
UCP_PRINT_ERROR("malloc(128M) for spe cfg error......\r\n"); UCP_PRINT_ERROR("malloc(128M) for spe cfg error......\r\n");
return OSP_ERROR; return OSP_ERROR;
} }
g_spe_static_mem_size = ARM_SPE_CFG_PHY_SIZE; //g_spe_static_mem_size = ARM_SPE_CFG_PHY_SIZE;
return OSP_OK; //return OSP_OK;
#endif #else
#if 0
g_spe_ptr_static_mem = get_static_mem(APE_PHY, &g_spe_static_mem_size); g_spe_ptr_static_mem = get_static_mem(APE_PHY, &g_spe_static_mem_size);
if (0 == g_spe_static_mem_size) if (0 == g_spe_static_mem_size)
{ {
@ -603,8 +601,8 @@ int32_t osp_get_cfg_file(char* name, uint64_t *paddr, uint32_t *psize)
if (0 == memcmp(head->name, name, strlen(name))) if (0 == memcmp(head->name, name, strlen(name)))
{ {
/* 物理层需要物理地址，而还是虚拟地址 */ /* 物理层需要物理地址，而还是虚拟地址 */
//osp_virt_to_phy(APE_PHY, head->vir_addr, paddr); osp_virt_to_phy(APE_PHY, head->vir_addr, paddr);
*paddr = head->vir_addr; //*paddr = head->vir_addr;
*psize = head->len; *psize = head->len;
return OSP_OK; return OSP_OK;
} }

21
rfic/makefile
View File

@ -66,15 +66,18 @@ FINAL_SRCS_FILES += $(foreach f,$(SRC_FILES),$(if $(findstring $(abspath $(f)),$
# Variables: Output Files # Variables: Output Files
# ============================================================================== # ==============================================================================
#BUILD_DIR := ./build #BUILD_DIR := ./build
ifeq ($(BOARD_TYPE),EVB) #ifeq ($(BOARD_TYPE),EVB)
BIN_FILE_NAME := rfic_evb.out # BIN_FILE_NAME := rfic_evb.out
else ifeq ($(BOARD_TYPE),EVMY) #else ifeq ($(BOARD_TYPE),EVMY)
BIN_FILE_NAME := rfic_evmy.out # BIN_FILE_NAME := rfic_evmy.out
else ifeq ($(BOARD_TYPE),EVMYF) #else ifeq ($(BOARD_TYPE),EVMYF)
BIN_FILE_NAME := rfic_evmyf.out # BIN_FILE_NAME := rfic_evmyf.out
else #else
BIN_FILE_NAME := rfic_evmyt.out # BIN_FILE_NAME := rfic_evmyt.out
endif #endif
BIN_FILE_NAME := rfic.out
#$(info "BUILD_DIR=" $(BUILD_DIR)) #$(info "BUILD_DIR=" $(BUILD_DIR))
OBJ_DIR := $(BUILD_DIR)/rfic OBJ_DIR := $(BUILD_DIR)/rfic
BIN_FILE := $(BUILD_DIR)/$(BIN_FILE_NAME) BIN_FILE := $(BUILD_DIR)/$(BIN_FILE_NAME)