arm-bsp: change port mapping for SSH to port 2222

Rationalise the port forwarding to be the same as the runqemu defaults,
so change the SSH port forward to be 2222=22 instead of 8022=22.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>

documentation/oeqa-fvp.md

@@ -8,9 +8,9 @@ meta-arm provides the OEFVPTarget which must be set up in the machine configurat
 ```
 TEST_TARGET = "OEFVPTarget"
 TEST_SERVER_IP = "127.0.0.1"
-TEST_TARGET_IP = "127.0.0.1:8022"
+TEST_TARGET_IP = "127.0.0.1:2222"
 IMAGE_FEATURES:append = " ssh-server-dropbear"
-FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22"
+FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "2222=22"
 FVP_CONSOLES[default] = "terminal_0"
 FVP_CONSOLES[tf-a] = "s_terminal_0"
 ```

meta-arm-bsp/conf/machine/corstone1000-fvp.conf

@@ -24,7 +24,7 @@ FVP_CONFIG[se.BootROM_config] ?= "3"
 FVP_CONFIG[board.hostbridge.interfaceName] ?= "tap0"
 FVP_CONFIG[board.smsc_91c111.enabled] ?= "1"
 FVP_CONFIG[board.hostbridge.userNetworking] ?= "true"
-FVP_CONFIG[board.hostbridge.userNetPorts] ?= "5555=5555,8080=80,8022=22"
+FVP_CONFIG[board.hostbridge.userNetPorts] ?= "5555=5555,8080=80,2222=22"
 FVP_CONFIG[board.se_flash_size] ?= "8192"
 FVP_CONFIG[diagnostics] ?= "4"
 FVP_CONFIG[disable_visualisation] ?= "true"

meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf

@@ -33,7 +33,7 @@ MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
 # testimage configuration
 TEST_TARGET = "OEFVPTarget"
 TEST_SUITES:append = " fvp_boot fvp_devices"
-TEST_TARGET_IP ?= "127.0.0.1:8022"
+TEST_TARGET_IP ?= "127.0.0.1:2222"
 TEST_SERVER_IP ?= "127.0.1.1"
 TEST_FVP_DEVICES ?= "rtc watchdog networking virtiorng cpu_hotplug"
 
@@ -48,7 +48,7 @@ FVP_CONFIG[bp.refcounter.non_arch_start_at_default] ?= "1"
 FVP_CONFIG[bp.refcounter.use_real_time] ?= "1"
 FVP_CONFIG[bp.ve_sysregs.exit_on_shutdown] ?= "1"
 FVP_CONFIG[bp.virtio_net.enabled] ?= "1"
-FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "8022=22"
+FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] ?= "2222=22"
 FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1"
 FVP_CONFIG[bp.virtio_net.secure_accesses] = "1"
 FVP_CONFIG[bp.virtio_rng.enabled] ?= "1"

meta-arm-bsp/conf/machine/include/fvp-common.inc

@@ -23,7 +23,7 @@ EXTRA_IMAGEDEPENDS += "trusted-firmware-a"
 MACHINE_EXTRA_RRECOMMENDS += "ssh-pregen-hostkeys"
 
 TEST_TARGET = "OEFVPTarget"
-TEST_TARGET_IP = "127.0.0.1:8022"
+TEST_TARGET_IP = "127.0.0.1:2222"
 TEST_SUITES:append = " fvp_boot fvp_devices"
 TEST_FVP_DEVICES ?= "rtc watchdog networking virtiorng cpu_hotplug"
 
@@ -32,8 +32,8 @@ FVP_EXE ?= "FVP_Base_RevC-2xAEMvA"
 FVP_CONFIG[bp.ve_sysregs.exit_on_shutdown] ?= "1"
 FVP_CONFIG[bp.virtio_net.enabled] ?= "1"
 FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1"
-# Tell testimage to connect to localhost:8022, and forward that to SSH in the FVP.
-FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22"
+# Tell testimage to connect to localhost:2222, and forward that to SSH in the FVP.
+FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "2222=22"
 FVP_CONFIG[cache_state_modelled] ?= "0"
 FVP_CONFIG[bp.secureflashloader.fname] ?= "bl1-fvp.bin"
 FVP_CONFIG[bp.flashloader0.fname] ?= "fip-fvp.bin"

meta-arm-bsp/conf/machine/tc1.conf

@@ -19,7 +19,7 @@ FVP_CONFIG[css.trustedBootROMloader.fname] ?= "bl1-tc.bin"
 FVP_CONFIG[board.flashloader0.fname] ?= "fip_gpt-tc.bin"
 
 #FVP_CONFIG[board.hostbridge.userNetworking] ?= "true"
-#FVP_CONFIG[board.hostbridge.userNetPorts] ?= "8022=22"
+#FVP_CONFIG[board.hostbridge.userNetPorts] ?= "2222=22"
 #smsc ethernet takes a very long time to come up.  disable now to prevent testimage timeout
 #FVP_CONFIG[board.smsc_91c111.enabled] ?= "1"
 

meta-arm-bsp/documentation/fvp-baser-aemv8r64.md

@@ -175,10 +175,10 @@ running:
     wget www.arm.com
 
 Inbound connections require an explicit port mapping from the host. By default,
-port 8022 on the host is mapped to port 22 on the FVP, so that the following
+port 2222 on the host is mapped to port 22 on the FVP, so that the following
 command will connect to an ssh server running on the FVP:
 
-    ssh root@localhost -p 8022
+    ssh root@localhost -p 2222
 
 Note that user-mode networking does not support ICMP, so `ping` will not work.
 For more information about user-mode networking, please see