From 5a0fea69877922bf6e06b7da0abfbf128b8b842c Mon Sep 17 00:00:00 2001 From: "Man, Jianting (Meco)" <920369182@qq.com> Date: Tue, 25 Jan 2022 02:00:47 -0500 Subject: [PATCH] =?UTF-8?q?[Kconfig][libcpu]=20=E5=A2=9E=E5=8A=A0ARCH=5FCP?= =?UTF-8?q?U=5FBIG=5FENDIAN=20(#5547)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cpu] 增加ARCH_CPU_BIG_ENDIAN - 之前RT_USING_BIG_ENDIAN的命名并不合理,予以替换为ARCH_CPU_BIG_ENDIAN - 删除一处多余的ARCH_CPU_64BIT - 整理了libcpu/Kconfig的格式 * [libcpu][Kconfig] Cortex-M4&7 select ARCH_ARM_CORTEX_FPU * revert last commit --- components/net/lwip-1.4.1/src/arch/include/arch/cc.h | 4 ++-- components/net/lwip-2.0.3/src/arch/include/arch/cc.h | 4 ++-- components/net/lwip-2.1.2/src/arch/include/arch/cc.h | 4 ++-- libcpu/Kconfig | 8 ++++---- src/Kconfig | 4 ---- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h index 50248b9863..4679777257 100644 --- a/components/net/lwip-1.4.1/src/arch/include/arch/cc.h +++ b/components/net/lwip-1.4.1/src/arch/include/arch/cc.h @@ -41,11 +41,11 @@ #include #ifndef BYTE_ORDER -#ifdef RT_USING_BIG_ENDIAN +#ifdef ARCH_CPU_BIG_ENDIAN #define BYTE_ORDER BIG_ENDIAN #else #define BYTE_ORDER LITTLE_ENDIAN -#endif /* RT_USING_BIG_ENDIAN */ +#endif /* ARCH_CPU_BIG_ENDIAN */ #endif /* BYTE_ORDER */ typedef uint8_t u8_t; diff --git a/components/net/lwip-2.0.3/src/arch/include/arch/cc.h b/components/net/lwip-2.0.3/src/arch/include/arch/cc.h index be5d406f50..ad029e8999 100644 --- a/components/net/lwip-2.0.3/src/arch/include/arch/cc.h +++ b/components/net/lwip-2.0.3/src/arch/include/arch/cc.h @@ -40,11 +40,11 @@ #include #ifndef BYTE_ORDER -#ifdef RT_USING_BIG_ENDIAN +#ifdef ARCH_CPU_BIG_ENDIAN #define BYTE_ORDER BIG_ENDIAN #else #define BYTE_ORDER LITTLE_ENDIAN -#endif /* RT_USING_BIG_ENDIAN */ +#endif /* ARCH_CPU_BIG_ENDIAN */ #endif /* BYTE_ORDER */ #define U16_F "hu" diff --git a/components/net/lwip-2.1.2/src/arch/include/arch/cc.h b/components/net/lwip-2.1.2/src/arch/include/arch/cc.h index ea201be28a..e54b0a7ae7 100644 --- a/components/net/lwip-2.1.2/src/arch/include/arch/cc.h +++ b/components/net/lwip-2.1.2/src/arch/include/arch/cc.h @@ -40,11 +40,11 @@ #include #ifndef BYTE_ORDER -#ifdef RT_USING_BIG_ENDIAN +#ifdef ARCH_CPU_BIG_ENDIAN #define BYTE_ORDER BIG_ENDIAN #else #define BYTE_ORDER LITTLE_ENDIAN -#endif /* RT_USING_BIG_ENDIAN */ +#endif /* ARCH_CPU_BIG_ENDIAN */ #endif /* BYTE_ORDER */ #define U16_F "hu" diff --git a/libcpu/Kconfig b/libcpu/Kconfig index d0fa40d1bd..9e6acdf70e 100644 --- a/libcpu/Kconfig +++ b/libcpu/Kconfig @@ -1,6 +1,9 @@ config ARCH_CPU_64BIT bool +config ARCH_CPU_BIG_ENDIAN + bool + config ARCH_ARM bool @@ -101,10 +104,7 @@ config ARCH_MIPS config ARCH_MIPS64 bool - select ARCH_CPU_64BIT - -config ARCH_CPU_64BIT - bool + select ARCH_CPU_64BIT config ARCH_MIPS_XBURST bool diff --git a/src/Kconfig b/src/Kconfig index 69edd20641..6dc73bc400 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -8,10 +8,6 @@ config RT_NAME_MAX Each kernel object, such as thread, timer, semaphore etc, has a name, the RT_NAME_MAX is the maximal size of this object name. -config RT_USING_BIG_ENDIAN - bool - default n - config RT_USING_ARCH_DATA_TYPE bool "Use the data types defined in ARCH_CPU" default n