Skip to content

Commit c6638da

Browse files
committed
Fix DTB compilation regression in default build
The 'all' target unconditionally included $(BUILD_DTB) and $(BUILD_DTB2C), causing device tree compilation to run even for user-space builds where ENABLE_SYSTEM=0. This triggered dtc syntax errors because the required macros (INITRD_START, INITRD_END, MEM_START, MEM_END) are only defined for system mode. Since DTB_DEPS is already conditionally set to include these targets when needed (ENABLE_SYSTEM=1 and ENABLE_ELF_LOADER=0), the redundant explicit dependencies are removed. Fixes regression introduced in commit 2b06e85 where ELF_LOADER logic was reordered.
1 parent dd76f58 commit c6638da

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -499,14 +499,14 @@ jobs:
499499
fi
500500
done
501501
502-
- name: JIT debug test
503-
env:
504-
CC: ${{ steps.install_cc.outputs.cc }}
505-
run: |
506-
# Run JIT tests with debug mode to catch register allocation and cache coherency issues
507-
make distclean && make ENABLE_JIT=1 ENABLE_JIT_DEBUG=1 check $PARALLEL
508-
make distclean && make ENABLE_EXT_C=0 ENABLE_JIT=1 ENABLE_JIT_DEBUG=1 check $PARALLEL
509-
if: ${{ always() }}
502+
- name: JIT debug test
503+
env:
504+
CC: ${{ steps.install_cc.outputs.cc }}
505+
run: |
506+
# Run JIT tests with debug mode to catch register allocation and cache coherency issues
507+
make distclean && make ENABLE_JIT=1 ENABLE_JIT_DEBUG=1 check $PARALLEL
508+
make distclean && make ENABLE_EXT_C=0 ENABLE_JIT=1 ENABLE_JIT_DEBUG=1 check $PARALLEL
509+
if: ${{ always() }}
510510

511511
- name: undefined behavior test
512512
if: (success() || failure()) && steps.install_cc.outputs.cc == 'clang' # gcc on macOS/arm64 does not support sanitizers

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ DTB_DEPS := $(BUILD_DTB) $(BUILD_DTB2C)
392392
endif
393393
endif
394394

395-
all: config $(DTB_DEPS) $(BUILD_DTB) $(BUILD_DTB2C) $(BIN)
395+
all: config $(DTB_DEPS) $(BIN)
396396

397397
OBJS := \
398398
map.o \

0 commit comments

Comments
 (0)