From 7baeaf0b49592a9f1878819f2a3f8a6451270f75 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 8 Sep 2012 18:57:57 +0000 Subject: [PATCH] Kconfig: QEMU fixes git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5116 42af7a65-404d-4744-a932-0658087f49c3 --- configs/Kconfig | 2 +- configs/qemu-i486/nsh/defconfig | 1 + configs/qemu-i486/ostest/defconfig | 1 + configs/shenzhou/nsh/Make.defs | 8 +++++++- configs/shenzhou/scripts/ld.script | 4 ++-- configs/shenzhou/scripts/ld.script.dfu | 6 +++--- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/configs/Kconfig b/configs/Kconfig index 77c691cfca..f8470bc948 100644 --- a/configs/Kconfig +++ b/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/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig index e514da1f42..8fb1fff89f 100644 --- a/configs/qemu-i486/nsh/defconfig +++ b/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/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig index 52b8ae80cb..0fa5f5cb6d 100644 --- a/configs/qemu-i486/ostest/defconfig +++ b/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/configs/shenzhou/nsh/Make.defs b/configs/shenzhou/nsh/Make.defs index dd3db80dea..130c73f6de 100644 --- a/configs/shenzhou/nsh/Make.defs +++ b/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/configs/shenzhou/scripts/ld.script b/configs/shenzhou/scripts/ld.script index fc4dfbd6b7..14f924baec 100644 --- a/configs/shenzhou/scripts/ld.script +++ b/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/configs/shenzhou/scripts/ld.script.dfu b/configs/shenzhou/scripts/ld.script.dfu index 80494bc7b0..53e3ee4fca 100644 --- a/configs/shenzhou/scripts/ld.script.dfu +++ b/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