Skip to content

Rename dtb_override to dtb_autodetect #62

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.

Sign up for GitHub

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

Open
rhythm16 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Rename dtb_override to dtb_autodetect #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ If a match is found it loads the corresponding device tree from the
## Command-line parameters

- `debug`: Enable debug logging
- `stubble.dtb_override=true/false`: Enable or disable device-tree compat based dtb lookup. The default is `true`.
- `stubble.dtb_autodetect=true/false`: Enable or disable device-tree compat based dtb lookup. The default is `true`.
- `stubble.dtb_override=true/false`: Deprecated, same as stubble.dtb_autodetect. Kept for backward compatability.

## Dependencies

Expand Down
2 changes: 1 addition & 1 deletion include/pe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "efi.h"

extern bool dtb_override;
extern bool dtb_autodetect;

/* This is the actual PE format of the section header */
typedef struct PeSectionHeader {
Expand Down
4 changes: 2 additions & 2 deletions pe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
# define TARGET_MACHINE_TYPE_COMPATIBILITY 0
#endif

bool dtb_override = true;
bool dtb_autodetect = true;

typedef struct DosFileHeader {
uint8_t Magic[2];
Expand Down Expand Up @@ -205,7 +205,7 @@ static bool pe_use_this_dtb(

EFI_STATUS err;

if (dtb_override == true) {
if (dtb_autodetect == true) {
err = devicetree_match(dtb, dtb_size);
if (err == EFI_SUCCESS) {
log_debug("found device-tree based on compatible: %s",
Expand Down
15 changes: 9 additions & 6 deletions stub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,21 @@ static bool parse_string(char16_t *p, const char16_t *opt) {
}

static void parse_cmdline(char16_t *p) {
if(p == NULL)
if (p == NULL)
return;
while (*p != '\0') {
if (parse_string(p, L"debug")) {
log_isdebug = true;
} else if (strncmp16(p, L"stubble.dtb_override=",
} else if (strncmp16(p, L"stubble.dtb_autodetect=",
strlen16(L"stubble.dtb_autodetect=")) == 0 ||
strncmp16(p, L"stubble.dtb_override=",
strlen16(L"stubble.dtb_override=")) == 0) {
p += strlen16(L"stubble.dtb_override=");
p = strchr16(p, '=');
p++;
if (parse_string(p, L"true")) {
dtb_override = true;
dtb_autodetect = true;
} else if (parse_string(p, L"false")) {
dtb_override = false;
dtb_autodetect = false;
}
}
p = strchr16(p, ' ');
Expand Down Expand Up @@ -170,7 +173,7 @@ static EFI_STATUS run(EFI_HANDLE image) {
if (log_isdebug == true) {
log_debug("Stubble configuration:");
log_debug("debug: enabled");
log_debug("dtb_override: %s", dtb_override ? "enabled" : "disabled");
log_debug("dtb_autodetect: %s", dtb_autodetect ? "enabled" : "disabled");
}

/* Find the sections we want to operate on */
Expand Down