diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2011-05-12 17:15:36 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-05-12 17:21:06 +0200 |
| commit | 7d9d09db673abbedc1cc865c213b742e0450268d (patch) | |
| tree | 43d87d5cfbfbd30d95208f41215e0e26d3e315ef /target/generic | |
| parent | 5db57b7ac9fc8c5bd0bec6e06166443f04870a3a (diff) | |
target/generic: only show getty port option if default skeleton is used
The special marker in etc/inittab might not be present with a custom
skeleton. At the same time make the option always active, remove the
hardcoded tty1/tty2 gettys and reword the option description slightly.
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'target/generic')
| -rw-r--r-- | target/generic/Config.in | 9 | ||||
| -rw-r--r-- | target/generic/Makefile.in | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/target/generic/Config.in b/target/generic/Config.in index c624ba872..2d2ad4423 100644 --- a/target/generic/Config.in +++ b/target/generic/Config.in @@ -12,13 +12,10 @@ config BR2_TARGET_GENERIC_ISSUE help Select system banner (/etc/issue) to be displayed at login. -menuconfig BR2_TARGET_GENERIC_GETTY - bool "Generic serial port config" - -if BR2_TARGET_GENERIC_GETTY +if BR2_ROOTFS_SKELETON_DEFAULT config BR2_TARGET_GENERIC_GETTY_PORT - string "Serial port to run a getty on" + string "Port to run a getty (login prompt) on" default "ttyS0" help Specify a port to run a getty (login prompt) on. @@ -52,6 +49,6 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE default "57600" if BR2_TARGET_GENERIC_GETTY_BAUDRATE_57600 default "115200" if BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200 -endif # BR2_TARGET_GENERIC_GETTY +endif # BR2_ROOTFS_SKELETON_DEFAULT endmenu diff --git a/target/generic/Makefile.in b/target/generic/Makefile.in index ba6e4b060..ce07ecfd0 100644 --- a/target/generic/Makefile.in +++ b/target/generic/Makefile.in @@ -31,7 +31,7 @@ ifneq ($(TARGET_GENERIC_ISSUE),) TARGETS += target-generic-issue endif -ifeq ($(BR2_TARGET_GENERIC_GETTY),y) +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) ifeq ($(BR2_PACKAGE_SYSVINIT),y) TARGETS += target-generic-getty-sysvinit else |