diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-19 09:22:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-19 09:22:57 -0400 |
| commit | a2ca54ff52146f2bbf52d87bf4e121e8e15e9e07 (patch) | |
| tree | 4e85487bc3da5aa7a918ca7bb2f8fffb2c8c0d20 /arch/arm/mach-stm32mp | |
| parent | 0ed2e2d825ac70d99ef89e3bb745979a22e2972e (diff) | |
| parent | b8050511c6ee4ab60ef4248dff42aff187696249 (diff) | |
Merge tag 'u-boot-rockchip-20190819' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- Add ROC-RK3399-PC board support
- Move CONFIG_SPI_FLASH_GIGADEVICE and CONFIG_CMD_USB_MASS_STORAGE to
Kconfig
- using SYSRESET_POWER_OFF for poweroff
(Note that patch for rk8xx pmic is droped for it can not pass Travis
build)
- fix ofnode_get_name() assert
Diffstat (limited to 'arch/arm/mach-stm32mp')
| -rw-r--r-- | arch/arm/mach-stm32mp/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/cmd_poweroff.c | 24 |
2 files changed, 0 insertions, 27 deletions
diff --git a/arch/arm/mach-stm32mp/Makefile b/arch/arm/mach-stm32mp/Makefile index 77450604b0f..ad5fd46ccda 100644 --- a/arch/arm/mach-stm32mp/Makefile +++ b/arch/arm/mach-stm32mp/Makefile @@ -12,9 +12,6 @@ obj-y += spl.o else obj-y += bsec.o obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o -ifndef CONFIG_STM32MP1_TRUSTED -obj-$(CONFIG_SYSRESET) += cmd_poweroff.o -endif endif obj-$(CONFIG_ARMV7_PSCI) += psci.o obj-$(CONFIG_$(SPL_)DM_REGULATOR) += pwr_regulator.o diff --git a/arch/arm/mach-stm32mp/cmd_poweroff.c b/arch/arm/mach-stm32mp/cmd_poweroff.c deleted file mode 100644 index f54dd1daf23..00000000000 --- a/arch/arm/mach-stm32mp/cmd_poweroff.c +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause -/* - * Copyright (C) 2019, STMicroelectronics - All Rights Reserved - */ - -#include <common.h> -#include <command.h> -#include <sysreset.h> - -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - int ret; - - puts("poweroff ...\n"); - mdelay(100); - - ret = sysreset_walk(SYSRESET_POWER); - - if (ret == -EINPROGRESS) - mdelay(1000); - - /*NOTREACHED when power off*/ - return CMD_RET_FAILURE; -} |