diff options
| author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2022-01-31 10:20:21 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-02-11 00:44:23 +0300 |
| commit | 6303b275a3424dc1b6c79e98ac575ab2c88659eb (patch) | |
| tree | 9b0039ca7d9599421f5b5f93772258353b9c9794 | |
| parent | d42f1074253505f4e129267faa0d34676ca54d1f (diff) | |
| download | u-boot-6303b275a3424dc1b6c79e98ac575ab2c88659eb.tar.xz | |
powerpc: mpc8xx: drop CONFIG_SYS_RESET_ADDRESS
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>
| -rw-r--r-- | arch/powerpc/cpu/mpc8xx/cpu.c | 11 | ||||
| -rw-r--r-- | 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 6b21e3918d..d0adcf7b12 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1823,7 +1823,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 |