diff options
author | Tom Rini | 2022-07-23 13:05:09 -0400 |
---|---|---|
committer | Tom Rini | 2022-08-04 16:18:48 -0400 |
commit | 923a855509c6114b044b6358c98f1857f52ab80b (patch) | |
tree | 91b5b089f9fe005a1356f63f432ef548bb89a873 /arch/arm | |
parent | 6f6b9703d0149b784cce81996773e4b84323c7e1 (diff) |
Convert CONFIG_SYS_FSL_CCSR_GUR_BE et al to Kconfig
This converts the following to Kconfig:
CONFIG_SYS_FSL_CCSR_GUR_BE
CONFIG_SYS_FSL_CCSR_SCFG_BE
CONFIG_SYS_FSL_ESDHC_BE
CONFIG_SYS_FSL_IFC_BE
CONFIG_SYS_FSL_PEX_LUT_BE
CONFIG_SYS_FSL_CCSR_GUR_LE
CONFIG_SYS_FSL_CCSR_SCFG_LE
CONFIG_SYS_FSL_ESDHC_LE
CONFIG_SYS_FSL_IFC_LE
CONFIG_SYS_FSL_PEX_LUT_LE
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/armv7/ls102xa/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 34 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-fsl-layerscape/config.h | 34 | ||||
-rw-r--r-- | arch/arm/include/asm/arch-ls102xa/config.h | 2 |
4 files changed, 36 insertions, 36 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index a901360fa7d..e75a895e008 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -3,6 +3,7 @@ config ARCH_LS1021A select FSL_IFC if !QSPI_BOOT && !SD_BOOT_QSPI select SYS_FSL_DDR_BE if SYS_FSL_DDR select SYS_FSL_DDR_VER_50 if SYS_FSL_DDR + select SYS_FSL_IFC_BE select SYS_FSL_ERRATUM_A008378 select SYS_FSL_ERRATUM_A008407 select SYS_FSL_ERRATUM_A008850 if SYS_FSL_DDR @@ -12,6 +13,7 @@ config ARCH_LS1021A select SYS_FSL_ERRATUM_A009798 if USB select SYS_FSL_ERRATUM_A009942 select SYS_FSL_ERRATUM_A010315 + select SYS_FSL_ESDHC_BE select SYS_FSL_HAS_CCI400 select SYS_FSL_HAS_DDR3 if SYS_FSL_DDR select SYS_FSL_HAS_DDR4 if SYS_FSL_DDR diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 602b624dca5..1f86070b8a2 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -323,6 +323,11 @@ config ARCH_LX2160A config FSL_LSCH2 bool select SKIP_LOWLEVEL_INIT + select SYS_FSL_CCSR_GUR_BE + select SYS_FSL_CCSR_SCFG_BE + select SYS_FSL_ESDHC_BE + select SYS_FSL_IFC_BE + select SYS_FSL_PEX_LUT_BE select SYS_FSL_HAS_CCI400 select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_5 @@ -330,11 +335,40 @@ config FSL_LSCH2 config FSL_LSCH3 select ARCH_MISC_INIT + select SYS_FSL_CCSR_GUR_LE + select SYS_FSL_CCSR_SCFG_LE + select SYS_FSL_ESDHC_LE + select SYS_FSL_IFC_LE + select SYS_FSL_PEX_LUT_LE bool config NXP_LSCH3_2 bool +config SYS_FSL_CCSR_GUR_BE + bool + +config SYS_FSL_CCSR_SCFG_BE + bool + +config SYS_FSL_PEX_LUT_BE + bool + +config SYS_FSL_CCSR_GUR_LE + bool + +config SYS_FSL_CCSR_SCFG_LE + bool + +config SYS_FSL_ESDHC_LE + bool + +config SYS_FSL_IFC_LE + bool + +config SYS_FSL_PEX_LUT_LE + bool + menu "Layerscape architecture" depends on FSL_LSCH2 || FSL_LSCH3 diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 9aee971b726..f6710d0b0e1 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -40,12 +40,6 @@ #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE -#define CONFIG_SYS_FSL_CCSR_GUR_LE -#define CONFIG_SYS_FSL_CCSR_SCFG_LE -#define CONFIG_SYS_FSL_ESDHC_LE -#define CONFIG_SYS_FSL_IFC_LE -#define CONFIG_SYS_FSL_PEX_LUT_LE - #define CONFIG_SYS_MEMAC_LITTLE_ENDIAN /* Generic Interrupt Controller Definitions */ @@ -56,7 +50,6 @@ #define SMMU_BASE 0x05000000 /* GR0 Base */ /* DCFG - GUR */ -#define CONFIG_SYS_FSL_CCSR_GUR_LE /* Cache Coherent Interconnect */ #define CCI_MN_BASE 0x04000000 @@ -141,16 +134,9 @@ #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE -#define CONFIG_SYS_FSL_CCSR_GUR_LE -#define CONFIG_SYS_FSL_CCSR_SCFG_LE -#define CONFIG_SYS_FSL_ESDHC_LE -#define CONFIG_SYS_FSL_IFC_LE -#define CONFIG_SYS_FSL_PEX_LUT_LE - #define CONFIG_SYS_MEMAC_LITTLE_ENDIAN /* DCFG - GUR */ -#define CONFIG_SYS_FSL_CCSR_GUR_LE #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 #define CONFIG_SYS_FSL_OCRAM_BASE 0x18000000 /* initial RAM */ #define SYS_FSL_OCRAM_SPACE_SIZE 0x00200000 /* 2M space */ @@ -179,11 +165,6 @@ #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE -#define CONFIG_SYS_FSL_CCSR_GUR_LE -#define CONFIG_SYS_FSL_CCSR_SCFG_LE -#define CONFIG_SYS_FSL_ESDHC_LE -#define CONFIG_SYS_FSL_PEX_LUT_LE - #define CONFIG_SYS_MEMAC_LITTLE_ENDIAN /* Generic Interrupt Controller Definitions */ @@ -194,7 +175,6 @@ #define SMMU_BASE 0x05000000 /* GR0 Base */ /* DCFG - GUR */ -#define CONFIG_SYS_FSL_CCSR_GUR_LE #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 @@ -234,18 +214,12 @@ #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE -#define CONFIG_SYS_FSL_CCSR_GUR_LE -#define CONFIG_SYS_FSL_CCSR_SCFG_LE -#define CONFIG_SYS_FSL_ESDHC_LE -#define CONFIG_SYS_FSL_PEX_LUT_LE - #define CONFIG_SYS_MEMAC_LITTLE_ENDIAN /* SEC */ #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 /* DCFG - GUR */ -#define CONFIG_SYS_FSL_CCSR_GUR_LE #elif defined(CONFIG_FSL_LSCH2) #define CONFIG_SYS_FSL_OCRAM_BASE 0x10000000 /* initial RAM */ @@ -255,12 +229,8 @@ #define DCSR_DCFG_SBEESR2 0x20140534 #define DCSR_DCFG_MBEESR2 0x20140544 -#define CONFIG_SYS_FSL_CCSR_SCFG_BE -#define CONFIG_SYS_FSL_ESDHC_BE #define CONFIG_SYS_FSL_WDOG_BE #define CONFIG_SYS_FSL_DSPI_BE -#define CONFIG_SYS_FSL_CCSR_GUR_BE -#define CONFIG_SYS_FSL_PEX_LUT_BE /* SoC related */ #ifdef CONFIG_ARCH_LS1043A @@ -275,8 +245,6 @@ #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 -#define CONFIG_SYS_FSL_IFC_BE - /* SMMU Defintions */ #define SMMU_BASE 0x09000000 @@ -323,8 +291,6 @@ #define CONFIG_SYS_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_DDR_BLOCK1_SIZE -#define CONFIG_SYS_FSL_IFC_BE - /* SMMU Defintions */ #define SMMU_BASE 0x09000000 diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index e5f61ea4a6e..868456f1f13 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -79,8 +79,6 @@ #define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #endif -#define CONFIG_SYS_FSL_IFC_BE -#define CONFIG_SYS_FSL_ESDHC_BE #define CONFIG_SYS_FSL_WDOG_BE #define CONFIG_SYS_FSL_DSPI_BE |