summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-08-20 19:04:05 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2020-08-20 19:04:05 -0400
commit31fc46ded69be7438cca2ba2c2b93c1f200165a6 (patch)
tree5032b2e0ca45fa35f1f77aadcc3be312afb3d903
parent71846b09ab45ec98b98e1d65e450371e8967c037 (diff)
downloadrockbox-31fc46ded6.tar.gz
rockbox-31fc46ded6.tar.bz2
rockbox-31fc46ded6.zip
Revert g#1612
Change-Id: Ia971919ecb1690875c916c62ced04bccf99c5aee
-rw-r--r--apps/debug_menu.c17
-rw-r--r--firmware/common/disk.c20
2 files changed, 3 insertions, 34 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index e75fce6d32..b93fb45c8f 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2451,21 +2451,10 @@ static bool dbg_boot_data(void)
info.scroll_all = true;
simplelist_info_init(&info, "Boot data", 1, NULL);
simplelist_set_line_count(0);
- crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
-#if defined(HAVE_MULTIBOOT)
- int boot_volume = 0;
- if(crc == boot_data.crc)
- {
- boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
- }
- simplelist_addline("Boot Volume: <%lu>", boot_volume);
- simplelist_addline("");
-#endif
- simplelist_addline("Bootdata RAW:");
- if (crc != boot_data.crc)
- simplelist_addline("Magic: %.8s", boot_data.magic);
+ simplelist_addline("Magic: %.8s", boot_data.magic);
simplelist_addline("Length: %lu", boot_data.length);
simplelist_addline("CRC: %lx", boot_data.crc);
+ crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
(crc == boot_data.crc) ? simplelist_addline("CRC: OK!") :
simplelist_addline("CRC: BAD");
for (unsigned i = 0; i < boot_data.length; i += 4)
@@ -2477,7 +2466,7 @@ static bool dbg_boot_data(void)
info.hide_selection = true;
return simplelist_show_list(&info);
}
-#endif /* defined(HAVE_BOOTDATA) && !defined(SIMULATOR) */
+#endif
/****** The menu *********/
static const struct {
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index 51d033b678..98c273b26d 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -30,10 +30,6 @@
#include "dircache_redirect.h"
#include "disk.h"
-#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER)
-#include "bootdata.h"
-#include "crc32.h"
-#endif
#ifndef CONFIG_DEFAULT_PARTNUM
#define CONFIG_DEFAULT_PARTNUM 0
@@ -253,23 +249,7 @@ int disk_mount_all(void)
for (int i = 0; i < NUM_VOLUMES; i++)
vol_drive[i] = -1; /* mark all as unassigned */
-#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER)
- unsigned int crc = 0;
- int boot_volume = 0;
- crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
- if(crc == boot_data.crc)
- {
- boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
- }
- #ifdef HAVE_HOTSWAP
- if (storage_present(boot_volume))
- #endif
- mounted += disk_mount(boot_volume); /* mount boot volume first */
- for (int i = 0; i < NUM_DRIVES; i++)
- if (i != boot_volume)
-#else
for (int i = 0; i < NUM_DRIVES; i++)
-#endif
{
#ifdef HAVE_HOTSWAP
if (storage_present(i))