summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-17 21:19:38 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-17 21:40:40 -0400
commitedbdefa09ab9dfe82f647b48493db91d79c094dd (patch)
treeb392575d39a7dc0941c0c6cc143dca8f2b6cfe85
parent4cdb28c167c028e89be670f54a0108af3416cd1f (diff)
downloadrockbox-edbdefa09ab9dfe82f647b48493db91d79c094dd.tar.gz
rockbox-edbdefa09ab9dfe82f647b48493db91d79c094dd.tar.bz2
rockbox-edbdefa09ab9dfe82f647b48493db91d79c094dd.zip
hosted: Drop a bootloader version string in /etc, and report it in debug menu
Change-Id: I4d72d7800dbff56619898b6bc9d0f81a6c561598
-rw-r--r--firmware/target/hosted/agptek/debug-agptek.c21
-rwxr-xr-xtools/hiby_patcher.pl7
2 files changed, 28 insertions, 0 deletions
diff --git a/firmware/target/hosted/agptek/debug-agptek.c b/firmware/target/hosted/agptek/debug-agptek.c
index 7f794a7073..d0ca613323 100644
--- a/firmware/target/hosted/agptek/debug-agptek.c
+++ b/firmware/target/hosted/agptek/debug-agptek.c
@@ -18,6 +18,13 @@
*
****************************************************************************/
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
#include "config.h"
#include "font.h"
#include "lcd.h"
@@ -34,12 +41,26 @@ bool dbg_hw_info(void)
{
int btn = 0;
+ /* Try to read the bootloader */
+ char verstr[40];
+ memset(verstr, 0, sizeof(verstr));
+ int fd = open("/etc/rockbox-bl-info.txt", O_RDONLY);
+ if(fd >= 0)
+ {
+ read(fd, verstr, sizeof(verstr) -1);
+ close(fd);
+ }
+
lcd_setfont(FONT_SYSFIXED);
while(btn ^ BUTTON_POWER) {
lcd_clear_display();
line = 0;
+ if (verstr[0]) {
+ lcd_putsf(0, line++, "Boot ver: %s", verstr);
+ }
+
lcd_putsf(0, line++, "pcm srate: %d", pcm_alsa_get_rate());
#ifdef HAVE_HEADPHONE_DETECTION
lcd_putsf(0, line++, "hp: %d", headphones_inserted());
diff --git a/tools/hiby_patcher.pl b/tools/hiby_patcher.pl
index b03f2343dd..cff029e03b 100755
--- a/tools/hiby_patcher.pl
+++ b/tools/hiby_patcher.pl
@@ -135,6 +135,13 @@ system(@sysargs);
my $rbbasename = basename($rbbname);
#### Mangle RootFS
+
+# Save version into rootfs
+my $version = `cat rockbox-info.txt | grep Version | cut -f2 -d' '`;
+open FILE, ">$rootfsdir/etc/rockbox-bl-info.txt" || die ("can't write version txt");
+print FILE $version;
+close FILE;
+
if ($hiby) {
my $bootloader_sh =
"#!/bin/sh