From 39bfc845b749ede5b9fd549fd2c056b3e4d61867 Mon Sep 17 00:00:00 2001
From: Johann Fischer <j.fischer@phytec.de>
Date: Wed, 11 Sep 2019 21:30:34 +0200
Subject: [PATCH] samples: cfb_shell: remove FRDM-K64F board config and overlay

Remove FRDM-K64F board config and overlay from cfb_shell sample.
Enable test for the shield ssd1306_128x32.

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
---
 .../display/cfb_shell/boards/frdm_k64f.conf   |  3 ---
 samples/display/cfb_shell/frdm_k64f.overlay   | 23 -------------------
 samples/display/cfb_shell/sample.yaml         |  2 ++
 3 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 samples/display/cfb_shell/boards/frdm_k64f.conf
 delete mode 100644 samples/display/cfb_shell/frdm_k64f.overlay

diff --git a/samples/display/cfb_shell/boards/frdm_k64f.conf b/samples/display/cfb_shell/boards/frdm_k64f.conf
deleted file mode 100644
index b688a7ed6ea..00000000000
--- a/samples/display/cfb_shell/boards/frdm_k64f.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_I2C=y
-CONFIG_SSD1306=y
-CONFIG_SSD1306_SH1106_COMPATIBLE=n
diff --git a/samples/display/cfb_shell/frdm_k64f.overlay b/samples/display/cfb_shell/frdm_k64f.overlay
deleted file mode 100644
index 00810264a74..00000000000
--- a/samples/display/cfb_shell/frdm_k64f.overlay
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2018, Diego Sueiro
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-&i2c0 {
-	status = "okay";
-
-	ssd1306@3c {
-		compatible = "solomon,ssd1306fb";
-		reg = <0x3c>;
-		label = "SSD1306";
-		width = <128>;
-		height = <64>;
-		segment-offset = <0>;
-		page-offset = <0>;
-		display-offset = <0>;
-		segment-remap;
-		com-invdir;
-		prechargep = <0x22>;
-	};
-};
diff --git a/samples/display/cfb_shell/sample.yaml b/samples/display/cfb_shell/sample.yaml
index 4bb7eb11a7f..9d48f0b93b8 100644
--- a/samples/display/cfb_shell/sample.yaml
+++ b/samples/display/cfb_shell/sample.yaml
@@ -7,5 +7,7 @@ sample:
 tests:
   sample.display.cfb_shell.ssd1306:
     platform_whitelist: frdm_k64f
+    extra_args: SHIELD=ssd1306_128x32
+    tags: shield
   sample.display.cfb_shell.ssd16xx:
     platform_whitelist: reel_board