From 57b41a99c9acc10689d330c74dc989953fe328ee Mon Sep 17 00:00:00 2001 From: Hanyuan Zhao Date: Tue, 28 Nov 2023 11:50:32 +0800 Subject: [PATCH] refactor: use the default c library and rename the defconfig --- .github/workflows/makefile.yml | 2 +- board/milkv/duo/readme.txt | 4 ++-- ...o_musl_riscv64_64mb_defconfig => milkv_duo_64mb_defconfig} | 1 - .../{milkv_duo_musl_riscv64_defconfig => milkv_duo_defconfig} | 1 - 4 files changed, 3 insertions(+), 5 deletions(-) rename configs/{milkv_duo_musl_riscv64_64mb_defconfig => milkv_duo_64mb_defconfig} (98%) rename configs/{milkv_duo_musl_riscv64_defconfig => milkv_duo_defconfig} (98%) diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml index 904d57c420eb..eba673184d28 100644 --- a/.github/workflows/makefile.yml +++ b/.github/workflows/makefile.yml @@ -27,7 +27,7 @@ jobs: android-tools-mkbootimg - name: Configure Buildroot - run: make milkv_duo_musl_riscv64_defconfig + run: make milkv_duo_defconfig - name: Build run: make diff --git a/board/milkv/duo/readme.txt b/board/milkv/duo/readme.txt index 1c019dff08ba..00b8117f9ee9 100644 --- a/board/milkv/duo/readme.txt +++ b/board/milkv/duo/readme.txt @@ -14,12 +14,12 @@ How to build it Configure Buildroot: - $ make milkv_duo_musl_riscv64_defconfig + $ make milkv_duo_defconfig Note that by default some RAM will be set for the ION camera use. If you expect to have all the 64MiB free RAM, please try: - $ make milkv_duo_musl_riscv64_64mb_defconfig + $ make milkv_duo_64mb_defconfig Modify configuration if needed, e.g. add more packages to target: diff --git a/configs/milkv_duo_musl_riscv64_64mb_defconfig b/configs/milkv_duo_64mb_defconfig similarity index 98% rename from configs/milkv_duo_musl_riscv64_64mb_defconfig rename to configs/milkv_duo_64mb_defconfig index 0d8d4dfdf173..13e72d354894 100644 --- a/configs/milkv_duo_musl_riscv64_64mb_defconfig +++ b/configs/milkv_duo_64mb_defconfig @@ -9,7 +9,6 @@ BR2_KERNEL_HEADERS_5_10=y # Using gcc13 to have t-head's optimization and features BR2_GCC_VERSION_13_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" # opensbi diff --git a/configs/milkv_duo_musl_riscv64_defconfig b/configs/milkv_duo_defconfig similarity index 98% rename from configs/milkv_duo_musl_riscv64_defconfig rename to configs/milkv_duo_defconfig index 1c22186a3e28..3774047aa506 100644 --- a/configs/milkv_duo_musl_riscv64_defconfig +++ b/configs/milkv_duo_defconfig @@ -9,7 +9,6 @@ BR2_KERNEL_HEADERS_5_10=y # Using gcc13 to have t-head's optimization and features BR2_GCC_VERSION_13_X=y BR2_TOOLCHAIN_BUILDROOT_CXX=y -BR2_TOOLCHAIN_BUILDROOT_MUSL=y BR2_TARGET_OPTIMIZATION="-march=rv64imafdc_xtheadba_xtheadbb_xtheadbs_xtheadcmo_xtheadcondmov_xtheadfmemidx_xtheadfmv_xtheadint_xtheadmac_xtheadmemidx_xtheadmempair_xtheadsync" # opensbi