diff options
author | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-23 20:44:25 -0400 |
commit | c851a2458fbc12495f4f786d4eabb612850a5143 (patch) | |
tree | fa0b97f9ff8f744db11a1d296283ce7ce335a536 /board/altera/socfpga/qts/iocsr_config.h | |
parent | 14e7a30f2e8963fc5b91ba68e53bb2de708aee65 (diff) | |
parent | 29aa439759ed2e5dfa45cd8d6d5a1d51604e3820 (diff) |
Merge git://git.denx.de/u-boot-socfpga
Conflicts:
configs/socfpga_arria5_defconfig
configs/socfpga_cyclone5_defconfig
configs/socfpga_socrates_defconfig
Merged these by hand and re-ran savedefconfig on them.
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'board/altera/socfpga/qts/iocsr_config.h')
-rw-r--r-- | board/altera/socfpga/qts/iocsr_config.h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/board/altera/socfpga/qts/iocsr_config.h b/board/altera/socfpga/qts/iocsr_config.h deleted file mode 100644 index d1c9b0d36a0..00000000000 --- a/board/altera/socfpga/qts/iocsr_config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright Altera Corporation (C) 2012-2014. All rights reserved - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -/* This file is generated by Preloader Generator */ - -#ifndef _PRELOADER_IOCSR_CONFIG_H_ -#define _PRELOADER_IOCSR_CONFIG_H_ - -#ifdef CONFIG_TARGET_SOCFPGA_CYCLONE5 -#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH (764) -#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH (1719) -#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH (955) -#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH (16766) -#endif - -#ifdef CONFIG_TARGET_SOCFPGA_ARRIA5 -#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH (1337) -#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH (1719) -#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH (1528) -#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH (16766) -#endif - -#endif /*_PRELOADER_IOCSR_CONFIG_H_*/ |