From 9aa6a35b3f812c0c551b26790abdad79db5fd894 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 12 Oct 2025 17:04:06 -0400 Subject: [PATCH] Fix warnings introduced in prior commit * #define CONFIG_RTC APPLICATION (in sim builds) * #define CONFIG_STORAGE 0 (in PCTOOL builds) Change-Id: Iabb77bd0a29ca06a13d1075f1e8cedb00f785c64 --- firmware/export/config.h | 2 ++ firmware/export/config/android.h | 2 +- firmware/export/config/fiiom3klinux.h | 2 +- firmware/export/config/hibylinux.h | 2 +- firmware/export/config/nokian8xx.h | 2 +- firmware/export/config/nokian900.h | 2 +- firmware/export/config/pandora.h | 2 +- firmware/export/config/rgnano.h | 2 +- firmware/export/config/samsungypr1.h | 2 +- firmware/export/config/sdlapp.h | 2 +- 10 files changed, 11 insertions(+), 9 deletions(-) diff --git a/firmware/export/config.h b/firmware/export/config.h index 3fac987f94..fe66f06644 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -340,6 +340,7 @@ Lyre prototype 1 */ #define NAND_IMX233 6 /* CONFIG_RTC */ +#define RTC_HOSTED 1 /* Generic hosted */ #define RTC_PCF50605 2 /* iPod 3G, 4G & Mini */ #define RTC_PCF50606 3 /* iriver H300 */ #define RTC_S3C2440 4 @@ -642,6 +643,7 @@ Lyre prototype 1 */ #undef HAVE_MULTIDRIVE #undef CONFIG_STORAGE_MULTI #undef CONFIG_STORAGE +#define CONFIG_STORAGE 0 #endif #ifndef CONFIG_BUFLIB_BACKEND diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h index dcf996ebc3..60f094b36d 100644 --- a/firmware/export/config/android.h +++ b/firmware/export/config/android.h @@ -52,7 +52,7 @@ #define HAVE_BUTTON_DATA /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/fiiom3klinux.h b/firmware/export/config/fiiom3klinux.h index ebf49a568b..2a8170f32f 100644 --- a/firmware/export/config/fiiom3klinux.h +++ b/firmware/export/config/fiiom3klinux.h @@ -66,7 +66,7 @@ #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/hibylinux.h b/firmware/export/config/hibylinux.h index ebab5bdf97..e3f881e324 100644 --- a/firmware/export/config/hibylinux.h +++ b/firmware/export/config/hibylinux.h @@ -60,7 +60,7 @@ #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED #ifndef SIMULATOR /* We have usb power and can detect usb but it is handled by Linux */ diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h index b145641586..9fb9e81780 100644 --- a/firmware/export/config/nokian8xx.h +++ b/firmware/export/config/nokian8xx.h @@ -44,7 +44,7 @@ #define HAVE_BUTTON_DATA /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h index cac8a66457..a939ff0799 100644 --- a/firmware/export/config/nokian900.h +++ b/firmware/export/config/nokian900.h @@ -43,7 +43,7 @@ #define HAVE_BUTTON_DATA /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h index 377b8aa04e..841d7e2b4b 100644 --- a/firmware/export/config/pandora.h +++ b/firmware/export/config/pandora.h @@ -44,7 +44,7 @@ #define HAVE_BUTTON_DATA /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000 diff --git a/firmware/export/config/rgnano.h b/firmware/export/config/rgnano.h index d5c9727a9f..c75b6409e8 100644 --- a/firmware/export/config/rgnano.h +++ b/firmware/export/config/rgnano.h @@ -48,7 +48,7 @@ #define HAVE_VOLUME_IN_LIST /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x200000 diff --git a/firmware/export/config/samsungypr1.h b/firmware/export/config/samsungypr1.h index 57da716aae..0853f59a94 100644 --- a/firmware/export/config/samsungypr1.h +++ b/firmware/export/config/samsungypr1.h @@ -112,7 +112,7 @@ /* R1 has a standard linux RTC driver on /dev/rtc1 (->/dev/rtc) * The RTC is S35392 A */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED #define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity */ #define BATTERY_CAPACITY_MIN 600 /* min. capacity selectable */ diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h index 4421e5e1ea..5a5ef2ccae 100644 --- a/firmware/export/config/sdlapp.h +++ b/firmware/export/config/sdlapp.h @@ -53,7 +53,7 @@ #define HAVE_BUTTON_DATA /* define this if you have a real-time clock */ -#define CONFIG_RTC APPLICATION +#define CONFIG_RTC RTC_HOSTED /* The number of bytes reserved for loadable codecs */ #define CODEC_SIZE 0x100000