Skip to content

Commit d36c84c

Browse files
committed
simplifying the buildroot configuration
Signed-off-by: Wojciech Ozga <woz@zurich.ibm.com>
1 parent 359d958 commit d36c84c

File tree

2 files changed

+30
-51
lines changed

2 files changed

+30
-51
lines changed

confidential-vms/linux_vm/configurations/qemu_riscv64_virt_defconfig

+21-31
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ BR2_RISCV_g=y
77
BR2_RISCV_ABI_LP64D=y
88
BR2_GCC_TARGET_ABI="lp64d"
99
#
10-
# BR2_TOOLCHAIN_EXTERNAL=y
11-
# BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)"
12-
# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu"
13-
# BR2_TOOLCHAIN_EXTERNAL_GCC_12=y
14-
# BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10=y
15-
# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
16-
# #BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
17-
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC=n
18-
# BR2_TOOLCHAIN_EXTERNAL_CXX=y
10+
BR2_TOOLCHAIN_EXTERNAL=y
11+
BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)"
12+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu"
13+
BR2_TOOLCHAIN_EXTERNAL_GCC_12=y
14+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10=y
15+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
16+
#BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
17+
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=n
18+
BR2_TOOLCHAIN_EXTERNAL_CXX=y
1919

2020
# Shell
2121
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -28,7 +28,7 @@ BR2_TARGET_GENERIC_GETTY=y
2828
BR2_TARGET_GENERIC_GETTY_PORT="ttyS0"
2929
BR2_TARGET_GENERIC_ROOT_PASSWD="passwd"
3030

31-
# Filesystem
31+
# Filesystem
3232
BR2_ROOTFS_OVERLAY=""
3333
BR2_TARGET_ROOTFS_EXT2=y
3434
BR2_TARGET_ROOTFS_EXT2_2=n
@@ -61,29 +61,19 @@ BR2_PACKAGE_DROPBEAR=y
6161
BR2_TARGET_OPENSBI=y
6262
BR2_TARGET_OPENSBI_PLAT="generic"
6363

64-
###
65-
# BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
66-
# BR2_TOOLCHAIN_BUILDROOT_CXX=y
67-
# BR2_PACKAGE_HOST_GDB=y
68-
# BR2_PACKAGE_HOST_GDB_TUI=y
69-
# BR2_PACKAGE_HOST_GDB_PYTHON3=y
70-
# BR2_CCACHE=y
71-
# BR2_CCACHE_INITIAL_SETUP="-M0 -F0"
72-
# BR2_SSP_NONE=y
73-
7464
BR2_PER_PACKAGE_DIRECTORIES=y
7565
BR2_VERBOSE=0
7666
BR2_PACKAGE_NVME=y
7767

7868
# Initramfs
79-
BR2_TARGET_ROOTFS_INITRAMFS=y
80-
BR2_TARGET_ROOTFS_CPIO=y
81-
BR2_PACKAGE_BUSYBOX=y
82-
BR2_INIT_BUSYBOX=y
83-
BR2_PACKAGE_HOST_DRACUT=y
84-
BR2_TARGET_ROOTFS_CPIO_DRACUT=y
85-
# dm-crypt
86-
BR2_PACKAGE_HOST_GENIMAGE=y
87-
BR2_PACKAGE_CRYPTSETUP=y
88-
BR2_PACKAGE_HOST_CRYPTSETUP=y
89-
BR2_PACKAGE_E2FSPROGS=y
69+
# BR2_TARGET_ROOTFS_INITRAMFS=y
70+
# BR2_TARGET_ROOTFS_CPIO=y
71+
# BR2_PACKAGE_BUSYBOX=y
72+
# BR2_INIT_BUSYBOX=y
73+
# BR2_PACKAGE_HOST_DRACUT=y
74+
# BR2_TARGET_ROOTFS_CPIO_DRACUT=y
75+
# # dm-crypt
76+
# BR2_PACKAGE_HOST_GENIMAGE=y
77+
# BR2_PACKAGE_CRYPTSETUP=y
78+
# BR2_PACKAGE_HOST_CRYPTSETUP=y
79+
# BR2_PACKAGE_E2FSPROGS=y

hypervisor/configurations/qemu_riscv64_virt_defconfig

+9-20
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ BR2_RISCV_g=y
77
BR2_RISCV_ABI_LP64D=y
88
BR2_GCC_TARGET_ABI="lp64d"
99
#
10-
# BR2_TOOLCHAIN_EXTERNAL=y
11-
# BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)"
12-
# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu"
13-
# BR2_TOOLCHAIN_EXTERNAL_GCC_12=y
14-
# BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10=y
15-
# BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
16-
# #BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
17-
# BR2_TOOLCHAIN_EXTERNAL_INET_RPC=n
18-
# BR2_TOOLCHAIN_EXTERNAL_CXX=y
10+
BR2_TOOLCHAIN_EXTERNAL=y
11+
BR2_TOOLCHAIN_EXTERNAL_PATH="$(RISCV)"
12+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="$(ARCH)-unknown-linux-gnu"
13+
BR2_TOOLCHAIN_EXTERNAL_GCC_12=y
14+
BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_10=y
15+
BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
16+
#BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
17+
BR2_TOOLCHAIN_EXTERNAL_INET_RPC=n
18+
BR2_TOOLCHAIN_EXTERNAL_CXX=y
1919

2020
# Shell
2121
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
@@ -73,17 +73,6 @@ BR2_PACKAGE_QEMU_BLOBS=y
7373
# below not needed?
7474
BR2_TARGET_OPENSBI=y
7575
BR2_TARGET_OPENSBI_PLAT="generic"
76-
#BR2_PACKAGE_DEVMEM2=y
77-
78-
###
79-
# BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
80-
# BR2_TOOLCHAIN_BUILDROOT_CXX=y
81-
# BR2_PACKAGE_HOST_GDB=y
82-
# BR2_PACKAGE_HOST_GDB_TUI=y
83-
# BR2_PACKAGE_HOST_GDB_PYTHON3=y
84-
# BR2_CCACHE=y
85-
# BR2_CCACHE_INITIAL_SETUP="-M0 -F0"
86-
# BR2_SSP_NONE=y
8776

8877
BR2_PER_PACKAGE_DIRECTORIES=y
8978
BR2_VERBOSE=0

0 commit comments

Comments
 (0)