projects / project / bcm63xx / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a7152e)
ARM: socfpga: rename the cyclone5 and arria5 base address file
authorDinh Nguyen <dinguyen@opensource.altera.com>
Mon, 23 Nov 2015 23:27:17 +0000 (17:27 -0600)
committerMarek Vasut <marex@denx.de>
Mon, 30 Nov 2015 12:30:19 +0000 (13:30 +0100)
When adding support for the Arria10 platform, we're going to name the file
base_addr_a10.h, so to be systematic about it, rename the socfpga_base_addr.h
to be base_addr_ac5.h for the Arria5 and Cyclone5 platform.

Suggested-by: Marek Vasut <marex@denx.de>
Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
arch/arm/mach-socfpga/include/mach/base_addr_ac5.h [new file with mode: 0644] patch | blob
arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h [deleted file] patch | blob | history
include/configs/socfpga_arria5_socdk.h patch | blob | history
include/configs/socfpga_cyclone5_socdk.h patch | blob | history
include/configs/socfpga_de0_nano_soc.h patch | blob | history
include/configs/socfpga_mcvevk.h patch | blob | history
include/configs/socfpga_sockit.h patch | blob | history

diff --git a/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
new file mode 100644 (file)
index 0000000..6534283
--- /dev/null
+++ b/arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
@@ -0,0 +1,62 @@
+/*
+ *  Copyright (C) 2012 Altera Corporation <www.altera.com>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _SOCFPGA_BASE_ADDRS_H_
+#define _SOCFPGA_BASE_ADDRS_H_
+
+#define SOCFPGA_STM_ADDRESS            0xfc000000
+#define SOCFPGA_DAP_ADDRESS            0xff000000
+#define SOCFPGA_EMAC0_ADDRESS          0xff700000
+#define SOCFPGA_EMAC1_ADDRESS          0xff702000
+#define SOCFPGA_SDMMC_ADDRESS          0xff704000
+#define SOCFPGA_QSPI_ADDRESS           0xff705000
+#define SOCFPGA_GPIO0_ADDRESS          0xff708000
+#define SOCFPGA_GPIO1_ADDRESS          0xff709000
+#define SOCFPGA_GPIO2_ADDRESS          0xff70a000
+#define SOCFPGA_L3REGS_ADDRESS         0xff800000
+#define SOCFPGA_USB0_ADDRESS           0xffb00000
+#define SOCFPGA_USB1_ADDRESS           0xffb40000
+#define SOCFPGA_CAN0_ADDRESS           0xffc00000
+#define SOCFPGA_CAN1_ADDRESS           0xffc01000
+#define SOCFPGA_UART0_ADDRESS          0xffc02000
+#define SOCFPGA_UART1_ADDRESS          0xffc03000
+#define SOCFPGA_I2C0_ADDRESS           0xffc04000
+#define SOCFPGA_I2C1_ADDRESS           0xffc05000
+#define SOCFPGA_I2C2_ADDRESS           0xffc06000
+#define SOCFPGA_I2C3_ADDRESS           0xffc07000
+#define SOCFPGA_SDR_ADDRESS            0xffc20000
+#define SOCFPGA_L4WD0_ADDRESS          0xffd02000
+#define SOCFPGA_L4WD1_ADDRESS          0xffd03000
+#define SOCFPGA_CLKMGR_ADDRESS         0xffd04000
+#define SOCFPGA_RSTMGR_ADDRESS         0xffd05000
+#define SOCFPGA_SYSMGR_ADDRESS         0xffd08000
+#define SOCFPGA_SPIS0_ADDRESS          0xffe02000
+#define SOCFPGA_SPIS1_ADDRESS          0xffe03000
+#define SOCFPGA_SPIM0_ADDRESS          0xfff00000
+#define SOCFPGA_SPIM1_ADDRESS          0xfff01000
+#define SOCFPGA_SCANMGR_ADDRESS                0xfff02000
+#define SOCFPGA_ROM_ADDRESS            0xfffd0000
+#define SOCFPGA_MPUSCU_ADDRESS         0xfffec000
+#define SOCFPGA_MPUL2_ADDRESS          0xfffef000
+#define SOCFPGA_OCRAM_ADDRESS          0xffff0000
+#define SOCFPGA_LWFPGASLAVES_ADDRESS   0xff200000
+#define SOCFPGA_LWHPS2FPGAREGS_ADDRESS 0xff400000
+#define SOCFPGA_HPS2FPGAREGS_ADDRESS   0xff500000
+#define SOCFPGA_FPGA2HPSREGS_ADDRESS   0xff600000
+#define SOCFPGA_FPGAMGRREGS_ADDRESS    0xff706000
+#define SOCFPGA_ACPIDMAP_ADDRESS       0xff707000
+#define SOCFPGA_NANDDATA_ADDRESS       0xff900000
+#define SOCFPGA_QSPIDATA_ADDRESS       0xffa00000
+#define SOCFPGA_NANDREGS_ADDRESS       0xffb80000
+#define SOCFPGA_FPGAMGRDATA_ADDRESS    0xffb90000
+#define SOCFPGA_SPTIMER0_ADDRESS       0xffc08000
+#define SOCFPGA_SPTIMER1_ADDRESS       0xffc09000
+#define SOCFPGA_OSC1TIMER0_ADDRESS     0xffd00000
+#define SOCFPGA_OSC1TIMER1_ADDRESS     0xffd01000
+#define SOCFPGA_DMANONSECURE_ADDRESS   0xffe00000
+#define SOCFPGA_DMASECURE_ADDRESS      0xffe01000
+
+#endif /* _SOCFPGA_BASE_ADDRS_H_ */
diff --git a/arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h b/arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h
deleted file mode 100644 (file)
index 6534283..0000000
--- a/arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Copyright (C) 2012 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
- */
-
-#ifndef _SOCFPGA_BASE_ADDRS_H_
-#define _SOCFPGA_BASE_ADDRS_H_
-
-#define SOCFPGA_STM_ADDRESS            0xfc000000
-#define SOCFPGA_DAP_ADDRESS            0xff000000
-#define SOCFPGA_EMAC0_ADDRESS          0xff700000
-#define SOCFPGA_EMAC1_ADDRESS          0xff702000
-#define SOCFPGA_SDMMC_ADDRESS          0xff704000
-#define SOCFPGA_QSPI_ADDRESS           0xff705000
-#define SOCFPGA_GPIO0_ADDRESS          0xff708000
-#define SOCFPGA_GPIO1_ADDRESS          0xff709000
-#define SOCFPGA_GPIO2_ADDRESS          0xff70a000
-#define SOCFPGA_L3REGS_ADDRESS         0xff800000
-#define SOCFPGA_USB0_ADDRESS           0xffb00000
-#define SOCFPGA_USB1_ADDRESS           0xffb40000
-#define SOCFPGA_CAN0_ADDRESS           0xffc00000
-#define SOCFPGA_CAN1_ADDRESS           0xffc01000
-#define SOCFPGA_UART0_ADDRESS          0xffc02000
-#define SOCFPGA_UART1_ADDRESS          0xffc03000
-#define SOCFPGA_I2C0_ADDRESS           0xffc04000
-#define SOCFPGA_I2C1_ADDRESS           0xffc05000
-#define SOCFPGA_I2C2_ADDRESS           0xffc06000
-#define SOCFPGA_I2C3_ADDRESS           0xffc07000
-#define SOCFPGA_SDR_ADDRESS            0xffc20000
-#define SOCFPGA_L4WD0_ADDRESS          0xffd02000
-#define SOCFPGA_L4WD1_ADDRESS          0xffd03000
-#define SOCFPGA_CLKMGR_ADDRESS         0xffd04000
-#define SOCFPGA_RSTMGR_ADDRESS         0xffd05000
-#define SOCFPGA_SYSMGR_ADDRESS         0xffd08000
-#define SOCFPGA_SPIS0_ADDRESS          0xffe02000
-#define SOCFPGA_SPIS1_ADDRESS          0xffe03000
-#define SOCFPGA_SPIM0_ADDRESS          0xfff00000
-#define SOCFPGA_SPIM1_ADDRESS          0xfff01000
-#define SOCFPGA_SCANMGR_ADDRESS                0xfff02000
-#define SOCFPGA_ROM_ADDRESS            0xfffd0000
-#define SOCFPGA_MPUSCU_ADDRESS         0xfffec000
-#define SOCFPGA_MPUL2_ADDRESS          0xfffef000
-#define SOCFPGA_OCRAM_ADDRESS          0xffff0000
-#define SOCFPGA_LWFPGASLAVES_ADDRESS   0xff200000
-#define SOCFPGA_LWHPS2FPGAREGS_ADDRESS 0xff400000
-#define SOCFPGA_HPS2FPGAREGS_ADDRESS   0xff500000
-#define SOCFPGA_FPGA2HPSREGS_ADDRESS   0xff600000
-#define SOCFPGA_FPGAMGRREGS_ADDRESS    0xff706000
-#define SOCFPGA_ACPIDMAP_ADDRESS       0xff707000
-#define SOCFPGA_NANDDATA_ADDRESS       0xff900000
-#define SOCFPGA_QSPIDATA_ADDRESS       0xffa00000
-#define SOCFPGA_NANDREGS_ADDRESS       0xffb80000
-#define SOCFPGA_FPGAMGRDATA_ADDRESS    0xffb90000
-#define SOCFPGA_SPTIMER0_ADDRESS       0xffc08000
-#define SOCFPGA_SPTIMER1_ADDRESS       0xffc09000
-#define SOCFPGA_OSC1TIMER0_ADDRESS     0xffd00000
-#define SOCFPGA_OSC1TIMER1_ADDRESS     0xffd01000
-#define SOCFPGA_DMANONSECURE_ADDRESS   0xffe00000
-#define SOCFPGA_DMASECURE_ADDRESS      0xffe01000
-
-#endif /* _SOCFPGA_BASE_ADDRS_H_ */
diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index 8364c66a8d5beaa46b195e79a18ec990fc56e475..91ecbf7d272ac3f7a96a12eba2ecc963b0078145 100644 (file)
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_SOCFPGA_ARRIA5_H__
 #define __CONFIG_SOCFPGA_ARRIA5_H__
 
-#include <asm/arch/socfpga_base_addrs.h>
+#include <asm/arch/base_addr_ac5.h>
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 86b53e200dca61f388d32f269addf563e570ed3e..b5cf3937193902b538123a804ce811fd894c953e 100644 (file)
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_SOCFPGA_CYCLONE5_H__
 #define __CONFIG_SOCFPGA_CYCLONE5_H__
 
-#include <asm/arch/socfpga_base_addrs.h>
+#include <asm/arch/base_addr_ac5.h>
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
index 3ae9b3ef42040c066111fbe893a07fb608e64097..b371a9baf4f0a5d4f94154d4242fc5c79cccd2f2 100644 (file)
--- a/include/configs/socfpga_de0_nano_soc.h
+++ b/include/configs/socfpga_de0_nano_soc.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_TERASIC_DE0_H__
 #define __CONFIG_TERASIC_DE0_H__
 
-#include <asm/arch/socfpga_base_addrs.h>
+#include <asm/arch/base_addr_ac5.h>
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h
index 4b270cecae38c2e957d055d70ca6f60914ee4924..d051eeca6644e3af8fa05db9e9b8976381be73c6 100644 (file)
--- a/include/configs/socfpga_mcvevk.h
+++ b/include/configs/socfpga_mcvevk.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_DENX_MCVEVK_H__
 #define __CONFIG_DENX_MCVEVK_H__
 
-#include <asm/arch/socfpga_base_addrs.h>
+#include <asm/arch/base_addr_ac5.h>
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
index 742c5ae61f7ad69daa6be3e20ca77a255d4e4bf6..d26f53dd1943a41f86167806f373ffef4ba18c59 100644 (file)
--- a/include/configs/socfpga_sockit.h
+++ b/include/configs/socfpga_sockit.h
@@ -6,7 +6,7 @@
 #ifndef __CONFIG_TERASIC_SOCKIT_H__
 #define __CONFIG_TERASIC_SOCKIT_H__
 
-#include <asm/arch/socfpga_base_addrs.h>
+#include <asm/arch/base_addr_ac5.h>
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
Broadcom-s U-Boot