diff options
| author | Rasmus Villemoes <rasmus.villemoes@prevas.dk> | 2019-12-12 08:11:46 +0000 |
|---|---|---|
| committer | Mario Six <mario.six@gdsys.cc> | 2020-01-08 08:14:09 +0100 |
| commit | a3c1e0e067ffaef6d594a2dc1f2c37177ebf570a (patch) | |
| tree | 89033b86e10e1fde0e26381cd1d049d5b679501e | |
| parent | 392b385d9d90c2a94911bf3a765ba85c9e96f42e (diff) | |
powerpc: mpc83xx: convert CONFIG_FSL_ELBC to Kconfig
This complements commit 068789773d0 which did the conversion for
mpc85xx.
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Reviewed-by: Mario Six <mario.six@gdsys.cc>
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/Kconfig | 7 | ||||
| -rw-r--r-- | include/configs/MPC8313ERDB_NAND.h | 1 | ||||
| -rw-r--r-- | include/configs/MPC8313ERDB_NOR.h | 1 | ||||
| -rw-r--r-- | include/configs/MPC8315ERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC837XEMDS.h | 2 | ||||
| -rw-r--r-- | include/configs/MPC837XERDB.h | 2 | ||||
| -rw-r--r-- | include/configs/ids8313.h | 2 | ||||
| -rw-r--r-- | include/configs/ve8313.h | 1 |
8 files changed, 7 insertions, 11 deletions
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index e9f6e93c21..5d7650294d 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -221,6 +221,7 @@ config ARCH_MPC8309 select MPC83XX_PCI_SUPPORT select MPC83XX_SECOND_I2C_SUPPORT select SYS_FSL_ERRATUM_ESDHC111 + select FSL_ELBC config ARCH_MPC831X bool @@ -232,6 +233,7 @@ config ARCH_MPC8313 bool select ARCH_MPC831X select MPC83XX_SECOND_I2C_SUPPORT + select FSL_ELBC config ARCH_MPC8315 bool @@ -239,6 +241,7 @@ config ARCH_MPC8315 select MPC83XX_PCIE1_SUPPORT select MPC83XX_PCIE2_SUPPORT select MPC83XX_SATA_SUPPORT + select FSL_ELBC config ARCH_MPC832X bool @@ -275,6 +278,7 @@ config ARCH_MPC837X select MPC83XX_SATA_SUPPORT select MPC83XX_LDP_PIN select MPC83XX_SECOND_I2C_SUPPORT + select FSL_ELBC config SYS_IMMR hex "Value for IMMR" @@ -318,6 +322,9 @@ endif endmenu +config FSL_ELBC + bool + source "board/esd/vme8349/Kconfig" source "board/freescale/mpc8308rdb/Kconfig" source "board/freescale/mpc8313erdb/Kconfig" diff --git a/include/configs/MPC8313ERDB_NAND.h b/include/configs/MPC8313ERDB_NAND.h index 4389d66dc0..ea5762a5ef 100644 --- a/include/configs/MPC8313ERDB_NAND.h +++ b/include/configs/MPC8313ERDB_NAND.h @@ -43,7 +43,6 @@ #endif #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_FSL_ELBC 1 /* * On-board devices diff --git a/include/configs/MPC8313ERDB_NOR.h b/include/configs/MPC8313ERDB_NOR.h index 20aaa83f46..9d4a6716c7 100644 --- a/include/configs/MPC8313ERDB_NOR.h +++ b/include/configs/MPC8313ERDB_NOR.h @@ -19,7 +19,6 @@ #endif #define CONFIG_PCI_INDIRECT_BRIDGE -#define CONFIG_FSL_ELBC 1 /* * On-board devices diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 169d747af9..5085a95635 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -116,8 +116,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) -#define CONFIG_FSL_ELBC - /* * FLASH on the Local Bus */ diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index f6420da21d..e5b411b12c 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -134,8 +134,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) -#define CONFIG_FSL_ELBC 1 - /* * FLASH on the Local Bus */ diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 1ba6f07e92..2ceb123a07 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -158,8 +158,6 @@ #define CONFIG_SYS_GBL_DATA_OFFSET \ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) -#define CONFIG_FSL_ELBC 1 - /* * FLASH on the Local Bus */ diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h index d37a5b7a4f..b96d4e82ad 100644 --- a/include/configs/ids8313.h +++ b/include/configs/ids8313.h @@ -14,8 +14,6 @@ /* * High Level Configuration Options */ -#define CONFIG_FSL_ELBC - #define CONFIG_BOOT_RETRY_TIME 900 #define CONFIG_BOOT_RETRY_MIN 30 #define CONFIG_RESET_TO_RETRY diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index a31e6f4abe..34726b9425 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -18,7 +18,6 @@ #define CONFIG_E300 1 #define CONFIG_PCI_INDIRECT_BRIDGE 1 -#define CONFIG_FSL_ELBC 1 /* * On-board devices |