diff options
| author | Tom Rini <trini@ti.com> | 2014-10-27 09:05:20 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-27 09:05:20 -0400 |
| commit | 674ca84d11391cd2e7faf8f638fc25ed4b782a91 (patch) | |
| tree | f24922da07018c656923d6c6a93f777738922662 /arch/arm/include | |
| parent | d0796defbe8eff6fc3c27c893dcbc47af59d4764 (diff) | |
| parent | 20cadbbe2e0425783855f6ae90ef82aa0db63155 (diff) | |
| download | blackbird-obmc-uboot-674ca84d11391cd2e7faf8f638fc25ed4b782a91.tar.gz blackbird-obmc-uboot-674ca84d11391cd2e7faf8f638fc25ed4b782a91.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-socfpga/spl.h | 15 | ||||
| -rw-r--r-- | arch/arm/include/asm/spl.h | 2 |
2 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/include/asm/arch-socfpga/spl.h b/arch/arm/include/asm/arch-socfpga/spl.h deleted file mode 100644 index 7e310d5a0c..0000000000 --- a/arch/arm/include/asm/arch-socfpga/spl.h +++ /dev/null @@ -1,15 +0,0 @@ -/* - * Copyright (C) 2012 Pavel Machek <pavel@denx.de> - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _SOCFPGA_SPL_H_ -#define _SOCFPGA_SPL_H_ - -/* Symbols from linker script */ -extern char __malloc_start, __malloc_end, __stack_start; - -#define BOOT_DEVICE_RAM 1 - -#endif diff --git a/arch/arm/include/asm/spl.h b/arch/arm/include/asm/spl.h index e5daf89127..8acd7cd1bd 100644 --- a/arch/arm/include/asm/spl.h +++ b/arch/arm/include/asm/spl.h @@ -7,7 +7,7 @@ #ifndef _ASM_SPL_H_ #define _ASM_SPL_H_ -#if defined(CONFIG_OMAP) || defined(CONFIG_SOCFPGA) \ +#if defined(CONFIG_OMAP) \ || defined(CONFIG_EXYNOS4) || defined(CONFIG_EXYNOS5) \ || defined(CONFIG_EXYNOS4210) /* Platform-specific defines */ |
