Browse Source

toolchain: update buildroot config and makefile support gcc 12.2

support gcc 12.2 and march rv64imafdc_zicsr_zifencei_zba_zbb

Signed-off-by: Andy Hu <andy.hu@starfivetech.com>
Andy Hu 11 months ago
parent
commit
da371fbf46
3 changed files with 17 additions and 12 deletions
  1. 1 10
      Makefile
  2. 8 1
      conf/buildroot_initramfs_config
  3. 8 1
      conf/buildroot_rootfs_config

+ 1 - 10
Makefile

@@ -1,4 +1,4 @@
-ISA ?= rv64imafdc
+ISA ?= rv64imafdc_zicsr_zifencei_zba_zbb
 ABI ?= lp64d
 
 #TARGET_BOARD is JH7110 or NULL
@@ -202,15 +202,6 @@ $(linux_wrkdir)/.config: $(linux_defconfig) $(linux_srcdir)
 	mkdir -p $(dir $@)
 	cp -p $< $@
 	$(MAKE) -C $(linux_srcdir) O=$(linux_wrkdir) CROSS_COMPILE=$(CROSS_COMPILE) ARCH=riscv olddefconfig
-ifeq (,$(filter rv%c,$(ISA)))
-	sed 's/^.*CONFIG_RISCV_ISA_C.*$$/CONFIG_RISCV_ISA_C=n/' -i $@
-	$(MAKE) -C $(linux_srcdir) O=$(linux_wrkdir) CROSS_COMPILE=$(CROSS_COMPILE) ARCH=riscv olddefconfig
-endif
-ifeq ($(ISA),$(filter rv32%,$(ISA)))
-	sed 's/^.*CONFIG_ARCH_RV32I.*$$/CONFIG_ARCH_RV32I=y/' -i $@
-	sed 's/^.*CONFIG_ARCH_RV64I.*$$/CONFIG_ARCH_RV64I=n/' -i $@
-	$(MAKE) -C $(linux_srcdir) O=$(linux_wrkdir) CROSS_COMPILE=$(CROSS_COMPILE) ARCH=riscv olddefconfig
-endif
 
 $(uboot_wrkdir)/.config: $(uboot_defconfig)
 	mkdir -p $(dir $@)

+ 8 - 1
conf/buildroot_initramfs_config

@@ -1,9 +1,16 @@
 BR2_riscv=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
 BR2_KERNEL_HEADERS_CUSTOM_GIT=y
 BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="https://github.com/starfive-tech/linux.git"
 BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="JH7110_VisionFive2_devel"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_GLIBC_UTILS=y
+BR2_BINUTILS_VERSION_2_39_X=y
+BR2_GCC_VERSION_12_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
 BR2_GCC_ENABLE_LTO=y

+ 8 - 1
conf/buildroot_rootfs_config

@@ -1,9 +1,16 @@
 BR2_riscv=y
-BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
+BR2_riscv_custom=y
+BR2_RISCV_ISA_CUSTOM_RVM=y
+BR2_RISCV_ISA_CUSTOM_RVF=y
+BR2_RISCV_ISA_CUSTOM_RVD=y
+BR2_RISCV_ISA_CUSTOM_RVC=y
 BR2_KERNEL_HEADERS_CUSTOM_GIT=y
 BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="https://github.com/starfive-tech/linux.git"
 BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="JH7110_VisionFive2_devel"
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
 BR2_PACKAGE_GLIBC_UTILS=y
+BR2_BINUTILS_VERSION_2_39_X=y
+BR2_GCC_VERSION_12_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_TOOLCHAIN_BUILDROOT_FORTRAN=y
 BR2_GCC_ENABLE_LTO=y