From d52b56753fd291c95468958ca60362ed94c929d7 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 3 Feb 2015 11:21:42 +0100 Subject: add debugtool, try to fix device-tree support and rpi-proto driver --- package/bcm2835-bootloader/Makefile | 22 ++++++++++++++++++++-- .../patch-interface_vcos_pthreads_vcos_platform_h | 12 ------------ .../patch-interface_vcos_pthreads_vcos_pthreads_c | 11 ----------- .../patch-interface_vmcs_host_linux_vcfilesys_c | 22 ---------------------- 4 files changed, 20 insertions(+), 47 deletions(-) delete mode 100644 package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h delete mode 100644 package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c delete mode 100644 package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c (limited to 'package') diff --git a/package/bcm2835-bootloader/Makefile b/package/bcm2835-bootloader/Makefile index 4095e1151..e452757b3 100644 --- a/package/bcm2835-bootloader/Makefile +++ b/package/bcm2835-bootloader/Makefile @@ -5,21 +5,27 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= bcm2835-bootloader PKG_VERSION:= 9b068fe44503f564579a25fd849df4ec784f9d4d -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_DESCR:= bootloader for raspberry pi PKG_SECTION:= base/boot PKG_URL:= https://github.com/raspberrypi/firmware PKG_SITES:= https://github.com/raspberrypi/firmware.git PKG_SYSTEM_DEPENDS:= raspberry-pi + PKG_CHOICES_BCM2835_BOOTLOADER:= DEFAULT EXTRA CUTDOWN PKGCD_DEFAULT:= default bootloader PKGCD_EXTRA:= bootloader with extra features and codecs PKGCD_CUTDOWN:= cut down bootloader +PKG_SUBPKGS:= BCM2835_BOOTLOADER BCM2835_DEBUGTOOL +PKGSD_BCM2835_DEBUGTOOL:= debugtool +PKGSC_BCM2835_DEBUGTOOL:= sys/hw + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,BCM2835_BOOTLOADER,bcm2835-bootloader,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,BCM2835_DEBUGTOOL,bcm2835-debugtool,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_BCM2835_DEBUGTOOL))) CONFIG_STYLE:= manual BUILD_STYLE:= manual @@ -56,9 +62,21 @@ ifeq ($(ADK_KERNEL_BCM2708_DT),y) printf "disable_commandline_tags=2\n" >> \ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt ifneq ($(ADK_KERNEL_SND_BCM2708_SOC_RPI_PROTO),) - printf "device_tree_overlay=rpi-proto\n" >> \ + printf "dtparam=i2c=on,i2s=on,spi=on\n" >> \ + $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt + printf "dtoverlay=rpi-proto\n" >> \ + $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt + printf "dtdebug=on\n" >> \ + $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt +endif +else + printf "device_tree=\n" >> \ $(IDIR_BCM2835_BOOTLOADER)/boot/config.txt endif +ifeq ($(ADK_PACKAGE_BCM2835_DEBUGTOOL),y) + $(INSTALL_DIR) $(IDIR_BCM2835_DEBUGTOOL)/opt/vc/bin + $(INSTALL_BIN) $(WRKBUILD)/hardfp/opt/vc/bin/vcdbg \ + $(IDIR_BCM2835_DEBUGTOOL)/opt/vc/bin endif include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h b/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h deleted file mode 100644 index 95b5d480b..000000000 --- a/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_platform_h +++ /dev/null @@ -1,12 +0,0 @@ ---- bcm2835-vc-0.3.orig/interface/vcos/pthreads/vcos_platform.h 2013-09-27 14:22:08.000000000 +0200 -+++ bcm2835-vc-0.3/interface/vcos/pthreads/vcos_platform.h 2013-10-13 20:20:55.000000000 +0200 -@@ -120,9 +120,6 @@ typedef struct - - #define VCOS_ONCE_INIT PTHREAD_ONCE_INIT - --#if defined(__arm__) && !defined(_HAVE_TIMER_T) && !defined(ANDROID) --typedef __timer_t timer_t; --#endif - typedef struct VCOS_TIMER_T - { - pthread_t thread; /**< id of the timer thread */ diff --git a/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c b/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c deleted file mode 100644 index 583fe04f3..000000000 --- a/package/bcm2835-vc/patches/patch-interface_vcos_pthreads_vcos_pthreads_c +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm2835-vc-0.3.orig/interface/vcos/pthreads/vcos_pthreads.c 2013-09-27 14:22:08.000000000 +0200 -+++ bcm2835-vc-0.3/interface/vcos/pthreads/vcos_pthreads.c 2013-10-14 19:44:50.000000000 +0200 -@@ -580,7 +580,7 @@ const char ** vcos_get_argv(void) - */ - uint32_t _vcos_get_ticks_per_second(void) - { -- return HZ; -+ return 100; - } - - VCOS_STATUS_T vcos_once(VCOS_ONCE_T *once_control, diff --git a/package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c b/package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c deleted file mode 100644 index c5419c90d..000000000 --- a/package/bcm2835-vc/patches/patch-interface_vmcs_host_linux_vcfilesys_c +++ /dev/null @@ -1,22 +0,0 @@ ---- bcm2835-vc-0.3.orig/interface/vmcs_host/linux/vcfilesys.c 2013-09-27 14:22:08.000000000 +0200 -+++ bcm2835-vc-0.3/interface/vmcs_host/linux/vcfilesys.c 2013-10-14 20:10:02.000000000 +0200 -@@ -49,10 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include - #include - --#if !defined(ANDROID) && !defined( __USE_FILE_OFFSET64 ) --#error "__USE_FILE_OFFSET64 isn't defined" --#endif -- - #include "interface/vcos/vcos.h" - - /* Some hackery to prevent a clash with the Linux type of the same name */ -@@ -916,7 +912,7 @@ int vc_hostfs_set_attr(const char *path, - - if (pathbuf) - { -- __mode_t mode = 0; -+ mode_t mode = 0; - struct stat sb; - - backslash_to_slash(pathbuf); -- cgit v1.2.3