Merge pull request #2 from enkiller/dev

解决适配层宏冲突的问题,并添加log
This commit is contained in:
燕十三 2018-10-24 17:57:53 +08:00 committed by GitHub
commit 3e75e46d81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 579 additions and 423 deletions

File diff suppressed because it is too large Load diff

View file

@ -11,6 +11,8 @@
#include "build_info.h" #include "build_info.h"
#include "rtconfig.h" #include "rtconfig.h"
extern int rtthread_startup(void);
void APP_Start(void) void APP_Start(void)
{ {
#if CONFIG_SOC_PS_MODULE #if CONFIG_SOC_PS_MODULE

View file

@ -53,7 +53,7 @@
/* /*
* < CONFIG OS * < CONFIG OS
*/ */
#define CONFIG_KERNEL 1 // #define CONFIG_KERNEL 0
#define PLATFORM_FREERTOS 1 #define PLATFORM_FREERTOS 1
#undef PLATFORM_UCOSII #undef PLATFORM_UCOSII
#undef PLATFORM_ECOS #undef PLATFORM_ECOS

View file

@ -297,6 +297,7 @@ UartLogCmdExecuteRam(
return FALSE; return FALSE;
} }
#ifdef CONFIG_KERNEL
VOID VOID
RtlConsolTaskRam( RtlConsolTaskRam(
@ -361,6 +362,7 @@ RtlConsolTaskRam(
} }
}while(1); }while(1);
} }
#endif
/** /**
* @brief Set UartLog Baud Rate use baudrate val. * @brief Set UartLog Baud Rate use baudrate val.