Skip to content

Commit

Permalink
Add machine-solidity-step v0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
vfusco committed May 5, 2023
1 parent d54dfa1 commit 6519868
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -16,3 +16,6 @@
[submodule "toolchain"]
path = toolchain
url = ../image-toolchain.git
[submodule "solidity-step"]
path = solidity-step
url = ../machine-solidity-step.git
10 changes: 7 additions & 3 deletions Makefile
Expand Up @@ -47,7 +47,7 @@ UPPER = $(shell echo '$1' | tr '[:lower:]' '[:upper:]')

all:
@echo "Usage: make [option]\n"
@echo "Options: emulator, rom, tests, fs, kernel or toolchain.\n"
@echo "Options: emulator, rom, tests, fs, kernel, toolchain and solidity-step.\n"
@echo "eg.: make emulator"

clean: $(SRCCLEAN)
Expand All @@ -58,7 +58,7 @@ $(BUILDDIR) $(IMAGES_INSTALL_PATH):
mkdir -p $@

submodules:
git submodule update --init --recursive emulator fs kernel toolchain rom tests
git submodule update --init --recursive emulator fs kernel toolchain rom tests solidity-step

emulator:
$(MAKE) -C $@ downloads
Expand Down Expand Up @@ -131,6 +131,10 @@ fs kernel:
toolchain:
$(MAKE) -C $@ TOOLCHAIN_TAG=$(TOOLCHAIN_TAG)

solidity-step:
cd solidity-step && yarn install
$(MAKE) -C $@ generate build

create-symlinks:
@ln -svf ../../rom/build/$(ROM_TO_IMAGES) emulator/src/rom.bin
@ln -svf ../../fs/$(FS_TO_IMAGES) emulator/src/rootfs.ext2
Expand All @@ -146,4 +150,4 @@ install: $(IMAGES_INSTALL_PATH)
cd $(IMAGES_INSTALL_PATH) && ln -s $(ROM_TO_IMAGES) rom.bin
cd $(IMAGES_INSTALL_PATH) && ln -s $(FS_TO_IMAGES) rootfs.ext2

.PHONY: all submodules clean fs kernel toolchain fs-env kernel-env toolchain-env $(SRCDIRS) $(SRCCLEAN)
.PHONY: all submodules clean fs kernel toolchain solidity-step fs-env kernel-env toolchain-env $(SRCDIRS) $(SRCCLEAN)
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -57,6 +57,7 @@ The following options are available to initialize and build the software artifac
- **tests**: builds the tests binaries (requires toolchain)
- **fs**: builds the rootfs.ext2 image (requires toolchain)
- **kernel**: builds the kernel image (requires toolchain)
- **solidity-step**: builds the machine solidity step (requires toolchain v0.11.0)

If you want to test the emulator you use:

Expand Down
1 change: 1 addition & 0 deletions solidity-step
Submodule solidity-step added at 53ba32

0 comments on commit 6519868

Please sign in to comment.