From 41bd8539c3dc4aa3528d1e23a757ee98ab42f609 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 24 Mar 2022 10:06:31 +0100 Subject: [PATCH 1/4] setup.py: Remove migen/pythondata-software-compiler-rt (Installed through litex_setup.py). --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index 3688b4fdf..f5e91cc6b 100755 --- a/setup.py +++ b/setup.py @@ -15,10 +15,8 @@ setup( license="BSD", python_requires="~=3.6", install_requires=[ - "migen", "pyserial", "requests", - "pythondata-software-compiler_rt", ], packages=find_packages(exclude=("test*", "sim*", "doc*")), include_package_data=True, From 72b61155c7b1d0f9117b6ce209e985e67032807d Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 24 Mar 2022 10:12:38 +0100 Subject: [PATCH 2/4] workflows/ci: Checkout to /usr/litex. --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14517dede..fa95c46b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,8 @@ jobs: # Checkout Repository - name: Checkout uses: actions/checkout@v2 + with: + path: /usr/litex # Install Tools - name: Install Tools From 1935a2599f4fe8372fd0c696a2bbebf6d8aa4e85 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 24 Mar 2022 10:15:30 +0100 Subject: [PATCH 3/4] workflows/ci: Use local version of litex_setup. --- .github/workflows/ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa95c46b1..c5d0f3244 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,6 @@ jobs: # Checkout Repository - name: Checkout uses: actions/checkout@v2 - with: - path: /usr/litex # Install Tools - name: Install Tools @@ -26,13 +24,11 @@ jobs: # Install (n)Migen / LiteX / Cores - name: Install LiteX run: | - wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py python3 litex_setup.py --config=full --init --install --user # Install GCC Toolchains - name: Install GCC Toolchains run: | - wget https://raw.githubusercontent.com/enjoy-digital/litex/master/litex_setup.py python3 litex_setup.py --gcc=riscv sudo mkdir /usr/local/riscv sudo cp -r $PWD/../riscv64-*/* /usr/local/riscv From caced992ad3162893c18d8306c05984c45004562 Mon Sep 17 00:00:00 2001 From: Florent Kermarrec Date: Thu, 24 Mar 2022 10:18:57 +0100 Subject: [PATCH 4/4] litex_setup: Remove pip3 install amaranth-yosys. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5d0f3244..24068961e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,6 @@ jobs: pip3 install requests pip3 install pexpect pip3 install meson - pip3 install amaranth-yosys # Install (n)Migen / LiteX / Cores - name: Install LiteX