Kconfig: QEMU fixes

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5116 42af7a65-404d-4744-a932-0658087f49c3

7 files changed, 16 insertions, 8 deletions

diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig
index 0c124b242..92890be96 100644
--- a/nuttx/arch/Kconfig
+++ b/nuttx/arch/Kconfig
@@ -143,7 +143,7 @@ config DRAM_SIZE
 comment "Boot options"
 
 choice
-	prompt "LPC31xx Boot Mode"
+	prompt "Boot Mode"
 	default BOOT_RUNFROMFLASH
 
 config BOOT_RUNFROMEXTSRAM
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig
index 77c691cfc..f8470bc94 100644
--- a/nuttx/configs/Kconfig
+++ b/nuttx/configs/Kconfig
@@ -367,7 +367,7 @@ config ARCH_BOARD_PJRC_87C52
 
 config ARCH_BOARD_QEMU_I486
 	bool "Qemu i486 Mode"
-	depends on ARCH_QEMU
+	depends on ARCH_X86 || ARCH_I486
 	---help---
 		Port of NuttX to QEMU in i486 mode.  This port will also run on real i486
 		hardwared (Google the Bifferboard).
diff --git a/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig
index e514da1f4..8fb1fff89 100644
--- a/nuttx/configs/qemu-i486/nsh/defconfig
+++ b/nuttx/configs/qemu-i486/nsh/defconfig
@@ -43,6 +43,7 @@ CONFIG_ARCH_CHIP_QEMU=y
 CONFIG_ARCH_BOARD="qemu-i486"
 CONFIG_ARCH_BOARD_QEMU_I486=y
 CONFIG_BOARD_LOOPSPERMSEC=999
+CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_DRAM_SIZE=1048576
 CONFIG_DRAM_START=0x00100000
 CONFIG_ARCH_NOINTC=n
diff --git a/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig
index 52b8ae80c..0fa5f5cb6 100644
--- a/nuttx/configs/qemu-i486/ostest/defconfig
+++ b/nuttx/configs/qemu-i486/ostest/defconfig
@@ -43,6 +43,7 @@ CONFIG_ARCH_CHIP_QEMU=y
 CONFIG_ARCH_BOARD="qemu-i486"
 CONFIG_ARCH_BOARD_QEMU_I486=y
 CONFIG_BOARD_LOOPSPERMSEC=999
+CONFIG_BOOT_RUNFROMEXTSRAM=y
 CONFIG_DRAM_SIZE=1048576
 CONFIG_DRAM_START=0x00100000
 CONFIG_ARCH_NOINTC=n
diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs
index dd3db80de..130c73f6d 100644
--- a/nuttx/configs/shenzhou/nsh/Make.defs
+++ b/nuttx/configs/shenzhou/nsh/Make.defs
@@ -88,7 +88,13 @@ ifeq ($(CONFIG_STM32_BUILDROOT),y)
   MAXOPTIMIZATION = -Os
 endif
 
-LDSCRIPT = ld.script
+# Pick the linker script
+
+ifeq ($(CONFIG_STM32_DFU),y)
+  LDSCRIPT = ld.script.dfu
+else
+  LDSCRIPT = ld.script
+endif
 
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
diff --git a/nuttx/configs/shenzhou/scripts/ld.script b/nuttx/configs/shenzhou/scripts/ld.script
index fc4dfbd6b..14f924bae 100644
--- a/nuttx/configs/shenzhou/scripts/ld.script
+++ b/nuttx/configs/shenzhou/scripts/ld.script
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-/* The STM32F107VC has 256Kb of FLASH beginning at address 0x0800:0000 and
- * 64Kb of SRAM beginning at address 0x2000:0000.
+/* The STM32F107VC has 256K of FLASH beginning at address 0x0800:0000 and
+ * 64K of SRAM beginning at address 0x2000:0000.
  */
 
 MEMORY
diff --git a/nuttx/configs/shenzhou/scripts/ld.script.dfu b/nuttx/configs/shenzhou/scripts/ld.script.dfu
index 80494bc7b..53e3ee4fc 100644
--- a/nuttx/configs/shenzhou/scripts/ld.script.dfu
+++ b/nuttx/configs/shenzhou/scripts/ld.script.dfu
@@ -33,10 +33,10 @@
  *
  ****************************************************************************/
 
-/* The STM32F107VC has 256Kb of FLASH beginning at address 0x0800:0000 and
- * 64Kb of SRAM beginning at address 0x2000:0000.  Here we assume that the
+/* The STM32F107VC has 256K of FLASH beginning at address 0x0800:0000 and
+ * 64K of SRAM beginning at address 0x2000:0000.  Here we assume that the
  * STMicro DFU bootloader is being used.  In that case, the corrct load .text
- * load address is 0x08003000 (leaving 464Kb).
+ * load address is 0x08003000 (leaving 208K).
  */
 
 MEMORY