diff --git a/samples/nanokernel/apps/grove_lcd/Makefile b/samples/nanokernel/apps/grove_lcd/Makefile index d3a3e4fa07..795c836dbb 100644 --- a/samples/nanokernel/apps/grove_lcd/Makefile +++ b/samples/nanokernel/apps/grove_lcd/Makefile @@ -1,6 +1,5 @@ BOARD ?= arduino_101_sss -ARCH ?= arc KERNEL_TYPE = nano -CONF_FILE = prj_$(ARCH).conf +CONF_FILE = prj.conf include ${ZEPHYR_BASE}/Makefile.inc diff --git a/samples/nanokernel/apps/grove_lcd/prj_x86.conf b/samples/nanokernel/apps/grove_lcd/prj.conf similarity index 100% rename from samples/nanokernel/apps/grove_lcd/prj_x86.conf rename to samples/nanokernel/apps/grove_lcd/prj.conf diff --git a/samples/nanokernel/apps/grove_lcd/prj_arc.conf b/samples/nanokernel/apps/grove_lcd/prj_arc.conf deleted file mode 100644 index d1a353749c..0000000000 --- a/samples/nanokernel/apps/grove_lcd/prj_arc.conf +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_STDOUT_CONSOLE=y -CONFIG_PRINTK=y - -CONFIG_I2C=y - -CONFIG_GROVE=y -CONFIG_GROVE_LCD_RGB=y -CONFIG_GROVE_LCD_RGB_INIT_PRIORITY=90 diff --git a/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile b/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile index d3a3e4fa07..795c836dbb 100644 --- a/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile +++ b/samples/nanokernel/apps/i2c_fujitsu_fram/Makefile @@ -1,6 +1,5 @@ BOARD ?= arduino_101_sss -ARCH ?= arc KERNEL_TYPE = nano -CONF_FILE = prj_$(ARCH).conf +CONF_FILE = prj.conf include ${ZEPHYR_BASE}/Makefile.inc diff --git a/samples/nanokernel/apps/i2c_fujitsu_fram/prj_x86.conf b/samples/nanokernel/apps/i2c_fujitsu_fram/prj.conf similarity index 100% rename from samples/nanokernel/apps/i2c_fujitsu_fram/prj_x86.conf rename to samples/nanokernel/apps/i2c_fujitsu_fram/prj.conf diff --git a/samples/nanokernel/apps/i2c_fujitsu_fram/prj_arc.conf b/samples/nanokernel/apps/i2c_fujitsu_fram/prj_arc.conf deleted file mode 100644 index 9332f6ef86..0000000000 --- a/samples/nanokernel/apps/i2c_fujitsu_fram/prj_arc.conf +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_STDOUT_CONSOLE=y -CONFIG_PRINTK=y -CONFIG_I2C=y