diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/nvidia-drivers/files | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/nvidia-drivers/files')
| -rw-r--r-- | recipes/nvidia-drivers/files/nvaudio-remap_page_range.patch | 27 | ||||
| -rw-r--r-- | recipes/nvidia-drivers/files/nvidia-oe-conftest.patch | 60 |
2 files changed, 87 insertions, 0 deletions
diff --git a/recipes/nvidia-drivers/files/nvaudio-remap_page_range.patch b/recipes/nvidia-drivers/files/nvaudio-remap_page_range.patch new file mode 100644 index 0000000000..e653d43a76 --- /dev/null +++ b/recipes/nvidia-drivers/files/nvaudio-remap_page_range.patch @@ -0,0 +1,27 @@ +--- NFORCE-Linux-x86-1.0-0310-pkg1/nvsound/main/Makefile.kbuild.sav 2006-05-16 09:44:26.000000000 -0600 ++++ NFORCE-Linux-x86-1.0-0310-pkg1/nvsound/main/Makefile.kbuild 2006-05-16 09:48:57.000000000 -0600 +@@ -48,16 +48,16 @@ + EXTRA_LDFLAGS := -d + + # Figure out how many args remap_page_ranges() wants or new remap call +-ifeq ($(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_pfn_range), 1) ++#ifeq ($(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_pfn_range), 1) + EXTRA_CFLAGS += -DNV_REMAP_PFN_RANGE_PRESENT +-else +- REMAP_PAGE_RANGE := $(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_page_range) +- +- ifeq ($(REMAP_PAGE_RANGE),5) +- EXTRA_CFLAGS += -DREMAP_NEW +- endif ++#else ++# REMAP_PAGE_RANGE := $(shell sh $(src)/conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" remap_page_range) + +-endif ++# ifeq ($(REMAP_PAGE_RANGE),5) ++# EXTRA_CFLAGS += -DREMAP_NEW ++# endif ++# ++#endif + + PATCHLEVEL ?= $(shell sh ./conftest.sh "$(CC)" "$(KERNEL_SOURCES)" "$(KERNEL_OUTPUT)" kernel_patch_level) + ifeq ($(PATCHLEVEL), 4) diff --git a/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch b/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch new file mode 100644 index 0000000000..6eae764d1c --- /dev/null +++ b/recipes/nvidia-drivers/files/nvidia-oe-conftest.patch @@ -0,0 +1,60 @@ +--- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.kbuild 2006-03-29 16:02:20.000000000 -0700 ++++ nv/Makefile.kbuild 2006-04-26 13:50:47.249353208 -0600 +@@ -28,7 +28,7 @@ + # Christian Zander (zander@mail.minion.de) (enhancements) + # + +-all: install ++all: module + install: package-install + + # +@@ -310,19 +310,17 @@ + # sufficient privileges. Rebuild the module dependency file. + # + +-module-install: suser-sanity-check module ++module-install: module + @mkdir -p $(MODULE_ROOT)/video; \ +- install -m 0664 -o root -g root $(MODULE_OBJECT) $(MODULE_ROOT)/video; \ +- PATH="$(PATH):/bin:/sbin" depmod -ae; ++ install -m 0664 $(MODULE_OBJECT) $(MODULE_ROOT)/video; \ ++ #PATH="$(PATH):/bin:/sbin" depmod -ae; + + # + # This target builds, then installs, then creates device nodes and inserts + # the module, if successful. + # + +-package-install: module-install rmmod-sanity-check +- PATH="$(PATH):/bin:/sbin" modprobe $(MODULE_NAME) && \ +- echo "$(MODULE_OBJECT) installed successfully."; ++package-install: module-install + + # + # Build an object file suitable for further processing by the installer and +--- ../../../temp/NVIDIA-Linux-x86-1.0-8756-pkg1/usr/src/nv/Makefile.nvidia 2006-03-29 16:02:20.000000000 -0700 ++++ nv/Makefile.nvidia 2006-04-26 13:52:19.573317832 -0600 +@@ -102,7 +102,7 @@ + + VERSION_HDR=nv_compiler.h + +-all: install ++all: module + + install: package-install + +@@ -123,11 +123,9 @@ + mdl: gcc-sanity-check rivafb-sanity-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) + $(LD) -r -o nvidia.o $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) + +-package-install: module suser-sanity-check rmmod-sanity-check ++package-install: module + mkdir -p $(MODULE_ROOT)/video && \ +- install -m 0664 -o root -g root nvidia.o $(MODULE_ROOT)/video/nvidia.o$(O) && \ +- PATH="$(PATH):/bin:/sbin" depmod -a && \ +- PATH="$(PATH):/bin:/sbin" modprobe nvidia && \ ++ install -m 0664 nvidia.o $(MODULE_ROOT)/video/nvidia.o$(O) && \ + echo "nvidia.o installed successfully."; \ + + $(VERSION_HDR): |