add feature target_kasli_soc to libsupport_zynq, libconfig, experiments, szl, default.nix

default.nix

@@ -36,7 +36,7 @@ let
     "${target}-experiments" = build-crate "${target}-experiments" "experiments" "target_${target}" cargoSha256Experiments;
     "${target}-szl" = build-crate "${target}-szl" "szl" "target_${target}" cargoSha256SZL;
   };
-  targets = ["zc706" "coraz7" "redpitaya"];
+  targets = ["zc706" "coraz7" "redpitaya" "kasli_soc"];
 in
   {
     inherit cargo-xbuild;

experiments/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2018"
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706"]
 target_coraz7 = ["libboard_zynq/target_coraz7", "libsupport_zynq/target_coraz7"]
 target_redpitaya = ["libboard_zynq/target_redpitaya", "libsupport_zynq/target_redpitaya"]
+target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libsupport_zynq/target_kasli_soc"]
 default = ["target_zc706"]
 
 [dependencies]

experiments/src/main.rs

@@ -105,31 +105,20 @@ pub fn main_core0() {
             .boot_mode_pins()
     );
 
-    #[cfg(feature = "target_zc706")]
+    #[cfg(any(
+        feature = "target_zc706",
+        feature = "target_redpitaya",
+        feature = "target_kasli_soc",
+    ))]
     const CPU_FREQ: u32 = 800_000_000;
     #[cfg(feature = "target_coraz7")]
     const CPU_FREQ: u32 = 650_000_000;
-    #[cfg(feature = "target_redpitaya")]
-    const CPU_FREQ: u32 = 800_000_000;
 
     info!("Setup clock sources...");
     ArmPll::setup(2 * CPU_FREQ);
     Clocks::set_cpu_freq(CPU_FREQ);
-    #[cfg(feature = "target_zc706")]
-    {
     IoPll::setup(1_000_000_000);
     libboard_zynq::stdio::drop_uart();
-    }
-    #[cfg(feature = "target_coraz7")]
-    {
-        IoPll::setup(1_000_000_000);
-        libboard_zynq::stdio::drop_uart();
-    }
-    #[cfg(feature = "target_redpitaya")]
-    {
-        IoPll::setup(1_000_000_000);
-        libboard_zynq::stdio::drop_uart();
-    }
     info!("PLLs set up");
     let clocks = zynq::clocks::Clocks::get();
     info!(

libboard_zynq/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2018"
 target_zc706 = []
 target_coraz7 = []
 target_redpitaya = []
+target_kasli_soc = []
 ipv6 = [ "smoltcp/proto-ipv6" ]
 
 [dependencies]

libboard_zynq/src/clocks/source.rs

@@ -8,6 +8,8 @@ pub const PS_CLK: u32 = 33_333_333;
 pub const PS_CLK: u32 = 50_000_000;
 #[cfg(feature = "target_redpitaya")]
 pub const PS_CLK: u32 = 33_333_333;
+#[cfg(feature = "target_kasli_soc")]
+pub const PS_CLK: u32 = 33_333_333;
 
 /// (pll_fdiv_max, (pll_cp, pll_res, lock_cnt))
 const PLL_FDIV_LOCK_PARAM: &[(u16, (u8, u8, u16))] = &[

libboard_zynq/src/ddr/mod.rs

@@ -20,8 +20,11 @@ const DDR_FREQ: u32 = 525_000_000;
 /// Alliance Memory AS4C256M16D3B: 800 MHz DDR3 at 533 MHz
 const DDR_FREQ: u32 = 533_333_333;
 
-/// MT41K256M16HA-125
-const DCI_FREQ: u32 = 10_000_000;
+#[cfg(feature = "target_kasli_soc")]
+/// MT41K256M16HA-125:E: 800 MHz DDR3L at 533 MHz
+const DDR_FREQ: u32 = 533_333_333;
+
+const DCI_MAX_FREQ: u32 = 10_000_000;
 
 pub struct DdrRam {
     regs: &'static mut regs::RegisterBlock,
@@ -61,7 +64,7 @@ impl DdrRam {
     }
 
     fn calculate_dci_divisors(clocks: &Clocks) -> (u8, u8) {
-        let target = (DCI_FREQ - 1 + clocks.ddr) / DCI_FREQ;
+        let target = (DCI_MAX_FREQ - 1 + clocks.ddr) / DCI_MAX_FREQ;
 
         let mut best = None;
         let mut best_error = 0;
@@ -144,13 +147,13 @@ impl DdrRam {
                 .output_en(slcr::DdriobOutputEn::Obuf);
             #[cfg(feature = "target_zc706")]
             let data1_config = data0_config.clone();
-            #[cfg(feature = "target_coraz7")]
+            #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
             let data0_config = slcr::DdriobConfig::zeroed()
                 .inp_type(slcr::DdriobInputType::VrefDifferential)
                 .term_en(true)
                 .dci_type(slcr::DdriobDciType::Termination)
                 .output_en(slcr::DdriobOutputEn::Obuf);
-            #[cfg(feature = "target_coraz7")]
+            #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
             let data1_config = slcr::DdriobConfig::zeroed()
                 .pullup_en(true);
             #[cfg(feature = "target_redpitaya")]
@@ -173,13 +176,13 @@ impl DdrRam {
                 .output_en(slcr::DdriobOutputEn::Obuf);
             #[cfg(feature = "target_zc706")]
             let diff1_config = diff0_config.clone();
-            #[cfg(feature = "target_coraz7")]
+            #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
             let diff0_config = slcr::DdriobConfig::zeroed()
                 .inp_type(slcr::DdriobInputType::Differential)
                 .term_en(true)
                 .dci_type(slcr::DdriobDciType::Termination)
                 .output_en(slcr::DdriobOutputEn::Obuf);
-            #[cfg(feature = "target_coraz7")]
+            #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
             let diff1_config = slcr::DdriobConfig::zeroed()
                 .pullup_en(true);
             #[cfg(feature = "target_redpitaya")]
@@ -207,7 +210,7 @@ impl DdrRam {
                 slcr.ddriob_drive_slew_clock.write(0x00F9861C);
             }
 
-            #[cfg(feature = "target_coraz7")]
+            #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
             slcr.ddriob_ddr_ctrl.modify(|_, w| w
                     .vref_int_en(false)
                     .vref_ext_en_lower(true)
@@ -232,7 +235,7 @@ impl DdrRam {
     }
 
     fn configure(&mut self) {
-        #[cfg(feature = "target_coraz7")]
+        #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
         self.regs.dram_param0.write(
             regs::DramParam0::zeroed()
                 .t_rc(0x1a)
@@ -295,11 +298,11 @@ impl DdrRam {
                 .emr(0x4)
         );
 
-        #[cfg(feature = "target_coraz7")]
+        #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
         self.regs.phy_configs[2].modify(
             |_, w| w.data_slice_in_use(false)
         );
-        #[cfg(feature = "target_coraz7")]
+        #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
         self.regs.phy_configs[3].modify(
             |_, w| w.data_slice_in_use(false)
         );
@@ -351,7 +354,7 @@ impl DdrRam {
                 .gatelvl_init_ratio(0xee)
         );
 
-        #[cfg(feature = "target_coraz7")]
+        #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
         self.regs.reg_64.modify(
             |_, w| w
                 .phy_ctrl_slave_ratio(0x100)
@@ -387,7 +390,7 @@ impl DdrRam {
     fn reset_ddrc<F: FnMut(&mut Self)>(&mut self, mut f: F) {
         #[cfg(feature = "target_zc706")]
         let width = regs::DataBusWidth::Width32bit;
-        #[cfg(feature = "target_coraz7")]
+        #[cfg(any(feature = "target_coraz7", feature = "target_kasli_soc"))]
         let width = regs::DataBusWidth::Width16bit;
         #[cfg(feature = "target_redpitaya")]
         let width = regs::DataBusWidth::Width16bit;
@@ -405,7 +408,11 @@ impl DdrRam {
             self.regs.dram_addr_map_col.write(0xFFF00000);
             self.regs.dram_addr_map_row.write(0x0F666666);
         }
-        #[cfg(any(feature = "target_coraz7", feature = "target_redpitaya"))]
+        #[cfg(any(
+            feature = "target_coraz7",
+            feature = "target_redpitaya",
+            feature = "target_kasli_soc",
+        ))]
         unsafe {
             // row/column address bits
             self.regs.dram_addr_map_bank.write(0x00000666);
@@ -437,9 +444,11 @@ impl DdrRam {
         // filtering address map
         #[cfg(feature = "target_zc706")]
         let megabytes = 1023;
-        #[cfg(feature = "target_coraz7")]
-        let megabytes = 512;
-        #[cfg(feature = "target_redpitaya")]
+        #[cfg(any(
+            feature = "target_coraz7",
+            feature = "target_redpitaya",
+            feature = "target_kasli_soc",
+        ))]
         let megabytes = 512;
 
         megabytes * 1024 * 1024

libboard_zynq/src/sdio/mod.rs

@@ -117,7 +117,7 @@ impl Sdio {
                 );
             }
             // redpitaya card detect pin
-            #[cfg(feature = "target_redpitaya")]
+            #[cfg(any(feature = "target_redpitaya", feature = "target_kasli_soc"))]
             {
                 unsafe {
                     slcr.sd0_wp_cd_sel.write(46 << 16);

libboard_zynq/src/stdio.rs

@@ -47,7 +47,7 @@ impl DerefMut for LazyUart {
             LazyUart::Uninitialized => {
                 #[cfg(any(feature = "target_coraz7", feature = "target_redpitaya"))]
                 let uart = Uart::uart0(UART_RATE);
-                #[cfg(feature = "target_zc706")]
+                #[cfg(any(feature = "target_zc706", feature = "target_kasli_soc"))]
                 let uart = Uart::uart1(UART_RATE);
                 *self = LazyUart::Initialized(uart);
                 self

libboard_zynq/src/uart/mod.rs

@@ -46,7 +46,7 @@ impl Uart {
         self_
     }
 
-    #[cfg(feature = "target_zc706")]
+    #[cfg(any(feature = "target_zc706", feature = "target_kasli_soc"))]
     pub fn uart1(baudrate: u32) -> Self {
         slcr::RegisterBlock::unlocked(|slcr| {
             // Route UART 1 RxD/TxD Signals to MIO Pins

libconfig/Cargo.toml

@@ -14,4 +14,5 @@ log = "0.4"
 target_zc706 = []
 target_coraz7 = []
 target_redpitaya = []
+target_kasli_soc = []
 ipv6 = []

libconfig/src/net_settings.rs

@@ -43,6 +43,10 @@ pub fn get_adresses(cfg: &Config) -> NetAddresses {
     let mut hardware_addr = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x55]);
     #[cfg(feature = "target_redpitaya")]
     let mut ipv4_addr = IpAddress::v4(192, 168, 1, 55);
+    #[cfg(feature = "target_kasli_soc")]
+    let mut hardware_addr = EthernetAddress([0x02, 0x00, 0x00, 0x00, 0x00, 0x56]);
+    #[cfg(feature = "target_kasli_soc")]
+    let mut ipv4_addr = IpAddress::v4(192, 168, 1, 56);
 
     if let Ok(Ok(addr)) = cfg.read_str("mac").map(|s| s.parse()) {
         hardware_addr = addr;

libcortex_a9/Cargo.toml

@@ -5,11 +5,8 @@ authors = ["M-Labs"]
 edition = "2018"
 
 [features]
-target_zc706 = []
-target_coraz7 = []
-target_redpitaya = []
 power_saving = []
-default = ["target_zc706"]
+default = []
 
 [dependencies]
 bit_field = "0.10"

libsupport_zynq/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2018"
 target_zc706 = ["libboard_zynq/target_zc706"]
 target_coraz7 = ["libboard_zynq/target_coraz7"]
 target_redpitaya = ["libboard_zynq/target_redpitaya"]
+target_kasli_soc = ["libboard_zynq/target_kasli_soc"]
 panic_handler = []
 dummy_irq_handler = []
 alloc_core = []

szl/Cargo.toml

@@ -9,6 +9,7 @@ edition = "2018"
 target_zc706 = ["libboard_zynq/target_zc706", "libsupport_zynq/target_zc706", "libconfig/target_zc706"]
 target_coraz7 = ["libboard_zynq/target_coraz7", "libsupport_zynq/target_coraz7", "libconfig/target_coraz7"]
 target_redpitaya = ["libboard_zynq/target_redpitaya", "libsupport_zynq/target_redpitaya", "libconfig/target_redpitaya"]
+target_kasli_soc = ["libboard_zynq/target_kasli_soc", "libsupport_zynq/target_kasli_soc", "libconfig/target_kasli_soc"]
 default = ["target_zc706"]
 
 [dependencies]