diff --git a/build/Rules.make b/build/Rules.make index e61efdb..45fabe5 100644 --- a/build/Rules.make +++ b/build/Rules.make @@ -4,7 +4,9 @@ # The directory that points to your kern # path to the full Linux kernel (usually convenient on ARM). This is only # used for building the DSPLink kernel modules, as the kernel's build system # gets invoked. -KERNEL_DIR=/opt/mv_pro_4.0/montavista/pro/devkit/lsp/ti-davinci +# KERNEL_DIR=/opt/mv_pro_4.0/montavista/pro/devkit/lsp/ti-davinci +# KERNEL_DIR=/opt/kernels/ti-davinci.orig +KERNEL_DIR=$(HOME)/src/linux # paths to MVLinux and Arm tools GPP_BASE_BUILDOS := $(KERNEL_DIR) diff --git a/build/buildall.sh b/build/buildall.sh new file mode 100755 index 0000000..b420e81 --- /dev/null +++ b/build/buildall.sh @@ -0,0 +1,17 @@ +#!/bin/sh + +T=`dirname $0`/.. +cd $T +TOPDIR=`pwd` + +cd $TOPDIR/gpp/src +make DSPLINK=$TOPDIR + +cd $TOPDIR/build +make + +echo ================================================ +echo If it failed, update $TOPDIR/config/CURRENTCFG.MK +echo ================================================ + + diff --git a/config/CURRENTCFG.MK b/config/CURRENTCFG.MK index 6aef066..95e5e76 100644 --- a/config/CURRENTCFG.MK +++ b/config/CURRENTCFG.MK @@ -17,8 +17,11 @@ export CFGDATE := FEB 17, 20 # ========================================================= # DSP/BIOS LINK GPP side root directory. # ========================================================= -export GPPROOT := /db/atree/library/trees/link-a07x/src/dsplink_dm420/gpp -export DSPROOT := /db/atree/library/trees/link-a07x/src/dsplink_dm420/dsp +# A.R. +# export GPPROOT := /db/atree/library/trees/link-a07x/src/dsplink_dm420/gpp +# export DSPROOT := /db/atree/library/trees/link-a07x/src/dsplink_dm420/dsp +export GPPROOT := $(HOME)/src/dvevm.git/dsplink_dm420/gpp +export DSPROOT := $(HOME)/src/dvevm.git/dsplink_dm420/dsp # ========================================================= diff --git a/config/all/CFG_Davinci_GPP.c b/config/all/CFG_Davinci_GPP.c index f897562..3d2f240 100644 --- a/config/all/CFG_Davinci_GPP.c +++ b/config/all/CFG_Davinci_GPP.c @@ -4,7 +4,7 @@ * Any change made in this file will be lost. * * The configuration was created on : FEB 17, 2006 10:48:08 - * This file was generated on : FEB 17, 2006 10:56:19 + * This file was generated on : JAN 18, 2007 11:42:06 * ---------------------------------------------------------------------------- */ diff --git a/config/all/CFG_Davinci_GPP.h b/config/all/CFG_Davinci_GPP.h index 33550ba..44f8bda 100644 --- a/config/all/CFG_Davinci_GPP.h +++ b/config/all/CFG_Davinci_GPP.h @@ -4,7 +4,7 @@ * Any change made in this file will be lost. * * The configuration was created on : FEB 17, 2006 10:48:08 - * This file was generated on : FEB 17, 2006 10:56:19 + * This file was generated on : JAN 18, 2007 11:42:06 * ---------------------------------------------------------------------------- */ diff --git a/gpp/BUILD/PMGR/BIN/DEBUG/dsplinkk.mod.c b/gpp/BUILD/PMGR/BIN/DEBUG/dsplinkk.mod.c deleted file mode 100644 index 3d9d210..0000000 --- a/gpp/BUILD/PMGR/BIN/DEBUG/dsplinkk.mod.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -MODULE_INFO(vermagic, VERMAGIC_STRING); - -#undef unix -struct module __this_module -__attribute__((section(".gnu.linkonce.this_module"))) = { - .name = __stringify(KBUILD_MODNAME), - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif -}; - -static const char __module_depends[] -__attribute_used__ -__attribute__((section(".modinfo"))) = -"depends="; - diff --git a/gpp/BUILD/PMGR/BIN/RELEASE/dsplinkk.mod.c b/gpp/BUILD/PMGR/BIN/RELEASE/dsplinkk.mod.c deleted file mode 100644 index 3d9d210..0000000 --- a/gpp/BUILD/PMGR/BIN/RELEASE/dsplinkk.mod.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -MODULE_INFO(vermagic, VERMAGIC_STRING); - -#undef unix -struct module __this_module -__attribute__((section(".gnu.linkonce.this_module"))) = { - .name = __stringify(KBUILD_MODNAME), - .init = init_module, -#ifdef CONFIG_MODULE_UNLOAD - .exit = cleanup_module, -#endif -}; - -static const char __module_depends[] -__attribute_used__ -__attribute__((section(".modinfo"))) = -"depends="; - diff --git a/gpp/inc/Linux/Davinci/linkcfg.h b/gpp/inc/Linux/Davinci/linkcfg.h index 33550ba..44f8bda 100644 --- a/gpp/inc/Linux/Davinci/linkcfg.h +++ b/gpp/inc/Linux/Davinci/linkcfg.h @@ -4,7 +4,7 @@ * Any change made in this file will be lost. * * The configuration was created on : FEB 17, 2006 10:48:08 - * This file was generated on : FEB 17, 2006 10:56:19 + * This file was generated on : JAN 18, 2007 11:42:06 * ---------------------------------------------------------------------------- */ diff --git a/gpp/src/api/Linux/drv_api.c b/gpp/src/api/Linux/drv_api.c index 524a57b..b69fd82 100755 --- a/gpp/src/api/Linux/drv_api.c +++ b/gpp/src/api/Linux/drv_api.c @@ -29,6 +29,13 @@ #include #include #include +// TBD: A.R. find proper include for the user mode +// asm/page.h works only for __KERNEL__ now +#ifndef PAGE_SIZE +#define PAGE_SHIFT 12 +#define PAGE_SIZE (1UL << PAGE_SHIFT) +#endif + /* ----------------------------------- DSP/BIOS Link */ #include #include diff --git a/gpp/src/ldrv/HAL/Davinci/hal_object.c b/gpp/src/ldrv/HAL/Davinci/hal_object.c index 772e52b..ab72c0d 100755 --- a/gpp/src/ldrv/HAL/Davinci/hal_object.c +++ b/gpp/src/ldrv/HAL/Davinci/hal_object.c @@ -17,6 +17,7 @@ /* ----------------------------------- DSP/BIOS Link */ +#include #include #include #include diff --git a/gpp/src/ldrv/HAL/Davinci/hal_rtc.c b/gpp/src/ldrv/HAL/Davinci/hal_rtc.c index b9dd979..609dd55 100755 --- a/gpp/src/ldrv/HAL/Davinci/hal_rtc.c +++ b/gpp/src/ldrv/HAL/Davinci/hal_rtc.c @@ -17,6 +17,7 @@ /* ----------------------------------- DSP/BIOS Link */ +#include #include #include #include diff --git a/gpp/src/ldrv/Linux/Davinci/linkcfg.c b/gpp/src/ldrv/Linux/Davinci/linkcfg.c index 931bafa..79eb6a7 100644 --- a/gpp/src/ldrv/Linux/Davinci/linkcfg.c +++ b/gpp/src/ldrv/Linux/Davinci/linkcfg.c @@ -4,7 +4,7 @@ * Any change made in this file will be lost. * * The configuration was created on : FEB 17, 2006 10:48:08 - * This file was generated on : FEB 17, 2006 10:56:06 + * This file was generated on : JAN 18, 2007 11:41:37 * ---------------------------------------------------------------------------- */ diff --git a/gpp/src/osal/Linux/2.6/isr.c b/gpp/src/osal/Linux/2.6/isr.c index 99aca83..401eb8e 100755 --- a/gpp/src/osal/Linux/2.6/isr.c +++ b/gpp/src/osal/Linux/2.6/isr.c @@ -130,7 +130,7 @@ struct IsrObject_tag { */ STATIC irqreturn_t -ISR_Callback (int irq, void * arg, struct pt_regs * flags) ; +ISR_Callback (int irq, void * arg) ; /* ============================================================================ @@ -664,7 +664,7 @@ #endif /* defined (DDSP_DEBUG) */ */ STATIC irqreturn_t -ISR_Callback (int irq, void * arg, struct pt_regs * flags) +ISR_Callback (int irq, void * arg) { DSP_STATUS status = DSP_SOK ; IsrObject * isrObj = (IsrObject *) (arg) ; diff --git a/gpp/src/osal/Linux/kfile.c b/gpp/src/osal/Linux/kfile.c index 3aece2e..b1fd817 100755 --- a/gpp/src/osal/Linux/kfile.c +++ b/gpp/src/osal/Linux/kfile.c @@ -14,7 +14,6 @@ * ============================================================================ */ - /* ----------------------------------- OS Specific Headers */ #include #include @@ -653,7 +652,6 @@ #endif /* #if defined (DM642_PCI) */ return status ; } - #if defined (__cplusplus) } #endif /* defined (__cplusplus) */ diff --git a/gpp/src/pmgr/Linux/2.6/drv_pmgr.c b/gpp/src/pmgr/Linux/2.6/drv_pmgr.c index d302981..83790b8 100755 --- a/gpp/src/pmgr/Linux/2.6/drv_pmgr.c +++ b/gpp/src/pmgr/Linux/2.6/drv_pmgr.c @@ -16,8 +16,8 @@ /* ----------------------------------- OS Specific Headers */ -#include #include +#include #include #include #include @@ -390,7 +390,9 @@ DRV_Mmap (struct file *filp, struct vm_a * @see None * ---------------------------------------------------------------------------- */ -STATIC int __init DRV_InitializeModule (void) ; + // TBD: A.R. STATIC +// STATIC int __init DRV_InitializeModule (void) ; +int __init DRV_InitializeModule (void) ; /** ---------------------------------------------------------------------------- @@ -409,7 +411,8 @@ STATIC int __init DRV_InitializeModule ( * @see None * ---------------------------------------------------------------------------- */ -STATIC void __exit DRV_FinalizeModule (void) ; +// STATIC +void __exit DRV_FinalizeModule (void) ; /** ---------------------------------------------------------------------------- @@ -510,8 +513,9 @@ #endif /* if defined (DM642_PCI) */ * @desc Module initialization function for Linux driver. * ---------------------------------------------------------------------------- */ -STATIC -int __init DRV_InitializeModule (void) +// STATIC +// int __init DRV_InitializeModule (void) +int DRV_InitializeModule (void) { int result = 0 ; DSP_STATUS status = DSP_SOK ; @@ -643,9 +647,10 @@ #endif /* if defined (DDSP_PROBE) */ * @desc Linux driver function to finalize the driver module. * ---------------------------------------------------------------------------- */ -STATIC -NORMAL_API -void __exit DRV_FinalizeModule (void) +// STATIC +// NORMAL_API +// void __exit DRV_FinalizeModule (void) +void DRV_FinalizeModule (void) { DSP_STATUS status = DSP_SOK ; @@ -751,9 +756,12 @@ int DRV_Ioctl (struct inode * inode, str * to the kernel. * ============================================================================ */ -MODULE_LICENSE ("DSP/BIOS(TM) LINK") ; -module_init (DRV_InitializeModule) ; -module_exit (DRV_FinalizeModule) ; +MODULE_DESCRIPTION("DSP BIOS Driver"); +MODULE_AUTHOR("TI"); +// MODULE_LICENSE ("DSP/BIOS(TM) LINK") ; +MODULE_LICENSE("Dual BSD/GPL"); +// module_init (DRV_InitializeModule) ; +// module_exit (DRV_FinalizeModule) ; /** ---------------------------------------------------------------------------- @@ -1415,6 +1423,10 @@ DSPLINK_ModifyMemTable (Void) } +module_init (DRV_InitializeModule) ; +module_exit (DRV_FinalizeModule) ; + + #if defined (__cplusplus) } #endif /* defined (__cplusplus) */ diff --git a/make/Linux/Davinci/compile.mk b/make/Linux/Davinci/compile.mk index 904e4a9..7b88cfd 100755 --- a/make/Linux/Davinci/compile.mk +++ b/make/Linux/Davinci/compile.mk @@ -132,6 +132,11 @@ ifeq ("$(COMP_TYPE)", "LIB") STD_CC_FLAGS += $(LIB_CC_FLAGS) endif # ifeq ("$(COMP_TYPE)", "LIB") +# A.R. +ifeq ("$(GPPOSVERSION)", "2.6") +STD_CC_FLAGS += -include $(HOME)/src/linux/include/linux/autoconf.h +endif + # ============================================================================ # Standard definitions for the compiler diff --git a/make/Linux/Davinci/link.mk b/make/Linux/Davinci/link.mk index 4cb8fc1..d229d13 100755 --- a/make/Linux/Davinci/link.mk +++ b/make/Linux/Davinci/link.mk @@ -398,6 +398,11 @@ ifeq ($(DAVINCI_VARIANT), 2) STD_CC_DEFNS += $(CC_SW_DEF)DAVINCI_QTVARIANT endif +# A.R. +ifeq ("$(GPPOSVERSION)", "2.6") +STD_CC_FLAGS += -include $(HOME)/src/linux/include/linux/autoconf.h +endif + CMD_LINK := $(LD) $(STD_LD_FLAGS) $(DRV_LD_FLAGS) $(LD_SW_RELOC) @@ -421,8 +426,14 @@ # ------------------------------------ $(CMDECHO)$(CMD_LINK) $(LD_SW_OUT)$(DRIVER_DEB) $(foreach dir, $(ARGS_ARCH_DEB), $(wildcard $(dir)/*.o)) $(USR_LIBS_DEB) $(CMDECHO)$(DISPLAY) Post processing kernel module $(basename $(basename $@))... $(CMD_MODPOST) $(DRIVER_DEB) +# A.R. +# $(CMDECHO)$(COMPILER) $(CC_SW_DEB) $(STD_CC_FLAGS) $(USR_CC_FLAGS) $(STD_CC_DEFNS) \ +# $(USR_CC_DEFNS) -DDDSP_DEBUG -DKBUILD_BASENAME=$(basename $(basename $@)) \ +# -c -o $(MOD_FILE_DEBOBJ) $(MOD_FILE_DEB) $(CMDECHO)$(COMPILER) $(CC_SW_DEB) $(STD_CC_FLAGS) $(USR_CC_FLAGS) $(STD_CC_DEFNS) \ - $(USR_CC_DEFNS) -DDDSP_DEBUG -DKBUILD_BASENAME=$(basename $(basename $@)) \ + $(USR_CC_DEFNS) -DDDSP_DEBUG \ + -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(dsplinkk.mod)" \ + -D"KBUILD_MODNAME=KBUILD_STR(dsplinkk)" \ -c -o $(MOD_FILE_DEBOBJ) $(MOD_FILE_DEB) $(CMDECHO)$(LD) $(STD_AR_FLAGS) $(LD_SW_RELOC) $(LD_SW_OUT) $(MOD_FILE_DEBKNL) $(DRIVER_DEB) $(MOD_FILE_DEBOBJ) $(CMDECHO)$(COPY) $(MOD_FILE_DEBKNL) $(BUILD_EXPORT_DEB)/. @@ -441,8 +452,14 @@ # ------------------------------------ $(CMDECHO)$(CMD_LINK) $(LD_SW_OUT)$(DRIVER_REL) $(foreach dir, $(ARGS_ARCH_REL), $(wildcard $(dir)/*.o)) $(USR_LIBS_REL) $(CMDECHO)$(DISPLAY) Post processing kernel module $(basename $(basename $@))... $(CMD_MODPOST) $(DRIVER_REL) +# A.R. +# $(CMDECHO)$(LINKER) $(CC_SW_REL) $(STD_CC_FLAGS) $(USR_CC_FLAGS) $(STD_CC_DEFNS) \ +# $(USR_CC_DEFNS) -DKBUILD_BASENAME=$(basename $(basename $@)) \ +# -c -o $(MOD_FILE_RELOBJ) $(MOD_FILE_REL) $(CMDECHO)$(LINKER) $(CC_SW_REL) $(STD_CC_FLAGS) $(USR_CC_FLAGS) $(STD_CC_DEFNS) \ - $(USR_CC_DEFNS) -DKBUILD_BASENAME=$(basename $(basename $@)) \ + $(USR_CC_DEFNS) \ + -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(dsplinkk.mod)" \ + -D"KBUILD_MODNAME=KBUILD_STR(dsplinkk)" \ -c -o $(MOD_FILE_RELOBJ) $(MOD_FILE_REL) $(CMDECHO)$(LD) -EL -r -o$(MOD_FILE_RELKNL) $(DRIVER_REL) $(MOD_FILE_RELOBJ) $(CMDECHO)$(COPY) $(MOD_FILE_RELKNL) $(BUILD_EXPORT_REL)/. diff --git a/make/Linux/davinci_mvlpro4.0.mk b/make/Linux/davinci_mvlpro4.0.mk index 25d9f75..fe3b92a 100755 --- a/make/Linux/davinci_mvlpro4.0.mk +++ b/make/Linux/davinci_mvlpro4.0.mk @@ -35,7 +35,8 @@ # ==================================== # ---------------------------------------------------------------------------- # Base directory for the GPP OS # ---------------------------------------------------------------------------- -BASE_BUILDOS := $(HOME)/montavista/kernel/Linux +# BASE_BUILDOS := $(HOME)/montavista/kernel/Linux +BASE_BUILDOS := $(HOME)/src/linux # ---------------------------------------------------------------------------- # Base for code generation tools - compiler, linker, archiver etc. @@ -49,7 +50,8 @@ BASE_OSINC := $(BASE_BUILDOS)/inclu OSINC_GENERIC := $(BASE_OSINC) OSINC_PLATFORM := /opt/montavista/pro/devkit/arm/v5t_le/lib/gcc/armv5tl-montavista-linuxeabi/3.4.3/include -OSINC_TARGET := /opt/montavista/pro/devkit/arm/v5t_le/target/usr/include +# OSINC_TARGET := /opt/montavista/pro/devkit/arm/v5t_le/target/usr/include +OSINC_TARGET := $(HOME)/src/linux/include ifneq ("$(VARIANT)", "") OSINC_VARIANT := $(BASE_OSINC) diff --git a/make/Linux/davinci_uclibc.mk b/make/Linux/davinci_uclibc.mk index a180b90..27bb5e9 100755 --- a/make/Linux/davinci_uclibc.mk +++ b/make/Linux/davinci_uclibc.mk @@ -67,7 +67,8 @@ BASE_OSINC := $(BASE_BUILDOS)/inclu OSINC_GENERIC := $(BASE_OSINC) OSINC_PLATFORM := /opt/montavista/pro/devkit/arm/v5t_le/lib/gcc/armv5tl-montavista-linuxeabi/3.4.3/include -OSINC_TARGET := /opt/montavista/pro/devkit/arm/v5t_le/target/usr/include +# OSINC_TARGET := /opt/montavista/pro/devkit/arm/v5t_le/target/usr/include +OSINC_TARGET := $(HOME)/linux/include ifneq ("$(VARIANT)", "") OSINC_VARIANT := $(BASE_OSINC) diff --git a/make/Linux/linux2.6.mk b/make/Linux/linux2.6.mk index 8c56038..c890df4 100755 --- a/make/Linux/linux2.6.mk +++ b/make/Linux/linux2.6.mk @@ -30,7 +30,8 @@ USE_DISTRIBUTION := 1 # ============================================================================ # Base directory for the GPP OS # ============================================================================ -BASE_BUILDOS := /usr/src/kernels/2.6.9-11.EL-i686/ +# BASE_BUILDOS := /usr/src/kernels/2.6.9-11.EL-i686/ +BASE_BUILDOS := /usr/src/kernels/2.6.11-1.1369_FC4-i686 # ============================================================================