Quentin SchulzandTom Rini
c480bbd92b
This reverts: - commite49c84f7bb("doc: usage: cmd: reset: specify when the -edl option is available") - commit1076feb8a3("cmd: boot: fix edl being shown when not supported") - commit63c806ba0e("qcom_defconfig: enable psci based sysreset") - commitef06c5d76f("cmd: boot: Add '-edl' option to reset command documentation") - commit32825eaddc("sysreset: Implement PSCI based reset to EDL mode for QCOM SoCs") - commitfcb48b8981("drivers: sysreset: Add sysreset op that can take arguments") There was a conflict reverting commit63c806ba0e("qcom_defconfig: enable psci based sysreset") due to commit02ef1859b4("configs: Resync with savedefconfig"), but the conflict resolution was trivial. The args support for the sysreset uclass contains a logic bug. The first sysreset device implementing the request_arg callback will consume the args, not support the specified arg and thus return -EPROTONOSUPPORT which will stop the iteration over all sysreset devices. This is an issue if one has multiple sysreset devices and each with support for different (valid) args. If a sysreset device implements a -dummy argument and another -foo and a user calls reset -dummy from the U-Boot CLI, it'll depend on which sysreset device will be attempted first. If it is the one implementing -foo, it'll return it doesn't support the argument with -EPROTONOSUPPORT in which case the device implementing -dummy will never be attempted and instead we'll do a cold reset which is very likely not what's expected from the user. Casey suggested[1] we revert this and start from scratch again with a different implementation instead. [1] https://lore.kernel.org/u-boot/77ff0f56-5c3b-42e7-bdd1-bf90296da900@linaro.org/ Acked-by: Casey Connolly <casey.connolly@linaro.org> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
36 lines
1.7 KiB
Makefile
36 lines
1.7 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
# (C) Copyright 2016 Cadence Design Systems Inc.
|
|
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET) += sysreset-uclass.o
|
|
obj-$(CONFIG_ARCH_ASPEED) += sysreset_ast.o
|
|
obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o
|
|
obj-$(CONFIG_ARCH_STI) += sysreset_sti.o
|
|
obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o
|
|
obj-$(CONFIG_SYSRESET_CV1800B) += sysreset_cv1800b.o
|
|
obj-$(CONFIG_$(PHASE_)POWEROFF_GPIO) += poweroff_gpio.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_GPIO) += sysreset_gpio.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_MAX77663) += sysreset_max77663.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_MAX8907) += sysreset_max8907.o
|
|
obj-$(CONFIG_SYSRESET_MPC83XX) += sysreset_mpc83xx.o
|
|
obj-$(CONFIG_SYSRESET_MICROBLAZE) += sysreset_microblaze.o
|
|
obj-$(CONFIG_SYSRESET_OCTEON) += sysreset_octeon.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_PALMAS) += sysreset_palmas.o
|
|
obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o
|
|
obj-$(CONFIG_SYSRESET_SBI) += sysreset_sbi.o
|
|
obj-$(CONFIG_SYSRESET_SOCFPGA) += sysreset_socfpga.o
|
|
obj-$(CONFIG_SYSRESET_SOCFPGA_SOC64) += sysreset_socfpga_soc64.o
|
|
obj-$(CONFIG_SYSRESET_TEGRA) += sysreset_tegra.o
|
|
obj-$(CONFIG_SYSRESET_TI_SCI) += sysreset-ti-sci.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_TPS65910) += sysreset_tps65910.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_TPS80031) += sysreset_tps80031.o
|
|
obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o
|
|
obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o
|
|
obj-$(CONFIG_SYSRESET_RESETCTL) += sysreset_resetctl.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_AT91) += sysreset_at91.o
|
|
obj-$(CONFIG_$(PHASE_)SYSRESET_X86) += sysreset_x86.o
|
|
obj-$(CONFIG_SYSRESET_RAA215300) += sysreset_raa215300.o
|
|
obj-$(CONFIG_SYSRESET_QCOM_PSHOLD) += sysreset_qcom-pshold.o
|
|
obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o
|
|
obj-$(CONFIG_SYSRESET_QEMU_VIRT_CTRL) += sysreset_qemu_virt_ctrl.o
|