diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-06-08 09:14:19 +0200 |
| commit | 5ed28948a3ffe6c735386e59c132989869beaa3e (patch) | |
| tree | cbb940a4fa90b89abdd57d6b13d64351cfce839c /include/configs/ti_armv7_common.h | |
| parent | e6607cffef965011ef0ddc0fbe6f4b7c0d53aeec (diff) | |
| parent | 83bad1026b9e3a4f6b7783cc1cbb434c1bbd3fa2 (diff) | |
| download | blackbird-obmc-uboot-5ed28948a3ffe6c735386e59c132989869beaa3e.tar.gz blackbird-obmc-uboot-5ed28948a3ffe6c735386e59c132989869beaa3e.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'include/configs/ti_armv7_common.h')
| -rw-r--r-- | include/configs/ti_armv7_common.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 485427276a..698291852b 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -196,7 +196,8 @@ * under common/spl/. Given our generally common memory map, we set a * number of related defaults and sizes here. */ -#ifndef CONFIG_NOR_BOOT +#if !defined(CONFIG_NOR_BOOT) && \ + !(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX)) #define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK #define CONFIG_SPL_OS_BOOT |
