bootloader: Shrink size (primarily by disabling debug printk)

keirf · Sep 23, 2019 · 2c1dda0 · 2c1dda0
1 parent f661196
commit 2c1dda0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -73,7 +73,8 @@ upd:
 
 all:
 	$(MAKE) -C src -f $(ROOT)/Rules.mk $(PROJ).elf $(PROJ).bin $(PROJ).hex
-	bootloader=y $(MAKE) -C bootloader -f $(ROOT)/Rules.mk \
+	bootloader=y debug=n logfile=n $(MAKE) -C bootloader \
+		-f $(ROOT)/Rules.mk \
 		Bootloader.elf Bootloader.bin Bootloader.hex
 	logfile=n $(MAKE) -C bl_update -f $(ROOT)/Rules.mk \
 		BL_Update.elf BL_Update.bin BL_Update.hex

diff --git a/src/fatfs/ffconf.h b/src/fatfs/ffconf.h
@@ -147,7 +147,11 @@
 */
 
 
+#if defined(BOOTLOADER)
+#define FF_FS_RPATH		0
+#else
 #define FF_FS_RPATH		1
+#endif
 /* This option configures support for relative path.
 /
 /   0: Disable relative path and remove related functions.

diff --git a/src/fs.c b/src/fs.c
@@ -168,11 +168,13 @@ void F_findnext(DIR *dp, FILINFO *fno)
     handle_fr(fr);
 }
 
+#if !defined(BOOTLOADER)
 void F_chdir(const TCHAR *path)
 {
     FRESULT fr = f_chdir(path);
     handle_fr(fr);
 }
+#endif
 
 /*
  * Local variables:

diff --git a/src/usb/stm32_usbh_msc/usb_core.c b/src/usb/stm32_usbh_msc/usb_core.c
@@ -175,6 +175,7 @@ USB_OTG_STS USB_OTG_SelectCore(USB_OTG_CORE_HANDLE *pdev,
     pdev->cfg.mps              = USB_OTG_FS_MAX_PACKET_SIZE ;
 
     /* initialize device cfg following its address */
+#ifdef USB_OTG_FS_CORE
     if (coreID == USB_OTG_FS_CORE_ID)
     {
         baseAddress                = USB_OTG_FS_BASE_ADDR;
@@ -192,6 +193,8 @@ USB_OTG_STS USB_OTG_SelectCore(USB_OTG_CORE_HANDLE *pdev,
         pdev->cfg.low_power        = 1;
 #endif
     }
+#endif /* USB_OTG_FS_CORE */
+#ifdef USB_OTG_HS_CORE
     else if (coreID == USB_OTG_HS_CORE_ID)
     {
         baseAddress                = USB_OTG_HS_BASE_ADDR;
@@ -221,11 +224,7 @@ USB_OTG_STS USB_OTG_SelectCore(USB_OTG_CORE_HANDLE *pdev,
 #endif
 
     }
-
-    else
-    {
-        /* Do Nothing */
-    }
+#endif /* USB_OTG_HS_CORE */
 
     pdev->regs.GREGS = (USB_OTG_GREGS *)(baseAddress + \
                                          USB_OTG_CORE_GLOBAL_REGS_OFFSET);