diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2023-11-26 23:04:04 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-11-29 23:43:01 +0100 |
| commit | 4211eab085ba38be024dc27731ee8135a671a8e8 (patch) | |
| tree | 9b8ec4da635135663cb7dc990bde0dad120af28f /config/Config-images.in | |
| parent | 6c118efc01a65c064934ec41b8108cb45e00c128 (diff) | |
| download | openwrt-4211eab085ba38be024dc27731ee8135a671a8e8.tar.gz openwrt-4211eab085ba38be024dc27731ee8135a671a8e8.tar.bz2 openwrt-4211eab085ba38be024dc27731ee8135a671a8e8.zip | |
target: Make TARGET_SERIAL independent of GRUB configuration
GRUB_SERIAL is also used for the default serial on the target and not
only in grub. When no grub was build it was not available and the build
fails.
Rename GRUB_SERIAL to TARGET_SERIAL and make it always available on x86
and armsr targets.
Fixes: #14063
Fixes: b10768476f9d ("x86,armsr: interpolate GRUB_SERIAL into /etc/inittab")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'config/Config-images.in')
| -rw-r--r-- | config/Config-images.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config/Config-images.in b/config/Config-images.in index c37537b1a7..c2d7af7a80 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -218,11 +218,6 @@ menu "Target Images" depends on GRUB_IMAGES || GRUB_EFI_IMAGES default y - config GRUB_SERIAL - string "Serial port device" - depends on GRUB_IMAGES || GRUB_EFI_IMAGES - default "ttyS0" - config GRUB_BAUDRATE int "Serial port baud rate" depends on GRUB_IMAGES || GRUB_EFI_IMAGES @@ -231,7 +226,8 @@ menu "Target Images" config GRUB_FLOWCONTROL bool "Use RTE/CTS on serial console" - depends on GRUB_SERIAL != "" + depends on GRUB_IMAGES || GRUB_EFI_IMAGES + depends on TARGET_SERIAL != "" config GRUB_BOOTOPTS string "Extra kernel boot options" @@ -277,6 +273,11 @@ menu "Target Images" depends on GRUB_IMAGES || GRUB_EFI_IMAGES select PACKAGE_kmod-e1000 + config TARGET_SERIAL + string "Serial port device" + depends on TARGET_x86 || TARGET_armsr + default "ttyS0" + config TARGET_IMAGES_GZIP bool "GZip images" depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta |