From 1d27e86aa06ee6d6d94a290d914aa668b8d9f400 Mon Sep 17 00:00:00 2001 From: Cyril Koenig Date: Thu, 9 Jan 2025 20:41:41 +0100 Subject: [PATCH] sw: New dts for vcu118 --- sw/boot/{carfield_vanilla.dts => carfield_bd_vcu118.dts} | 0 sw/boot/{carfield_bd.dts => carfield_bd_vcu128.dts} | 6 +----- sw/boot/carfield_vanilla_vcu128.dts | 8 ++++++++ target/xilinx/xilinx.mk | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) rename sw/boot/{carfield_vanilla.dts => carfield_bd_vcu118.dts} (100%) rename sw/boot/{carfield_bd.dts => carfield_bd_vcu128.dts} (93%) create mode 100644 sw/boot/carfield_vanilla_vcu128.dts diff --git a/sw/boot/carfield_vanilla.dts b/sw/boot/carfield_bd_vcu118.dts similarity index 100% rename from sw/boot/carfield_vanilla.dts rename to sw/boot/carfield_bd_vcu118.dts diff --git a/sw/boot/carfield_bd.dts b/sw/boot/carfield_bd_vcu128.dts similarity index 93% rename from sw/boot/carfield_bd.dts rename to sw/boot/carfield_bd_vcu128.dts index 4fc775e6..090ee6a4 100644 --- a/sw/boot/carfield_bd.dts +++ b/sw/boot/carfield_bd_vcu128.dts @@ -75,12 +75,8 @@ reg = <3>; #phy-cells = <1>; device_type = "ethernet-phy"; - //ti,sgmii-ref-clock-output-enable; + ti,sgmii-ref-clock-output-enable; ti,dp83867-rxctrl-strap-quirk; - //ti,6-wire-mode; - //ti,rx-internal-delay = <0x8>; - //ti,tx-internal-delay = <0xa>; - //ti,fifo-depth = <0x1>; }; }; }; diff --git a/sw/boot/carfield_vanilla_vcu128.dts b/sw/boot/carfield_vanilla_vcu128.dts new file mode 100644 index 00000000..c3d2805d --- /dev/null +++ b/sw/boot/carfield_vanilla_vcu128.dts @@ -0,0 +1,8 @@ +// Copyright 2022 ETH Zurich and University of Bologna. +// Solderpad Hardware License, Version 0.51, see LICENSE for details. +// SPDX-License-Identifier: SHL-0.51 +// +// Cyril Koenig + + +/include/ "carfield.dtsi" diff --git a/target/xilinx/xilinx.mk b/target/xilinx/xilinx.mk index 182d90c8..6fb8ed13 100644 --- a/target/xilinx/xilinx.mk +++ b/target/xilinx/xilinx.mk @@ -99,7 +99,7 @@ car-xil-program: ## @param XILINX_BOARD The target Xilinx board to be programmed ## @param XILINX_FLAVOR= The flavor of the implementation. ## @param VIVADO_FLAGS Some flags for Vivado, such as batch or gui mode -car-xil-flash: $(CAR_SW_DIR)/boot/linux_carfield_$(XILINX_FLAVOR).gpt.bin +car-xil-flash: $(CAR_SW_DIR)/boot/linux_carfield_$(XILINX_FLAVOR)_$(XILINX_BOARD).gpt.bin $(vivado_env) FILE=$< OFFSET=0 $(VIVADO) $(VIVADO_FLAGS) -source $(CAR_XIL_DIR)/scripts/flash_spi.tcl ## Clean Xilinx artifacts for all implementations