You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by li...@apache.org on 2024/03/04 10:08:21 UTC
(nuttx) branch master updated (3f872807bf -> 91f0a0f1a8)
This is an automated email from the ASF dual-hosted git repository.
ligd pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
from 3f872807bf sh:Change expansion path logic
new b599fdbc0e stm32: fix compile failed
new 91f0a0f1a8 Revert "goldfish & qemu: handle MMU table and CONFIG_RAM_END"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/common/arm_allocateheap.c | 5 -----
arch/arm/src/goldfish/chip.h | 5 +----
arch/arm/src/qemu/chip.h | 5 +----
arch/arm/src/stm32h7/stm32_sdmmc.c | 4 ++--
4 files changed, 4 insertions(+), 15 deletions(-)
(nuttx) 01/02: stm32: fix compile failed
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ligd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit b599fdbc0ea249791e989cf594aaa63c8e21581d
Author: ligd <li...@xiaomi.com>
AuthorDate: Mon Mar 4 13:28:32 2024 +0800
stm32: fix compile failed
Error: chip/stm32_sdmmc.c:1911:7: error: variable 'regaddress' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized]
1911 | if (priv->base == STM32_SDMMC1_BASE)
Signed-off-by: ligd <li...@xiaomi.com>
---
arch/arm/src/stm32h7/stm32_sdmmc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/src/stm32h7/stm32_sdmmc.c b/arch/arm/src/stm32h7/stm32_sdmmc.c
index faf70a42af..fe780234ca 100644
--- a/arch/arm/src/stm32h7/stm32_sdmmc.c
+++ b/arch/arm/src/stm32h7/stm32_sdmmc.c
@@ -1900,8 +1900,8 @@ static void stm32_reset(struct sdio_dev_s *dev)
struct stm32_dev_s *priv = (struct stm32_dev_s *)dev;
irqstate_t flags;
uint32_t regval;
- uint32_t regaddress;
- uint32_t restval;
+ uint32_t regaddress = 0;
+ uint32_t restval = 0;
/* Disable clocking */
(nuttx) 02/02: Revert "goldfish & qemu: handle MMU table and CONFIG_RAM_END"
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ligd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 91f0a0f1a8cf33588411f68c738a855c8f988c71
Author: ligd <li...@xiaomi.com>
AuthorDate: Mon Mar 4 15:55:58 2024 +0800
Revert "goldfish & qemu: handle MMU table and CONFIG_RAM_END"
This reverts commit 2f7b1076082707bd729f01268b095e44d51e2c33.
Signed-off-by: ligd <li...@xiaomi.com>
---
arch/arm/src/common/arm_allocateheap.c | 5 -----
arch/arm/src/goldfish/chip.h | 5 +----
arch/arm/src/qemu/chip.h | 5 +----
3 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/arch/arm/src/common/arm_allocateheap.c b/arch/arm/src/common/arm_allocateheap.c
index 59189157b9..ef28edc828 100644
--- a/arch/arm/src/common/arm_allocateheap.c
+++ b/arch/arm/src/common/arm_allocateheap.c
@@ -36,11 +36,6 @@
#include <arch/board/board.h>
#include "arm_internal.h"
-#include "chip.h"
-
-#ifdef CONFIG_ARCH_HAVE_MMU
-#include "mmu.h"
-#endif
/****************************************************************************
* Pre-processor Definitions
diff --git a/arch/arm/src/goldfish/chip.h b/arch/arm/src/goldfish/chip.h
index dad6b7b5cc..355e3b37d6 100644
--- a/arch/arm/src/goldfish/chip.h
+++ b/arch/arm/src/goldfish/chip.h
@@ -38,9 +38,6 @@
#define PGTABLE_BASE_PADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - ALL_PGTABLE_SIZE)
#define PGTABLE_BASE_VADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - ALL_PGTABLE_SIZE)
-#undef CONFIG_RAM_END
-#define CONFIG_RAM_END PGTABLE_BASE_PADDR
-
#define NUTTX_TEXT_VADDR (CONFIG_FLASH_VSTART & 0xfff00000)
#define NUTTX_TEXT_PADDR (CONFIG_FLASH_VSTART & 0xfff00000)
#define NUTTX_TEXT_PEND ((CONFIG_FLASH_END + 0x000fffff) & 0xfff00000)
@@ -48,7 +45,7 @@
#define NUTTX_RAM_VADDR (CONFIG_RAM_VSTART & 0xfff00000)
#define NUTTX_RAM_PADDR (CONFIG_RAM_START & 0xfff00000)
-#define NUTTX_RAM_PEND ((CONFIG_RAM_START + CONFIG_RAM_SIZE + 0x000fffff) & 0xfff00000)
+#define NUTTX_RAM_PEND ((CONFIG_RAM_END + 0x000fffff) & 0xfff00000)
#define NUTTX_RAM_SIZE (NUTTX_RAM_PEND - NUTTX_RAM_PADDR)
/****************************************************************************
diff --git a/arch/arm/src/qemu/chip.h b/arch/arm/src/qemu/chip.h
index 026a88c816..fe581e329d 100644
--- a/arch/arm/src/qemu/chip.h
+++ b/arch/arm/src/qemu/chip.h
@@ -38,9 +38,6 @@
#define PGTABLE_BASE_PADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - ALL_PGTABLE_SIZE)
#define PGTABLE_BASE_VADDR (CONFIG_RAM_START + CONFIG_RAM_SIZE - ALL_PGTABLE_SIZE)
-#undef CONFIG_RAM_END
-#define CONFIG_RAM_END PGTABLE_BASE_PADDR
-
#define NUTTX_TEXT_VADDR (CONFIG_FLASH_VSTART & 0xfff00000)
#define NUTTX_TEXT_PADDR (CONFIG_FLASH_VSTART & 0xfff00000)
#define NUTTX_TEXT_PEND ((CONFIG_FLASH_END + 0x000fffff) & 0xfff00000)
@@ -48,7 +45,7 @@
#define NUTTX_RAM_VADDR (CONFIG_RAM_VSTART & 0xfff00000)
#define NUTTX_RAM_PADDR (CONFIG_RAM_START & 0xfff00000)
-#define NUTTX_RAM_PEND ((CONFIG_RAM_START + CONFIG_RAM_SIZE + 0x000fffff) & 0xfff00000)
+#define NUTTX_RAM_PEND ((CONFIG_RAM_END + 0x000fffff) & 0xfff00000)
#define NUTTX_RAM_SIZE (NUTTX_RAM_PEND - NUTTX_RAM_PADDR)
/****************************************************************************