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

Christophe Leroy christophe.leroy at csgroup.eu
Mon Jan 31 11:40:53 CET 2022



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 at windriver.com>

Acked-by: Christophe Leroy <christophe.leroy at 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


More information about the U-Boot mailing list