Merge branch 'u-boot/master'
Conflicts: drivers/net/Makefile (trivial merge)
This commit is contained in:
@@ -6,5 +6,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0+
|
||||
#
|
||||
|
||||
obj-y += $(BOARD).o
|
||||
obj-y += cm_t335.o
|
||||
obj-$(CONFIG_SPL_BUILD) += mux.o spl.o
|
||||
|
||||
Reference in New Issue
Block a user