Merge branch 'master' into nuttx-merge-5447

2026-10-25 14:33:33 +08:00 · 2013-01-11 00:39:22 -08:00
parent 40dfbf0d97 0f2decb70f
commit ccf9882dc5
128 changed files with 12693 additions and 1007 deletions
@@ -47,6 +47,10 @@ ifeq ($(CONFIG_LCD_NOKIA6100),y)
  CSRCS += nokia6100.c
 endif

+ifeq ($(CONFIG_LCD_UG2864AMBAG01),y)
+  CSRCS += ug-2864ambag01.c
+endif
+
 ifeq ($(CONFIG_LCD_UG9664HSWAG01),y)
  CSRCS += ug-9664hswag01.c
 endif
@@ -63,6 +67,6 @@ endif

 DEPPATH += --dep-path lcd
 VPATH += :lcd
-CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh $(INCDIROPT) "$(CC)" $(TOPDIR)/drivers/lcd}
+CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TOPDIR)$(DELIM)drivers$(DELIM)lcd}
 endif