Skip to content

Commit 2bd0266

Browse files
32teeth32teeth
committed
Sun 3 Jan 2021 17:50:04 EST
2 parents 87ca032 + 0b1961e commit 2bd0266

File tree

27 files changed

+332
-2
lines changed

27 files changed

+332
-2
lines changed

‎Configs/cute-esp32/Emulators/frodo-go/sdkconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,11 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
168168
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
169169
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
170170
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
171+
<<<<<<< HEAD
171172
CONFIG_SPIRAM_SUPPORT=
173+
=======
174+
CONFIG_SPIRAM_SUPPORT=y
175+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
172176

173177
#
174178
# SPI RAM config

‎Configs/cute-esp32/Emulators/go-play/gnuboy-go/sdkconfig

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,20 @@ CONFIG_BOOTLOADER_SPI_WP_PIN=10
2424
CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
2525
CONFIG_BOOTLOADER_FACTORY_RESET=
2626
CONFIG_BOOTLOADER_APP_TEST=
27+
<<<<<<< HEAD
2728
CONFIG_BOOTLOADER_WDT_ENABLE=y
2829
CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=
2930
CONFIG_BOOTLOADER_WDT_TIME_MS=9000
31+
=======
32+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
3033

3134
#
3235
# Security features
3336
#
37+
<<<<<<< HEAD
3438
CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT=
39+
=======
40+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
3541
CONFIG_SECURE_BOOT_ENABLED=
3642
CONFIG_FLASH_ENCRYPTION_ENABLED=
3743

@@ -81,6 +87,7 @@ CONFIG_MONITOR_BAUD_OTHER_VAL=115200
8187
CONFIG_MONITOR_BAUD=115200
8288

8389
#
90+
<<<<<<< HEAD
8491
# Retro ESP32 Configuration
8592
#
8693
CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=y
@@ -93,6 +100,8 @@ CONFIG_IN_GAME_MENU_YES=y
93100
CONFIG_IN_GAME_MENU_NO=
94101

95102
#
103+
=======
104+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
96105
# Partition Table
97106
#
98107
CONFIG_PARTITION_TABLE_SINGLE_APP=
@@ -118,7 +127,10 @@ CONFIG_STACK_CHECK_STRONG=
118127
CONFIG_STACK_CHECK_ALL=
119128
CONFIG_STACK_CHECK=y
120129
CONFIG_WARN_WRITE_STRINGS=y
130+
<<<<<<< HEAD
121131
CONFIG_DISABLE_GCC8_WARNINGS=
132+
=======
133+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
122134

123135
#
124136
# Component config
@@ -137,9 +149,12 @@ CONFIG_AWS_IOT_SDK=
137149
# Bluetooth
138150
#
139151
CONFIG_BT_ENABLED=
152+
<<<<<<< HEAD
140153
CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
141154
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
142155
CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
156+
=======
157+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
143158
CONFIG_BTDM_CONTROLLER_PINNED_TO_CORE=0
144159
CONFIG_BT_RESERVE_DRAM=0
145160

@@ -154,12 +169,19 @@ CONFIG_ADC_FORCE_XPD_FSM=
154169
CONFIG_ADC2_DISABLE_DAC=y
155170

156171
#
172+
<<<<<<< HEAD
157173
# SPI configuration
158174
#
159175
CONFIG_SPI_MASTER_IN_IRAM=
160176
CONFIG_SPI_MASTER_ISR_IN_IRAM=
161177
CONFIG_SPI_SLAVE_IN_IRAM=
162178
CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
179+
=======
180+
# SPI master configuration
181+
#
182+
CONFIG_SPI_MASTER_IN_IRAM=
183+
CONFIG_SPI_MASTER_ISR_IN_IRAM=
184+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
163185

164186
#
165187
# ESP32-specific
@@ -168,7 +190,26 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
168190
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
169191
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
170192
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
193+
<<<<<<< HEAD
171194
CONFIG_SPIRAM_SUPPORT=
195+
=======
196+
CONFIG_SPIRAM_SUPPORT=y
197+
198+
#
199+
# SPI RAM config
200+
#
201+
CONFIG_SPIRAM_BOOT_INIT=y
202+
CONFIG_SPIRAM_IGNORE_NOTFOUND=
203+
CONFIG_SPIRAM_USE_MEMMAP=y
204+
CONFIG_SPIRAM_USE_CAPS_ALLOC=
205+
CONFIG_SPIRAM_USE_MALLOC=
206+
CONFIG_SPIRAM_TYPE_ESPPSRAM32=y
207+
CONFIG_SPIRAM_SIZE=4194304
208+
CONFIG_SPIRAM_SPEED_40M=
209+
CONFIG_SPIRAM_SPEED_80M=y
210+
CONFIG_SPIRAM_MEMTEST=
211+
CONFIG_SPIRAM_CACHE_WORKAROUND=
212+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
172213
CONFIG_MEMMAP_TRACEMEM=
173214
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
174215
CONFIG_ESP32_TRAX=
@@ -217,15 +258,21 @@ CONFIG_BROWNOUT_DET_LVL_SEL_5=
217258
CONFIG_BROWNOUT_DET_LVL_SEL_6=
218259
CONFIG_BROWNOUT_DET_LVL_SEL_7=
219260
CONFIG_BROWNOUT_DET_LVL=0
261+
<<<<<<< HEAD
220262
CONFIG_REDUCE_PHY_TX_POWER=y
263+
=======
264+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
221265
CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
222266
CONFIG_ESP32_TIME_SYSCALL_USE_RTC=
223267
CONFIG_ESP32_TIME_SYSCALL_USE_FRC1=
224268
CONFIG_ESP32_TIME_SYSCALL_USE_NONE=
225269
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
226270
CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL=
271+
<<<<<<< HEAD
227272
CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC=
228273
CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256=
274+
=======
275+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
229276
CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
230277
CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
231278
CONFIG_ESP32_XTAL_FREQ_40=y
@@ -255,7 +302,10 @@ CONFIG_ESP32_WIFI_RX_BA_WIN=6
255302
CONFIG_ESP32_WIFI_NVS_ENABLED=y
256303
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0=y
257304
CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=
305+
<<<<<<< HEAD
258306
CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
307+
=======
308+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
259309

260310
#
261311
# PHY
@@ -278,30 +328,40 @@ CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
278328
CONFIG_ADC_CAL_LUT_ENABLE=y
279329

280330
#
331+
<<<<<<< HEAD
281332
# Event Loop Library
282333
#
283334
CONFIG_EVENT_LOOP_PROFILING=
284335

285336
#
337+
=======
338+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
286339
# ESP HTTP client
287340
#
288341
CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=
289342

290343
#
344+
<<<<<<< HEAD
291345
# HTTP Server
292346
#
293347
CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
294348
CONFIG_HTTPD_MAX_URI_LEN=512
295349

296350
#
351+
=======
352+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
297353
# Ethernet
298354
#
299355
CONFIG_DMA_RX_BUF_NUM=10
300356
CONFIG_DMA_TX_BUF_NUM=10
301357
CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
358+
<<<<<<< HEAD
302359
CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
303360
CONFIG_EMAC_TASK_PRIORITY=20
304361
CONFIG_EMAC_TASK_STACK_SIZE=3072
362+
=======
363+
CONFIG_EMAC_TASK_PRIORITY=20
364+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
305365

306366
#
307367
# FAT Filesystem support
@@ -341,6 +401,7 @@ CONFIG_FATFS_TIMEOUT_MS=10000
341401
CONFIG_FATFS_PER_FILE_CACHE=y
342402

343403
#
404+
<<<<<<< HEAD
344405
# Modbus configuration
345406
#
346407
CONFIG_MB_QUEUE_LENGTH=20
@@ -361,6 +422,11 @@ CONFIG_MB_TIMER_INDEX=0
361422
#
362423
CONFIG_FREERTOS_UNICORE=
363424
CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
425+
=======
426+
# FreeRTOS
427+
#
428+
CONFIG_FREERTOS_UNICORE=
429+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
364430
CONFIG_FREERTOS_CORETIMER_0=y
365431
CONFIG_FREERTOS_CORETIMER_1=
366432
CONFIG_FREERTOS_HZ=100
@@ -426,11 +492,16 @@ CONFIG_LWIP_IP_FRAG=
426492
CONFIG_LWIP_IP_REASSEMBLY=
427493
CONFIG_LWIP_STATS=
428494
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
495+
<<<<<<< HEAD
429496
CONFIG_ESP_GRATUITOUS_ARP=y
430497
CONFIG_GARP_TMR_INTERVAL=60
431498
CONFIG_TCPIP_RECVMBOX_SIZE=32
432499
CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
433500
CONFIG_LWIP_DHCP_RESTORE_LAST_IP=
501+
=======
502+
CONFIG_TCPIP_RECVMBOX_SIZE=32
503+
CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
504+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
434505

435506
#
436507
# DHCP server
@@ -465,10 +536,13 @@ CONFIG_TCP_OVERSIZE_DISABLE=
465536
CONFIG_LWIP_MAX_UDP_PCBS=16
466537
CONFIG_UDP_RECVMBOX_SIZE=6
467538
CONFIG_TCPIP_TASK_STACK_SIZE=2560
539+
<<<<<<< HEAD
468540
CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
469541
CONFIG_TCPIP_TASK_AFFINITY_CPU0=
470542
CONFIG_TCPIP_TASK_AFFINITY_CPU1=
471543
CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
544+
=======
545+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
472546
CONFIG_PPP_SUPPORT=
473547

474548
#
@@ -485,11 +559,15 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
485559
#
486560
# mbedTLS
487561
#
562+
<<<<<<< HEAD
488563
CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
489564
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=
490565
CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
491566
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
492567
CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
568+
=======
569+
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
570+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
493571
CONFIG_MBEDTLS_DEBUG=
494572
CONFIG_MBEDTLS_HARDWARE_AES=y
495573
CONFIG_MBEDTLS_HARDWARE_MPI=y
@@ -565,6 +643,7 @@ CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
565643
CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
566644

567645
#
646+
<<<<<<< HEAD
568647
# mDNS
569648
#
570649
CONFIG_MDNS_MAX_SERVICES=10
@@ -585,6 +664,8 @@ CONFIG_MQTT_CUSTOM_OUTBOX=
585664
#
586665

587666
#
667+
=======
668+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
588669
# OpenSSL
589670
#
590671
CONFIG_OPENSSL_DEBUG=
@@ -596,7 +677,10 @@ CONFIG_OPENSSL_ASSERT_EXIT=
596677
#
597678
CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
598679
CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048
680+
<<<<<<< HEAD
599681
CONFIG_PTHREAD_STACK_MIN=768
682+
=======
683+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
600684

601685
#
602686
# SPI Flash driver
@@ -640,16 +724,25 @@ CONFIG_SPIFFS_CHECK_DBG=
640724
CONFIG_SPIFFS_TEST_VISUALISATION=
641725

642726
#
727+
<<<<<<< HEAD
643728
# TCP/IP Adapter
644729
#
645730
CONFIG_IP_LOST_TIMER_INTERVAL=120
646731
CONFIG_TCPIP_LWIP=y
732+
=======
733+
# tcpip adapter
734+
#
735+
CONFIG_IP_LOST_TIMER_INTERVAL=120
736+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
647737

648738
#
649739
# Virtual file system
650740
#
651741
CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y
742+
<<<<<<< HEAD
652743
CONFIG_SUPPORT_TERMIOS=y
744+
=======
745+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
653746

654747
#
655748
# Wear Levelling

‎Configs/cute-esp32/Emulators/go-play/nesemu-go/sdkconfig

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,31 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
183183
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
184184
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
185185
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
186+
<<<<<<< HEAD
186187
CONFIG_SPIRAM_SUPPORT=
188+
=======
189+
CONFIG_SPIRAM_SUPPORT=y
190+
191+
#
192+
# SPI RAM config
193+
#
194+
CONFIG_SPIRAM_BOOT_INIT=y
195+
CONFIG_SPIRAM_IGNORE_NOTFOUND=
196+
CONFIG_SPIRAM_USE_MEMMAP=y
197+
CONFIG_SPIRAM_USE_CAPS_ALLOC=
198+
CONFIG_SPIRAM_USE_MALLOC=
199+
CONFIG_SPIRAM_TYPE_AUTO=y
200+
CONFIG_SPIRAM_TYPE_ESPPSRAM32=
201+
CONFIG_SPIRAM_TYPE_ESPPSRAM64=
202+
CONFIG_SPIRAM_SIZE=-1
203+
CONFIG_SPIRAM_SPEED_40M=
204+
CONFIG_SPIRAM_SPEED_80M=y
205+
CONFIG_SPIRAM_MEMTEST=
206+
CONFIG_SPIRAM_CACHE_WORKAROUND=
207+
CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
208+
CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
209+
CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
210+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
187211
CONFIG_MEMMAP_TRACEMEM=
188212
CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
189213
CONFIG_ESP32_TRAX=
@@ -507,6 +531,10 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
507531
# mbedTLS
508532
#
509533
CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
534+
<<<<<<< HEAD
535+
=======
536+
CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC=
537+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
510538
CONFIG_MBEDTLS_DEFAULT_MEM_ALLOC=
511539
CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
512540
CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384

‎Configs/cute-esp32/Emulators/go-play/smsplusgx-go/sdkconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
8888
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
8989
CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
9090
CONFIG_DEFAULT_MENU_KEY=
91+
<<<<<<< HEAD
9192
CONFIG_COMBO_MENU_KEY=yn
93+
=======
94+
CONFIG_COMBO_MENU_KEY=y
95+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
9296
CONFIG_IN_GAME_MENU_YES=y
9397
CONFIG_IN_GAME_MENU_NO=
9498

@@ -168,7 +172,11 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
168172
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
169173
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
170174
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
175+
<<<<<<< HEAD
171176
CONFIG_SPIRAM_SUPPORT=
177+
=======
178+
CONFIG_SPIRAM_SUPPORT=y
179+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
172180

173181
#
174182
# SPI RAM config

‎Configs/cute-esp32/Emulators/handy-go/sdkconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,11 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
168168
CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
169169
CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
170170
CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
171+
<<<<<<< HEAD
171172
CONFIG_SPIRAM_SUPPORT=
173+
=======
174+
CONFIG_SPIRAM_SUPPORT=y
175+
>>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
172176

173177
#
174178
# SPI RAM config

0 commit comments

Comments
 (0)