summaryrefslogtreecommitdiff
path: root/arch/xtensa
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-04-18 08:29:35 -0600
committerTom Rini <trini@konsulko.com>2024-04-18 08:29:35 -0600
commitcdd20e3f66fe910da0545d3615decf511519b4a6 (patch)
tree9162980e2293b2a2405060f44529fe7a25cd0e1e /arch/xtensa
parent3434b88d2c2fdad3cc947f9e9b03dabfdd3feb5c (diff)
downloadu-boot-cdd20e3f66fe910da0545d3615decf511519b4a6.tar.gz
u-boot-cdd20e3f66fe910da0545d3615decf511519b4a6.tar.bz2
u-boot-cdd20e3f66fe910da0545d3615decf511519b4a6.zip
Revert "Merge patch series "pxe: Allow extlinux booting without CMDLINE enabled""
As reported by Jonas Karlman this series breaks booting on some AArch64 platforms with common use cases. For now the best path forward is to revert the series. This reverts commit 777c28460947371ada40868dc994dfe8537d7115, reversing changes made to ab3453e7b12daef47b9e91da2a2a3d48615dc6fc. Link: https://lore.kernel.org/u-boot/50dfa3d6-a1ca-4492-a3fc-8d8c56b40b43@kwiboo.se/ Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/lib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/lib/Makefile b/arch/xtensa/lib/Makefile
index bb9157f30f..ad4fe32cb6 100644
--- a/arch/xtensa/lib/Makefile
+++ b/arch/xtensa/lib/Makefile
@@ -3,6 +3,6 @@
# (C) Copyright 2007 - 2013 Tensilica Inc.
# (C) Copyright 2014 - 2016 Cadence Design Systems Inc.
-obj-$(CONFIG_BOOTM) += bootm.o
+obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-y += cache.o misc.o relocate.o time.o