summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Porter <jporter@pfsense.org>2016-02-15 19:31:49 -0600
committerJeremy Porter <jporter@pfsense.org>2016-02-15 19:31:49 -0600
commitf7c6105b85c48d02d95ff8315ff29694efde5d44 (patch)
treec9db718d41271147bc211a426ff7cd10f974c4cb
parentc3b9b531875f7e94d99e2e7d5648e0decb21d720 (diff)
downloadpfsense-f7c6105b85c48d02d95ff8315ff29694efde5d44.zip
pfsense-f7c6105b85c48d02d95ff8315ff29694efde5d44.tar.gz
add RCC, fix XG-1540 name, ensure serial port is set on RCC
-rw-r--r--etc/inc/pfsense-utils.inc2
-rw-r--r--etc/inc/system.inc6
2 files changed, 7 insertions, 1 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index e363b39..af673d9 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -972,6 +972,7 @@ function setup_serial_port($when="save", $path="") {
} else {
$specific_platform = system_identify_specific_platform();
if ($specific_platform['name'] == 'RCC-VE' ||
+ $specific_platform['name'] == 'RCC') ||
$specific_platform['name'] == 'RCC-DFF') {
$serial_only = true;
}
@@ -1034,6 +1035,7 @@ function setup_serial_port($when="save", $path="") {
$specplatform = system_identify_specific_platform();
if ($specplatform['name'] == 'RCC-VE' ||
+ $specplatform['name'] == 'RCC') ||
$specplatform['name'] == 'RCC-DFF') {
$new_boot_config[] = 'comconsole_port="0x2F8"';
$new_boot_config[] = 'hint.uart.0.flags="0x00"';
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index b0196c3..adf3684 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -2007,6 +2007,7 @@ function system_check_reset_button() {
case 'FW7541':
case 'APU':
case 'RCC-VE':
+ case 'RCC':
case 'RCC-DFF':
break;
default:
@@ -2066,12 +2067,15 @@ function system_identify_specific_platform() {
case 'DFFv2':
return (array('name' => 'RCC-DFF', 'descr' => 'Netgate RCC-DFF'));
break;
+ case 'RCC':
+ return (array('name' => 'RCC', 'descr' => 'Netgate RCC'));
+ break;
case 'SYS-5018A-FTN4':
case 'A1SAi':
return (array('name' => 'C2758', 'descr' => 'Super Micro C2758'));
break;
case 'SYS-5018D-FN4T':
- return (array('name' => 'D1540-XG', 'descr' => 'Super Micro D1540-XG'));
+ return (array('name' => 'XG-1540', 'descr' => 'Super Micro D1540-XG'));
break;
}
OpenPOWER on IntegriCloud