diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index f3a1992..f3573a1 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -15,9 +15,9 @@
 set -e
 
 BUILD_DIR=~/p4tools
-BMV2_COMMIT="487ee8f907153d93d4806f3e9e209ed9cb668c2b"
-PI_COMMIT="d7418b386e2301f82c1330a1d2dca131ef7b4fe3"
-P4C_COMMIT="80db63762314494b313f39c40067b3d3416007d3"
+BMV2_COMMIT="41c1f2ed487ff086a1d582069e8bc68cab8ffdb0"
+PI_COMMIT="f110570ca0c8ddc5feaf5028b08a0f477ceb4eea"
+P4C_COMMIT="adce375fd961a9e467c7e77ad1bef647ef28e5e8"
 P4C_BM_COMMIT="8f4abeaa6f8374aaf95ea2aacfc2b750069391b5"
 PROTOBUF_COMMIT="tags/v3.0.2"
 GRPC_COMMIT="tags/v1.3.0"
diff --git a/tools/dev/mininet/bmv2.py b/tools/dev/mininet/bmv2.py
index 64be413..e1d51a5 100644
--- a/tools/dev/mininet/bmv2.py
+++ b/tools/dev/mininet/bmv2.py
@@ -13,7 +13,7 @@
 
 BMV2_TARGET = 'simple_switch_grpc'
 ONOS_ROOT = os.environ["ONOS_ROOT"]
-INIT_BMV2_JSON = '%s/tools/test/p4src/p4-16/p4c-out/empty.json' % ONOS_ROOT
+CPU_PORT = 255
 
 
 class ONOSBmv2Switch(Switch):
@@ -118,12 +118,11 @@
         if self.debugger:
             args.append('--debugger')
         args.append('-L%s' % self.loglevel)
-
-        args.append(INIT_BMV2_JSON)
+        args.append('--no-p4')
 
         # gRPC target-specific options.
         args.append('--')
-        args.append('--enable-swap')
+        args.append('--cpu-port %d' % CPU_PORT)
         args.append('--grpc-server-addr 0.0.0.0:%d' % self.grpcPort)
 
         bmv2cmd = " ".join(args)