298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-03 09:12:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

target: Make TARGET_SERIAL independent of GRUB

Browse Source
This commit is contained in:
coolsnowwolf 2025-01-08 23:17:09 +08:00
parent 4f5a34e801
commit c3e37b59ec
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
config/Config-images.in
View File

@ -207,12 +207,12 @@ menu "Target Images"
config GRUB_EFI_IMAGES config GRUB_EFI_IMAGES
bool "Build GRUB EFI images" bool "Build GRUB EFI images"
depends on TARGET_x86 || TARGET_armvirt || TARGET_loongarch64 || TARGET_phytium depends on TARGET_x86 || TARGET_armsr || TARGET_loongarch64 || TARGET_phytium
depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
select PACKAGE_grub2 if TARGET_x86 select PACKAGE_grub2 if TARGET_x86
select PACKAGE_grub2-efi if TARGET_x86 select PACKAGE_grub2-efi if TARGET_x86
select PACKAGE_grub2-bios-setup if TARGET_x86 select PACKAGE_grub2-bios-setup if TARGET_x86
select PACKAGE_grub2-efi-arm if TARGET_armvirt select PACKAGE_grub2-efi-arm if TARGET_armsr
select PACKAGE_grub2-efi-arm if TARGET_phytium_armv8 select PACKAGE_grub2-efi-arm if TARGET_phytium_armv8
select PACKAGE_grub2-efi-loongarch64 if TARGET_loongarch64 select PACKAGE_grub2-efi-loongarch64 if TARGET_loongarch64
select PACKAGE_kmod-fs-vfat select PACKAGE_kmod-fs-vfat
@ -223,11 +223,6 @@ menu "Target Images"
depends on GRUB_IMAGES || GRUB_EFI_IMAGES depends on GRUB_IMAGES || GRUB_EFI_IMAGES
default y default y
config GRUB_SERIAL
string "Serial port device"
depends on GRUB_IMAGES || GRUB_EFI_IMAGES
default "ttyS0"
config GRUB_BAUDRATE config GRUB_BAUDRATE
int "Serial port baud rate" int "Serial port baud rate"
depends on GRUB_IMAGES || GRUB_EFI_IMAGES depends on GRUB_IMAGES || GRUB_EFI_IMAGES
@ -236,8 +231,8 @@ menu "Target Images"
config GRUB_FLOWCONTROL config GRUB_FLOWCONTROL
bool "Use RTE/CTS on serial console" bool "Use RTE/CTS on serial console"
depends on GRUB_SERIAL != "" depends on GRUB_IMAGES || GRUB_EFI_IMAGES
default n depends on TARGET_SERIAL != ""
config GRUB_BOOTOPTS config GRUB_BOOTOPTS
string "Extra kernel boot options" string "Extra kernel boot options"
@ -255,10 +250,10 @@ menu "Target Images"
config GRUB_TITLE config GRUB_TITLE
string "Title for the menu entry in GRUB" string "Title for the menu entry in GRUB"
depends on GRUB_IMAGES || GRUB_EFI_IMAGES depends on GRUB_IMAGES || GRUB_EFI_IMAGES
default "OpenWrt" default "LEDE"
help help
This is the title of the GRUB menu entry. This is the title of the GRUB menu entry.
If unspecified, it defaults to OpenWrt. If unspecified, it defaults to LEDE.
config ISO_IMAGES config ISO_IMAGES
bool "Build LiveCD image (ISO)" bool "Build LiveCD image (ISO)"
@ -279,7 +274,7 @@ menu "Target Images"
config VMDK_IMAGES config VMDK_IMAGES
bool "Build VMware image files (VMDK)" bool "Build VMware image files (VMDK)"
depends on TARGET_x86 || TARGET_armvirt depends on TARGET_x86 || TARGET_armsr
depends on GRUB_IMAGES || GRUB_EFI_IMAGES depends on GRUB_IMAGES || GRUB_EFI_IMAGES
select PACKAGE_kmod-e1000 select PACKAGE_kmod-e1000
@ -289,9 +284,14 @@ menu "Target Images"
depends on GRUB_IMAGES || GRUB_EFI_IMAGES depends on GRUB_IMAGES || GRUB_EFI_IMAGES
select PACKAGE_kmod-e1000 select PACKAGE_kmod-e1000
config TARGET_SERIAL
string "Serial port device"
depends on TARGET_x86 || TARGET_armsr || TARGET_loongarch64 || TARGET_phytium
default "ttyS0"
config TARGET_IMAGES_GZIP config TARGET_IMAGES_GZIP
bool "GZip images" bool "GZip images"
depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta || TARGET_loongarch64 depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta || TARGET_loongarch64
default y default y
comment "Image Options" comment "Image Options"
@ -303,8 +303,8 @@ menu "Target Images"
int "Kernel partition size (in MiB)" int "Kernel partition size (in MiB)"
depends on USES_BOOT_PART depends on USES_BOOT_PART
default 8 if TARGET_apm821xx_sata default 8 if TARGET_apm821xx_sata
default 128 if TARGET_armsr
default 64 if TARGET_bcm27xx default 64 if TARGET_bcm27xx
default 128 if TARGET_armvirt
default 32 if TARGET_rockchip default 32 if TARGET_rockchip
default 16 default 16

4
target/linux/loongarch64/base-files.mk
View File

@ -1,6 +1,6 @@
GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL)) GRUB_SERIAL:=$(call qstrip,$(CONFIG_TARGET_SERIAL))
ifeq ($(GRUB_SERIAL),) ifeq ($(GRUB_SERIAL),)
$(error This platform requires CONFIG_GRUB_SERIAL be set!) $(error This platform requires CONFIG_TARGET_SERIAL be set!)
endif endif
define Package/base-files/install-target define Package/base-files/install-target

4
target/linux/phytium/base-files.mk
View File

@ -1,6 +1,6 @@
GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL)) GRUB_SERIAL:=$(call qstrip,$(CONFIG_TARGET_SERIAL))
ifeq ($(GRUB_SERIAL),) ifeq ($(GRUB_SERIAL),)
$(error This platform requires CONFIG_GRUB_SERIAL be set!) $(error This platform requires CONFIG_TARGET_SERIAL be set!)
endif endif
define Package/base-files/install-target define Package/base-files/install-target

2
target/linux/x86/image/Makefile
View File

@ -16,7 +16,7 @@ ifneq ($(CONFIG_GRUB_CONSOLE),)
GRUB_TERMINALS += console GRUB_TERMINALS += console
endif endif
GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL)) GRUB_SERIAL:=$(call qstrip,$(CONFIG_TARGET_SERIAL))
ifneq ($(GRUB_SERIAL),) ifneq ($(GRUB_SERIAL),)
GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8$(if $(CONFIG_GRUB_FLOWCONTROL),r,) GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8$(if $(CONFIG_GRUB_FLOWCONTROL),r,)