summaryrefslogtreecommitdiff
path: root/nuttx
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx')
-rw-r--r--nuttx/ChangeLog8
-rw-r--r--nuttx/binfmt/binfmt_execmodule.c4
-rwxr-xr-xnuttx/configs/open1788/knsh/defconfig3
-rw-r--r--nuttx/configs/open1788/nsh/defconfig3
-rw-r--r--nuttx/configs/open1788/scripts/memory.ld3
-rw-r--r--nuttx/configs/sam3u-ek/scripts/memory.ld3
-rw-r--r--nuttx/configs/stm32f4discovery/scripts/memory.ld3
7 files changed, 17 insertions, 10 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 1a855db64..a54bd46b8 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -4434,4 +4434,10 @@
in the kernel build. The original implementation was C-based
and simpler. However, the C code intermixed with SVC calls was
not properly preserving registers. The more complex, assembly
- language version does not suffer from these issues (2013-03-23).
+ language version does not suffer from these issues. I believe
+ the the kernel build can not be called "feature complete"
+ (2013-03-23).
+ * binfmt/binfmt_execmodule.c: Here is a place where I forget
+ to update the call to sched_releasetcb() to pass the thread
+ type as the second parameter (2013-03-23).
+
diff --git a/nuttx/binfmt/binfmt_execmodule.c b/nuttx/binfmt/binfmt_execmodule.c
index 651960267..c98490359 100644
--- a/nuttx/binfmt/binfmt_execmodule.c
+++ b/nuttx/binfmt/binfmt_execmodule.c
@@ -245,10 +245,10 @@ int exec_module(FAR const struct binary_s *binp)
errout_with_stack:
#ifndef CONFIG_CUSTOM_STACK
tcb->cmn.stack_alloc_ptr = NULL;
- sched_releasetcb(&tcb->cmn);
+ sched_releasetcb(&tcb->cmn, TCB_FLAG_TTYPE_TASK);
kufree(stack);
#else
- sched_releasetcb(&tcb->cmn);
+ sched_releasetcb(&tcb->cmn, TCB_FLAG_TTYPE_TASK);
#endif
goto errout;
diff --git a/nuttx/configs/open1788/knsh/defconfig b/nuttx/configs/open1788/knsh/defconfig
index addfd82ad..291740f8e 100755
--- a/nuttx/configs/open1788/knsh/defconfig
+++ b/nuttx/configs/open1788/knsh/defconfig
@@ -191,8 +191,7 @@ CONFIG_LPC17_GPDMA=y
#
# SDIO Configuration
#
-# CONFIG_SDIO_DMA=y
-CONFIG_SDIO_DMAPRIO=0x0
+# CONFIG_SDIO_DMA is not defined
# CONFIG_SDIO_WIDTH_D1_ONLY is not set
#
diff --git a/nuttx/configs/open1788/nsh/defconfig b/nuttx/configs/open1788/nsh/defconfig
index d4139111a..27ae85829 100644
--- a/nuttx/configs/open1788/nsh/defconfig
+++ b/nuttx/configs/open1788/nsh/defconfig
@@ -185,8 +185,7 @@ CONFIG_LPC17_GPDMA=y
#
# SDIO Configuration
#
-# CONFIG_SDIO_DMA=y
-CONFIG_SDIO_DMAPRIO=0x0
+# CONFIG_SDIO_DMA is not defined
# CONFIG_SDIO_WIDTH_D1_ONLY is not set
#
diff --git a/nuttx/configs/open1788/scripts/memory.ld b/nuttx/configs/open1788/scripts/memory.ld
index 690c7d3d6..33f93a195 100644
--- a/nuttx/configs/open1788/scripts/memory.ld
+++ b/nuttx/configs/open1788/scripts/memory.ld
@@ -57,7 +57,8 @@
*
* For the same reasons, the maximum size of the SRAM mapping is limited to
* 4KB. Both of these alignment limitations could be reduced by using
- * multiple regions to map the FLASH/SDRAM range.
+ * multiple regions to map the FLASH/SDRAM range or perhaps with some
+ * clever use of subregions.
*
* A detailed memory map for the 64KB CPU SRAM region is as follows:
*
diff --git a/nuttx/configs/sam3u-ek/scripts/memory.ld b/nuttx/configs/sam3u-ek/scripts/memory.ld
index 43fca9478..c99a31146 100644
--- a/nuttx/configs/sam3u-ek/scripts/memory.ld
+++ b/nuttx/configs/sam3u-ek/scripts/memory.ld
@@ -58,7 +58,8 @@
*
* For the same reasons, the maximum size of the SRAM mapping is limited to
* 4KB. Both of these alignment limitations could be reduced by using
- * multiple regions to map the FLASH/SDRAM range.
+ * multiple regions to map the FLASH/SDRAM range or perhaps with some
+ * clever use of subregions.
*
* A detailed memory map for the 16Kb SRAM region is as follows:
*
diff --git a/nuttx/configs/stm32f4discovery/scripts/memory.ld b/nuttx/configs/stm32f4discovery/scripts/memory.ld
index 0cf99ef96..ffe8054db 100644
--- a/nuttx/configs/stm32f4discovery/scripts/memory.ld
+++ b/nuttx/configs/stm32f4discovery/scripts/memory.ld
@@ -65,7 +65,8 @@
*
* For the same reasons, the maximum size of the SRAM mapping is limited to
* 4KB. Both of these alignment limitations could be reduced by using
- * multiple regions to map the FLASH/SDRAM range.
+ * multiple regions to map the FLASH/SDRAM range or perhaps with some
+ * clever use of subregions.
*
* A detailed memory map for the 112KB SRAM region is as follows:
*