[PATCH 1/2] powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS

[PATCH 1/2] powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS

[Ovidiu Panait]

There are no boards that define CONFIG_SYS_RESET_ADDRESS, so drop the
associated mpc8xx code that checks for it.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---

 arch/powerpc/cpu/mpc8xx/cpu.c | 11 ++---------
 scripts/config_whitelist.txt  |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 893aecef21..6d16ed084e 100644
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -215,19 +215,12 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 	/*
 	 * Trying to execute the next instruction at a non-existing address
 	 * should cause a machine check, resulting in reset
-	 */
-#ifdef CONFIG_SYS_RESET_ADDRESS
-	addr = CONFIG_SYS_RESET_ADDRESS;
-#else
-	/*
+	 *
 	 * note: when CONFIG_SYS_MONITOR_BASE points to a RAM address,
 	 * CONFIG_SYS_MONITOR_BASE - sizeof (ulong) is usually a valid address.
-	 * Better pick an address known to be invalid on your system and assign
-	 * it to CONFIG_SYS_RESET_ADDRESS.
-	 * "(ulong)-1" used to be a good choice for many systems...
 	 */
 	addr = CONFIG_SYS_MONITOR_BASE - sizeof(ulong);
-#endif
+
 	((void (*)(void)) addr)();
 	return 1;
 }
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 7b45d578a3..84e46e3763 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1837,7 +1837,6 @@ CONFIG_SYS_RCAR_I2C1_BASE
 CONFIG_SYS_RCAR_I2C2_BASE
 CONFIG_SYS_RCAR_I2C3_BASE
 CONFIG_SYS_RESET_ADDR
-CONFIG_SYS_RESET_ADDRESS
 CONFIG_SYS_RFD
 CONFIG_SYS_RGMII1_PHY_ADDR
 CONFIG_SYS_RGMII2_PHY_ADDR
-- 
2.25.1

[PATCH 2/2] common: drop CONFIG_SYS_RESET_ADDR

[Ovidiu Panait]

There are no boards that define CONFIG_SYS_RESET_ADDR, so drop the
remaining comments referencing it and also the config_whitelist.txt entry.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---

 include/configs/10m50_devboard.h | 9 ---------
 include/configs/3c120_devboard.h | 9 ---------
 scripts/config_whitelist.txt     | 1 -
 3 files changed, 19 deletions(-)

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 04ce88c9dd..3b4d1fd626 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -47,13 +47,4 @@
 					 CONFIG_SYS_SDRAM_SIZE - \
 					 CONFIG_SYS_MONITOR_LEN)
 
-/*
- * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
- * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
- * reset address, no? This will keep the environment in user region
- * of flash. NOTE: the monitor length must be multiple of sector size
- * (which is common practice).
- */
-
-
 #endif /* __CONFIG_H */
diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
index e12e54fe4f..763cb8db7c 100644
--- a/include/configs/3c120_devboard.h
+++ b/include/configs/3c120_devboard.h
@@ -47,13 +47,4 @@
 					 CONFIG_SYS_SDRAM_SIZE - \
 					 CONFIG_SYS_MONITOR_LEN)
 
-/*
- * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
- * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
- * reset address, no? This will keep the environment in user region
- * of flash. NOTE: the monitor length must be multiple of sector size
- * (which is common practice).
- */
-
-
 #endif /* __CONFIG_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 84e46e3763..4bd298694a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1836,7 +1836,6 @@ CONFIG_SYS_RCAR_I2C0_BASE
 CONFIG_SYS_RCAR_I2C1_BASE
 CONFIG_SYS_RCAR_I2C2_BASE
 CONFIG_SYS_RCAR_I2C3_BASE
-CONFIG_SYS_RESET_ADDR
 CONFIG_SYS_RFD
 CONFIG_SYS_RGMII1_PHY_ADDR
 CONFIG_SYS_RGMII2_PHY_ADDR
-- 
2.25.1

Re: [PATCH 1/2] powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS

[Stefan Roese]

On 1/31/22 08:20, Ovidiu Panait wrote:
> There are no boards that define CONFIG_SYS_RESET_ADDRESS, so drop the
> associated mpc8xx code that checks for it.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> 
>   arch/powerpc/cpu/mpc8xx/cpu.c | 11 ++---------
>   scripts/config_whitelist.txt  |  1 -
>   2 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
> index 893aecef21..6d16ed084e 100644
> --- a/arch/powerpc/cpu/mpc8xx/cpu.c
> +++ b/arch/powerpc/cpu/mpc8xx/cpu.c
> @@ -215,19 +215,12 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>   	/*
>   	 * Trying to execute the next instruction at a non-existing address
>   	 * should cause a machine check, resulting in reset
> -	 */
> -#ifdef CONFIG_SYS_RESET_ADDRESS
> -	addr = CONFIG_SYS_RESET_ADDRESS;
> -#else
> -	/*
> +	 *
>   	 * note: when CONFIG_SYS_MONITOR_BASE points to a RAM address,
>   	 * CONFIG_SYS_MONITOR_BASE - sizeof (ulong) is usually a valid address.
> -	 * Better pick an address known to be invalid on your system and assign
> -	 * it to CONFIG_SYS_RESET_ADDRESS.
> -	 * "(ulong)-1" used to be a good choice for many systems...
>   	 */
>   	addr = CONFIG_SYS_MONITOR_BASE - sizeof(ulong);
> -#endif
> +
>   	((void (*)(void)) addr)();
>   	return 1;
>   }
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 7b45d578a3..84e46e3763 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1837,7 +1837,6 @@ CONFIG_SYS_RCAR_I2C1_BASE
>   CONFIG_SYS_RCAR_I2C2_BASE
>   CONFIG_SYS_RCAR_I2C3_BASE
>   CONFIG_SYS_RESET_ADDR
> -CONFIG_SYS_RESET_ADDRESS
>   CONFIG_SYS_RFD
>   CONFIG_SYS_RGMII1_PHY_ADDR
>   CONFIG_SYS_RGMII2_PHY_ADDR

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH 2/2] common: drop CONFIG_SYS_RESET_ADDR

[Stefan Roese]

On 1/31/22 08:20, Ovidiu Panait wrote:
> There are no boards that define CONFIG_SYS_RESET_ADDR, so drop the
> remaining comments referencing it and also the config_whitelist.txt entry.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

Reviewed-by: Stefan Roese <sr@denx.de>

Thanks,
Stefan

> ---
> 
>   include/configs/10m50_devboard.h | 9 ---------
>   include/configs/3c120_devboard.h | 9 ---------
>   scripts/config_whitelist.txt     | 1 -
>   3 files changed, 19 deletions(-)
> 
> diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
> index 04ce88c9dd..3b4d1fd626 100644
> --- a/include/configs/10m50_devboard.h
> +++ b/include/configs/10m50_devboard.h
> @@ -47,13 +47,4 @@
>   					 CONFIG_SYS_SDRAM_SIZE - \
>   					 CONFIG_SYS_MONITOR_LEN)
>   
> -/*
> - * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
> - * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> - * reset address, no? This will keep the environment in user region
> - * of flash. NOTE: the monitor length must be multiple of sector size
> - * (which is common practice).
> - */
> -
> -
>   #endif /* __CONFIG_H */
> diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h
> index e12e54fe4f..763cb8db7c 100644
> --- a/include/configs/3c120_devboard.h
> +++ b/include/configs/3c120_devboard.h
> @@ -47,13 +47,4 @@
>   					 CONFIG_SYS_SDRAM_SIZE - \
>   					 CONFIG_SYS_MONITOR_LEN)
>   
> -/*
> - * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN above
> - * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> - * reset address, no? This will keep the environment in user region
> - * of flash. NOTE: the monitor length must be multiple of sector size
> - * (which is common practice).
> - */
> -
> -
>   #endif /* __CONFIG_H */
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 84e46e3763..4bd298694a 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1836,7 +1836,6 @@ CONFIG_SYS_RCAR_I2C0_BASE
>   CONFIG_SYS_RCAR_I2C1_BASE
>   CONFIG_SYS_RCAR_I2C2_BASE
>   CONFIG_SYS_RCAR_I2C3_BASE
> -CONFIG_SYS_RESET_ADDR
>   CONFIG_SYS_RFD
>   CONFIG_SYS_RGMII1_PHY_ADDR
>   CONFIG_SYS_RGMII2_PHY_ADDR

Viele Grüße,
Stefan Roese

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr@denx.de

Re: [PATCH 1/2] powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS

[Christophe Leroy]

Le 31/01/2022 à 08:20, Ovidiu Panait a écrit :
> There are no boards that define CONFIG_SYS_RESET_ADDRESS, so drop the
> associated mpc8xx code that checks for it.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>

> ---
> 
>   arch/powerpc/cpu/mpc8xx/cpu.c | 11 ++---------
>   scripts/config_whitelist.txt  |  1 -
>   2 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
> index 893aecef21..6d16ed084e 100644
> --- a/arch/powerpc/cpu/mpc8xx/cpu.c
> +++ b/arch/powerpc/cpu/mpc8xx/cpu.c
> @@ -215,19 +215,12 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
>   	/*
>   	 * Trying to execute the next instruction at a non-existing address
>   	 * should cause a machine check, resulting in reset
> -	 */
> -#ifdef CONFIG_SYS_RESET_ADDRESS
> -	addr = CONFIG_SYS_RESET_ADDRESS;
> -#else
> -	/*
> +	 *
>   	 * note: when CONFIG_SYS_MONITOR_BASE points to a RAM address,
>   	 * CONFIG_SYS_MONITOR_BASE - sizeof (ulong) is usually a valid address.
> -	 * Better pick an address known to be invalid on your system and assign
> -	 * it to CONFIG_SYS_RESET_ADDRESS.
> -	 * "(ulong)-1" used to be a good choice for many systems...
>   	 */
>   	addr = CONFIG_SYS_MONITOR_BASE - sizeof(ulong);
> -#endif
> +
>   	((void (*)(void)) addr)();
>   	return 1;
>   }
> diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
> index 7b45d578a3..84e46e3763 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1837,7 +1837,6 @@ CONFIG_SYS_RCAR_I2C1_BASE
>   CONFIG_SYS_RCAR_I2C2_BASE
>   CONFIG_SYS_RCAR_I2C3_BASE
>   CONFIG_SYS_RESET_ADDR
> -CONFIG_SYS_RESET_ADDRESS
>   CONFIG_SYS_RFD
>   CONFIG_SYS_RGMII1_PHY_ADDR
>   CONFIG_SYS_RGMII2_PHY_ADDR

Re: [PATCH 2/2] common: drop CONFIG_SYS_RESET_ADDR

[thomas]

On 2022-01-31 07:20, Ovidiu Panait wrote:
> There are no boards that define CONFIG_SYS_RESET_ADDR, so drop the
> remaining comments referencing it and also the config_whitelist.txt 
> entry.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> ---
> 
>  include/configs/10m50_devboard.h | 9 ---------
>  include/configs/3c120_devboard.h | 9 ---------
>  scripts/config_whitelist.txt     | 1 -
>  3 files changed, 19 deletions(-)
> 

Acked-by: thomas@wytron.com.tw

Thanks,
Thomas Chou

> diff --git a/include/configs/10m50_devboard.h 
> b/include/configs/10m50_devboard.h
> index 04ce88c9dd..3b4d1fd626 100644
> --- a/include/configs/10m50_devboard.h
> +++ b/include/configs/10m50_devboard.h
> @@ -47,13 +47,4 @@
>  					 CONFIG_SYS_SDRAM_SIZE - \
>  					 CONFIG_SYS_MONITOR_LEN)
> 
> -/*
> - * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN 
> above
> - * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> - * reset address, no? This will keep the environment in user region
> - * of flash. NOTE: the monitor length must be multiple of sector size
> - * (which is common practice).
> - */
> -
> -
>  #endif /* __CONFIG_H */
> diff --git a/include/configs/3c120_devboard.h 
> b/include/configs/3c120_devboard.h
> index e12e54fe4f..763cb8db7c 100644
> --- a/include/configs/3c120_devboard.h
> +++ b/include/configs/3c120_devboard.h
> @@ -47,13 +47,4 @@
>  					 CONFIG_SYS_SDRAM_SIZE - \
>  					 CONFIG_SYS_MONITOR_LEN)
> 
> -/*
> - * ENVIRONMENT -- Put environment in sector CONFIG_SYS_MONITOR_LEN 
> above
> - * CONFIG_SYS_RESET_ADDR, since we assume the monitor is stored at the
> - * reset address, no? This will keep the environment in user region
> - * of flash. NOTE: the monitor length must be multiple of sector size
> - * (which is common practice).
> - */
> -
> -
>  #endif /* __CONFIG_H */
> diff --git a/scripts/config_whitelist.txt 
> b/scripts/config_whitelist.txt
> index 84e46e3763..4bd298694a 100644
> --- a/scripts/config_whitelist.txt
> +++ b/scripts/config_whitelist.txt
> @@ -1836,7 +1836,6 @@ CONFIG_SYS_RCAR_I2C0_BASE
>  CONFIG_SYS_RCAR_I2C1_BASE
>  CONFIG_SYS_RCAR_I2C2_BASE
>  CONFIG_SYS_RCAR_I2C3_BASE
> -CONFIG_SYS_RESET_ADDR
>  CONFIG_SYS_RFD
>  CONFIG_SYS_RGMII1_PHY_ADDR
>  CONFIG_SYS_RGMII2_PHY_ADDR

Re: [PATCH 1/2] powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 402 bytes --]

On Mon, Jan 31, 2022 at 09:20:21AM +0200, Ovidiu Panait wrote:

> There are no boards that define CONFIG_SYS_RESET_ADDRESS, so drop the
> associated mpc8xx code that checks for it.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
> Acked-by: Christophe Leroy <christophe.leroy@csgroup.eu>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 2/2] common: drop CONFIG_SYS_RESET_ADDR

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 405 bytes --]

On Mon, Jan 31, 2022 at 09:20:22AM +0200, Ovidiu Panait wrote:

> There are no boards that define CONFIG_SYS_RESET_ADDR, so drop the
> remaining comments referencing it and also the config_whitelist.txt entry.
> 
> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
> Reviewed-by: Stefan Roese <sr@denx.de>
> Acked-by: thomas@wytron.com.tw

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]