rpi_pico: make it work with picolibc

The picolibc changes were merged upstream; switch to using that revision.

As the module now includes flash I/O functions, we don't need our own
versions, so remove them.

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

drivers/flash/flash_rpi_pico.c

@@ -58,135 +58,8 @@ enum outover {
 	OUTOVER_HIGH
 };
 
-static ssi_hw_t *const ssi = (ssi_hw_t *)SSI_BASE_ADDRESS;
-static uint32_t boot2_copyout[BOOT2_SIZE_WORDS];
-static bool boot2_copyout_valid;
 static uint8_t flash_ram_buffer[PAGE_SIZE];
 
-static void __no_inline_not_in_flash_func(flash_init_boot2_copyout)(void)
-{
-	if (boot2_copyout_valid) {
-		return;
-	}
-	for (int i = 0; i < BOOT2_SIZE_WORDS; ++i) {
-		boot2_copyout[i] = ((uint32_t *)FLASH_BASE)[i];
-	}
-	__compiler_memory_barrier();
-	boot2_copyout_valid = true;
-}
-
-static void __no_inline_not_in_flash_func(flash_enable_xip_via_boot2)(void)
-{
-	((void (*)(void))((uint32_t)boot2_copyout+1))();
-}
-
-void __no_inline_not_in_flash_func(flash_cs_force)(enum outover over)
-{
-	io_rw_32 *reg = (io_rw_32 *) (IO_QSPI_BASE + IO_QSPI_GPIO_QSPI_SS_CTRL_OFFSET);
-	*reg = (*reg & ~IO_QSPI_GPIO_QSPI_SS_CTRL_OUTOVER_BITS)
-		| (over << IO_QSPI_GPIO_QSPI_SS_CTRL_OUTOVER_LSB);
-	(void) *reg;
-}
-
-int __no_inline_not_in_flash_func(flash_was_aborted)()
-{
-	return *(io_rw_32 *) (IO_QSPI_BASE + IO_QSPI_GPIO_QSPI_SD1_CTRL_OFFSET)
-		   & IO_QSPI_GPIO_QSPI_SD1_CTRL_INOVER_BITS;
-}
-
-void __no_inline_not_in_flash_func(flash_put_get)(const uint8_t *tx, uint8_t *rx, size_t count,
-						size_t rx_skip)
-{
-	const uint max_in_flight = 16 - 2;
-	size_t tx_count = count;
-	size_t rx_count = count;
-	bool did_something;
-	uint32_t tx_level;
-	uint32_t rx_level;
-	uint8_t rxbyte;
-
-	while (tx_count || rx_skip || rx_count) {
-		tx_level = ssi_hw->txflr;
-		rx_level = ssi_hw->rxflr;
-		did_something = false;
-		if (tx_count && tx_level + rx_level < max_in_flight) {
-			ssi->dr0 = (uint32_t) (tx ? *tx++ : 0);
-			--tx_count;
-			did_something = true;
-		}
-		if (rx_level) {
-			rxbyte = ssi->dr0;
-			did_something = true;
-			if (rx_skip) {
-				--rx_skip;
-			} else {
-				if (rx) {
-					*rx++ = rxbyte;
-				}
-				--rx_count;
-			}
-		}
-
-		if (!did_something && __builtin_expect(flash_was_aborted(), 0)) {
-			break;
-		}
-	}
-	flash_cs_force(OUTOVER_HIGH);
-}
-
-void __no_inline_not_in_flash_func(flash_put_get_wrapper)(uint8_t cmd, const uint8_t *tx,
-					uint8_t *rx, size_t count)
-{
-	flash_cs_force(OUTOVER_LOW);
-	ssi->dr0 = cmd;
-	flash_put_get(tx, rx, count, 1);
-}
-
-static ALWAYS_INLINE void flash_put_cmd_addr(uint8_t cmd, uint32_t addr)
-{
-	flash_cs_force(OUTOVER_LOW);
-	addr |= cmd << 24;
-	for (int i = 0; i < 4; ++i) {
-		ssi->dr0 = addr >> 24;
-		addr <<= 8;
-	}
-}
-
-void __no_inline_not_in_flash_func(flash_write_partial_internal)(uint32_t addr, const uint8_t *data,
-					size_t size)
-{
-	uint8_t status_reg;
-
-	flash_put_get_wrapper(FLASHCMD_WRITE_ENABLE, NULL, NULL, 0);
-	flash_put_cmd_addr(FLASHCMD_PAGE_PROGRAM, addr);
-	flash_put_get(data, NULL, size, 4);
-
-	do {
-		flash_put_get_wrapper(FLASHCMD_READ_STATUS, NULL, &status_reg, 1);
-	} while (status_reg & 0x1 && !flash_was_aborted());
-}
-
-void __no_inline_not_in_flash_func(flash_write_partial)(uint32_t flash_offs, const uint8_t *data,
-							size_t count)
-{
-	rom_connect_internal_flash_fn connect_internal_flash = (rom_connect_internal_flash_fn)
-					rom_func_lookup_inline(ROM_FUNC_CONNECT_INTERNAL_FLASH);
-	rom_flash_exit_xip_fn exit_xip = (rom_flash_exit_xip_fn)
-						rom_func_lookup_inline(ROM_FUNC_FLASH_EXIT_XIP);
-	rom_flash_flush_cache_fn flush_cache = (rom_flash_flush_cache_fn)
-						rom_func_lookup_inline(ROM_FUNC_FLASH_FLUSH_CACHE);
-
-	flash_init_boot2_copyout();
-
-	__compiler_memory_barrier();
-
-	connect_internal_flash();
-	exit_xip();
-	flash_write_partial_internal(flash_offs, data, count);
-	flush_cache();
-	flash_enable_xip_via_boot2();
-}
-
 static bool is_valid_range(off_t offset, uint32_t size)
 {
 	return (offset >= 0) && ((offset + size) <= FLASH_SIZE);

west.yml

@@ -231,7 +231,7 @@ manifest:
         - hal
     - name: hal_rpi_pico
       path: modules/hal/rpi_pico
-      revision: 7b57b24588797e6e7bf18b6bda168e6b96374264
+      revision: b547a36a722af7787e5f55b551fd6ce72dcba5a4
       groups:
         - hal
     - name: hal_silabs