fix PROGMEM str declaration (ld section conflics)

d-a-v · d-a-v · commit b02b98fcebf5 · 2018-03-21T17:34:55.000+01:00
diff --git a/cores/esp8266/uart.c b/cores/esp8266/uart.c
@@ -103,7 +103,7 @@ inline size_t uart_rx_fifo_available(uart_t* uart) {
     return (USS(uart->uart_nr) >> USRXC) & 0x7F;
 }
 
-char overrun_str [] ICACHE_RODATA_ATTR STORE_ATTR = "uart input full!\r\n";
+const char overrun_str [] ICACHE_RODATA_ATTR STORE_ATTR = "uart input full!\r\n";
 
 // Copy all the rx fifo bytes that fit into the rx buffer
 inline void uart_rx_copy_fifo_to_buffer(uart_t* uart) {

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ inline size_t uart_rx_fifo_available(uart_t* uart) {`
`103`	`103`	`return (USS(uart->uart_nr) >> USRXC) & 0x7F;`
`104`	`104`	`}`
`105`	`105`
`106`		`-char overrun_str [] ICACHE_RODATA_ATTR STORE_ATTR = "uart input full!\r\n";`
	`106`	`+const char overrun_str [] ICACHE_RODATA_ATTR STORE_ATTR = "uart input full!\r\n";`
`107`	`107`
`108`	`108`	`// Copy all the rx fifo bytes that fit into the rx buffer`
`109`	`109`	`inline void uart_rx_copy_fifo_to_buffer(uart_t* uart) {`