diff options
author | Tom Rini <trini@konsulko.com> | 2016-04-06 21:17:22 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-04-06 21:17:22 +0300 |
commit | 43d3fb5c0609a76409e7859a2a5800670c7b5bd2 (patch) | |
tree | 562ebcc0e6a22077140b10efce77f44340b819ac /arch/arm/include/asm/fsl_secure_boot.h | |
parent | 46a16bd895144617575c788d9c2554aeef76ac44 (diff) | |
parent | 3c1d218a1d3048fb576677c47eab43049d0b7778 (diff) | |
download | u-boot-43d3fb5c0609a76409e7859a2a5800670c7b5bd2.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'arch/arm/include/asm/fsl_secure_boot.h')
-rw-r--r-- | arch/arm/include/asm/fsl_secure_boot.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index d576f2ef45..53cd7550a0 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -44,15 +44,14 @@ #endif -#if defined(CONFIG_LS1043A) || defined(CONFIG_LS2080A) ||\ - defined(CONFIG_LS2085A) +#if defined(CONFIG_LS1043A) || defined(CONFIG_LS2080A) /* For LS1043 (ARMv8), ESBC image Address in Header is 64 bit - * Similiarly for LS2080 and LS2085 + * Similiarly for LS2080 */ #define CONFIG_ESBC_ADDR_64BIT #endif -#if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) +#ifdef CONFIG_LS2080A #define CONFIG_EXTRA_ENV \ "setenv fdt_high 0xa0000000;" \ "setenv initrd_high 0xcfffffff;" \ @@ -66,12 +65,11 @@ /* Copying Bootscript and Header to DDR from NOR for LS2 and for rest, from * Non-XIP Memory (Nand/SD)*/ -#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_LS2080A) ||\ - defined(CONFIG_LS2085A) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_LS2080A) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif /* The address needs to be modified according to NOR and DDR memory map */ -#if defined(CONFIG_LS2080A) || defined(CONFIG_LS2085A) +#ifdef CONFIG_LS2080A #define CONFIG_BS_HDR_ADDR_FLASH 0x583920000 #define CONFIG_BS_ADDR_FLASH 0x583900000 #define CONFIG_BS_HDR_ADDR_RAM 0xa3920000 |