You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by ac...@apache.org on 2020/02/18 13:26:28 UTC
[incubator-nuttx] branch pr296 updated: arch: Move iob_initialize
into nx_start just after heap initialization
This is an automated email from the ASF dual-hosted git repository.
acassis pushed a commit to branch pr296
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/pr296 by this push:
new 6b77f73 arch: Move iob_initialize into nx_start just after heap initialization
6b77f73 is described below
commit 6b77f73583d113330843a5f9d32a1002ea9f9e8f
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Tue Feb 18 01:08:08 2020 +0800
arch: Move iob_initialize into nx_start just after heap initialization
it doesn't make sense that iob initialization is in up_initialize
but other memory components initialization is called in nx_start
Change-Id: Id43aeaa995f340c5943f59a0067a483ff3ac34a2
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/arm/src/common/up_initialize.c | 7 -------
arch/avr/src/common/up_initialize.c | 7 -------
arch/hc/src/common/up_initialize.c | 7 -------
arch/mips/src/common/up_initialize.c | 7 -------
arch/misoc/src/lm32/lm32_initialize.c | 7 -------
arch/misoc/src/minerva/minerva_initialize.c | 7 -------
arch/or1k/src/common/up_initialize.c | 7 -------
arch/renesas/src/common/up_initialize.c | 7 -------
arch/risc-v/src/common/up_initialize.c | 7 -------
arch/sim/src/sim/up_initialize.c | 7 -------
arch/x86/src/common/up_initialize.c | 7 -------
arch/xtensa/src/common/xtensa_initialize.c | 7 -------
arch/z16/src/common/up_initialize.c | 7 -------
arch/z80/src/common/up_initialize.c | 7 -------
sched/init/nx_start.c | 7 +++++++
15 files changed, 7 insertions(+), 98 deletions(-)
diff --git a/arch/arm/src/common/up_initialize.c b/arch/arm/src/common/up_initialize.c
index 7d307be..5056480 100644
--- a/arch/arm/src/common/up_initialize.c
+++ b/arch/arm/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -150,12 +149,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/avr/src/common/up_initialize.c b/arch/avr/src/common/up_initialize.c
index 412d5f7..04a5958 100644
--- a/arch/avr/src/common/up_initialize.c
+++ b/arch/avr/src/common/up_initialize.c
@@ -43,7 +43,6 @@
#include <nuttx/arch.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -191,12 +190,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/hc/src/common/up_initialize.c b/arch/hc/src/common/up_initialize.c
index 06ed076..e2f7f92 100644
--- a/arch/hc/src/common/up_initialize.c
+++ b/arch/hc/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -113,12 +112,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/mips/src/common/up_initialize.c b/arch/mips/src/common/up_initialize.c
index 25c4a17..dc98820 100644
--- a/arch/mips/src/common/up_initialize.c
+++ b/arch/mips/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -115,12 +114,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/misoc/src/lm32/lm32_initialize.c b/arch/misoc/src/lm32/lm32_initialize.c
index 9e00ebf..aea7dba 100644
--- a/arch/misoc/src/lm32/lm32_initialize.c
+++ b/arch/misoc/src/lm32/lm32_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -75,12 +74,6 @@ void up_initialize(void)
rpmsg_serialinit();
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
#if 0 /* REVISIT */
/* Initialize the network cores */
diff --git a/arch/misoc/src/minerva/minerva_initialize.c b/arch/misoc/src/minerva/minerva_initialize.c
index 1bf7849..14d2d89 100644
--- a/arch/misoc/src/minerva/minerva_initialize.c
+++ b/arch/misoc/src/minerva/minerva_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -75,12 +74,6 @@ void up_initialize(void)
rpmsg_serialinit();
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Initialize the network cores */
#ifdef CONFIG_MISOC_ETHERNET
diff --git a/arch/or1k/src/common/up_initialize.c b/arch/or1k/src/common/up_initialize.c
index 0014302..def37ab 100644
--- a/arch/or1k/src/common/up_initialize.c
+++ b/arch/or1k/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -208,12 +207,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/renesas/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
index 803daa7..ad0ae69 100644
--- a/arch/renesas/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -96,12 +95,6 @@ void up_initialize(void)
up_pminitialize();
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/risc-v/src/common/up_initialize.c b/arch/risc-v/src/common/up_initialize.c
index 5c25e5b..3dc6bd0 100644
--- a/arch/risc-v/src/common/up_initialize.c
+++ b/arch/risc-v/src/common/up_initialize.c
@@ -43,7 +43,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/serial/pty.h>
#include <nuttx/syslog/syslog.h>
#include <nuttx/drivers/drivers.h>
@@ -114,12 +113,6 @@ void up_initialize(void)
up_addregion();
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/sim/src/sim/up_initialize.c b/arch/sim/src/sim/up_initialize.c
index bbd1122..0f52405 100644
--- a/arch/sim/src/sim/up_initialize.c
+++ b/arch/sim/src/sim/up_initialize.c
@@ -43,7 +43,6 @@
#include <nuttx/arch.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/fs/ioctl.h>
@@ -192,12 +191,6 @@ void up_initialize(void)
pm_initialize();
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/x86/src/common/up_initialize.c b/arch/x86/src/common/up_initialize.c
index 81fcd7f..2573373 100644
--- a/arch/x86/src/common/up_initialize.c
+++ b/arch/x86/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -115,12 +114,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/xtensa/src/common/xtensa_initialize.c b/arch/xtensa/src/common/xtensa_initialize.c
index 8f4183e..f276284 100644
--- a/arch/xtensa/src/common/xtensa_initialize.c
+++ b/arch/xtensa/src/common/xtensa_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -123,12 +122,6 @@ void up_initialize(void)
}
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/z16/src/common/up_initialize.c b/arch/z16/src/common/up_initialize.c
index 605693b..dca43d6 100644
--- a/arch/z16/src/common/up_initialize.c
+++ b/arch/z16/src/common/up_initialize.c
@@ -44,7 +44,6 @@
#include <nuttx/arch.h>
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -115,12 +114,6 @@ void up_initialize(void)
up_pminitialize();
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/arch/z80/src/common/up_initialize.c b/arch/z80/src/common/up_initialize.c
index 80637d7..dbde260 100644
--- a/arch/z80/src/common/up_initialize.c
+++ b/arch/z80/src/common/up_initialize.c
@@ -45,7 +45,6 @@
#include <nuttx/board.h>
#include <nuttx/sched_note.h>
#include <nuttx/mm/mm.h>
-#include <nuttx/mm/iob.h>
#include <nuttx/drivers/drivers.h>
#include <nuttx/fs/loop.h>
#include <nuttx/net/loopback.h>
@@ -114,12 +113,6 @@ void up_initialize(void)
z80_mmu_initialize();
#endif
-#ifdef CONFIG_MM_IOB
- /* Initialize IO buffering */
-
- iob_initialize();
-#endif
-
/* Register devices */
#if defined(CONFIG_DEV_NULL)
diff --git a/sched/init/nx_start.c b/sched/init/nx_start.c
index 0117fb3..8992cd5 100644
--- a/sched/init/nx_start.c
+++ b/sched/init/nx_start.c
@@ -51,6 +51,7 @@
#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
#include <nuttx/lib/lib.h>
+#include <nuttx/mm/iob.h>
#include <nuttx/mm/mm.h>
#include <nuttx/mm/shm.h>
#include <nuttx/kmalloc.h>
@@ -610,6 +611,12 @@ void nx_start(void)
}
#endif
+#ifdef CONFIG_MM_IOB
+ /* Initialize IO buffering */
+
+ iob_initialize();
+#endif
+
/* The memory manager is available */
g_nx_initstate = OSINIT_MEMORY;