ソースを参照

[2.0.x][LPC176x] Fix binary linking broken by pio update (#11026)

Chris Pepper 6年前
コミット
f88adcbfd5
3個のファイルの変更8行の追加7行の削除
  1. 3
    1
      Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
  2. 1
    2
      frameworks/CMSIS/library.json
  3. 4
    4
      platformio.ini

+ 3
- 1
Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py ファイルの表示

@@ -22,6 +22,7 @@ if __name__ == "__main__":
22 22
 
23 23
                     # For MarlinFirmware/U8glib-HAL
24 24
                     "-IMarlin/src/HAL/HAL_LPC1768/u8g",
25
+                    "-DU8G_HAL_LINKS",
25 26
 
26 27
                     "-MMD",
27 28
                     "-MP",
@@ -48,11 +49,12 @@ else:
48 49
           "-fno-threadsafe-statics"
49 50
       ],
50 51
       LINKFLAGS=[
52
+          "-Wl,-Tframeworks/CMSIS/LPC1768/Re-ARM/LPC1768.ld,--gc-sections",
51 53
           "-Os",
52 54
           "-mcpu=cortex-m3",
53 55
           "-mthumb",
54 56
           "--specs=nano.specs",
55 57
           "--specs=nosys.specs",
56
-          "-u_printf_float",
58
+          "-u_printf_float"
57 59
       ],
58 60
   )

+ 1
- 2
frameworks/CMSIS/library.json ファイルの表示

@@ -11,8 +11,7 @@
11 11
       "src_filter": "+<LPC1768/*>",
12 12
       "flags": [
13 13
         "-ILPC1768/include",
14
-        "-ILPC1768/lib",
15
-        "-Wl,-Tframeworks/CMSIS/LPC1768/Re-ARM/LPC1768.ld,--gc-sections"
14
+        "-ILPC1768/lib"
16 15
     ]
17 16
   }
18 17
 }

+ 4
- 4
platformio.ini ファイルの表示

@@ -150,10 +150,10 @@ monitor_speed = 250000
150 150
 platform          = nxplpc
151 151
 board             = lpc1768
152 152
 board_build.f_cpu = 100000000L
153
-build_flags       = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py
154
-  ${common.build_flags}
155
-  -DU8G_HAL_LINKS
156
-src_build_flags   = -Wall
153
+# Override default maximum RAM. LPC1768/9 do have 64k, but in 3 blocks (32K, 16K, 16K).
154
+# The first 32k block is used by default, while the others must be specifically targeted.
155
+board_upload.maximum_ram_size = 32768
156
+build_flags       = !python Marlin/src/HAL/HAL_LPC1768/lpc1768_flag_script.py ${common.build_flags}
157 157
 build_unflags     = -Wall
158 158
 lib_ldf_mode      = off
159 159
 lib_extra_dirs    = frameworks

読み込み中…
キャンセル
保存