| Message ID | 20191212081131.15718-1-rasmus.villemoes@prevas.dk |
|---|---|
| State | Accepted |
| Commit | a3c1e0e067ffaef6d594a2dc1f2c37177ebf570a |
| Delegated to: | Mario Six |
| Headers | show |
| Series | powerpc: mpc83xx: convert CONFIG_FSL_ELBC to Kconfig | expand |
On Thu, Dec 12, 2019 at 9:11 AM Rasmus Villemoes <rasmus.villemoes@prevas.dk> wrote: > > This complements commit 068789773d0 which did the conversion for > mpc85xx. > > Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> > --- > arch/powerpc/cpu/mpc83xx/Kconfig | 7 +++++++ > include/configs/MPC8313ERDB_NAND.h | 1 - > include/configs/MPC8313ERDB_NOR.h | 1 - > include/configs/MPC8315ERDB.h | 2 -- > include/configs/MPC837XEMDS.h | 2 -- > include/configs/MPC837XERDB.h | 2 -- > include/configs/ids8313.h | 2 -- > 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 4153d609be..569b59008c 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 ff8dedf03e..274653df29 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 521c5ca6ee..e60a6a7d7a 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 724f8afb76..36bf4b18f2 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 37f51ba743..31ecc2ff3f 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 43cb14c14e..e1d271cc33 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 66f771d818..67793c17ae 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 > -- > 2.23.0 > Reviewed-by: Mario Six <mario.six@gdsys.cc> Applied to mpc83xx/next. Best regards, Mario
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 4153d609be..569b59008c 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 ff8dedf03e..274653df29 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 521c5ca6ee..e60a6a7d7a 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 724f8afb76..36bf4b18f2 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 37f51ba743..31ecc2ff3f 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 43cb14c14e..e1d271cc33 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 66f771d818..67793c17ae 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
This complements commit 068789773d0 which did the conversion for mpc85xx. Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> --- arch/powerpc/cpu/mpc83xx/Kconfig | 7 +++++++ include/configs/MPC8313ERDB_NAND.h | 1 - include/configs/MPC8313ERDB_NOR.h | 1 - include/configs/MPC8315ERDB.h | 2 -- include/configs/MPC837XEMDS.h | 2 -- include/configs/MPC837XERDB.h | 2 -- include/configs/ids8313.h | 2 -- include/configs/ve8313.h | 1 - 8 files changed, 7 insertions(+), 11 deletions(-)