summaryrefslogtreecommitdiff
path: root/ports
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2020-09-28 15:10:12 -0700
committerScott Shawcroft <scott@tannewt.org>2020-09-28 15:10:12 -0700
commitabdbbf9e242e7ae8234d338f0b1d7a0c26fa6ad1 (patch)
treee1cdc69382cb2b94b3d3e70367c6058ebbd5964c /ports
parent17bdc969dbd060eec60de067f21f8d4143e80bd8 (diff)
One grep
Diffstat (limited to 'ports')
-rw-r--r--ports/esp32s2/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/ports/esp32s2/Makefile b/ports/esp32s2/Makefile
index 662be481e..a32c83013 100644
--- a/ports/esp32s2/Makefile
+++ b/ports/esp32s2/Makefile
@@ -259,8 +259,7 @@ $(BUILD)/esp-idf/partition_table/partition-table.bin: $(BUILD)/esp-idf/config/sd
menuconfig: $(BUILD)/esp-idf/config
$(Q)ninja -C $(BUILD)/esp-idf menuconfig
$(Q)diff --old-line-format= --unchanged-line-format= esp-idf-config/sdkconfig.defaults $(BUILD)/esp-idf/sdkconfig > $(BUILD)/sdkconfig.diff || true
- $(Q)grep -Fvxf $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > $(BUILD)/sdkconfig.stripped1
- $(Q)grep -Fvxf $(DEBUG_SDKCONFIG) $(BUILD)/sdkconfig.stripped1 > boards/$(BOARD)/sdkconfig
+ $(Q)grep -Fvxf $(DEBUG_SDKCONFIG) -f $(FLASH_SDKCONFIG) $(BUILD)/sdkconfig.diff > boards/$(BOARD)/sdkconfig
# qstr builds include headers so we need to make sure they are up to date
$(HEADER_BUILD)/qstr.i.last: | $(BUILD)/esp-idf/config/sdkconfig.h