diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-13 20:58:49 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-13 20:58:49 -0500 |
| commit | 85432c69da37144c2ae7b7e5539a142b218cdc81 (patch) | |
| tree | 98b06f362e50134c6763380f2c0196f7938d1d97 /drivers | |
| parent | f39abbbc531eb7b246d83dbb765e65afcc0989f8 (diff) | |
| parent | 7da4fb9235dd242036bed16c9ea6ad07b60b7ba1 (diff) | |
| download | u-boot-85432c69da37144c2ae7b7e5539a142b218cdc81.tar.gz | |
Merge branch '2019-12-13-master-imports'
- Assorted minor fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/sysreset/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/sysreset/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index 5e6293ae69..f09e138bb8 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -119,7 +119,7 @@ config SYSRESET_TPL_X86 help Reboot support for generic x86 processor reset in TPL. -config SYSRESET_MCP83XX +config SYSRESET_MPC83XX bool "Enable support MPC83xx SoC family reboot driver" help Reboot support for NXP MPC83xx SoCs. diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile index fff4a184a0..51af68fad3 100644 --- a/drivers/sysreset/Makefile +++ b/drivers/sysreset/Makefile @@ -8,7 +8,7 @@ obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o obj-$(CONFIG_ARCH_STI) += sysreset_sti.o obj-$(CONFIG_SANDBOX) += sysreset_sandbox.o obj-$(CONFIG_SYSRESET_GPIO) += sysreset_gpio.o -obj-$(CONFIG_SYSRESET_MCP83XX) += sysreset_mpc83xx.o +obj-$(CONFIG_SYSRESET_MPC83XX) += sysreset_mpc83xx.o obj-$(CONFIG_SYSRESET_MICROBLAZE) += sysreset_microblaze.o obj-$(CONFIG_SYSRESET_PSCI) += sysreset_psci.o obj-$(CONFIG_SYSRESET_SOCFPGA) += sysreset_socfpga.o |