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 955ba1e commit 6e172da
Show file tree
Hide file tree
Showing 53 changed files with 29 additions and 19 deletions.
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -330,11 +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
# 在预先链接的$(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

# 最终生成目标文件
$(TARGET): $($(TARGET)-all) FORCE
Expand Down
17 changes: 12 additions & 5 deletions project/gui/azure/threadx/cortex_a7/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
obj-y += asm/

obj-y += tx_initialize_low_level.o
obj-y += tx_thread_context_restore.o
obj-y += tx_thread_stack_build.o
obj-y += tx_thread_schedule.o
obj-y += tx_thread_system_return.o
obj-y += tx_thread_context_save.o
obj-y += tx_thread_context_restore.o
obj-y += tx_thread_interrupt_control.o
obj-y += tx_thread_schedule.o
obj-y += tx_timer_interrupt.o
obj-y += tx_thread_interrupt_disable.o
obj-y += tx_thread_interrupt_restore.o
obj-y += tx_thread_irq_nesting_end.o
obj-y += tx_thread_irq_nesting_start.o
obj-y += tx_thread_vectored_context_save.o
obj-y += tx_thread_smp_core_get.o
obj-y += tx_thread_smp_core_preempt.o
obj-y += tx_thread_smp_current_state_get.o
Expand All @@ -12,6 +22,3 @@ obj-y += tx_thread_smp_low_level_initialize.o
obj-y += tx_thread_smp_protect.o
obj-y += tx_thread_smp_time_get.o
obj-y += tx_thread_smp_unprotect.o
obj-y += tx_thread_stack_build.o
obj-y += tx_thread_system_return.o
obj-y += tx_timer_interrupt.o
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
obj-y += asm/

obj-y += tx_initialize_low_level.o
obj-y += tx_thread_stack_build.o
obj-y += tx_thread_schedule.o
obj-y += tx_thread_system_return.o
obj-y += tx_thread_context_save.o
obj-y += tx_thread_context_restore.o
obj-y += tx_thread_context_save.o
obj-y += tx_thread_interrupt_control.o
obj-y += tx_timer_interrupt.o
obj-y += tx_thread_interrupt_disable.o
obj-y += tx_thread_interrupt_restore.o
obj-y += tx_thread_irq_nesting_end.o
obj-y += tx_thread_irq_nesting_start.o
obj-y += tx_thread_vectored_context_save.o
obj-y += tx_thread_schedule.o
obj-y += tx_thread_smp_core_get.o
obj-y += tx_thread_smp_core_preempt.o
obj-y += tx_thread_smp_current_state_get.o
Expand All @@ -22,3 +12,6 @@ obj-y += tx_thread_smp_low_level_initialize.o
obj-y += tx_thread_smp_protect.o
obj-y += tx_thread_smp_time_get.o
obj-y += tx_thread_smp_unprotect.o
obj-y += tx_thread_stack_build.o
obj-y += tx_thread_system_return.o
obj-y += tx_timer_interrupt.o
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 6e172da

Please sign in to comment.