Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow overriding the physical memory offset through an environment variable #58

Merged
merged 4 commits into from
Jun 24, 2019

Conversation

phil-opp
Copy link
Member

@phil-opp phil-opp commented Jun 21, 2019

The plan is that the bootimage crate gets an additional Cargo.toml config key for this property and sets the environment variable automatically.

cc @64

@64
Copy link
Contributor

64 commented Jun 21, 2019

Looks great! Thanks.

@phil-opp
Copy link
Member Author

bors r+

@bors
Copy link
Contributor

bors bot commented Jun 24, 2019

Merge conflict (retrying...)

bors bot added a commit that referenced this pull request Jun 24, 2019
58: Allow overriding the physical memory offset through an environment variable r=phil-opp a=phil-opp

The plan is that the `bootimage` crate gets an additional `Cargo.toml` config key for this property and sets the environment variable automatically.

cc @64

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
@bors
Copy link
Contributor

bors bot commented Jun 24, 2019

Build failed

  • rust-osdev.bootloader

@phil-opp
Copy link
Member Author

Seems spurious (chocolatey timeout)

bors retry

bors bot added a commit that referenced this pull request Jun 24, 2019
58: Allow overriding the physical memory offset through an environment variable r=phil-opp a=phil-opp

The plan is that the `bootimage` crate gets an additional `Cargo.toml` config key for this property and sets the environment variable automatically.

cc @64

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
@bors
Copy link
Contributor

bors bot commented Jun 24, 2019

Build failed

  • rust-osdev.bootloader

@phil-opp
Copy link
Member Author

@phil-opp
Copy link
Member Author

Seems to be working again

bors retry

bors bot added a commit that referenced this pull request Jun 24, 2019
58: Allow overriding the physical memory offset through an environment variable r=phil-opp a=phil-opp

The plan is that the `bootimage` crate gets an additional `Cargo.toml` config key for this property and sets the environment variable automatically.

cc @64

Co-authored-by: Philipp Oppermann <dev@phil-opp.com>
@bors
Copy link
Contributor

bors bot commented Jun 24, 2019

Build succeeded

  • rust-osdev.bootloader

@bors bors bot merged commit a9b8d89 into master Jun 24, 2019
@bors bors bot deleted the override-phys_mem_offset branch June 24, 2019 13:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants