Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add option to indicatet that data is retained in SDRAM

Browse Source
This commit is contained in:
Gregory Nutt
2014-01-28 10:42:49 -06:00
parent 03d8a4700e
commit 9f46dac1e2
15 changed files with 71 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/Kconfig
+20
View File
@@ -139,6 +139,11 @@ config ARCH_HAVE_VFORK
config ARCH_HAVE_MMU config ARCH_HAVE_MMU
bool bool
default n
config ARCH_NAND_HWECC
bool
default n
config ARCH_IRQPRIO config ARCH_IRQPRIO
bool "Prioritized interrupt support" bool "Prioritized interrupt support"
@@ -428,4 +433,19 @@ config FLASH_SIZE
refers to the FLASH that you link program code into. refers to the FLASH that you link program code into.
endif # BOOT_RUNFROMFLASH && ARCH_HAVE_MMU endif # BOOT_RUNFROMFLASH && ARCH_HAVE_MMU
config ARCH_HAVE_SDRAM
bool
default n
config BOOT_SDRAM_DATA
bool "Data in SDRAM"
default n
depends on ARCH_HAVE_SDRAM
---help---
This selection should be set if data lies in SDRAM (vs. SRAM). In
that case, the initialization sequence is a little different: SDRAM
must be configured before before the .data and .bss sections can be
initialized.
endmenu # Boot Memory Configuration endmenu # Boot Memory Configuration
arch/arm/Kconfig
+1
View File
@@ -16,6 +16,7 @@ config ARCH_CHIP_A1X
select ARCH_HAVE_FPU select ARCH_HAVE_FPU
select ARCH_HAVE_MMU select ARCH_HAVE_MMU
select ARCH_HAVE_LOWVECTORS select ARCH_HAVE_LOWVECTORS
select ARCH_HAVE_SDRAM
select BOOT_RUNFROMSDRAM select BOOT_RUNFROMSDRAM
---help--- ---help---
Allwinner A1X family: A10, A10S (A12), A13 (ARM Cortex-A8) Allwinner A1X family: A10, A10S (A12), A13 (ARM Cortex-A8)
arch/arm/src/lpc17xx/Kconfig
+1
View File
@@ -374,6 +374,7 @@ config LPC17_EXTDRAM
bool "Configure external DRAM" bool "Configure external DRAM"
default n default n
depends on ARCH_HAVE_EXTDRAM depends on ARCH_HAVE_EXTDRAM
select ARCH_HAVE_SDRAM
---help--- ---help---
Configure external DRAM memory and, if applicable, map then external Configure external DRAM memory and, if applicable, map then external
DRAM into the memory map. DRAM into the memory map.
arch/arm/src/lpc31xx/Kconfig
+1
View File
@@ -104,6 +104,7 @@ config LPC31_EXTDRAM
bool "Configure external DRAM" bool "Configure external DRAM"
default n default n
depends on ARCH_HAVE_EXTDRAM depends on ARCH_HAVE_EXTDRAM
select ARCH_HAVE_SDRAM
---help--- ---help---
Configure external DRAM memory and, if applicable, map then external Configure external DRAM memory and, if applicable, map then external
DRAM into the memory map. DRAM into the memory map.
arch/arm/src/sam34/Kconfig
+1
View File
@@ -720,6 +720,7 @@ config SAM34_EXTDRAM
bool "Configure external DRAM" bool "Configure external DRAM"
default n default n
depends on ARCH_HAVE_EXTDRAM depends on ARCH_HAVE_EXTDRAM
select ARCH_HAVE_SDRAM
---help--- ---help---
Configure external DRAM memory and, if applicable, map then external Configure external DRAM memory and, if applicable, map then external
DRAM into the memory map. DRAM into the memory map.
configs/sama5d3x-ek/demo/Make.defs
+5 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/demo/Make.defs # configs/sama5d3x-ek/demo/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,10 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/hello/Make.defs
+6 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/hello/Make.defs # configs/sama5d3x-ek/hello/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/norboot/Make.defs
+6 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/norboot/Make.defs # configs/sama5d3x-ek/norboot/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/nsh/Make.defs
+6 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/nsh/Make.defs # configs/sama5d3x-ek/nsh/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/nx/Make.defs
+6 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/nx/Make.defs # configs/sama5d3x-ek/nx/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/nxwm/Make.defs
+5 -1
View File
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/ostest/Make.defs
+6 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/ostest/Make.defs # configs/sama5d3x-ek/ostest/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/ov2640/Make.defs
+6 -2
View File
@@ -1,7 +1,7 @@
############################################################################ ############################################################################
# configs/sama5d3x-ek/ov2640/Make.defs # configs/sama5d3x-ek/ov2640/Make.defs
# #
# Copyright (C) 2013 Gregory Nutt. All rights reserved. # Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
LDSCRIPT = ddram.ld LDSCRIPT = ddram.ld
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
LDSCRIPT = norflash.ld ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
LDSCRIPT = nor-ddram.ld
else
LDSCRIPT = nor-isram.ld
endif
endif endif
ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y) ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
# LDSCRIPT = cs1flash.ld # LDSCRIPT = cs1flash.ld
configs/sama5d3x-ek/scripts/norflash.ld → configs/sama5d3x-ek/scripts/nor-isram.ld
+1 -1
View File
@@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* configs/sama5d3x-ek/scripts/norflash.ld * configs/sama5d3x-ek/scripts/nor-isram.ld
* *
* Copyright (C) 2013 Gregory Nutt. All rights reserved. * Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
drivers/mtd/Kconfig
-5
View File
@@ -85,11 +85,6 @@ config MTD_CONFIG_ERASEDVALUE
comment "MTD Device Drivers" comment "MTD Device Drivers"
config ARCH_NAND_HWECC
bool
default n
menuconfig MTD_NAND menuconfig MTD_NAND
bool "MTD NAND support" bool "MTD NAND support"
default n default n