| Message ID | 20220324211806.1553189-1-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | 225aaacf361dbd894a4a8b81bf5beba484c0e3cd |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/11] db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP | expand |
On 3/24/22 22:17, Tom Rini wrote: > The value CONFIG_DB_784MP_GP is only used in the DDR code to refer to > CONFIG_TARGET_DB_MV784MP_GP so just use that second value directly. > > Cc: Stefan Roese <sr@denx.de> > Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Stefan Roese <sr@denx.de> Thanks, Stefan > --- > arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +- > drivers/ddr/marvell/axp/ddr3_axp.h | 2 +- > drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 +- > include/configs/db-mv784mp-gp.h | 5 ----- > 4 files changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c > index 0b63664dd8be..68f8eade2722 100644 > --- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c > +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c > @@ -62,7 +62,7 @@ static u32 board_id_get(void) > return DB_78X60_AMC_ID; > #elif defined(CONFIG_DB_78X60_PCAC_REV2) > return DB_78X60_PCAC_REV2_ID; > -#elif defined(CONFIG_DB_784MP_GP) > +#elif defined(CONFIG_TARGET_DB_MV784MP_GP) > return DB_784MP_GP_ID; > #elif defined(CONFIG_RD_78460_CUSTOMER) > return RD_78460_CUSTOMER_ID; > diff --git a/drivers/ddr/marvell/axp/ddr3_axp.h b/drivers/ddr/marvell/axp/ddr3_axp.h > index 970651f87029..a14c766dda71 100644 > --- a/drivers/ddr/marvell/axp/ddr3_axp.h > +++ b/drivers/ddr/marvell/axp/ddr3_axp.h > @@ -37,7 +37,7 @@ > #define ECC_SUPPORT > #endif > #define NEW_FABRIC_TWSI_ADDR 0x4E > -#ifdef CONFIG_DB_784MP_GP > +#ifdef CONFIG_TARGET_DB_MV784MP_GP > #define BUS_WIDTH_ECC_TWSI_ADDR 0x4E > #else > #define BUS_WIDTH_ECC_TWSI_ADDR 0x4F > diff --git a/drivers/ddr/marvell/axp/ddr3_axp_config.h b/drivers/ddr/marvell/axp/ddr3_axp_config.h > index 437a02efbac9..ab09e72623a0 100644 > --- a/drivers/ddr/marvell/axp/ddr3_axp_config.h > +++ b/drivers/ddr/marvell/axp/ddr3_axp_config.h > @@ -138,7 +138,7 @@ > * Enables I2C auto detection different options > */ > #if defined(CONFIG_DB_88F78X60) || defined(CONFIG_DB_88F78X60_REV2) || \ > - defined(CONFIG_DB_784MP_GP) > + defined(CONFIG_TARGET_DB_MV784MP_GP) > #define AUTO_DETECTION_SUPPORT > #endif > #endif > diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h > index 41d469d79526..d6850bd32e72 100644 > --- a/include/configs/db-mv784mp-gp.h > +++ b/include/configs/db-mv784mp-gp.h > @@ -6,11 +6,6 @@ > #ifndef _CONFIG_DB_MV7846MP_GP_H > #define _CONFIG_DB_MV7846MP_GP_H > > -/* > - * High Level Configuration Options (easy to change) > - */ > -#define CONFIG_DB_784MP_GP /* Board target name for DDR training */ > - > /* > * TEXT_BASE needs to be below 16MiB, since this area is scrubbed > * for DDR ECC byte filling in the SPL before loading the main Viele Grüße, Stefan Roese
On Thu, Mar 24, 2022 at 05:17:56PM -0400, Tom Rini wrote: > The value CONFIG_DB_784MP_GP is only used in the DDR code to refer to > CONFIG_TARGET_DB_MV784MP_GP so just use that second value directly. > > Cc: Stefan Roese <sr@denx.de> > Signed-off-by: Tom Rini <trini@konsulko.com> > Reviewed-by: Stefan Roese <sr@denx.de> For the whole of the series, applied to u-boot/next, thanks!
diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c index 0b63664dd8be..68f8eade2722 100644 --- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c @@ -62,7 +62,7 @@ static u32 board_id_get(void) return DB_78X60_AMC_ID; #elif defined(CONFIG_DB_78X60_PCAC_REV2) return DB_78X60_PCAC_REV2_ID; -#elif defined(CONFIG_DB_784MP_GP) +#elif defined(CONFIG_TARGET_DB_MV784MP_GP) return DB_784MP_GP_ID; #elif defined(CONFIG_RD_78460_CUSTOMER) return RD_78460_CUSTOMER_ID; diff --git a/drivers/ddr/marvell/axp/ddr3_axp.h b/drivers/ddr/marvell/axp/ddr3_axp.h index 970651f87029..a14c766dda71 100644 --- a/drivers/ddr/marvell/axp/ddr3_axp.h +++ b/drivers/ddr/marvell/axp/ddr3_axp.h @@ -37,7 +37,7 @@ #define ECC_SUPPORT #endif #define NEW_FABRIC_TWSI_ADDR 0x4E -#ifdef CONFIG_DB_784MP_GP +#ifdef CONFIG_TARGET_DB_MV784MP_GP #define BUS_WIDTH_ECC_TWSI_ADDR 0x4E #else #define BUS_WIDTH_ECC_TWSI_ADDR 0x4F diff --git a/drivers/ddr/marvell/axp/ddr3_axp_config.h b/drivers/ddr/marvell/axp/ddr3_axp_config.h index 437a02efbac9..ab09e72623a0 100644 --- a/drivers/ddr/marvell/axp/ddr3_axp_config.h +++ b/drivers/ddr/marvell/axp/ddr3_axp_config.h @@ -138,7 +138,7 @@ * Enables I2C auto detection different options */ #if defined(CONFIG_DB_88F78X60) || defined(CONFIG_DB_88F78X60_REV2) || \ - defined(CONFIG_DB_784MP_GP) + defined(CONFIG_TARGET_DB_MV784MP_GP) #define AUTO_DETECTION_SUPPORT #endif #endif diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 41d469d79526..d6850bd32e72 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -6,11 +6,6 @@ #ifndef _CONFIG_DB_MV7846MP_GP_H #define _CONFIG_DB_MV7846MP_GP_H -/* - * High Level Configuration Options (easy to change) - */ -#define CONFIG_DB_784MP_GP /* Board target name for DDR training */ - /* * TEXT_BASE needs to be below 16MiB, since this area is scrubbed * for DDR ECC byte filling in the SPL before loading the main
The value CONFIG_DB_784MP_GP is only used in the DDR code to refer to CONFIG_TARGET_DB_MV784MP_GP so just use that second value directly. Cc: Stefan Roese <sr@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 2 +- drivers/ddr/marvell/axp/ddr3_axp.h | 2 +- drivers/ddr/marvell/axp/ddr3_axp_config.h | 2 +- include/configs/db-mv784mp-gp.h | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-)