From 7f17a45f0b82bab378832cc0a631e910d250063d Mon Sep 17 00:00:00 2001 From: Graham Sanderson Date: Thu, 4 Mar 2021 20:20:56 -0600 Subject: [PATCH] Remove PICO_FLASH_SIZE_BYTES warning from header as it breaks any build with -Werror; actual uses that care should warn instead (#229) --- lib/tinyusb | 2 +- src/rp2_common/hardware_flash/include/hardware/flash.h | 3 --- src/rp2_common/pico_double/double_init_rom.c | 2 +- src/rp2_common/pico_float/float_init_rom.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/tinyusb b/lib/tinyusb index 11c23f8..e0aa405 160000 --- a/lib/tinyusb +++ b/lib/tinyusb @@ -1 +1 @@ -Subproject commit 11c23f88bf42f64ce14b8a7b0b2a4e207dc4dd12 +Subproject commit e0aa405d19e35dbf58cf502b8106455c1a3c2a5c diff --git a/src/rp2_common/hardware_flash/include/hardware/flash.h b/src/rp2_common/hardware_flash/include/hardware/flash.h index 77bd1d0..d015db4 100644 --- a/src/rp2_common/hardware_flash/include/hardware/flash.h +++ b/src/rp2_common/hardware_flash/include/hardware/flash.h @@ -45,9 +45,6 @@ #define FLASH_UNIQUE_ID_SIZE_BYTES 8 // PICO_CONFIG: PICO_FLASH_SIZE_BYTES, size of primary flash in bytes, type=int, group=hardware_flash -#ifndef PICO_FLASH_SIZE_BYTES -#warning PICO_FLASH_SIZE_BYTES is not set -#endif #ifdef __cplusplus extern "C" { diff --git a/src/rp2_common/pico_double/double_init_rom.c b/src/rp2_common/pico_double/double_init_rom.c index 2074a3f..1a25559 100644 --- a/src/rp2_common/pico_double/double_init_rom.c +++ b/src/rp2_common/pico_double/double_init_rom.c @@ -13,7 +13,7 @@ uint32_t sd_table[SF_TABLE_V2_SIZE / 2]; #if !PICO_DOUBLE_SUPPORT_ROM_V1 -static __attribute__((noreturn)) void missing_double_func_shim() { +static __attribute__((noreturn)) void missing_double_func_shim(void) { panic("missing double function"); } #endif diff --git a/src/rp2_common/pico_float/float_init_rom.c b/src/rp2_common/pico_float/float_init_rom.c index 1f9d3d8..24c74ce 100644 --- a/src/rp2_common/pico_float/float_init_rom.c +++ b/src/rp2_common/pico_float/float_init_rom.c @@ -14,7 +14,7 @@ uint32_t sf_table[SF_TABLE_V2_SIZE / 2]; void *sf_clz_func; #if !PICO_FLOAT_SUPPORT_ROM_V1 -static __attribute__((noreturn)) void missing_float_func_shim() { +static __attribute__((noreturn)) void missing_float_func_shim(void) { panic(""); } #endif