summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-01-22 20:15:04 +0800
committerSascha Hauer <s.hauer@pengutronix.de>2013-01-31 19:13:09 +0100
commit41d337174129b8f2d4516b4cdf8ad6e3df21613b (patch)
tree8965e9b9b4b202ccba4ad176a1045867e071a9ae /arch
parent7e30422d72897f524194570544c65306e3a58279 (diff)
downloadbarebox-41d337174129b8f2d4516b4cdf8ad6e3df21613b.tar.gz
barebox-41d337174129b8f2d4516b4cdf8ad6e3df21613b.tar.xz
at91: introduce AT91_LOAD_BAREBOX_SRAM to specifcy which size load for external boot
Some SoC as sam9261 or sam9263 have enough sram to directly load a barebox from external boot. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-at91/Kconfig11
-rw-r--r--arch/arm/mach-at91/include/mach/barebox-arm-head.h2
2 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index dad448cd47..d7939c3518 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -70,6 +70,9 @@ config AT91SAM9_RESET
config AT91SAM9G45_RESET
bool
+config HAVE_AT91_LOAD_BAREBOX_SRAM
+ bool
+
config AT91SAM9_LOWLEVEL_INIT
bool
@@ -109,6 +112,7 @@ config SOC_AT91SAM9263
select HAS_MACB
select AT91SAM9_RESET
select AT91SAM9_LOWLEVEL_INIT
+ select HAVE_AT91_LOAD_BAREBOX_SRAM
config SOC_AT91SAM9G45
bool
@@ -156,6 +160,7 @@ config ARCH_AT91SAM9260
config ARCH_AT91SAM9261
bool "AT91SAM9261"
select SOC_AT91SAM9261
+ select HAVE_AT91_LOAD_BAREBOX_SRAM
config ARCH_AT91SAM9263
bool "AT91SAM9263"
@@ -560,4 +565,10 @@ config AT91_BOOTSTRAP
depends on MACH_HAS_LOWLEVEL_INIT
select BOOTSTRAP
+config AT91_LOAD_BAREBOX_SRAM
+ bool "at91 laad barebox in sram"
+ depends on MACH_HAS_LOWLEVEL_INIT
+ depends on SHELL_NONE || HAVE_AT91_LOAD_BAREBOX_SRAM
+ default y if SHELL_NONE
+
endif
diff --git a/arch/arm/mach-at91/include/mach/barebox-arm-head.h b/arch/arm/mach-at91/include/mach/barebox-arm-head.h
index a9c8dd44a7..7d6a009e2f 100644
--- a/arch/arm/mach-at91/include/mach/barebox-arm-head.h
+++ b/arch/arm/mach-at91/include/mach/barebox-arm-head.h
@@ -1,7 +1,7 @@
#ifndef __MACH_ARM_HEAD_H
#define __MACH_ARM_HEAD_H
-#ifdef CONFIG_SHELL_NONE
+#ifdef CONFIG_AT91_LOAD_BAREBOX_SRAM
#define AT91_EXV6 ".word _barebox_image_size\n"
#else
#define AT91_EXV6 ".word _barebox_bare_init_size\n"