[Armadeus-commitlog] SF.net SVN: armadeus:[1293] trunk
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1293] trunk
|
From: <ar...@us...> - 2009-05-21 09:16:22
|
Revision: 1293
http://armadeus.svn.sourceforge.net/armadeus/?rev=1293&view=rev
Author: artemys
Date: 2009-05-21 09:16:16 +0000 (Thu, 21 May 2009)
Log Message:
-----------
[BUILDROOT] Integrates fbtest in Buildroot instead of having it apart
Added Paths:
-----------
trunk/buildroot/package/fbtest/
trunk/buildroot/package/fbtest/Config.in
trunk/buildroot/package/fbtest/fbtest.mk
trunk/buildroot/package/fbtest/patches/
trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
Removed Paths:
-------------
trunk/target/linux/framebuffer/fbtest/
Added: trunk/buildroot/package/fbtest/Config.in
===================================================================
--- trunk/buildroot/package/fbtest/Config.in (rev 0)
+++ trunk/buildroot/package/fbtest/Config.in 2009-05-21 09:16:16 UTC (rev 1293)
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
+ help
+ Fbtest is a collection of tests for the frame buffer device.
+ All tests are gathered inside the same executable.
+
+ http://linux-fbdev.cvs.sourceforge.net/viewvc/linux-fbdev/FBdev/utlilities/fbtest/
Added: trunk/buildroot/package/fbtest/fbtest.mk
===================================================================
--- trunk/buildroot/package/fbtest/fbtest.mk (rev 0)
+++ trunk/buildroot/package/fbtest/fbtest.mk 2009-05-21 09:16:16 UTC (rev 1293)
@@ -0,0 +1,51 @@
+#############################################################
+#
+# fbtest
+#
+#############################################################
+FBTEST_VERSION:=20041102-1
+FBTEST_SOURCE:=fbtest-$(FBTEST_VERSION).tar.gz
+FBTEST_SITE:=http://www.pengutronix.de/software/ptxdist/temporary-src/
+FBTEST_DIR:=$(BUILD_DIR)/fbtest-$(FBTEST_VERSION)
+FBTEST_CAT:=$(ZCAT)
+FBTEST_BINARY:=fbtest
+FBTEST_TARGET_BINARY:=usr/bin/$(FBTEST_BINARY)
+
+$(DL_DIR)/$(FBTEST_SOURCE):
+ $(WGET) -P $(DL_DIR) $(FBTEST_SITE)/$(FBTEST_SOURCE)
+
+$(FBTEST_DIR)/.unpacked: $(DL_DIR)/$(FBTEST_SOURCE)
+ $(FBTEST_CAT) $(DL_DIR)/$(FBTEST_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+ toolchain/patch-kernel.sh $(FBTEST_DIR) package/fbtest/patches/ \
+ fbtest-$(FBTEST_VERSION)\*.patch \
+ fbtest-$(FBTEST_VERSION)\*.patch.$(ARCH)
+ touch $@
+
+$(FBTEST_DIR)/$(FBTEST_BINARY): $(FBTEST_DIR)/.unpacked
+ $(MAKE1) ARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) -C $(FBTEST_DIR)
+ touch -c $@
+
+$(TARGET_DIR)/$(FBTEST_TARGET_BINARY): $(FBTEST_DIR)/$(FBTEST_BINARY)
+ $(INSTALL) -m 755 $(FBTEST_DIR)/$(FBTEST_BINARY) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
+ -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
+ touch -c $@
+
+fbtest: uclibc $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
+
+fbtest-source: $(DL_DIR)/$(FBTEST_SOURCE)
+
+fbtest-clean:
+ rm -f $(TARGET_DIR)/$(FBTEST_TARGET_BINARY)
+ -$(MAKE) -C $(FBTEST_DIR) clean
+
+fbtest-dirclean:
+ rm -rf $(FBTEST_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_FBTEST)),y)
+TARGETS+=fbtest
+endif
Added: trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch
===================================================================
--- trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch (rev 0)
+++ trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-exe-target-name-change.patch 2009-05-21 09:16:16 UTC (rev 1293)
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
+@@ -1,7 +1,7 @@
+
+ TOPDIR = .
+
+-TARGET = $(CROSS_COMPILE)fbtest
++TARGET = fbtest
+
+ OBJS += drawops/drawops.o fonts/fonts.o images/images.o visops/visops.o \
+ tests/tests.o
Added: trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch
===================================================================
--- trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch (rev 0)
+++ trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-page-mask.patch 2009-05-21 09:16:16 UTC (rev 1293)
@@ -0,0 +1,36 @@
+--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
+@@ -19,7 +19,6 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
+-#include <asm/page.h>
+
+ #include "types.h"
+ #include "fb.h"
+@@ -179,6 +179,7 @@
+ void fb_map(void)
+ {
+ caddr_t addr;
++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
+
+ Debug("fb_map()\n");
+ fb_start = (unsigned long)fb_fix.smem_start & PAGE_MASK;
+@@ -189,7 +190,7 @@
+ addr = mmap(NULL, fb_len, PROT_READ | PROT_WRITE, MAP_SHARED, fb_fd, 0);
+ if (addr == (caddr_t)-1)
+ Fatal("mmap smem: %s\n", strerror(errno));
+- fb = addr+fb_offset;
++ fb = (u8*)(addr+fb_offset);
+ }
+
+
+@@ -199,6 +200,8 @@
+
+ void fb_unmap(void)
+ {
++ unsigned long PAGE_MASK = ~(sysconf(_SC_PAGE_SIZE)-1);
++
+ Debug("fb_unmap()\n");
+ if (munmap((caddr_t)((unsigned long)fb & PAGE_MASK), fb_len) == -1)
+ Fatal("munmap smem: %s\n", strerror(errno));
Added: trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch
===================================================================
--- trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch (rev 0)
+++ trunk/buildroot/package/fbtest/patches/fbtest-20041102-1-pnmtohex-libs-depends.patch 2009-05-21 09:16:16 UTC (rev 1293)
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
+@@ -3,7 +3,7 @@ TOPDIR = ..
+
+ HOST_TARGET = pnmtohex
+
+-LIBS += -lnetpnm -lnetpbm -lnetpgm -lnetppm
++LIBS += -lnetpbm -lm
+
+ include $(TOPDIR)/Rules.make
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
