summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihail Zenkov <mihail.zenkov@gmail.com>2016-04-22 12:17:35 +0000
committerMihail Zenkov <mihail.zenkov@gmail.com>2016-04-22 20:43:45 +0000
commit7cb1e5ae8b8014edca64f1fd187f4e1e6f3e99e3 (patch)
tree813600c507d997521fd54dd740921cbac4026b35
parent79ca6d4e3cf6fcd2f05cca0a703200394920741f (diff)
downloadrockbox-7cb1e5a.tar.gz
rockbox-7cb1e5a.tar.bz2
rockbox-7cb1e5a.zip
Fix AMSv2 variant 1 detection if rockbox loaded from SD card
Change-Id: Ie7c9c06170601e109f8d3de9686773c38a6e224a
-rw-r--r--bootloader/sansa_as3525.c7
-rw-r--r--firmware/rolo.c7
2 files changed, 14 insertions, 0 deletions
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index fb3ba98346..3938f819b4 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -160,6 +160,13 @@ void main(void)
#endif
}
+#if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) || defined(SANSA_CLIPZIP)
+ /* It is necessary for proper detection AMSv2 variant 1.
+ * We should restore initial state of GPIOB_PIN(5) as it used for
+ * variant detection, but can be changed if we switch SD card. */
+ if (amsv2_variant == 1)
+ GPIOB_PIN(5) = 1 << 5;
+#endif
kernel_entry = (void*) loadbuffer;
commit_discard_idcache();
printf("Executing");
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 266ba79e69..d432642d9d 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -275,6 +275,13 @@ int rolo_load(const char* filename)
/* Set CVDD1 power supply to default*/
ascodec_write_pmu(0x17, 1, 0);
#endif
+#if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) || defined(SANSA_CLIPZIP)
+ /* It is necessary for proper detection AMSv2 variant 1.
+ * We should restore initial state of GPIOB_PIN(5) as it used for
+ * variant detection, but can be changed if we switch SD card. */
+ if (amsv2_variant == 1)
+ GPIOB_PIN(5) = 1 << 5;
+#endif
#if CONFIG_CPU != IMX31L /* We're not finished yet */
#ifdef CPU_ARM