Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-19 11:24:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct SPL uses of MULTIPLEXER

Browse source 
This converts 3 usages of this option to the non-SPL form, since there is
no SPL_MULTIPLEXER defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2023-02-22 09:33:49 -07:00 • committed by Tom Rini
parent 1be3077e71
commit b07be4a8a2
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/Makefile
View file

@ -18,7 +18,6 @@ obj-$(CONFIG_$(SPL_TPL_)INPUT) += input/
obj-$(CONFIG_$(SPL_TPL_)LED) += led/ obj-$(CONFIG_$(SPL_TPL_)LED) += led/
obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/ obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/
obj-y += mtd/ obj-y += mtd/
obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/
obj-$(CONFIG_$(SPL_TPL_)ETH) += net/ obj-$(CONFIG_$(SPL_TPL_)ETH) += net/
obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/
obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/
@ -87,6 +86,7 @@ obj-$(CONFIG_FASTBOOT) += fastboot/
obj-$(CONFIG_FWU_MDATA) += fwu-mdata/ obj-$(CONFIG_FWU_MDATA) += fwu-mdata/
obj-y += misc/ obj-y += misc/
obj-$(CONFIG_MMC) += mmc/ obj-$(CONFIG_MMC) += mmc/
obj-$(CONFIG_MULTIPLEXER) += mux/
obj-$(CONFIG_NVME) += nvme/ obj-$(CONFIG_NVME) += nvme/
obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/ obj-$(CONFIG_PCI_ENDPOINT) += pci_endpoint/
obj-y += dfu/ obj-y += dfu/

2
drivers/mux/Makefile
View file

@ -3,5 +3,5 @@
# (C) Copyright 2019 # (C) Copyright 2019
# Jean-Jacques Hiblot <jjhiblot@ti.com> # Jean-Jacques Hiblot <jjhiblot@ti.com>
obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux-uclass.o obj-$(CONFIG_MULTIPLEXER) += mux-uclass.o
obj-$(CONFIG_$(SPL_)MUX_MMIO) += mmio.o obj-$(CONFIG_$(SPL_)MUX_MMIO) += mmio.o

2
include/mux.h
View file

@ -23,7 +23,7 @@
struct udevice; struct udevice;
struct mux_control; struct mux_control;
#if CONFIG_IS_ENABLED(MULTIPLEXER) #if IS_ENABLED(CONFIG_MULTIPLEXER)
/** /**
* mux_control_states() - Query the number of multiplexer states. * mux_control_states() - Query the number of multiplexer states.
* @mux: The mux-control to query. * @mux: The mux-control to query.