diff --git a/samples/nanokernel/apps/grove_lcd/Makefile b/samples/nanokernel/apps/grove_lcd/Makefile index cf07af92236..d3a3e4fa070 100644 --- a/samples/nanokernel/apps/grove_lcd/Makefile +++ b/samples/nanokernel/apps/grove_lcd/Makefile @@ -1,6 +1,6 @@ BOARD ?= arduino_101_sss ARCH ?= arc KERNEL_TYPE = nano -CONF_FILE = prj.conf +CONF_FILE = prj_$(ARCH).conf include ${ZEPHYR_BASE}/Makefile.inc diff --git a/samples/nanokernel/apps/grove_lcd/prj.conf b/samples/nanokernel/apps/grove_lcd/prj_arc.conf similarity index 88% rename from samples/nanokernel/apps/grove_lcd/prj.conf rename to samples/nanokernel/apps/grove_lcd/prj_arc.conf index 6ee1e415542..21d662bb4a1 100644 --- a/samples/nanokernel/apps/grove_lcd/prj.conf +++ b/samples/nanokernel/apps/grove_lcd/prj_arc.conf @@ -1,5 +1,4 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_KERNEL_BIN_NAME="arc" CONFIG_PRINTK=y CONFIG_I2C=y diff --git a/samples/nanokernel/apps/grove_lcd/prj_x86.conf b/samples/nanokernel/apps/grove_lcd/prj_x86.conf new file mode 100644 index 00000000000..230bfbbe6d7 --- /dev/null +++ b/samples/nanokernel/apps/grove_lcd/prj_x86.conf @@ -0,0 +1,11 @@ +CONFIG_STDOUT_CONSOLE=y +CONFIG_PRINTK=y + +CONFIG_I2C=y +CONFIG_I2C_DW=y +CONFIG_I2C_DW_0=y + +CONFIG_GROVE=y +CONFIG_GROVE_LCD_RGB=y +CONFIG_GROVE_LCD_RGB_I2C_MASTER_DEV_NAME="I2C0" +CONFIG_GROVE_LCD_RGB_INIT_PRIORITY=90 diff --git a/samples/nanokernel/apps/grove_lcd/src/Makefile b/samples/nanokernel/apps/grove_lcd/src/Makefile index 2d9547e5121..c61ec392e4c 100644 --- a/samples/nanokernel/apps/grove_lcd/src/Makefile +++ b/samples/nanokernel/apps/grove_lcd/src/Makefile @@ -1 +1 @@ -obj-y = arc_i2c_grove_lcd.o +obj-y = grove_lcd.o diff --git a/samples/nanokernel/apps/grove_lcd/src/arc_i2c_grove_lcd.c b/samples/nanokernel/apps/grove_lcd/src/grove_lcd.c similarity index 98% rename from samples/nanokernel/apps/grove_lcd/src/arc_i2c_grove_lcd.c rename to samples/nanokernel/apps/grove_lcd/src/grove_lcd.c index 1d571d2bb20..134c13ef458 100644 --- a/samples/nanokernel/apps/grove_lcd/src/arc_i2c_grove_lcd.c +++ b/samples/nanokernel/apps/grove_lcd/src/grove_lcd.c @@ -82,7 +82,7 @@ void main(void) cnt = 0; while (1) { - glcd_clear(glcd); + glcd_cursor_pos_set(glcd, 0, 0); /* RGB values are from 0 - 511. * First half means incrementally brighter. diff --git a/samples/nanokernel/apps/grove_lcd/testcase.ini b/samples/nanokernel/apps/grove_lcd/testcase.ini index 095f9e3dd6b..c170d8e45f1 100644 --- a/samples/nanokernel/apps/grove_lcd/testcase.ini +++ b/samples/nanokernel/apps/grove_lcd/testcase.ini @@ -2,5 +2,5 @@ build_only = true tags = drivers -arch_whitelist = arc -platform_whitelist = arduino_101_sss +arch_whitelist = arc x86 +platform_whitelist = arduino_101_sss quark_d2000_crb