diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:20 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-09-25 08:06:20 +0200 |
| commit | 39bdcdfb814a22c8143c04938268378e9994b7dd (patch) | |
| tree | 4eeea3247892cab65f10a25d2910fad021cbe7f0 /arch/kvx | |
| parent | e083790340aa4cf1b8edaa50f6b9fbb1edfe56d0 (diff) | |
| parent | 8fb0a2bf6efb67084a5d7a7f3822b4d480fca685 (diff) | |
| download | barebox-39bdcdfb814a22c8143c04938268378e9994b7dd.tar.gz barebox-39bdcdfb814a22c8143c04938268378e9994b7dd.tar.xz | |
Merge branch 'for-next/misc' into master
Diffstat (limited to 'arch/kvx')
| -rw-r--r-- | arch/kvx/configs/generic_defconfig | 12 | ||||
| -rw-r--r-- | arch/kvx/cpu/reset.c | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/arch/kvx/configs/generic_defconfig b/arch/kvx/configs/generic_defconfig index 8162171741..0d971ff3d5 100644 --- a/arch/kvx/configs/generic_defconfig +++ b/arch/kvx/configs/generic_defconfig @@ -1,15 +1,13 @@ CONFIG_AUTO_COMPLETE=y -CONFIG_BAUDRATE=115200 -CONFIG_CLOCKSOURCE_KVX=y +CONFIG_CONSOLE_RATP=y CONFIG_CMD_BOOT=y -CONFIG_CMD_BOOTM=y +CONFIG_CMD_RESET=y CONFIG_CMD_CMP=y -CONFIG_CMD_OF_DUMP=y CONFIG_CMD_POWEROFF=y -CONFIG_CMD_RESET=y CONFIG_CMD_WD=y -CONFIG_CONSOLE_RATP=y +CONFIG_CMD_OF_DUMP=y CONFIG_DRIVER_SERIAL_NS16550=y -CONFIG_PINCTRL_SINGLE=y +CONFIG_CLOCKSOURCE_KVX=y CONFIG_WATCHDOG=y CONFIG_WATCHDOG_KVX=y +CONFIG_PINCTRL_SINGLE=y diff --git a/arch/kvx/cpu/reset.c b/arch/kvx/cpu/reset.c index c7f2018e00..df36764cb6 100644 --- a/arch/kvx/cpu/reset.c +++ b/arch/kvx/cpu/reset.c @@ -60,7 +60,7 @@ static int kvx_reset_init(void) break; } - restart_handler_register_fn(kvx_restart_soc); + restart_handler_register_fn("soc", kvx_restart_soc); return 0; } |