summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2009-11-07 10:48:05 +0000
committerNils Wallménius <nils@rockbox.org>2009-11-07 10:48:05 +0000
commit109f182b0c16e2ebb50fbae746550730151d8913 (patch)
tree8d1977fda7754e992743e59a3e48a794623b0021 /firmware
parent9b6d3d74b380625f62fccb985043e864c648d330 (diff)
downloadrockbox-109f182b0c16e2ebb50fbae746550730151d8913.tar.gz
rockbox-109f182b0c16e2ebb50fbae746550730151d8913.zip
Introduce new config header 'config-sim.h' that takes care of undefining things that shouldn't be defined for sims so that the target configs no longer need to have #ifndef SIMULATOR sections and to bring some consistency for what is and is not included for sims.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23547 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/config-c100.h3
-rw-r--r--firmware/export/config-c200.h5
-rw-r--r--firmware/export/config-c200v2.h5
-rw-r--r--firmware/export/config-clip.h5
-rw-r--r--firmware/export/config-cowond2.h7
-rw-r--r--firmware/export/config-creativezv.h6
-rw-r--r--firmware/export/config-creativezvm.h3
-rw-r--r--firmware/export/config-creativezvm60gb.h3
-rw-r--r--firmware/export/config-e200.h6
-rw-r--r--firmware/export/config-e200v2.h5
-rw-r--r--firmware/export/config-fmrecorder.h4
-rw-r--r--firmware/export/config-fuze.h5
-rw-r--r--firmware/export/config-gigabeat-s.h6
-rw-r--r--firmware/export/config-gigabeat.h8
-rw-r--r--firmware/export/config-h10.h3
-rw-r--r--firmware/export/config-h100.h4
-rw-r--r--firmware/export/config-h300.h4
-rw-r--r--firmware/export/config-hdd1630.h3
-rw-r--r--firmware/export/config-iaudio7.h3
-rw-r--r--firmware/export/config-iaudiom3.h8
-rw-r--r--firmware/export/config-iaudiom5.h4
-rw-r--r--firmware/export/config-iaudiox5.h4
-rw-r--r--firmware/export/config-ifp7xx.h3
-rw-r--r--firmware/export/config-ipod1g2g.h3
-rw-r--r--firmware/export/config-ipod3g.h3
-rw-r--r--firmware/export/config-ipod4g.h6
-rw-r--r--firmware/export/config-ipodcolor.h3
-rw-r--r--firmware/export/config-ipodmini.h3
-rw-r--r--firmware/export/config-ipodmini2g.h3
-rw-r--r--firmware/export/config-ipodnano.h3
-rw-r--r--firmware/export/config-ipodnano2g.h6
-rw-r--r--firmware/export/config-ipodvideo.h6
-rw-r--r--firmware/export/config-logikdax.h3
-rw-r--r--firmware/export/config-lyre_proto1.h3
-rw-r--r--firmware/export/config-m200.h3
-rw-r--r--firmware/export/config-m200v4.h3
-rw-r--r--firmware/export/config-meizu-m3.h4
-rw-r--r--firmware/export/config-meizu-m6sl.h4
-rw-r--r--firmware/export/config-meizu-m6sp.h4
-rw-r--r--firmware/export/config-mini2440.h6
-rw-r--r--firmware/export/config-mrobe100.h3
-rw-r--r--firmware/export/config-mrobe500.h3
-rw-r--r--firmware/export/config-ondavx747.h5
-rw-r--r--firmware/export/config-ondavx767.h3
-rw-r--r--firmware/export/config-ondiofm.h4
-rw-r--r--firmware/export/config-ondiosp.h4
-rw-r--r--firmware/export/config-player.h4
-rw-r--r--firmware/export/config-recorder.h4
-rw-r--r--firmware/export/config-recorderv2.h4
-rw-r--r--firmware/export/config-sa9200.h4
-rw-r--r--firmware/export/config-sim.h80
-rw-r--r--firmware/export/config-tpj1022.h3
-rw-r--r--firmware/export/config-view.h5
-rw-r--r--firmware/export/config-yh820.h5
-rw-r--r--firmware/export/config-yh920.h5
-rw-r--r--firmware/export/config-yh925.h5
-rw-r--r--firmware/export/config-yps3.h4
-rw-r--r--firmware/export/config.h5
58 files changed, 87 insertions, 236 deletions
diff --git a/firmware/export/config-c100.h b/firmware/export/config-c100.h
index 5cc29e32f6..a332bf5670 100644
--- a/firmware/export/config-c100.h
+++ b/firmware/export/config-c100.h
@@ -95,8 +95,6 @@
/* define this if the unit should not shut down on low battery. */
#define NO_LOW_BATTERY_SHUTDOWN
-#ifndef SIMULATOR
-
/* Define this if you have a TCC770 */
#define CONFIG_CPU TCC770
@@ -128,4 +126,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index ab70396eef..45cfb8aee9 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -149,9 +149,6 @@
#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */
#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5024 */
#define CONFIG_CPU PP5022
@@ -204,8 +201,6 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
/* Default recording levels */
#define DEFAULT_REC_MIC_GAIN 23
#define DEFAULT_REC_LEFT_GAIN 23
diff --git a/firmware/export/config-c200v2.h b/firmware/export/config-c200v2.h
index 2441fe01c5..65aebf245b 100644
--- a/firmware/export/config-c200v2.h
+++ b/firmware/export/config-c200v2.h
@@ -137,9 +137,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5024 */
#define CONFIG_CPU AS3525
@@ -189,8 +186,6 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
/** Port-specific settings **/
/* Main LCD backlight brightness range and defaults */
diff --git a/firmware/export/config-clip.h b/firmware/export/config-clip.h
index b57881f794..4fa5f94598 100644
--- a/firmware/export/config-clip.h
+++ b/firmware/export/config-clip.h
@@ -140,9 +140,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have a AMS AS3525 SoC */
#define CONFIG_CPU AS3525
@@ -189,8 +186,6 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
/** Port-specific settings **/
/* Main LCD backlight brightness range and defaults */
diff --git a/firmware/export/config-cowond2.h b/firmware/export/config-cowond2.h
index 45bf90bbd0..88c7ce5b8f 100644
--- a/firmware/export/config-cowond2.h
+++ b/firmware/export/config-cowond2.h
@@ -62,14 +62,10 @@
/* define this if you have a flash memory storage */
#define HAVE_FLASH_STORAGE
-#ifndef SIMULATOR
#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
#define HAVE_MULTIDRIVE
#define HAVE_HOTSWAP
#define NUM_DRIVES 2
-#else
-#define CONFIG_STORAGE STORAGE_NAND
-#endif
#define CONFIG_NAND NAND_TCC
@@ -150,7 +146,6 @@
#define CURRENT_BACKLIGHT 30 /* TBD */
#define CURRENT_RECORD 0 /* no recording yet */
-#ifndef SIMULATOR
/* Define this if you have a TCC7801 */
#define CONFIG_CPU TCC7801
@@ -174,5 +169,3 @@
#define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/.rockbox"
-
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h
index f396694339..5454038f0c 100644
--- a/firmware/export/config-creativezv.h
+++ b/firmware/export/config-creativezv.h
@@ -127,8 +127,6 @@
/* Hardware controlled charging with monitoring */
//#define CONFIG_CHARGING CHARGING_MONITOR
-#ifndef SIMULATOR
-
/* Define this if you have a TI TMS320DM320 */
#define CONFIG_CPU DM320
@@ -144,9 +142,6 @@
/* Define this if you have ATA power-off control */
#define HAVE_ATA_POWER_OFF
-/* Virtual LED (icon) */
-#define CONFIG_LED LED_VIRTUAL
-
/* Offset ( in the firmware file's header ) to the file CRC */
#define FIRMWARE_OFFSET_FILE_CRC 0
@@ -167,4 +162,3 @@
#define USB_PRODUCT_ID 0x4133
#define USB_NUM_ENDPOINTS 7
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h
index 5eeaa7abcc..37d2eb48cf 100644
--- a/firmware/export/config-creativezvm.h
+++ b/firmware/export/config-creativezvm.h
@@ -128,8 +128,6 @@
/* Hardware controlled charging with monitoring */
//#define CONFIG_CHARGING CHARGING_MONITOR
-#ifndef SIMULATOR
-
/* Define this if you have a TI TMS320DM320 */
#define CONFIG_CPU DM320
@@ -173,4 +171,3 @@
#define BUTTON_DEBUG
*/
-#endif
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h
index 41e0be3542..e34515ca44 100644
--- a/firmware/export/config-creativezvm60gb.h
+++ b/firmware/export/config-creativezvm60gb.h
@@ -127,8 +127,6 @@
/* Hardware controlled charging with monitoring */
//#define CONFIG_CHARGING CHARGING_MONITOR
-#ifndef SIMULATOR
-
/* Define this if you have a TI TMS320DM320 */
#define CONFIG_CPU DM320
@@ -165,4 +163,3 @@
#define USB_PRODUCT_ID 0x4133
#define USB_NUM_ENDPOINTS 7
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h
index 18de2f65f1..dd65e6a37d 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -143,9 +143,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5024 */
#define CONFIG_CPU PP5024
@@ -198,9 +195,6 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
-
/** Port-specific settings **/
/* Main LCD backlight brightness range and defaults */
diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h
index 4dc3e43f2d..b4985ecd6d 100644
--- a/firmware/export/config-e200v2.h
+++ b/firmware/export/config-e200v2.h
@@ -145,9 +145,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have an AMS AS3525*/
#define CONFIG_CPU AS3525
@@ -206,8 +203,6 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
/* Default recording levels */
#define DEFAULT_REC_MIC_GAIN 23
#define DEFAULT_REC_LEFT_GAIN 23
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index acc1c74dcf..97dc52ebb5 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -98,8 +98,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a SH7034 */
#define CONFIG_CPU SH7034
@@ -134,8 +132,6 @@
#define BOOTFILE "ajbrec." BOOTFILE_EXT
#define BOOTDIR "/"
-#endif /* SIMULATOR */
-
#define HAVE_LCD_CONTRAST
#define MIN_CONTRAST_SETTING 5
diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h
index 2a438ec91b..e9b54e14fd 100644
--- a/firmware/export/config-fuze.h
+++ b/firmware/export/config-fuze.h
@@ -150,9 +150,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have an AMS AS3525*/
#define CONFIG_CPU AS3525
@@ -204,5 +201,3 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h
index 36f874b72f..344c572e40 100644
--- a/firmware/export/config-gigabeat-s.h
+++ b/firmware/export/config-gigabeat-s.h
@@ -128,11 +128,6 @@
#define HAVE_HEADPHONE_DETECTION
#endif /* BOOTLOADER */
-#ifndef SIMULATOR
-
-/* The LCD on a Gigabeat is 240x320 - it is portrait */
-#define HAVE_PORTRAIT_LCD
-
#define CONFIG_CPU IMX31L
/* Define this if you want to use imx31l's i2c interface */
@@ -221,4 +216,3 @@
#define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/.rockbox"
-#endif
diff --git a/firmware/export/config-gigabeat.h b/firmware/export/config-gigabeat.h
index c4272205bc..a20a5d87ff 100644
--- a/firmware/export/config-gigabeat.h
+++ b/firmware/export/config-gigabeat.h
@@ -59,9 +59,7 @@
#define HAVE_TOUCHPAD_SENSITIVITY_SETTING
-#ifndef SIMULATOR
#define HAVE_HARDWARE_BEEP
-#endif
#endif /* BOOTLOADER */
@@ -140,11 +138,6 @@
* when running */
#define HAVE_BATTERY_SWITCH
-#ifndef SIMULATOR
-
-/* The LCD on a Gigabeat is 240x320 - it is portrait */
-#define HAVE_PORTRAIT_LCD
-
#define HAVE_LCD_FLIP
/* Define this if your LCD can set contrast */
@@ -190,4 +183,3 @@
#define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/.rockbox"
-#endif
diff --git a/firmware/export/config-h10.h b/firmware/export/config-h10.h
index 5ac12af3fc..6ad7a8ddc5 100644
--- a/firmware/export/config-h10.h
+++ b/firmware/export/config-h10.h
@@ -127,8 +127,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -185,4 +183,3 @@
#define ICODE_ATTR_TREMOR_NOT_MDCT
-#endif
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index f06aaf8335..520079b8a0 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -133,8 +133,6 @@
#define CURRENT_RECORD 105 /* additional current while recording */
#define CURRENT_REMOTE 8 /* additional current when remote connected */
-#ifndef SIMULATOR
-
/* Define this if you have a Motorola SCF5249 */
#define CONFIG_CPU MCF5249
@@ -183,8 +181,6 @@
/* Define this if the EEPROM chip is used */
#define HAVE_EEPROM_SETTINGS
-#endif /* !SIMULATOR */
-
/* Define bitmask of input sources - recordable bitmask can be defined
explicitly if different */
#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | \
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 9fad6cc503..09fce49b10 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -139,8 +139,6 @@
* if USB/MAIN power is discernable and hardware doesn't compel charging */
#define HAVE_USB_CHARGING_ENABLE
-#ifndef SIMULATOR
-
/* Define this if you have a Motorola SCF5249 */
#define CONFIG_CPU MCF5249
@@ -181,8 +179,6 @@
/* Define this if there is an EEPROM chip */
#define HAVE_EEPROM
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-hdd1630.h b/firmware/export/config-hdd1630.h
index 1d7bff3ee6..f44f7d1729 100644
--- a/firmware/export/config-hdd1630.h
+++ b/firmware/export/config-hdd1630.h
@@ -141,8 +141,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5022
@@ -199,4 +197,3 @@
#define ICODE_ATTR_TREMOR_NOT_MDCT
-#endif
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h
index 68393f1293..44a6f84b0a 100644
--- a/firmware/export/config-iaudio7.h
+++ b/firmware/export/config-iaudio7.h
@@ -133,8 +133,6 @@
#define CONFIG_CHARGING CHARGING_SIMPLE
-#ifndef SIMULATOR
-
/* Define this if you have a TCC770 */
#define CONFIG_CPU TCC770
@@ -162,4 +160,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-iaudiom3.h b/firmware/export/config-iaudiom3.h
index b3d7fb83b3..99c4605be0 100644
--- a/firmware/export/config-iaudiom3.h
+++ b/firmware/export/config-iaudiom3.h
@@ -117,8 +117,6 @@
/* define current usage levels */
#define CURRENT_REMOTE 8 /* additional current when remote connected */
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
#define HAVE_LCD_CONTRAST
@@ -140,8 +138,8 @@
/* Define this if you have ATA power-off control */
#define HAVE_ATA_POWER_OFF
-/* Virtual LED (icon) */
-#define CONFIG_LED LED_VIRTUAL /* FIXME: implement hardware LED handling */
+/* FIXME: implement hardware LED handling */
+/* #define CONFIG_LED LED_REAL */
/* Offset ( in the firmware file's header ) to the file CRC */
#define FIRMWARE_OFFSET_FILE_CRC 0
@@ -160,8 +158,6 @@
#define FLASH_ENTRYPOINT 0x00001000
#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h
index b10ac9ad09..00e07a92cd 100644
--- a/firmware/export/config-iaudiom5.h
+++ b/firmware/export/config-iaudiom5.h
@@ -136,8 +136,6 @@
/* define current usage levels */
#define CURRENT_REMOTE 8 /* additional current when remote connected */
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
#define HAVE_LCD_CONTRAST
@@ -176,8 +174,6 @@
#define FLASH_ENTRYPOINT 0x00001000
#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/** Port-specific settings **/
/* Main LCD contrast range and defaults */
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index 0cf39325a4..a6b48b98a8 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -139,8 +139,6 @@
/* define current usage levels */
#define CURRENT_REMOTE 8 /* additional current when remote connected */
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
#define HAVE_LCD_CONTRAST
@@ -182,8 +180,6 @@
#define FLASH_ENTRYPOINT 0x00001000
#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-ifp7xx.h b/firmware/export/config-ifp7xx.h
index 901f78f0ea..48a53f8c9d 100644
--- a/firmware/export/config-ifp7xx.h
+++ b/firmware/export/config-ifp7xx.h
@@ -76,8 +76,6 @@
/* define this if the unit should not shut down on low battery. */
#define NO_LOW_BATTERY_SHUTDOWN
-#ifndef SIMULATOR
-
/* Define this if you have a Philips PNX0101 */
#define CONFIG_CPU PNX0101
@@ -127,4 +125,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif
diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h
index 549af02fdc..835b75bd85 100644
--- a/firmware/export/config-ipod1g2g.h
+++ b/firmware/export/config-ipod1g2g.h
@@ -120,8 +120,6 @@
/* FIXME: Don't shutdown on low battery until we have proper suspend. */
#define NO_LOW_BATTERY_SHUTDOWN
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5002 */
#define CONFIG_CPU PP5002
@@ -168,4 +166,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 197f80fe72..7cab8846ef 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -124,8 +124,6 @@
/* Hardware controlled charging? FIXME */
#define CONFIG_CHARGING CHARGING_SIMPLE
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5002 */
#define CONFIG_CPU PP5002
@@ -172,4 +170,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 232e0aa5a3..6195e0c1b6 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -141,8 +141,6 @@
#define CURRENT_RECORD 35 /* FIXME: this needs adjusting */
#endif
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -185,9 +183,6 @@
#define USB_PRODUCT_ID 0x1203
#define HAVE_USB_HID_MOUSE
-/* Virtual LED (icon) */
-#define CONFIG_LED LED_VIRTUAL
-
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
@@ -205,4 +200,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 3254c0abfb..7c7897b67b 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -118,8 +118,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -177,4 +175,3 @@
#define IPOD_ACCESSORY_PROTOCOL
#define HAVE_SERIAL
-#endif
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index 9cf377f99a..be3ab2bc96 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -137,8 +137,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -192,4 +190,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index dcd3113d77..53476b177f 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -144,8 +144,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5022 */
#define CONFIG_CPU PP5022
@@ -202,4 +200,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 005d2ffd9c..f1a4d6a65e 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -131,8 +131,6 @@
#define CURRENT_RECORD 35 /* FIXME: this needs adjusting */
#endif
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5022 */
#define CONFIG_CPU PP5022
@@ -187,4 +185,3 @@
#define IPOD_ACCESSORY_PROTOCOL
#define HAVE_SERIAL
-#endif
diff --git a/firmware/export/config-ipodnano2g.h b/firmware/export/config-ipodnano2g.h
index 59ab28cc21..bcc98e0da3 100644
--- a/firmware/export/config-ipodnano2g.h
+++ b/firmware/export/config-ipodnano2g.h
@@ -105,9 +105,7 @@
/* Define the type of audio codec */
#define HAVE_WM8975
-#ifndef SIMULATOR
#define HAVE_PCM_DMA_ADDRESS
-#endif
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT
@@ -134,8 +132,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
//#define HAVE_LCD_CONTRAST
@@ -184,8 +180,6 @@
#define FLASH_MAGIC 0xfbfbfbf1
#endif
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index f760a5656f..9762e71a73 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -152,8 +152,6 @@
#define CURRENT_RECORD 35 /* FIXME: this needs adjusting */
#endif
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5022 */
#define CONFIG_CPU PP5022
@@ -196,9 +194,6 @@
#define USB_PRODUCT_ID 0x1209
#define HAVE_USB_HID_MOUSE
-/* Virtual LED (icon) */
-#define CONFIG_LED LED_VIRTUAL
-
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
@@ -222,4 +217,3 @@
#define IPOD_ACCESSORY_PROTOCOL
#define HAVE_SERIAL
-#endif
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h
index 8cfbbd8bd8..8fbd064306 100644
--- a/firmware/export/config-logikdax.h
+++ b/firmware/export/config-logikdax.h
@@ -103,8 +103,6 @@
/* define this if the unit should not shut down on low battery. */
#define NO_LOW_BATTERY_SHUTDOWN
-#ifndef SIMULATOR
-
/* Define this if you have a TCC773L */
#define CONFIG_CPU TCC773L
@@ -147,4 +145,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-lyre_proto1.h b/firmware/export/config-lyre_proto1.h
index d157f5be2d..250b8e2c00 100644
--- a/firmware/export/config-lyre_proto1.h
+++ b/firmware/export/config-lyre_proto1.h
@@ -84,8 +84,6 @@
#define BATTERY_CAPACITY_INC 100 /* capacity increment */
#define BATTERY_TYPES_COUNT 1 /* only one type */
-#ifndef SIMULATOR
-
#define CONFIG_CPU AT91SAM9260
/* Define this to the CPU frequency */
@@ -103,4 +101,3 @@
#define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/.rockbox"
-#endif
diff --git a/firmware/export/config-m200.h b/firmware/export/config-m200.h
index 3ec721cc7c..59f5ad7cfb 100644
--- a/firmware/export/config-m200.h
+++ b/firmware/export/config-m200.h
@@ -98,8 +98,6 @@
/* define this if the unit should not shut down on low battery. */
#define NO_LOW_BATTERY_SHUTDOWN
-#ifndef SIMULATOR
-
/* Define this if you have a TCC770 */
#define CONFIG_CPU TCC770
@@ -133,4 +131,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h
index b734f3e368..13dcec92ff 100644
--- a/firmware/export/config-m200v4.h
+++ b/firmware/export/config-m200v4.h
@@ -111,8 +111,6 @@
/* define this if the unit should not shut down on low battery. */
#define NO_LOW_BATTERY_SHUTDOWN
-#ifndef SIMULATOR
-
/* Define this if you have an AMS AS3525 */
#define CONFIG_CPU AS3525
@@ -162,4 +160,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-meizu-m3.h b/firmware/export/config-meizu-m3.h
index 7da1759a61..12f2cfdfea 100644
--- a/firmware/export/config-meizu-m3.h
+++ b/firmware/export/config-meizu-m3.h
@@ -119,8 +119,6 @@
/* Hardware controlled charging, software can monitor plug and charge state */
#define CONFIG_CHARGING CHARGING_MONITOR
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
//#define HAVE_LCD_CONTRAST
@@ -162,8 +160,6 @@
#define FLASH_ENTRYPOINT 0x00001000
#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-meizu-m6sl.h b/firmware/export/config-meizu-m6sl.h
index 033dc619a0..ffa8903526 100644
--- a/firmware/export/config-meizu-m6sl.h
+++ b/firmware/export/config-meizu-m6sl.h
@@ -119,8 +119,6 @@
/* Hardware controlled charging? FIXME */
#define CONFIG_CHARGING CHARGING_SIMPLE
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
//#define HAVE_LCD_CONTRAST
@@ -162,8 +160,6 @@
#define FLASH_ENTRYPOINT 0x00001000
#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-meizu-m6sp.h b/firmware/export/config-meizu-m6sp.h
index 02f1f86d7a..0fc7264192 100644
--- a/firmware/export/config-meizu-m6sp.h
+++ b/firmware/export/config-meizu-m6sp.h
@@ -122,8 +122,6 @@
/* Hardware controlled charging? FIXME */
#define CONFIG_CHARGING CHARGING_SIMPLE
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
//#define HAVE_LCD_CONTRAST
@@ -165,8 +163,6 @@
#define FLASH_ENTRYPOINT 0x00001000
#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-mini2440.h b/firmware/export/config-mini2440.h
index f08d4875ef..739489becd 100644
--- a/firmware/export/config-mini2440.h
+++ b/firmware/export/config-mini2440.h
@@ -120,10 +120,6 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x100000
-
-/***************************************************************************/
-#ifndef SIMULATOR
-
#define CONFIG_CPU S3C2440
/* Define this to the CPU frequency */
@@ -158,5 +154,3 @@
#define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/.rockbox"
-#endif
-/***************************************************************************/
diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h
index c348770188..5a2790062d 100644
--- a/firmware/export/config-mrobe100.h
+++ b/firmware/export/config-mrobe100.h
@@ -123,8 +123,6 @@
#define BATTERY_CAPACITY_DEFAULT 720 /* default battery capacity */
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -199,4 +197,3 @@
#define ICODE_ATTR_TREMOR_NOT_MDCT
-#endif
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h
index 9d04aac125..7b73fe7ad6 100644
--- a/firmware/export/config-mrobe500.h
+++ b/firmware/export/config-mrobe500.h
@@ -199,8 +199,6 @@
/* Define this if you have a Texas Instruments TSC2100 touch screen */
#define HAVE_TSC2100
-#if !defined(SIMULATOR)
-
/* M66591 register base */
#define M66591_BASE 0x60000000
@@ -252,4 +250,3 @@
#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */
-#endif
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h
index dee18663d1..c4fc39bfc0 100644
--- a/firmware/export/config-ondavx747.h
+++ b/firmware/export/config-ondavx747.h
@@ -140,9 +140,7 @@
#define HAVE_SW_TONE_CONTROLS
/* has no volume control, so we use the software ones */
-#ifndef SIMULATOR
#define HAVE_SW_VOLUME_CONTROL
-#endif
/* software controlled volume ranges from -73 -> 0 dB, other than that
is controlled by hardware */
@@ -169,8 +167,6 @@
#define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */
-#ifndef SIMULATOR
-
#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD)
#define NUM_DRIVES 2
@@ -217,4 +213,3 @@
#define USB_VENDOR_ID 0x07C4
#define USB_PRODUCT_ID 0xA4A5
-#endif
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h
index cc0ce10151..661d3e9e5e 100644
--- a/firmware/export/config-ondavx767.h
+++ b/firmware/export/config-ondavx767.h
@@ -133,8 +133,6 @@
/* Hardware controlled charging with monitoring */
//#define CONFIG_CHARGING CHARGING_MONITOR
-#ifndef SIMULATOR
-
/* Define this if you have a Ingenic JZ4740 */
#define CONFIG_CPU JZ4732
@@ -167,4 +165,3 @@
#define USB_VENDOR_ID 0x07C4
#define USB_PRODUCT_ID 0xA4A5
-#endif
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 7a2b30dbf1..b14f113244 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -79,8 +79,6 @@
#define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */
#define CURRENT_BACKLIGHT 0 /* no backlight */
-#ifndef SIMULATOR
-
/* Define this if you have a SH7034 */
#define CONFIG_CPU SH7034
@@ -134,8 +132,6 @@
#define BOOTFILE "ajbrec." BOOTFILE_EXT
#define BOOTDIR "/"
-#endif /* SIMULATOR */
-
#define HAVE_LCD_CONTRAST
#define MIN_CONTRAST_SETTING 5
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 134f7e3cfa..452b47b78e 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -66,8 +66,6 @@
#define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */
#define CURRENT_BACKLIGHT 0 /* no backlight */
-#ifndef SIMULATOR
-
/* Define this if you have a SH7034 */
#define CONFIG_CPU SH7034
@@ -118,8 +116,6 @@
#define BOOTFILE "ajbrec." BOOTFILE_EXT
#define BOOTDIR "/"
-#endif /* SIMULATOR */
-
#define HAVE_LCD_CONTRAST
#define MIN_CONTRAST_SETTING 5
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 5f6cf17fbe..c60ee6a071 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -58,8 +58,6 @@
/* Hardware controlled charging */
#define CONFIG_CHARGING CHARGING_SIMPLE
-#ifndef SIMULATOR
-
/* Define this if you have a SH7034 */
#define CONFIG_CPU SH7034
@@ -97,8 +95,6 @@
#define BOOTFILE "archos." BOOTFILE_EXT
#define BOOTDIR "/"
-#endif /* SIMULATOR */
-
#define HAVE_LCD_CONTRAST
#define MIN_CONTRAST_SETTING 5
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 74a7ce7cdc..88ff2c2006 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -87,8 +87,6 @@
/* Software controlled charging */
#define CONFIG_CHARGING CHARGING_TARGET
-#ifndef SIMULATOR
-
/* Define this if you have a SH7034 */
#define CONFIG_CPU SH7034
@@ -123,8 +121,6 @@
#define BOOTFILE "ajbrec." BOOTFILE_EXT
#define BOOTDIR "/"
-#endif /* SIMULATOR */
-
#define HAVE_LCD_CONTRAST
#define MIN_CONTRAST_SETTING 5
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 5ca9459750..6a5564487e 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -93,8 +93,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a SH7034 */
#define CONFIG_CPU SH7034
@@ -134,8 +132,6 @@
#define BOOTFILE "ajbrec." BOOTFILE_EXT
#define BOOTDIR "/"
-#endif /* SIMULATOR */
-
#define HAVE_LCD_CONTRAST
#define MIN_CONTRAST_SETTING 5
diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h
index 2ab538e98c..ce233184cb 100644
--- a/firmware/export/config-sa9200.h
+++ b/firmware/export/config-sa9200.h
@@ -134,9 +134,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5024 */
#define CONFIG_CPU PP5024
@@ -194,4 +191,3 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
diff --git a/firmware/export/config-sim.h b/firmware/export/config-sim.h
new file mode 100644
index 0000000000..0656da3ac4
--- /dev/null
+++ b/firmware/export/config-sim.h
@@ -0,0 +1,80 @@
+/* This config file is for all simulators, and is used in addition to the
+ target specific configs */
+
+#undef CONFIG_CPU
+
+#undef HAVE_FMADC
+
+#undef NEED_ATA_POWER_BATT_MEASURE
+
+#undef CONFIG_I2C
+
+#undef HAVE_PCM_DMA_ADDRESS
+
+#undef FLASH_SIZE
+
+#undef CPU_FREQ
+
+#undef HAVE_ATA_POWER_OFF
+
+#undef CONFIG_LCD
+
+#undef CONFIG_LED
+
+#undef ROM_START
+
+#undef FIRMWARE_OFFSET_FILE_LENGTH
+#undef FIRMWARE_OFFSET_FILE_CRC
+#undef FIRMWARE_OFFSET_FILE_DATA
+
+#undef AMS_OF_SIZE
+
+#undef HAVE_MULTIDRIVE
+#undef NUM_DRIVES
+#undef HAVE_HOTSWAP
+
+#undef CONFIG_STORAGE
+
+#undef CONFIG_USBOTG
+
+#undef USB_HANDLED_BY_OF
+
+#undef HAVE_USBSTACK
+#undef USE_ROCKBOX_USB
+#undef USB_VENDOR_ID
+#undef USB_PRODUCT_ID
+#undef USB_NUM_ENDPOINTS
+#undef HAVE_USB_HID_MOUSE
+
+#undef HAVE_ADJUSTABLE_CPU_FREQ
+
+#undef MI4_FORMAT
+#undef BOOTFILE_EXT
+#undef BOOTFILE
+#undef BOOTDIR
+
+#undef BOOTLOADER_ENTRYPOINT
+
+#undef FLASH_ENTRYPOINT
+
+#undef FLASH_MAGIC
+
+#undef HAVE_EEPROM
+#undef HAVE_EEPROM_SETTINGS
+
+#undef HAVE_HARDWARE_BEEP
+
+#undef HAVE_POWEROFF_WHILE_CHARGING
+
+#undef INCLUDE_TIMEOUT_API
+
+#undef HAVE_FLASHED_ROCKBOX
+
+#undef IPOD_ACCESSORY_PROTOCOL
+
+#undef HAVE_WHEEL_POSITION
+
+#undef HAVE_LCD_MODES
+
+#undef HAVE_SPEAKER
+
diff --git a/firmware/export/config-tpj1022.h b/firmware/export/config-tpj1022.h
index cdb1eb93ac..89e3d6dff1 100644
--- a/firmware/export/config-tpj1022.h
+++ b/firmware/export/config-tpj1022.h
@@ -88,8 +88,6 @@
/* define this if the unit can be powered or charged via USB */
/*#define HAVE_USB_POWER*/
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -139,4 +137,3 @@
#define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/.rockbox"
-#endif
diff --git a/firmware/export/config-view.h b/firmware/export/config-view.h
index 4ba5d916ba..7b13bf74ba 100644
--- a/firmware/export/config-view.h
+++ b/firmware/export/config-view.h
@@ -135,9 +135,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-/** Non-simulator section **/
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5024 */
#define CONFIG_CPU PP6100
@@ -190,8 +187,6 @@
#define INCLUDE_TIMEOUT_API
-#endif /* SIMULATOR */
-
/** Port-specific settings **/
/* Main LCD backlight brightness range and defaults */
diff --git a/firmware/export/config-yh820.h b/firmware/export/config-yh820.h
index 4005ec0267..4968960803 100644
--- a/firmware/export/config-yh820.h
+++ b/firmware/export/config-yh820.h
@@ -106,9 +106,7 @@
#define CONFIG_STORAGE STORAGE_ATA
/* We're able to shut off power to the HDD */
-#ifndef SIMULATOR
/* todo #define HAVE_ATA_POWER_OFF */
-#endif
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
@@ -139,8 +137,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -185,4 +181,3 @@
#define ICODE_ATTR_TREMOR_NOT_MDCT
-#endif /* !SIMULATOR */
diff --git a/firmware/export/config-yh920.h b/firmware/export/config-yh920.h
index e5a0fc8f71..310fa1374c 100644
--- a/firmware/export/config-yh920.h
+++ b/firmware/export/config-yh920.h
@@ -113,9 +113,7 @@
#define CONFIG_STORAGE STORAGE_ATA
/* We're able to shut off power to the HDD */
-#ifndef SIMULATOR
/* todo #define HAVE_ATA_POWER_OFF */
-#endif
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
@@ -146,8 +144,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -191,4 +187,3 @@
#define ICODE_ATTR_TREMOR_NOT_MDCT
-#endif /* !SIMULATOR */
diff --git a/firmware/export/config-yh925.h b/firmware/export/config-yh925.h
index 4119118678..55d46ae1e1 100644
--- a/firmware/export/config-yh925.h
+++ b/firmware/export/config-yh925.h
@@ -110,9 +110,7 @@
#define CONFIG_STORAGE STORAGE_ATA
/* We're able to shut off power to the HDD */
-#ifndef SIMULATOR
/* todo #define HAVE_ATA_POWER_OFF */
-#endif
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF
@@ -143,8 +141,6 @@
/* define this if the unit can be powered or charged via USB */
#define HAVE_USB_POWER
-#ifndef SIMULATOR
-
/* Define this if you have a PortalPlayer PP5020 */
#define CONFIG_CPU PP5020
@@ -189,4 +185,3 @@
#define ICODE_ATTR_TREMOR_NOT_MDCT
-#endif /* !SIMULATOR */
diff --git a/firmware/export/config-yps3.h b/firmware/export/config-yps3.h
index cd7cf5050a..fd8fde6f6c 100644
--- a/firmware/export/config-yps3.h
+++ b/firmware/export/config-yps3.h
@@ -121,8 +121,6 @@
/* Hardware controlled charging, software can monitor plug and charge state */
#define CONFIG_CHARGING CHARGING_MONITOR
-#ifndef SIMULATOR
-
/* Define this if your LCD can set contrast */
//#define HAVE_LCD_CONTRAST
@@ -167,8 +165,6 @@
//#define FLASH_ENTRYPOINT 0x00001000
//#define FLASH_MAGIC 0xfbfbfbf1
-#endif /* SIMULATOR */
-
/* Define this for FM radio input available */
#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config.h b/firmware/export/config.h
index adc03d54f8..bb1c5eab19 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -403,6 +403,11 @@ Lyre prototype 1 */
/* no known platform */
#endif
+/* keep this include after the target configs */
+#ifdef SIMULATOR
+#include "config-sim.h"
+#endif
+
/* setup basic macros from capability masks */
#include "config_caps.h"