From 8599254e29bb3133ec72234fe63dbfd2bf65e75f Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 13 Dec 2021 13:24:56 -0800 Subject: [PATCH 1/4] --enable-ftdi-oscan1 in Linux build. Change-Id: I531cd283a1020d94eaeee36e81140c8c4801c69e Signed-off-by: Tim Newsome --- .github/workflows/linux-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 12d07e98b..33eb47070 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v2 - run: sudo apt-get install clang gcc-multilib - run: ./bootstrap - - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --disable-target64 + - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --disable-target64 --enable-ftdi-oscan1 - run: make - run: file src/openocd | grep 32-bit @@ -29,6 +29,6 @@ jobs: - name: Checkout Code uses: actions/checkout@v2 - run: ./bootstrap - - run: ./configure --enable-remote-bitbang --enable-jtag_vpi + - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --enable-ftdi-oscan1 - run: make - run: file src/openocd | grep 64-bit From 26c9e64d3d33dfbb1367310757fb7dbcafb46d6c Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 13 Dec 2021 13:28:44 -0800 Subject: [PATCH 2/4] Install libusb Change-Id: I711c814ff3c9d4fada58aac530e406df662024a4 Signed-off-by: Tim Newsome --- .github/workflows/linux-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 33eb47070..2ed67dde0 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 - - run: sudo apt-get install clang gcc-multilib + - run: sudo apt-get install clang gcc-multilib libusb-1.0-0-dev - run: ./bootstrap - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --disable-target64 --enable-ftdi-oscan1 - run: make @@ -28,6 +28,7 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 + - run: sudo apt-get install libusb-1.0-0-dev - run: ./bootstrap - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --enable-ftdi-oscan1 - run: make From deab0f463823b5795b251dbc31649ef70603fb94 Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 13 Dec 2021 13:32:22 -0800 Subject: [PATCH 3/4] Also install the library itself. Change-Id: I86579f6f5abeecf6b85ccbc6c736cc7aa0922a16 Signed-off-by: Tim Newsome --- .github/workflows/linux-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 2ed67dde0..15f923a5b 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 - - run: sudo apt-get install clang gcc-multilib libusb-1.0-0-dev + - run: sudo apt-get install clang gcc-multilib libusb-1.0-0 libusb-1.0-0-dev - run: ./bootstrap - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --disable-target64 --enable-ftdi-oscan1 - run: make @@ -28,7 +28,7 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 - - run: sudo apt-get install libusb-1.0-0-dev + - run: sudo apt-get install libusb-1.0-0 libusb-1.0-0-dev - run: ./bootstrap - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --enable-ftdi-oscan1 - run: make From f3c69c7292d6e09a53050881976c1c9403f04254 Mon Sep 17 00:00:00 2001 From: Tim Newsome Date: Mon, 13 Dec 2021 13:35:35 -0800 Subject: [PATCH 4/4] Don't use oscan1 on 32-bit build. It requires libusb, and I'm not off-hand seeing a 32-bit libusb to link with. Change-Id: Ib676982b9c17369326ffc63eab5ef895add48569 Signed-off-by: Tim Newsome --- .github/workflows/linux-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 15f923a5b..74028d54b 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -12,9 +12,9 @@ jobs: steps: - name: Checkout Code uses: actions/checkout@v2 - - run: sudo apt-get install clang gcc-multilib libusb-1.0-0 libusb-1.0-0-dev + - run: sudo apt-get install clang gcc-multilib - run: ./bootstrap - - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --disable-target64 --enable-ftdi-oscan1 + - run: ./configure --enable-remote-bitbang --enable-jtag_vpi --disable-target64 - run: make - run: file src/openocd | grep 32-bit