diff --git a/Makefile b/Makefile index 24b48c8a7..82fe0ce75 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/project/gui/azure/threadx/Makefile b/project/gui/azure/threadx/Makefile index e271ecf0a..215337a33 100644 --- a/project/gui/azure/threadx/Makefile +++ b/project/gui/azure/threadx/Makefile @@ -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/ diff --git a/project/gui/azure/threadx/cortex_a7/Makefile b/project/gui/azure/threadx/cortex_a7s/Makefile similarity index 100% rename from project/gui/azure/threadx/cortex_a7/Makefile rename to project/gui/azure/threadx/cortex_a7s/Makefile diff --git a/project/gui/azure/threadx/cortex_a7/asm/MP_GIC.S b/project/gui/azure/threadx/cortex_a7s/asm/MP_GIC.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/MP_GIC.S rename to project/gui/azure/threadx/cortex_a7s/asm/MP_GIC.S diff --git a/project/gui/azure/threadx/cortex_a7/asm/MP_GIC.h b/project/gui/azure/threadx/cortex_a7s/asm/MP_GIC.h similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/MP_GIC.h rename to project/gui/azure/threadx/cortex_a7s/asm/MP_GIC.h diff --git a/project/gui/azure/threadx/cortex_a7/asm/MP_Mutexes.S b/project/gui/azure/threadx/cortex_a7s/asm/MP_Mutexes.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/MP_Mutexes.S rename to project/gui/azure/threadx/cortex_a7s/asm/MP_Mutexes.S diff --git a/project/gui/azure/threadx/cortex_a7/asm/MP_Mutexes.h b/project/gui/azure/threadx/cortex_a7s/asm/MP_Mutexes.h similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/MP_Mutexes.h rename to project/gui/azure/threadx/cortex_a7s/asm/MP_Mutexes.h diff --git a/project/gui/azure/threadx/cortex_a7/asm/Makefile b/project/gui/azure/threadx/cortex_a7s/asm/Makefile similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/Makefile rename to project/gui/azure/threadx/cortex_a7s/asm/Makefile diff --git a/project/gui/azure/threadx/cortex_a7/asm/sample_threadx.ld b/project/gui/azure/threadx/cortex_a7s/asm/sample_threadx.ld similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/sample_threadx.ld rename to project/gui/azure/threadx/cortex_a7s/asm/sample_threadx.ld diff --git a/project/gui/azure/threadx/cortex_a7/asm/startup.S b/project/gui/azure/threadx/cortex_a7s/asm/startup.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/startup.S rename to project/gui/azure/threadx/cortex_a7s/asm/startup.S diff --git a/project/gui/azure/threadx/cortex_a7/asm/v7.S b/project/gui/azure/threadx/cortex_a7s/asm/v7.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/v7.S rename to project/gui/azure/threadx/cortex_a7s/asm/v7.S diff --git a/project/gui/azure/threadx/cortex_a7/asm/v7.h b/project/gui/azure/threadx/cortex_a7s/asm/v7.h similarity index 100% rename from project/gui/azure/threadx/cortex_a7/asm/v7.h rename to project/gui/azure/threadx/cortex_a7s/asm/v7.h diff --git a/project/gui/azure/threadx/cortex_a7/tx_initialize_low_level.S b/project/gui/azure/threadx/cortex_a7s/tx_initialize_low_level.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_initialize_low_level.S rename to project/gui/azure/threadx/cortex_a7s/tx_initialize_low_level.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_context_restore.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_context_restore.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_context_restore.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_context_restore.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_context_save.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_context_save.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_context_save.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_context_save.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_interrupt_control.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_interrupt_control.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_interrupt_control.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_interrupt_control.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_interrupt_disable.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_interrupt_disable.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_interrupt_disable.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_interrupt_disable.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_interrupt_restore.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_interrupt_restore.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_interrupt_restore.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_interrupt_restore.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_irq_nesting_end.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_irq_nesting_end.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_irq_nesting_end.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_irq_nesting_end.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_irq_nesting_start.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_irq_nesting_start.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_irq_nesting_start.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_irq_nesting_start.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_schedule.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_schedule.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_schedule.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_schedule.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_core_get.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_core_get.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_core_get.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_core_get.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_core_preempt.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_core_preempt.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_core_preempt.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_core_preempt.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_current_state_get.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_current_state_get.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_current_state_get.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_current_state_get.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_current_thread_get.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_current_thread_get.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_current_thread_get.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_current_thread_get.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_initialize_wait.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_initialize_wait.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_initialize_wait.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_initialize_wait.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_low_level_initialize.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_low_level_initialize.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_low_level_initialize.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_low_level_initialize.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_protect.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_protect.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_protect.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_protect.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_protection_wait_list_macros.h b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_protection_wait_list_macros.h similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_protection_wait_list_macros.h rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_protection_wait_list_macros.h diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_time_get.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_time_get.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_time_get.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_time_get.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_smp_unprotect.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_smp_unprotect.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_smp_unprotect.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_smp_unprotect.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_stack_build.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_stack_build.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_stack_build.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_stack_build.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_system_return.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_system_return.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_system_return.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_system_return.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_thread_vectored_context_save.S b/project/gui/azure/threadx/cortex_a7s/tx_thread_vectored_context_save.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_thread_vectored_context_save.S rename to project/gui/azure/threadx/cortex_a7s/tx_thread_vectored_context_save.S diff --git a/project/gui/azure/threadx/cortex_a7/tx_timer_interrupt.S b/project/gui/azure/threadx/cortex_a7s/tx_timer_interrupt.S similarity index 100% rename from project/gui/azure/threadx/cortex_a7/tx_timer_interrupt.S rename to project/gui/azure/threadx/cortex_a7s/tx_timer_interrupt.S diff --git a/project/gui/azure/threadx/tx_port.h b/project/gui/azure/threadx/tx_port.h index 44aef65ff..20df1a12c 100644 --- a/project/gui/azure/threadx/tx_port.h +++ b/project/gui/azure/threadx/tx_port.h @@ -4,8 +4,8 @@ #include #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