Skip to content

Commit

Permalink
Merge pull request #44 from PandABlocks/vivado2023
Browse files Browse the repository at this point in the history
Vivado2023 upgrade
  • Loading branch information
tomtrafford authored Feb 15, 2024
2 parents dcee87a + 512c06f commit d0c59be
Show file tree
Hide file tree
Showing 6 changed files with 757 additions and 883 deletions.
4 changes: 4 additions & 0 deletions .github/scripts/tar-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,13 @@ fi

# Install tar file dependencies
curl -o u-boot-xlnx-xilinx-v2022.2.tar.gz -L https://github.com/Xilinx/u-boot-xlnx/archive/refs/tags/xilinx-v2022.2.tar.gz \
-o u-boot-xlnx-xilinx-v2023.2.tar.gz -L https://github.com/Xilinx/u-boot-xlnx/archive/refs/tags/xilinx-v2023.2.tar.gz \
-o linux-xlnx-xilinx-v2022.2.tar.gz -L https://github.com/Xilinx/linux-xlnx/archive/refs/tags/xilinx-v2022.2.tar.gz \
-o linux-xlnx-xilinx-v2023.2.tar.gz -L https://github.com/Xilinx/linux-xlnx/archive/refs/tags/xilinx-v2023.2.tar.gz \
-o device-tree-xlnx-xilinx_v2022.2.tar.gz -L https://github.com/Xilinx/device-tree-xlnx/archive/refs/tags/xilinx_v2022.2.tar.gz \
-o device-tree-xlnx-xilinx_v2023.2.tar.gz -L https://github.com/Xilinx/device-tree-xlnx/archive/refs/tags/xilinx_v2023.2.tar.gz \
-o arm-trusted-firmware-xilinx-v2022.2.tar.gz -L https://github.com/Xilinx/arm-trusted-firmware/archive/refs/tags/xilinx-v2022.2.tar.gz \
-o arm-trusted-firmware-xilinx-v2023.2.tar.gz -L https://github.com/Xilinx/arm-trusted-firmware/archive/refs/tags/xilinx-v2023.2.tar.gz \
-o dtc-1.7.0.tar.gz -L https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.7.0.tar.gz

# Old url to i2c-tools tar file. No longer working
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ RUN yum -y upgrade && yum -y install \
git \
glibc-devel \
glibc-langpack-en \
gnutls-devel \
gmp-devel \
libffi-devel \
libmpc-devel \
libjpeg-turbo-devel \
libuuid-devel \
ncurses-compat-libs \
openssl-devel \
patch \
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ TOP := $(CURDIR)
# Note: if these files have been downloaded through the releases directory then
# they need to be renamed with the appropriate {u-boot,linux}-xlnx- prefix so
# that the file name and contents match.
MD5_SUM_u-boot-xlnx-xilinx-v2022.2 = a9e54fff739d5702465c786b5420d31e
MD5_SUM_linux-xlnx-xilinx-v2022.2 = 5f156f71acadfb849eb3e1f65e1a42f0
MD5_SUM_u-boot-xlnx-xilinx-v2023.2 = 135d51a81aadaed096a667e41db6e110
MD5_SUM_linux-xlnx-xilinx-v2023.2 = 95b396e350aaab3f4ef944e3b22b1799

# Define settings that may need to be overridden before including CONFIG.
SPHINX_BUILD = sphinx-build
Expand All @@ -29,8 +29,8 @@ BOOT_ZIP = $(PANDA_ROOT)/boot@$(PLATFORM)-$(GIT_VERSION_SUFFIX).zip
DEPS_ZIP = $(PANDA_ROOT)/deps@$(PLATFORM)-$(GIT_VERSION_SUFFIX).zip

# Tags for versions of u-boot and kernel
U_BOOT_TAG = xilinx-v2022.2
KERNEL_TAG = xilinx-v2022.2
U_BOOT_TAG = xilinx-v2023.2
KERNEL_TAG = xilinx-v2023.2

# Configuration and local settings.
include CONFIG
Expand Down Expand Up @@ -170,7 +170,7 @@ $(KERNEL_SRC):
$(KERNEL_BUILD)/.config: kernel/$(PLATFORM).config $(KERNEL_SRC)
mkdir -p $(KERNEL_BUILD)
cp $< $@
$(MAKE_KERNEL) -j4 oldconfig
$(MAKE_KERNEL) -j4 olddefconfig

$(IMAGE): $(KERNEL_BUILD)/.config
$(MAKE_KERNEL) Image modules
Expand Down
Loading

0 comments on commit d0c59be

Please sign in to comment.