Commit 11c08db0 authored by Thomas Abraham's avatar Thomas Abraham
Browse files

rdinfra/run_model: remove the use of smsc91x controller



All the platforms have virtio.net enabled on them. So the use of
SMSC Lan91x controller can be removed.
Signed-off-by: Thomas Abraham's avatarThomas Abraham <thomas.abraham@arm.com>
Change-Id: Ie1a74a273bd380f971fa260b28c18bb7f6aa2ec8
parent 3b1b0c4d
......@@ -79,7 +79,6 @@ function usage_help {
echo -e "$GREEN_FONT virtio_imag_path = Please input virtio image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT sata_image_path = Please input sata disk image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT extra_model_params = Input additional model parameters $NORMAL_FONT" >&2
echo -e "$GREEN_FONT smscnet = Use SMSC91c111 network interface instead of Virtio Net $NORMAL_FONT" >&2
}
while test $# -gt 0; do
......@@ -123,13 +122,6 @@ while test $# -gt 0; do
fi
shift
;;
-smscnet)
shift
if test $# -gt 0; then
VIRTIO_NET="false"
fi
shift
;;
-j)
shift
if test $# -gt 0; then
......@@ -201,11 +193,7 @@ fi
mkdir -p ./$MODEL_TYPE
if [[ ${NTW_ENABLE,,} == "true" && ${VIRTIO_NET} == "false" ]]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.smsc_91c111.enabled=1"
elif [ ${NTW_ENABLE,,} == "true" ]; then
if [ ${NTW_ENABLE,,} == "true" ]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.virtio_net.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.virtio_net.enabled=1 \
......
......@@ -79,7 +79,6 @@ function usage_help {
echo -e "$GREEN_FONT virtio_imag_path = Please input virtio image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT sata_image_path = Please input sata disk image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT extra_model_params = Input additional model parameters $NORMAL_FONT" >&2
echo -e "$GREEN_FONT smscnet = Use SMSC91c111 network interface instead of Virtio Net $NORMAL_FONT" >&2
}
while test $# -gt 0; do
......@@ -123,13 +122,6 @@ while test $# -gt 0; do
fi
shift
;;
-smscnet)
shift
if test $# -gt 0; then
VIRTIO_NET="false"
fi
shift
;;
-j)
shift
if test $# -gt 0; then
......@@ -201,11 +193,7 @@ fi
mkdir -p ./$MODEL_TYPE
if [[ ${NTW_ENABLE,,} == "true" && ${VIRTIO_NET} == "false" ]]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board0.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board0.smsc_91c111.enabled=1"
elif [ ${NTW_ENABLE,,} == "true" ]; then
if [ ${NTW_ENABLE,,} == "true" ]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board0.virtio_net.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board0.virtio_net.enabled=1 \
......
......@@ -79,7 +79,6 @@ function usage_help {
echo -e "$GREEN_FONT virtio_imag_path = Please input virtio image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT sata_image_path = Please input sata disk image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT extra_model_params = Input additional model parameters $NORMAL_FONT" >&2
echo -e "$GREEN_FONT smscnet = Use SMSC91c111 network interface instead of Virtio Net $NORMAL_FONT" >&2
}
while test $# -gt 0; do
......@@ -123,13 +122,6 @@ while test $# -gt 0; do
fi
shift
;;
-smscnet)
shift
if test $# -gt 0; then
VIRTIO_NET="false"
fi
shift
;;
-j)
shift
if test $# -gt 0; then
......@@ -201,11 +193,7 @@ fi
mkdir -p ./$MODEL_TYPE
if [[ ${NTW_ENABLE,,} == "true" && ${VIRTIO_NET} == "false" ]]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.smsc_91c111.enabled=1"
elif [ ${NTW_ENABLE,,} == "true" ]; then
if [ ${NTW_ENABLE,,} == "true" ]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.virtio_net.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.virtio_net.enabled=1 \
......
......@@ -79,7 +79,6 @@ function usage_help {
echo -e "$GREEN_FONT virtio_imag_path = Please input virtio image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT sata_image_path = Please input sata disk image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT extra_model_params = Input additional model parameters $NORMAL_FONT" >&2
echo -e "$GREEN_FONT smscnet = Use SMSC91c111 network interface instead of Virtio Net $NORMAL_FONT" >&2
}
while test $# -gt 0; do
......@@ -123,13 +122,6 @@ while test $# -gt 0; do
fi
shift
;;
-smscnet)
shift
if test $# -gt 0; then
VIRTIO_NET="false"
fi
shift
;;
-j)
shift
if test $# -gt 0; then
......@@ -201,11 +193,7 @@ fi
mkdir -p ./$MODEL_TYPE
if [[ ${NTW_ENABLE,,} == "true" && ${VIRTIO_NET} == "false" ]]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.smsc_91c111.enabled=1"
elif [ ${NTW_ENABLE,,} == "true" ]; then
if [ ${NTW_ENABLE,,} == "true" ]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.virtio_net.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.virtio_net.enabled=1 \
......
......@@ -79,7 +79,6 @@ function usage_help {
echo -e "$GREEN_FONT virtio_imag_path = Please input virtio image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT sata_image_path = Please input sata disk image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT extra_model_params = Input additional model parameters $NORMAL_FONT" >&2
echo -e "$GREEN_FONT smscnet = Use SMSC91c111 network interface instead of Virtio Net $NORMAL_FONT" >&2
}
while test $# -gt 0; do
......@@ -123,13 +122,6 @@ while test $# -gt 0; do
fi
shift
;;
-smscnet)
shift
if test $# -gt 0; then
VIRTIO_NET="false"
fi
shift
;;
-j)
shift
if test $# -gt 0; then
......@@ -205,13 +197,7 @@ fi
mkdir -p ./$MODEL_TYPE
if [[ ${NTW_ENABLE,,} == "true" && ${VIRTIO_NET} == "false" ]]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board0.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board0.smsc_91c111.enabled=1 \
-C board1.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board1.smsc_91c111.enabled=1"
elif [ ${NTW_ENABLE,,} == "true" ]; then
if [ ${NTW_ENABLE,,} == "true" ]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board0.virtio_net.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board0.virtio_net.enabled=1 \
......
......@@ -59,7 +59,6 @@ function usage_help {
echo -e "$GREEN_FONT virtio_imag_path = Please input virtio image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT sata_image_path = Please input sata disk image path $NORMAL_FONT" >&2
echo -e "$GREEN_FONT extra_model_params = Input additional model parameters $NORMAL_FONT" >&2
echo -e "$GREEN_FONT smscnet = Use SMSC91c111 network interface instead of Virtio Net $NORMAL_FONT" >&2
}
while test $# -gt 0; do
......@@ -103,13 +102,6 @@ while test $# -gt 0; do
fi
shift
;;
-smscnet)
shift
if test $# -gt 0; then
VIRTIO_NET="false"
fi
shift
;;
-j)
shift
if test $# -gt 0; then
......@@ -181,11 +173,7 @@ fi
mkdir -p ./$MODEL_TYPE
if [[ ${NTW_ENABLE,,} == "true" && ${VIRTIO_NET} == "false" ]]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.smsc_91c111.enabled=1"
elif [ ${NTW_ENABLE,,} == "true" ]; then
if [ ${NTW_ENABLE,,} == "true" ]; then
MODEL_PARAMS="$MODEL_PARAMS \
-C board.virtio_net.hostbridge.interfaceName="$TAP_INTERFACE" \
-C board.virtio_net.enabled=1 \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment