diff options
author | Tom Rini <trini@konsulko.com> | 2018-05-20 09:44:05 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-05-20 09:44:05 -0400 |
commit | 904e546970184d9f5b7e1bde7065b745e67a1bef (patch) | |
tree | 5873f1c17c89a7db365841e989dc71e22bf09f75 /arch/arm/mach-socfpga/include/mach/system_manager.h | |
parent | 855ff8e6dd58b01930d8b8b726e65310d546a0c9 (diff) | |
parent | 00f7ae6138ad8b9d859a70d022161297b1bb8049 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/include/mach/system_manager.h')
-rw-r--r-- | arch/arm/mach-socfpga/include/mach/system_manager.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/system_manager.h b/arch/arm/mach-socfpga/include/mach/system_manager.h index fbe2a8be28..7e76df74b7 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager.h @@ -6,6 +6,9 @@ #ifndef _SYSTEM_MANAGER_H_ #define _SYSTEM_MANAGER_H_ +#if defined(CONFIG_TARGET_SOCFPGA_STRATIX10) +#include <asm/arch/system_manager_s10.h> +#else #define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGPINMUX BIT(0) #define SYSMGR_ROMCODEGRP_CTRL_WARMRSTCFGIO BIT(1) #define SYSMGR_ECC_OCRAM_EN BIT(0) @@ -88,5 +91,5 @@ #define SYSMGR_GET_BOOTINFO_BSEL(bsel) \ (((bsel) >> SYSMGR_BOOTINFO_BSEL_SHIFT) & 7) - +#endif #endif /* _SYSTEM_MANAGER_H_ */ |