Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 871c24bc501b035604123e5f6754b0b457678edb

Authored by Dinh Nguyen
Committed by Marek Vasut
1 parent 5a7152e4fd
Exists in v2017.01-smarct4x and in 31 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: socfpga: rename the cyclone5 and arria5 base address file 

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>

Showing 7 changed files with 67 additions and 67 deletions Side-by-side Diff

arch/arm/mach-socfpga/include/mach/base_addr_ac5.h
Diff comments   View file @ 871c24b
  1 +/*
  2 + * Copyright (C) 2012 Altera Corporation <www.altera.com>
  3 + *
  4 + * SPDX-License-Identifier: GPL-2.0+
  5 + */
  6 +
  7 +#ifndef _SOCFPGA_BASE_ADDRS_H_
  8 +#define _SOCFPGA_BASE_ADDRS_H_
  9 +
  10 +#define SOCFPGA_STM_ADDRESS 0xfc000000
  11 +#define SOCFPGA_DAP_ADDRESS 0xff000000
  12 +#define SOCFPGA_EMAC0_ADDRESS 0xff700000
  13 +#define SOCFPGA_EMAC1_ADDRESS 0xff702000
  14 +#define SOCFPGA_SDMMC_ADDRESS 0xff704000
  15 +#define SOCFPGA_QSPI_ADDRESS 0xff705000
  16 +#define SOCFPGA_GPIO0_ADDRESS 0xff708000
  17 +#define SOCFPGA_GPIO1_ADDRESS 0xff709000
  18 +#define SOCFPGA_GPIO2_ADDRESS 0xff70a000
  19 +#define SOCFPGA_L3REGS_ADDRESS 0xff800000
  20 +#define SOCFPGA_USB0_ADDRESS 0xffb00000
  21 +#define SOCFPGA_USB1_ADDRESS 0xffb40000
  22 +#define SOCFPGA_CAN0_ADDRESS 0xffc00000
  23 +#define SOCFPGA_CAN1_ADDRESS 0xffc01000
  24 +#define SOCFPGA_UART0_ADDRESS 0xffc02000
  25 +#define SOCFPGA_UART1_ADDRESS 0xffc03000
  26 +#define SOCFPGA_I2C0_ADDRESS 0xffc04000
  27 +#define SOCFPGA_I2C1_ADDRESS 0xffc05000
  28 +#define SOCFPGA_I2C2_ADDRESS 0xffc06000
  29 +#define SOCFPGA_I2C3_ADDRESS 0xffc07000
  30 +#define SOCFPGA_SDR_ADDRESS 0xffc20000
  31 +#define SOCFPGA_L4WD0_ADDRESS 0xffd02000
  32 +#define SOCFPGA_L4WD1_ADDRESS 0xffd03000
  33 +#define SOCFPGA_CLKMGR_ADDRESS 0xffd04000
  34 +#define SOCFPGA_RSTMGR_ADDRESS 0xffd05000
  35 +#define SOCFPGA_SYSMGR_ADDRESS 0xffd08000
  36 +#define SOCFPGA_SPIS0_ADDRESS 0xffe02000
  37 +#define SOCFPGA_SPIS1_ADDRESS 0xffe03000
  38 +#define SOCFPGA_SPIM0_ADDRESS 0xfff00000
  39 +#define SOCFPGA_SPIM1_ADDRESS 0xfff01000
  40 +#define SOCFPGA_SCANMGR_ADDRESS 0xfff02000
  41 +#define SOCFPGA_ROM_ADDRESS 0xfffd0000
  42 +#define SOCFPGA_MPUSCU_ADDRESS 0xfffec000
  43 +#define SOCFPGA_MPUL2_ADDRESS 0xfffef000
  44 +#define SOCFPGA_OCRAM_ADDRESS 0xffff0000
  45 +#define SOCFPGA_LWFPGASLAVES_ADDRESS 0xff200000
  46 +#define SOCFPGA_LWHPS2FPGAREGS_ADDRESS 0xff400000
  47 +#define SOCFPGA_HPS2FPGAREGS_ADDRESS 0xff500000
  48 +#define SOCFPGA_FPGA2HPSREGS_ADDRESS 0xff600000
  49 +#define SOCFPGA_FPGAMGRREGS_ADDRESS 0xff706000
  50 +#define SOCFPGA_ACPIDMAP_ADDRESS 0xff707000
  51 +#define SOCFPGA_NANDDATA_ADDRESS 0xff900000
  52 +#define SOCFPGA_QSPIDATA_ADDRESS 0xffa00000
  53 +#define SOCFPGA_NANDREGS_ADDRESS 0xffb80000
  54 +#define SOCFPGA_FPGAMGRDATA_ADDRESS 0xffb90000
  55 +#define SOCFPGA_SPTIMER0_ADDRESS 0xffc08000
  56 +#define SOCFPGA_SPTIMER1_ADDRESS 0xffc09000
  57 +#define SOCFPGA_OSC1TIMER0_ADDRESS 0xffd00000
  58 +#define SOCFPGA_OSC1TIMER1_ADDRESS 0xffd01000
  59 +#define SOCFPGA_DMANONSECURE_ADDRESS 0xffe00000
  60 +#define SOCFPGA_DMASECURE_ADDRESS 0xffe01000
  61 +
  62 +#endif /* _SOCFPGA_BASE_ADDRS_H_ */
arch/arm/mach-socfpga/include/mach/socfpga_base_addrs.h
View file @ 871c24b
1   -/*
2   - * Copyright (C) 2012 Altera Corporation <www.altera.com>
3   - *
4   - * SPDX-License-Identifier: GPL-2.0+
5   - */
6   -
7   -#ifndef _SOCFPGA_BASE_ADDRS_H_
8   -#define _SOCFPGA_BASE_ADDRS_H_
9   -
10   -#define SOCFPGA_STM_ADDRESS 0xfc000000
11   -#define SOCFPGA_DAP_ADDRESS 0xff000000
12   -#define SOCFPGA_EMAC0_ADDRESS 0xff700000
13   -#define SOCFPGA_EMAC1_ADDRESS 0xff702000
14   -#define SOCFPGA_SDMMC_ADDRESS 0xff704000
15   -#define SOCFPGA_QSPI_ADDRESS 0xff705000
16   -#define SOCFPGA_GPIO0_ADDRESS 0xff708000
17   -#define SOCFPGA_GPIO1_ADDRESS 0xff709000
18   -#define SOCFPGA_GPIO2_ADDRESS 0xff70a000
19   -#define SOCFPGA_L3REGS_ADDRESS 0xff800000
20   -#define SOCFPGA_USB0_ADDRESS 0xffb00000
21   -#define SOCFPGA_USB1_ADDRESS 0xffb40000
22   -#define SOCFPGA_CAN0_ADDRESS 0xffc00000
23   -#define SOCFPGA_CAN1_ADDRESS 0xffc01000
24   -#define SOCFPGA_UART0_ADDRESS 0xffc02000
25   -#define SOCFPGA_UART1_ADDRESS 0xffc03000
26   -#define SOCFPGA_I2C0_ADDRESS 0xffc04000
27   -#define SOCFPGA_I2C1_ADDRESS 0xffc05000
28   -#define SOCFPGA_I2C2_ADDRESS 0xffc06000
29   -#define SOCFPGA_I2C3_ADDRESS 0xffc07000
30   -#define SOCFPGA_SDR_ADDRESS 0xffc20000
31   -#define SOCFPGA_L4WD0_ADDRESS 0xffd02000
32   -#define SOCFPGA_L4WD1_ADDRESS 0xffd03000
33   -#define SOCFPGA_CLKMGR_ADDRESS 0xffd04000
34   -#define SOCFPGA_RSTMGR_ADDRESS 0xffd05000
35   -#define SOCFPGA_SYSMGR_ADDRESS 0xffd08000
36   -#define SOCFPGA_SPIS0_ADDRESS 0xffe02000
37   -#define SOCFPGA_SPIS1_ADDRESS 0xffe03000
38   -#define SOCFPGA_SPIM0_ADDRESS 0xfff00000
39   -#define SOCFPGA_SPIM1_ADDRESS 0xfff01000
40   -#define SOCFPGA_SCANMGR_ADDRESS 0xfff02000
41   -#define SOCFPGA_ROM_ADDRESS 0xfffd0000
42   -#define SOCFPGA_MPUSCU_ADDRESS 0xfffec000
43   -#define SOCFPGA_MPUL2_ADDRESS 0xfffef000
44   -#define SOCFPGA_OCRAM_ADDRESS 0xffff0000
45   -#define SOCFPGA_LWFPGASLAVES_ADDRESS 0xff200000
46   -#define SOCFPGA_LWHPS2FPGAREGS_ADDRESS 0xff400000
47   -#define SOCFPGA_HPS2FPGAREGS_ADDRESS 0xff500000
48   -#define SOCFPGA_FPGA2HPSREGS_ADDRESS 0xff600000
49   -#define SOCFPGA_FPGAMGRREGS_ADDRESS 0xff706000
50   -#define SOCFPGA_ACPIDMAP_ADDRESS 0xff707000
51   -#define SOCFPGA_NANDDATA_ADDRESS 0xff900000
52   -#define SOCFPGA_QSPIDATA_ADDRESS 0xffa00000
53   -#define SOCFPGA_NANDREGS_ADDRESS 0xffb80000
54   -#define SOCFPGA_FPGAMGRDATA_ADDRESS 0xffb90000
55   -#define SOCFPGA_SPTIMER0_ADDRESS 0xffc08000
56   -#define SOCFPGA_SPTIMER1_ADDRESS 0xffc09000
57   -#define SOCFPGA_OSC1TIMER0_ADDRESS 0xffd00000
58   -#define SOCFPGA_OSC1TIMER1_ADDRESS 0xffd01000
59   -#define SOCFPGA_DMANONSECURE_ADDRESS 0xffe00000
60   -#define SOCFPGA_DMASECURE_ADDRESS 0xffe01000
61   -
62   -#endif /* _SOCFPGA_BASE_ADDRS_H_ */
include/configs/socfpga_arria5_socdk.h
Diff comments   View file @ 871c24b
... ... @@ -6,7 +6,7 @@
6 6 #ifndef __CONFIG_SOCFPGA_ARRIA5_H__
7 7 #define __CONFIG_SOCFPGA_ARRIA5_H__
8 8  
9   -#include <asm/arch/socfpga_base_addrs.h>
  9 +#include <asm/arch/base_addr_ac5.h>
10 10  
11 11 /* U-Boot Commands */
12 12 #define CONFIG_SYS_NO_FLASH
include/configs/socfpga_cyclone5_socdk.h
Diff comments   View file @ 871c24b
... ... @@ -6,7 +6,7 @@
6 6 #ifndef __CONFIG_SOCFPGA_CYCLONE5_H__
7 7 #define __CONFIG_SOCFPGA_CYCLONE5_H__
8 8  
9   -#include <asm/arch/socfpga_base_addrs.h>
  9 +#include <asm/arch/base_addr_ac5.h>
10 10  
11 11 /* U-Boot Commands */
12 12 #define CONFIG_SYS_NO_FLASH
include/configs/socfpga_de0_nano_soc.h
Diff comments   View file @ 871c24b
... ... @@ -6,7 +6,7 @@
6 6 #ifndef __CONFIG_TERASIC_DE0_H__
7 7 #define __CONFIG_TERASIC_DE0_H__
8 8  
9   -#include <asm/arch/socfpga_base_addrs.h>
  9 +#include <asm/arch/base_addr_ac5.h>
10 10  
11 11 /* U-Boot Commands */
12 12 #define CONFIG_SYS_NO_FLASH
include/configs/socfpga_mcvevk.h
Diff comments   View file @ 871c24b
... ... @@ -6,7 +6,7 @@
6 6 #ifndef __CONFIG_DENX_MCVEVK_H__
7 7 #define __CONFIG_DENX_MCVEVK_H__
8 8  
9   -#include <asm/arch/socfpga_base_addrs.h>
  9 +#include <asm/arch/base_addr_ac5.h>
10 10  
11 11 /* U-Boot Commands */
12 12 #define CONFIG_SYS_NO_FLASH
include/configs/socfpga_sockit.h
Diff comments   View file @ 871c24b
... ... @@ -6,7 +6,7 @@
6 6 #ifndef __CONFIG_TERASIC_SOCKIT_H__
7 7 #define __CONFIG_TERASIC_SOCKIT_H__
8 8  
9   -#include <asm/arch/socfpga_base_addrs.h>
  9 +#include <asm/arch/base_addr_ac5.h>
10 10  
11 11 /* U-Boot Commands */
12 12 #define CONFIG_SYS_NO_FLASH