Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
jiale-gdyd committed Oct 4, 2022
1 parent ce73db9 commit 9e04d3f
Show file tree
Hide file tree
Showing 36 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -330,21 +330,21 @@ $(TARGET)-objs := $(patsubst %,%/built-in.o, $(objs-y))
$(TARGET)-libs := $(patsubst %,%/lib.a, $(libs-y))
$(TARGET)-all := $($(TARGET)-objs) $($(TARGET)-libs)

ifeq ($(APP_NAME),rv1126_azure_gui)
AZURE_THREADX_LDS=$(PROJECT_ROOT)/gui/azure/threadx/cortex_a7/asm/sample_threadx.ld

# 在预先链接的$(TARGET)上执行modpost。最终链接的$(TARGET)根据链接器脚本重命名了相关部分
quiet_cmd_$(TARGET) = LD $@
cmd_$(TARGET) = $(CXX) $(LDFLAGS) -o $@ -T $(AZURE_THREADX_LDS) -e Vectors \
-Wl,--start-group $($(TARGET)-libs) $($(TARGET)-objs) $(USER_LINK_LIB) $(USER_PTH_RT_LIB) -Wl,--end-group
# -Wl,-wrap,malloc,-wrap,free,-wrap,realloc,--start-group $($(TARGET)-libs) $($(TARGET)-objs) $(USER_LINK_LIB) $(USER_PTH_RT_LIB) -Wl,--end-group
else
# ifeq ($(APP_NAME),rv1126_azure_gui)
# AZURE_THREADX_LDS=$(PROJECT_ROOT)/gui/azure/threadx/cortex_a7/asm/sample_threadx.ld

# # 在预先链接的$(TARGET)上执行modpost。最终链接的$(TARGET)根据链接器脚本重命名了相关部分
# quiet_cmd_$(TARGET) = LD $@
# cmd_$(TARGET) = $(CXX) $(LDFLAGS) -o $@ -T $(AZURE_THREADX_LDS) -e Vectors \
# -Wl,--start-group $($(TARGET)-libs) $($(TARGET)-objs) $(USER_LINK_LIB) $(USER_PTH_RT_LIB) -Wl,--end-group
# # -Wl,-wrap,malloc,-wrap,free,-wrap,realloc,--start-group $($(TARGET)-libs) $($(TARGET)-objs) $(USER_LINK_LIB) $(USER_PTH_RT_LIB) -Wl,--end-group
# else
# 在预先链接的$(TARGET)上执行modpost。最终链接的$(TARGET)根据链接器脚本重命名了相关部分
quiet_cmd_$(TARGET) = LD $@
cmd_$(TARGET) = $(CXX) $(LDFLAGS) -o $@ \
-Wl,--start-group $($(TARGET)-libs) $($(TARGET)-objs) $(USER_LINK_LIB) $(USER_PTH_RT_LIB) -Wl,--end-group
# -Wl,-wrap,malloc,-wrap,free,-wrap,realloc,--start-group $($(TARGET)-libs) $($(TARGET)-objs) $(USER_LINK_LIB) $(USER_PTH_RT_LIB) -Wl,--end-group
endif
# endif

# 最终生成目标文件
$(TARGET): $($(TARGET)-all) FORCE
Expand Down
2 changes: 1 addition & 1 deletion project/gui/azure/threadx/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
obj-$(CONFIG_CORTEX_A7) += cortex_a7/
obj-$(CONFIG_CORTEX_A7) += cortex_a7c/
obj-$(CONFIG_LINUX_GNU) += linux_gnu/

obj-y += source/
4 changes: 2 additions & 2 deletions project/gui/azure/threadx/tx_port.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <linux/kconfig.h>

#if defined(CONFIG_CORTEX_A7)
#include "port/tx_cortex_a7_port.h"
//#include "port/tx_linux_gnu_port.h"
//#include "port/tx_cortex_a7_port.h"
#include "port/tx_linux_gnu_port.h"
#elif defined(CONFIG_LINUX_GNU)
#include "port/tx_linux_gnu_port.h"
#endif
Expand Down

0 comments on commit 9e04d3f

Please sign in to comment.