Skip to content

Commit 1a90f0b

Browse files
committed
Kconfig: Escape variables
Same as 46bee3f, but for the pcengines modifications. New kconfig parsers interpret $(var) themselves, leading to empty fields. Old kconfig understands \$(var), so use that. Signed-off-by: Michał Kopeć <michal.kopec@3mdeb.com>
1 parent 411cf7a commit 1a90f0b

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

payloads/external/SeaBIOS/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,22 +104,22 @@ config SEABIOS_BOOTORDER_FILE
104104

105105
config SEABIOS_BOOTORDER_MAP_FILE
106106
string "SeaBIOS bootorder_map file"
107-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/bootorder_map_apu5" if BOARD_PCENGINES_APU5
108-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/bootorder_map"
107+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/bootorder_map_apu5" if BOARD_PCENGINES_APU5
108+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/bootorder_map"
109109
help
110110
Determine mapping of keystrokes to group of positions in bootorder
111111

112112
config SEABIOS_BOOTORDER_DEF_FILE
113113
string "SeaBIOS bootorder_def file"
114-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/bootorder_def_apu5" if BOARD_PCENGINES_APU5
115-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/bootorder_def"
114+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/bootorder_def_apu5" if BOARD_PCENGINES_APU5
115+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/bootorder_def"
116116
help
117117
Determine default boot order and default values for runtime config
118118
options e.g. usben, pxen, etc.
119119

120120
config SEABIOS_BOOTMENU_KEY_FILE
121121
string "SeaBIOS boot-menu-key file"
122-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/boot-menu-key"
122+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/boot-menu-key"
123123
help
124124
Add SeaBIOS boot-menu-key file. From wiki:
125125
"Controls which key activates the boot menu. The value stored is the
@@ -130,7 +130,7 @@ config SEABIOS_BOOTMENU_KEY_FILE
130130

131131
config SEABIOS_BOOTMENU_WAIT_FILE
132132
string "SeaBIOS boot-menu-wait file"
133-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/boot-menu-wait"
133+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/boot-menu-wait"
134134
help
135135
Add SeaBIOS boot-menu-wait file. From wiki:
136136
"Amount of time (in milliseconds) to wait at the boot menu prompt
@@ -140,7 +140,7 @@ config SEABIOS_BOOTMENU_WAIT_FILE
140140

141141
config SEABIOS_BOOTMENU_MESSAGE_FILE
142142
string "SeaBIOS boot-menu-message file"
143-
default "$(top)/src/mainboard/$(MAINBOARDDIR)/boot-menu-message"
143+
default "\$(top)/src/mainboard/\$(MAINBOARDDIR)/boot-menu-message"
144144
help
145145
Customize the text boot menu message. From wiki:
146146

src/mainboard/pcengines/apu2/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ config FORCE_MPCIE2_CLK
114114

115115
config FMDFILE
116116
string
117-
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/vboot-rw-ab.fmd" if VBOOT
118-
default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/board.fmd"
117+
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rw-ab.fmd" if VBOOT
118+
default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/board.fmd"
119119

120120
config CBFS_SIZE
121121
hex

0 commit comments

Comments
 (0)