Skip to content

Commit abdbbf9

Browse files
tannewttannewt
committed
One grep
1 parent 17bdc96 commit abdbbf9

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

‎ports/esp32s2/Makefile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,8 +259,7 @@ $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sd
259259
menuconfig: $(BUILD)/esp-idf/config
260260
$(Q)ninja -C $(BUILD)/esp-idf menuconfig
261261
$(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true
262-
$(Q)grep -Fvxf $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > $(BUILD)/sdkconfig.stripped1
263-
$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) $(BUILD)/sdkconfig.stripped1 > boards/$(BOARD)/sdkconfig
262+
$(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig
264263

265264
# qstr builds include headers so we need to make sure they are up to date
266265
$(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h

0 commit comments

Comments
 (0)