Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few more linux build issues

Browse Source
This commit is contained in:
Jordan Carlin 2025-01-21 22:58:33 -08:00
parent f3a16e90a9
commit 3e9f2d0b27
No known key found for this signature in database
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux/Makefile
View File

@ -6,6 +6,7 @@ BR2_EXTERNAL_TREE := $(WALLYLINUX)/br2-external-tree
LINUX_TESTVECTORS := $(RISCV)/linux-testvectors LINUX_TESTVECTORS := $(RISCV)/linux-testvectors
BUILDROOT_OUTPUTS := Image fw_jump.bin fw_jump.elf rootfs.cpio vmlinux busybox BUILDROOT_OUTPUTS := Image fw_jump.bin fw_jump.elf rootfs.cpio vmlinux busybox
BUILDROOT_OUTPUTS := $(foreach name, $(BUILDROOT_OUTPUTS), $(IMAGE_DIR)/$(name))
# Device tree files # Device tree files
DTS ?= $(wildcard devicetree/*.dts) DTS ?= $(wildcard devicetree/*.dts)
@ -51,7 +52,7 @@ build: $(BUILDROOT_OUTPUTS) devicetrees
# Build buildroot itself # Build buildroot itself
# LD_LIBRARY_PATH must be unset to avoid conflicts between the host and cross compiler # LD_LIBRARY_PATH must be unset to avoid conflicts between the host and cross compiler
$(BUILDROOT_OUTPUTS): check_environment $(BUILDROOT) $(BUILDROOT_OUTPUTS) $(IMAGE_DIR): check_environment $(BUILDROOT)
bash -c "unset LD_LIBRARY_PATH; $(MAKE) -C $(BUILDROOT)" bash -c "unset LD_LIBRARY_PATH; $(MAKE) -C $(BUILDROOT)"
# Install buildroot to $RISCV # Install buildroot to $RISCV
@ -82,7 +83,7 @@ ${LINUX_TESTVECTORS}/%GDB.bin: | $(LINUX_TESTVECTORS)
# Generate device tree binaries # Generate device tree binaries
devicetrees: $(DTB) devicetrees: $(DTB)
$(IMAGE_DIR)/%.dtb: ${WALLYLINUX}/devicetree/%.dts $(IMAGE_DIR)/%.dtb: ${WALLYLINUX}/devicetree/%.dts | $(IMAGE_DIR)
dtc -I dts -O dtb $< > $@ dtc -I dts -O dtb $< > $@
# Create disassembly files # Create disassembly files
@ -94,9 +95,13 @@ $(DISASSEMBLY_DIR)/rootfs: $(IMAGE_DIR)/rootfs.cpio
-cpio -id -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio -cpio -id -D $(DISASSEMBLY_DIR)/rootfs -F $(IMAGE_DIR)rootfs.cpio
# Disassemble binaries # Disassemble binaries
objdump_flags = $(if $(findstring .elf,$<),-SD,-S) # Add -D flag for .elf files
$(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/% | $(DISASSEMBLY_DIR) $(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/% | $(DISASSEMBLY_DIR)
riscv64-unknown-elf-objdump $(objdump_flags) $< >> $@ riscv64-unknown-elf-objdump -S $< >> $@
$(WALLY)/bin/extractFunctionRadix.sh $@
# Disassemble binaries ending in .elf
$(DISASSEMBLY_DIR)/%.objdump: $(IMAGE_DIR)/%.elf | $(DISASSEMBLY_DIR)
riscv64-unknown-elf-objdump -SD $< >> $@
$(WALLY)/bin/extractFunctionRadix.sh $@ $(WALLY)/bin/extractFunctionRadix.sh $@
# Load wally buildroot configuration # Load wally buildroot configuration

2
linux/br2-external-tree/board/wally/post_image.sh Normal file → Executable file
View File

@ -2,4 +2,4 @@
# Copy linux and busybox binaries (with symbol info) to images directory # Copy linux and busybox binaries (with symbol info) to images directory
cp "$BUILD_DIR"/linux-*/vmlinux "$BINARIES_DIR"/vmlinux cp "$BUILD_DIR"/linux-*/vmlinux "$BINARIES_DIR"/vmlinux
cp "$BUILD_DIR"busybox-*/busybox "$BINARIES_DIR"/busybox cp "$BUILD_DIR"/busybox-*/busybox "$BINARIES_DIR"/busybox

1
linux/br2-external-tree/configs/wally_defconfig
View File

@ -10,6 +10,7 @@ BR2_GNU_MIRROR="http://ftpmirror.gnu.org"
BR2_ENABLE_DEBUG=y BR2_ENABLE_DEBUG=y
BR2_DEBUG_3=y BR2_DEBUG_3=y
# BR2_STRIP_strip is not set # BR2_STRIP_strip is not set
BR2_PER_PACKAGE_DIRECTORIES=y
# BR2_PIC_PIE is not set # BR2_PIC_PIE is not set
BR2_SSP_NONE=y BR2_SSP_NONE=y
BR2_RELRO_NONE=y BR2_RELRO_NONE=y