Skip to content

Commit 11c3298

Browse files
authored
Merge branch 'master' into feature/config_ui
2 parents c184c89 + e1e13da commit 11c3298

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

configs/defconfig.common

+2
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
8181
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
8282
CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0
8383
CONFIG_LWIP_IPV6_AUTOCONFIG=y
84+
CONFIG_LWIP_IPV6_DHCP6=y
85+
CONFIG_LWIP_IPV6_RDNSS_MAX_DNS_SERVERS=2
8486
CONFIG_ESP_RMAKER_SKIP_VERSION_CHECK=y
8587
CONFIG_ESP_RMAKER_USER_ID_CHECK=y
8688
CONFIG_ESP_INSIGHTS_ENABLED=y

tools/config.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if [ -d "$IDF_PATH" ]; then
5858
fi
5959

6060
function get_os(){
61-
OSBITS=`arch`
61+
OSBITS=`uname -m`
6262
if [[ "$OSTYPE" == "linux"* ]]; then
6363
if [[ "$OSBITS" == "i686" ]]; then
6464
echo "linux32"

0 commit comments

Comments
 (0)