3 files changed, 11 insertions, 1 deletions

diff --git a/firmware/target/arm/pbell/vibe500/button-vibe500.c b/firmware/target/arm/pbell/vibe500/button-vibe500.c
index 9afc9eecab..1279e86725 100644
--- a/firmware/target/arm/pbell/vibe500/button-vibe500.c
+++ b/firmware/target/arm/pbell/vibe500/button-vibe500.c
@@ -97,9 +97,11 @@ int button_read_device(void)
     int buttons = int_btn;
     unsigned char state;
     static bool hold_button = false;
+#ifndef BOOTLOADER
     bool hold_button_old;
 
     hold_button_old = hold_button;
+#endif
     hold_button = button_hold();
 
 #ifndef BOOTLOADER
diff --git a/firmware/target/arm/samsung/button-yh82x_yh92x.c b/firmware/target/arm/samsung/button-yh82x_yh92x.c
index ff8a580d2a..7d0f390644 100644
--- a/firmware/target/arm/samsung/button-yh82x_yh92x.c
+++ b/firmware/target/arm/samsung/button-yh82x_yh92x.c
@@ -103,10 +103,14 @@ int button_read_device(void)
     int btn = BUTTON_NONE;
 #endif /* (SAMSUNG_YH920) || (SAMSUNG_YH925) */
     static bool hold_button = false;
+#ifndef BOOTLOADER
     bool hold_button_old;
+#endif
 
     /* Hold */
+#ifndef BOOTLOADER
     hold_button_old = hold_button;
+#endif
     hold_button = button_hold();
 
 #ifndef BOOTLOADER
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c
index 44d006b30f..b19b635923 100644
--- a/firmware/target/arm/usb-drv-arc.c
+++ b/firmware/target/arm/usb-drv-arc.c
@@ -352,12 +352,16 @@ static struct queue_head qh_array[USB_NUM_ENDPOINTS*2]
 static struct semaphore transfer_completion_signal[USB_NUM_ENDPOINTS*2]
     SHAREDBSS_ATTR;
 
-static const unsigned int pipe2mask[] = {
+static const unsigned int pipe2mask[USB_NUM_ENDPOINTS*2] = {
     0x01, 0x010000,
     0x02, 0x020000,
     0x04, 0x040000,
+#if USB_NUM_ENDPOINTS > 3
     0x08, 0x080000,
+#endif
+#if USB_NUM_ENDPOINTS > 4
     0x10, 0x100000,
+#endif
 };
 
 /*-------------------------------------------------------------------------*/