diff --git a/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c b/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c
deleted file mode 100644
index a03f6ff548c..00000000000
--- a/src/gallium/drivers/etnaviv/etnaviv_compiler_cmdline.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2015 Etnaviv Project
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Authors:
- *    Rob Clark <robclark@freedesktop.org>
- *    Christian Gmeiner <christian.gmeiner@gmail.com>
- */
-
-#include <err.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "tgsi/tgsi_parse.h"
-#include "tgsi/tgsi_text.h"
-
-#include "nir/tgsi_to_nir.h"
-
-#include "etnaviv_compiler.h"
-#include "etnaviv_debug.h"
-#include "etnaviv_internal.h"
-#include "etnaviv_shader.h"
-
-#include "util/u_memory.h"
-
-static const struct etna_specs specs_gc2000 = {
-   .vs_need_z_div = 0,
-   .has_sin_cos_sqrt = 1,
-   .has_sign_floor_ceil = 1,
-   .vertex_sampler_offset = 8,
-   .vertex_output_buffer_size = 512,
-   .vertex_cache_size = 16,
-   .shader_core_count = 4,
-   .max_instructions = 512,
-   .max_varyings = 12,
-   .max_registers = 64,
-   .max_vs_uniforms = 168,
-   .max_ps_uniforms = 128,
-   .num_constants = 168,
-};
-
-static int
-read_file(const char *filename, void **ptr, size_t *size)
-{
-   int fd, ret;
-   struct stat st;
-
-   *ptr = MAP_FAILED;
-
-   fd = open(filename, O_RDONLY);
-   if (fd == -1) {
-      warnx("couldn't open `%s'", filename);
-      return 1;
-   }
-
-   ret = fstat(fd, &st);
-   if (ret)
-      errx(1, "couldn't stat `%s'", filename);
-
-   *size = st.st_size;
-   *ptr = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0);
-   if (*ptr == MAP_FAILED)
-      errx(1, "couldn't map `%s'", filename);
-
-   close(fd);
-
-   return 0;
-}
-
-static void
-print_usage(void)
-{
-   printf("Usage: etnaviv_compiler [OPTIONS]... FILE\n");
-   printf("    --verbose         - verbose compiler/debug messages\n");
-   printf("    --frag-rb-swap    - swap rb in color output (FRAG)\n");
-   printf("    --help            - show this message\n");
-}
-
-int
-main(int argc, char **argv)
-{
-   int ret = 0, n = 1;
-   const char *filename;
-   struct tgsi_token toks[65536];
-   struct tgsi_parse_context parse;
-   struct etna_shader_key key = {};
-   void *ptr;
-   size_t size;
-
-   etna_mesa_debug = ETNA_DBG_MSGS | ETNA_DBG_NOCACHE;
-
-   while (n < argc) {
-      if (!strcmp(argv[n], "--verbose")) {
-         etna_mesa_debug |= ETNA_DBG_COMPILER_MSGS;
-         n++;
-         continue;
-      }
-
-      if (!strcmp(argv[n], "--frag-rb-swap")) {
-         debug_printf(" %s", argv[n]);
-         key.frag_rb_swap = true;
-         n++;
-         continue;
-      }
-
-      if (!strcmp(argv[n], "--help")) {
-         print_usage();
-         return 0;
-      }
-
-      break;
-   }
-
-   filename = argv[n];
-
-   ret = read_file(filename, &ptr, &size);
-   if (ret) {
-      print_usage();
-      return ret;
-   }
-
-   debug_printf("%s\n", (char *)ptr);
-
-   if (!tgsi_text_translate(ptr, toks, ARRAY_SIZE(toks)))
-      errx(1, "could not parse `%s'", filename);
-
-   tgsi_parse_init(&parse, toks);
-   glsl_type_singleton_init_or_ref();
-
-   struct etna_compiler *compiler = etna_compiler_create(NULL, &specs_gc2000);
-
-   struct etna_shader shader = {};
-   shader.nir = tgsi_to_nir_noscreen(toks, &compiler->options);
-   shader.specs = &specs_gc2000;
-   shader.compiler = compiler;
-
-   struct util_debug_callback debug = {}; // TODO: proper debug callback
-   struct etna_shader_variant *v = etna_shader_variant(&shader, &key, &debug, false);
-   if (!v) {
-      fprintf(stderr, "shader variant creation failed!\n");
-      return 1;
-   }
-
-   if (!etna_compile_shader(v)) {
-      fprintf(stderr, "compiler failed!\n");
-      return 1;
-   }
-
-   etna_dump_shader(v);
-   etna_destroy_shader(v);
-   glsl_type_singleton_decref();
-}
diff --git a/src/gallium/drivers/etnaviv/meson.build b/src/gallium/drivers/etnaviv/meson.build
index 729f3c87ae5..23ee96f969e 100644
--- a/src/gallium/drivers/etnaviv/meson.build
+++ b/src/gallium/drivers/etnaviv/meson.build
@@ -120,18 +120,6 @@ libetnaviv = static_library(
   dependencies : [dep_libdrm, idep_nir_headers, idep_mesautil, idep_libetnaviv_decode],
 )
 
-etnaviv_compiler = executable(
-  'etnaviv_compiler',
-  'etnaviv_compiler_cmdline.c',
-  include_directories : [
-    inc_include, inc_src, inc_gallium, inc_gallium_aux, inc_etnaviv,
-  ],
-  link_with : [libgallium, libetnaviv, libetnaviv_drm],
-  build_by_default : with_tools.contains('etnaviv'),
-  install : with_tools.contains('etnaviv'),
-  dependencies : [idep_mesautil, dep_libdrm, idep_nir],
-)
-
 driver_etnaviv = declare_dependency(
   compile_args : '-DGALLIUM_ETNAVIV',
   link_with : [libetnaviv, libetnavivdrm],