Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
Merge pull request #542 from sifive/remove-picolibc
Browse files Browse the repository at this point in the history
Remove picolibc support
  • Loading branch information
nategraff-sifive authored Sep 16, 2020
2 parents 593be13 + f43d363 commit 5a2f019
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 15 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ jobs:
]
riscv_libc: [
"",
"picolibc",
"segger",
]

Expand Down
5 changes: 0 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ FROM ubuntu:16.04 AS download-tarballs
ARG SIFIVE_TOOLS_URL=https://static.dev.sifive.com/dev-tools/freedom-tools/v2020.08

ARG RISCV_TOOLS_TARBALL=riscv64-unknown-elf-gcc-10.1.0-2020.08.2-x86_64-linux-ubuntu14.tar.gz
ARG RISCV_PICOLIBC_TARBALL=riscv64-unknown-elf-picolibc-1.4.6-2020.08.2-x86_64-linux-ubuntu14.tar.gz
ARG RISCV_SEGGER_LIBC_TARBALL=segger_libc-2020.08.2.tar.bz2
ARG QEMU_TARBALL=riscv-qemu-5.1.0-2020.08.1-x86_64-linux-ubuntu14.tar.gz

Expand All @@ -14,10 +13,6 @@ RUN apt-get update && \
rsync \
wget

# Install picolibc
RUN wget --no-verbose https://github.com/picolibc/picolibc/releases/download/1.4.6/${RISCV_PICOLIBC_TARBALL} && \
tar xzf ${RISCV_PICOLIBC_TARBALL}

# Install RISC-V Toolchain
RUN wget --no-verbose ${SIFIVE_TOOLS_URL}/${RISCV_TOOLS_TARBALL} && \
tar xzf ${RISCV_TOOLS_TARBALL} && \
Expand Down
2 changes: 1 addition & 1 deletion freedom-metal
7 changes: 0 additions & 7 deletions scripts/standalone.mk
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,6 @@ METAL_WITH_EXTRA=--with-builtin-libgloss
SPEC=nano
endif

ifeq ($(RISCV_LIBC),picolibc)
LIBMETAL_EXTRA=-lmetal-pico
METAL_WITH_EXTRA=--with-builtin-libmetal-pico
SPEC=picolibc
endif

ifeq ($(SPEC),)
$(error RISCV_LIBC set to an unsupported value: $(RISCV_LIBC))
endif
Expand Down Expand Up @@ -275,7 +269,6 @@ PROGRAM_SRCS = $(wildcard $(SRC_DIR)/*.c) $(wildcard $(SRC_DIR)/*.h) $(wildcard
$(PROGRAM_ELF): \
$(PROGRAM_SRCS) \
$(BSP_DIR)/install/lib/$(CONFIGURATION)/libmetal.a \
$(BSP_DIR)/install/lib/$(CONFIGURATION)/libmetal-pico.a \
$(BSP_DIR)/install/lib/$(CONFIGURATION)/libmetal-gloss.a \
$(BSP_DIR)/metal.$(LINK_TARGET).lds
mkdir -p $(dir $@)
Expand Down
2 changes: 1 addition & 1 deletion wit-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"source": "git@github.com:sifive/freedom-devicetree-tools.git"
},
{
"commit": "4afda0c6036346ca64a88d5501dd2758c8b12cdd",
"commit": "58f40ee376f85998eabbe9e35654b74e1807e03e",
"name": "freedom-metal",
"source": "git@github.com:sifive/freedom-metal.git"
},
Expand Down

0 comments on commit 5a2f019

Please sign in to comment.