Explorar el Código

Restore Pico 2 DaynaPORT to full speed

Pico 2 DaynaPORT build was being limited to Fast 10 SCSI when it
can do the lower end of Fast 20. Also mirrored more parts of the
rp2040 linker file in the `rp23xx-template.ld` linker script
J. Morio Sakaguchi hace 11 meses
padre
commit
0fe02af789

+ 1 - 2
lib/ZuluSCSI_platform_RP2MCU/ZuluSCSI_platform_config.h

@@ -35,16 +35,15 @@
 #elif defined(ZULUSCSI_PICO_2)
 # ifdef ZULUSCSI_PICO_2_DAYNAPORT
 #   define PLATFORM_NAME "ZuluSCSI Pico 2 DaynaPORT"
-#   define PLATFORM_DEFAULT_SCSI_SPEED_SETTING 10
 # else
 #   define PLATFORM_NAME "ZuluSCSI Pico 2"
-#   define PLATFORM_DEFAULT_SCSI_SPEED_SETTING 20
 # endif
 # define PLATFORM_PID "Pico 2"
 # define PLATFORM_REVISION "2.0"
 # define PLATFORM_HAS_INITIATOR_MODE 1
 # define DISABLE_SWO
 # define PLATFORM_MAX_SCSI_SPEED S2S_CFG_SPEED_SYNC_20
+# define PLATFORM_DEFAULT_SCSI_SPEED_SETTING 20
 
 #elif defined(ZULUSCSI_RP2350A)
 # define PLATFORM_NAME "ZuluSCSI RP2350A"

+ 4 - 5
lib/ZuluSCSI_platform_RP2MCU/rp23xx-template.ld

@@ -188,11 +188,11 @@ SECTIONS
     __binary_info_end = .;
     . = ALIGN(4);
 
-    .ram_vector_table (NOLOAD): {
+    .ram_vector_table (COPY): {
         *(.ram_vector_table)
     } > RAM
 
-    .uninitialized_data (NOLOAD): {
+    .uninitialized_data (COPY): {
         . = ALIGN(4);
         *(.uninitialized_data*)
     } > RAM
@@ -202,17 +202,16 @@ SECTIONS
         *(vtable)
 
         *(.time_critical*)
-
+        . = ALIGN(4);
         /* remaining .text and .rodata; i.e. stuff we exclude above because we want it in RAM */
         *(.text)
         *(.text*)
         . = ALIGN(4);
         *(.rodata*)
         . = ALIGN(4);
-
         *(.data*)
+        . = ALIGN(4);
         *(.sdata*)
-
         . = ALIGN(4);
         *(.after_data.*)
         . = ALIGN(4);

+ 1 - 1
platformio.ini

@@ -125,7 +125,7 @@ build_flags =
     -DPICO_FLASH_SPI_CLKDIV=2
     -DPLATFORM_MASS_STORAGE
     -DFILE_COPY_CONSTRUCTOR_SELECT=FILE_COPY_CONSTRUCTOR_PUBLIC
-; build flags mirroring the framework-arduinopico#v4.1.1-DaynaPORT static library build
+; build flags mirroring the "framework-arduinopico#x.x.x-DaynaPORT" static library build
     -DPICO_CYW43_ARCH_POLL=1
 	-DCYW43_LWIP=0
 	-DCYW43_USE_OTP_MAC=0

+ 1 - 1
src/ZuluSCSI_config.h

@@ -28,7 +28,7 @@
 #include <ZuluSCSI_platform_config.h>
 
 // Use variables for version number
-#define FW_VER_NUM      "24.11.25"
+#define FW_VER_NUM      "24.11.26"
 #define FW_VER_SUFFIX   "devel"
 
 #define ZULU_FW_VERSION FW_VER_NUM "-" FW_VER_SUFFIX