Fix: Make emulated VRAM size configurable from userspace #2

Open

tihmstar wants to merge 1 commit from tihmstar/patch-2 into 6.72

tihmstar commented

2021-01-03 04:52:02 -06:00

(Migrated from github.com)

In linux_boot.c prepare_boot_params() uses vram_gb before you set it in set_nix_info().
Thus you need to call set_nix_info() first in order to make vram_gb a configurable option.

In linux_boot.c `prepare_boot_params()` uses `vram_gb` before you set it in `set_nix_info()`. Thus you need to call `set_nix_info()` first in order to make `vram_gb` a configurable option.

This pull request has changes conflicting with the target branch.

kexec.c

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Fix: Make emulated VRAM size configurable from userspace' (#2) from tihmstar/patch-2 into 6.72

Merge commit body

Reviewed-on: https://git.richey.dev/gh-sleirsgoevy/ps4-kexec/pulls/2

Merge pull request 'Fix: Make emulated VRAM size configurable from userspace' (#2) from tihmstar/patch-2 into 6.72

Reviewed-on: https://git.richey.dev/gh-sleirsgoevy/ps4-kexec/pulls/2

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 'tihmstar/patch-2:tihmstar/patch-2'

git switch 'tihmstar/patch-2'

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch '6.72'

git merge --no-ff 'tihmstar/patch-2'

git switch 'tihmstar/patch-2'

git rebase '6.72'

git switch '6.72'

git merge --ff-only 'tihmstar/patch-2'

git switch 'tihmstar/patch-2'

git rebase '6.72'

git switch '6.72'

git merge --no-ff 'tihmstar/patch-2'

git switch '6.72'

git merge --squash 'tihmstar/patch-2'