diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-06-16 13:24:22 +0200 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-06-16 13:24:22 +0200 |
| commit | a7eb627c6dbeb0bf82c266b838b77d992b069782 (patch) | |
| tree | 674de842813b9ae179c5c8bcfe562a13f5e7eb13 /configs/platform-v7a | |
| parent | bf433685e7ec06333b1da6adb803f25b653c65d9 (diff) | |
| parent | 0413b67a39891b7ef70fd7c2a3731c7f8422f6ad (diff) | |
| download | DistroKit-a7eb627c6dbeb0bf82c266b838b77d992b069782.tar.gz DistroKit-a7eb627c6dbeb0bf82c266b838b77d992b069782.tar.xz | |
Merge branch 'master' of git.pengutronix.de:DistroKit
Diffstat (limited to 'configs/platform-v7a')
| -rw-r--r-- | configs/platform-v7a/platformconfig | 4 | ||||
| -rwxr-xr-x | configs/platform-v7a/run | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index cd23771..0466800 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2017.05.0 +# PTXdist 2017.06.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2017.05.0" +PTXCONF_PLATFORMCONFIG_VERSION="2017.06.0" # # architecture diff --git a/configs/platform-v7a/run b/configs/platform-v7a/run index 5cfe8bf..4237009 100755 --- a/configs/platform-v7a/run +++ b/configs/platform-v7a/run @@ -41,6 +41,10 @@ TELNET_INTERNAL_PORT=23 # port QEMU opens at the host side to give access to the ${TELNET_INTERNAL_PORT} TELNET_EXTERNAL_PORT=4444 +# dito for ssh +SSH_INTERNAL_PORT=22 +SSH_EXTERNAL_PORT=4445 + # check if vde is available for networking if [ -z "${VDE_SOCKET}" ]; then for dir in $(ls -d /var/run/vde2/*.ctl 2>/dev/null); do @@ -58,7 +62,7 @@ fi # fall back to user network if necessary if [ -z "${QEMU_NET}" ]; then - QEMU_NET=(-netdev user,id=net1,hostfwd=tcp:127.0.0.1:${TELNET_EXTERNAL_PORT}-:${TELNET_INTERNAL_PORT} ) + QEMU_NET=(-netdev user,id=net1,hostfwd=tcp:127.0.0.1:${TELNET_EXTERNAL_PORT}-:${TELNET_INTERNAL_PORT},hostfwd=tcp:127.0.0.1:${SSH_EXTERNAL_PORT}-:${SSH_INTERNAL_PORT} ) fi BASE_CMDLINE="console=ttyAMA0,115200 loglevel=5 systemd.log_level=warning systemd.show_status=auto" |