diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-06-01 17:44:13 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-06-01 17:45:15 -0500 |
| commit | f877f77fdd2cff9bde9b8da75b1a8adb4a1c796e (patch) | |
| tree | 8263731bc7151bd97db2f65e099c3c48494c22ee /etc | |
| parent | e6807c5ae0e7dc8f5caf7d0de076728824e91887 (diff) | |
| download | pfsense-f877f77fdd2cff9bde9b8da75b1a8adb4a1c796e.zip pfsense-f877f77fdd2cff9bde9b8da75b1a8adb4a1c796e.tar.gz | |
set the serial port appropriately for RCC-VE platforms. sync from factory
repo. Ticket #4720
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 57811ce..4efec89 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -947,7 +947,7 @@ function reload_all_sync() { } function setup_serial_port($when="save", $path="") { - global $g, $config; + global $g, $config, $device_type; conf_mount_rw(); $ttys_file = "{$path}/etc/ttys"; $boot_config_file = "{$path}/boot.config"; @@ -1003,7 +1003,9 @@ function setup_serial_port($when="save", $path="") { && (stripos($bcs, "console") === false) && (stripos($bcs, "boot_multicons") === false) && (stripos($bcs, "boot_serial") === false) - && (stripos($bcs, "hw.usb.no_pf") === false)) + && (stripos($bcs, "hw.usb.no_pf") === false) + && (stripos($bcs, "hint.uart.0.flags") === false) + && (stripos($bcs, "hint.uart.1.flags") === false)) $new_boot_config[] = $bcs; if ($serial_only === true) { @@ -1023,6 +1025,13 @@ function setup_serial_port($when="save", $path="") { } } $new_boot_config[] = 'comconsole_speed="' . $serialspeed . '"'; + + $specplatform = system_identify_specific_platform(); + if ($device_type == "ADI" || $specplatform['name'] == "RCC-VE") { + $new_boot_config[] = 'comconsole_port="0x2F8"'; + $new_boot_config[] = 'hint.uart.0.flags="0x00"'; + $new_boot_config[] = 'hint.uart.1.flags="0x10"'; + } $new_boot_config[] = 'hw.usb.no_pf="1"'; file_put_contents($loader_conf_file, implode("\n", $new_boot_config) . "\n"); |
