diff options
| author | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-12-10 17:15:18 -0500 |
| commit | 4b210ad34282bfd9fc982a8e3c9a9126f4094cdb (patch) | |
| tree | f91ebdc46ede952728602d5ecc18e64ad0e52682 /include/configs/arndale.h | |
| parent | 65b7fe28a12bbaccc7a0c076f5f9f213150030e7 (diff) | |
| parent | f15ea6e1d67782a1626d4a4922b6c20e380085e5 (diff) | |
| download | u-boot-imx-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.zip u-boot-imx-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.gz u-boot-imx-4b210ad34282bfd9fc982a8e3c9a9126f4094cdb.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
board/samsung/trats2/trats2.c
include/configs/exynos5250-dt.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/arndale.h')
| -rw-r--r-- | include/configs/arndale.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/arndale.h b/include/configs/arndale.h index ea8753b..a3cb56b 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -198,10 +198,6 @@ #define BL2_START_OFFSET (CONFIG_BL2_OFFSET/512) #define BL2_SIZE_BLOC_COUNT (CONFIG_BL2_SIZE/512) -#define CONFIG_SPI_BOOTING -#define EXYNOS_COPY_SPI_FNPTR_ADDR 0x02020058 -#define SPI_FLASH_UBOOT_POS (CONFIG_SEC_FW_SIZE + CONFIG_BL1_SIZE) - #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_CMD_PART |