diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 11 | ||||
| -rw-r--r-- | arch/arm/mach-at91/include/mach/barebox-arm-head.h | 2 |
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" |