From 4f2486f75c2d2d3e2cc4cbc96b9d828dd5524a22 Mon Sep 17 00:00:00 2001 From: neil Date: Sun, 1 Sep 2013 09:53:22 +0000 Subject: [PATCH] Renamed kernel-pci* targets to kernel-hidd-pci* for consistency with other HIDDs. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@47933 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-linux/mmakefile.src | 2 +- arch/all-pc/hidds/pcipc/mmakefile.src | 2 +- arch/i386-pc/drivers/mmakefile.src | 3 +-- arch/m68k-amiga/hidd/pci-mediator/mmakefile.src | 2 +- arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src | 2 +- arch/ppc-chrp/efika/boot/mmakefile.src | 4 ++-- arch/ppc-chrp/efika/pci/mmakefile.src | 2 +- arch/ppc-sam440/boot/mmakefile.src | 6 +++--- arch/ppc-sam440/pci/mmakefile.src | 2 +- arch/ppc-sam440/pci460/mmakefile.src | 2 +- arch/x86_64-pc/boot/mmakefile.src | 4 ++-- rom/hidds/hidd.pci/mmakefile.src | 8 ++++---- rom/mmakefile.src | 4 ++-- workbench/hidds/hidd.nvidia/mmakefile.src | 2 +- workbench/hidds/sm502/mmakefile.src | 2 +- 15 files changed, 23 insertions(+), 24 deletions(-) diff --git a/arch/all-linux/mmakefile.src b/arch/all-linux/mmakefile.src index 4513e98f89..7f0b720bd2 100644 --- a/arch/all-linux/mmakefile.src +++ b/arch/all-linux/mmakefile.src @@ -9,7 +9,7 @@ include $(TOP)/config/make.cfg #MM- workbench-linux-$(CPU) : \ #MM workbench-unix \ #MM workbench-devs-tap-unix \ -#MM kernel-pci \ +#MM kernel-hidd-pci \ #MM $(PCI_HIDD_TARGET) #MM- includes-linux: includes-unix diff --git a/arch/all-pc/hidds/pcipc/mmakefile.src b/arch/all-pc/hidds/pcipc/mmakefile.src index 22ea2a5f6a..3cd1261142 100644 --- a/arch/all-pc/hidds/pcipc/mmakefile.src +++ b/arch/all-pc/hidds/pcipc/mmakefile.src @@ -3,7 +3,7 @@ include $(TOP)/config/make.cfg FILES := pcipc_init driverclass pciconf1 pciconf2 -%build_module mmake=kernel-pci-pcipc \ +%build_module mmake=kernel-hidd-pci-pcipc \ modname=pcipc modtype=hidd \ files=$(FILES) diff --git a/arch/i386-pc/drivers/mmakefile.src b/arch/i386-pc/drivers/mmakefile.src index 6f952edd84..d88e80d5b8 100644 --- a/arch/i386-pc/drivers/mmakefile.src +++ b/arch/i386-pc/drivers/mmakefile.src @@ -8,8 +8,7 @@ include $(TOP)/config/make.cfg #MM- kernel-pc-i386-drivers : \ #MM kernel-pc-i386-serial-kobj \ #MM kernel-pc-i386-parallel-kobj \ -#MM kernel-pci-kobj \ -#MM kernel-pci-pcipc-kobj \ +#MM kernel-hidd-pci-pcipc-kobj \ #MM kernel-ata-kobj # diff --git a/arch/m68k-amiga/hidd/pci-mediator/mmakefile.src b/arch/m68k-amiga/hidd/pci-mediator/mmakefile.src index d14c3a7a1f..8c47d90865 100644 --- a/arch/m68k-amiga/hidd/pci-mediator/mmakefile.src +++ b/arch/m68k-amiga/hidd/pci-mediator/mmakefile.src @@ -5,7 +5,7 @@ FILES=pci-mediator_init driverclass pci_resource #MM- workbench-expansion-amiga-m68k: hidd-pci-mediator -#MM- hidd-pci-mediator: kernel-pci hidd-pci-mediator-hidd hidd-pci-mediator-icon +#MM- hidd-pci-mediator: kernel-hidd-pci hidd-pci-mediator-hidd hidd-pci-mediator-icon #MM- hidd-pci-mediator-quick: hidd-pci-mediator-hidd-quick hidd-pci-mediator-icon %build_module mmake=hidd-pci-mediator-hidd \ diff --git a/arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src b/arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src index 3faae210e0..0f42ba97a5 100644 --- a/arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src +++ b/arch/m68k-amiga/hidd/pci-prometheus/mmakefile.src @@ -5,7 +5,7 @@ FILES=pci-prometheus_init driverclass pci_resource #MM- workbench-expansion-amiga-m68k: hidd-pci-prometheus -#MM- hidd-pci-prometheus: kernel-pci hidd-pci-prometheus-hidd hidd-pci-prometheus-icon +#MM- hidd-pci-prometheus: kernel-hidd-pci hidd-pci-prometheus-hidd hidd-pci-prometheus-icon #MM- hidd-pci-prometheus-quick: hidd-pci-prometheus-hidd-quick hidd-pci-prometheus-icon %build_module mmake=hidd-pci-prometheus-hidd \ diff --git a/arch/ppc-chrp/efika/boot/mmakefile.src b/arch/ppc-chrp/efika/boot/mmakefile.src index a64d5b41ba..e1e04b6e88 100644 --- a/arch/ppc-chrp/efika/boot/mmakefile.src +++ b/arch/ppc-chrp/efika/boot/mmakefile.src @@ -25,8 +25,8 @@ include $(TOP)/config/make.cfg #MM kernel-aros \ #MM kernel-misc \ #MM kernel-timer \ -#MM kernel-pci \ -#MM kernel-pci-efika \ +#MM kernel-hidd-pci \ +#MM kernel-hidd-pci-efika \ #MM kernel-graphics \ #MM workbench-libs-cgfx-kobj \ #MM kernel-layers \ diff --git a/arch/ppc-chrp/efika/pci/mmakefile.src b/arch/ppc-chrp/efika/pci/mmakefile.src index 15cd38c1df..80d001a91e 100644 --- a/arch/ppc-chrp/efika/pci/mmakefile.src +++ b/arch/ppc-chrp/efika/pci/mmakefile.src @@ -1,6 +1,6 @@ # $Id$ include $(TOP)/config/make.cfg -%build_module mmake=kernel-pci-efika \ +%build_module mmake=kernel-hidd-pci-efika \ modname=pci-efika modtype=hidd \ files="pci_efika_init driverclass" diff --git a/arch/ppc-sam440/boot/mmakefile.src b/arch/ppc-sam440/boot/mmakefile.src index fc30edde57..f3d4083d5e 100644 --- a/arch/ppc-sam440/boot/mmakefile.src +++ b/arch/ppc-sam440/boot/mmakefile.src @@ -23,9 +23,9 @@ include $(TOP)/config/make.cfg #MM kernel-aros \ #MM kernel-misc \ #MM kernel-timer \ -#MM kernel-pci \ -#MM kernel-pci-amcc440 \ -#MM kernel-pci-amcc460 \ +#MM kernel-hidd-pci \ +#MM kernel-hidd-pci-amcc440 \ +#MM kernel-hidd-pci-amcc460 \ #MM kernel-graphics \ #MM kernel-layers \ #MM kernel-keymap \ diff --git a/arch/ppc-sam440/pci/mmakefile.src b/arch/ppc-sam440/pci/mmakefile.src index 0a74bada4e..47e7bc5e89 100644 --- a/arch/ppc-sam440/pci/mmakefile.src +++ b/arch/ppc-sam440/pci/mmakefile.src @@ -1,6 +1,6 @@ # $Id$ include $(TOP)/config/make.cfg -%build_module mmake=kernel-pci-amcc440 \ +%build_module mmake=kernel-hidd-pci-amcc440 \ modname=pci-amcc440 modtype=hidd \ files="pci_amcc440_init driverclass" diff --git a/arch/ppc-sam440/pci460/mmakefile.src b/arch/ppc-sam440/pci460/mmakefile.src index f5c5959924..16dc95433a 100644 --- a/arch/ppc-sam440/pci460/mmakefile.src +++ b/arch/ppc-sam440/pci460/mmakefile.src @@ -1,6 +1,6 @@ # $Id$ include $(TOP)/config/make.cfg -%build_module mmake=kernel-pci-amcc460 \ +%build_module mmake=kernel-hidd-pci-amcc460 \ modname=pci-amcc460 modtype=hidd \ files="pci_amcc460_init driverclass" diff --git a/arch/x86_64-pc/boot/mmakefile.src b/arch/x86_64-pc/boot/mmakefile.src index bf40c7cf6f..5d558293a1 100644 --- a/arch/x86_64-pc/boot/mmakefile.src +++ b/arch/x86_64-pc/boot/mmakefile.src @@ -29,8 +29,8 @@ include $(TOP)/config/make.cfg #MM kernel-hidd-vga-kobj \ #MM kernel-hidd-irq-kobj \ #MM kernel-hidd-vesa-kobj \ -#MM kernel-pci-kobj \ -#MM kernel-pci-pcipc-kobj \ +#MM kernel-hidd-pci-kobj \ +#MM kernel-hidd-pci-pcipc-kobj \ #MM kernel-processor-kobj KRSRCS := acpi battclock efi hpet processor diff --git a/rom/hidds/hidd.pci/mmakefile.src b/rom/hidds/hidd.pci/mmakefile.src index 159f0339ef..dfb8c8c1ca 100644 --- a/rom/hidds/hidd.pci/mmakefile.src +++ b/rom/hidds/hidd.pci/mmakefile.src @@ -7,8 +7,8 @@ CFLAGS := $(CFLAGS) -D__KERNEL__ FILES := pci_init pcidriverclass pcideviceclass pciclass pciutil -#MM kernel-pci : kernel-pci-ids -#MM kernel-pci-kobj : kernel-pci-ids +#MM kernel-hidd-pci : kernel-hidd-pci-ids +#MM kernel-hidd-pci-kobj : kernel-hidd-pci-ids #MM includes-copy : $(AROS_INCLUDES)/hidd/pci.h $(GENINCDIR)/hidd/pci.h @@ -19,10 +19,10 @@ $(AROS_INCLUDES)/hidd/pci.h: include/pci_hidd.h $(GENINCDIR)/hidd/pci.h: include/pci_hidd.h $(CP) $< $(GENINCDIR)/hidd/pci.h -%fetch mmake=kernel-pci-ids \ +%fetch mmake=kernel-hidd-pci-ids \ archive_origins="http://pciids.sourceforge.net/v2.2/" \ archive="pci.ids" suffixes="" location=$(AROS_DEVS) -%build_module mmake=kernel-pci \ +%build_module mmake=kernel-hidd-pci \ modname=pci modtype=hidd \ files="$(FILES)" diff --git a/rom/mmakefile.src b/rom/mmakefile.src index 4748c4dee4..d71116c218 100644 --- a/rom/mmakefile.src +++ b/rom/mmakefile.src @@ -20,7 +20,7 @@ include $(TOP)/config/make.cfg #MM kernel-devs-keyboard \ #MM kernel-hidd \ #MM kernel-oop \ -#MM kernel-pci \ +#MM kernel-hidd-pci \ #MM kernel-layers \ #MM kernel-usb-$(AROS_TARGET_ARCH)-$(AROS_TARGET_CPU) @@ -49,7 +49,7 @@ include $(TOP)/config/make.cfg #MM kernel-layers-includes \ #MM kernel-timer-includes \ #MM kernel-oop-includes \ -#MM kernel-pci-includes \ +#MM kernel-hidd-pci-includes \ #MM kernel-battclock-includes \ #MM kernel-misc-includes \ #MM kernel-openfirmware-includes \ diff --git a/workbench/hidds/hidd.nvidia/mmakefile.src b/workbench/hidds/hidd.nvidia/mmakefile.src index 09d56e2615..bd72fcc909 100644 --- a/workbench/hidds/hidd.nvidia/mmakefile.src +++ b/workbench/hidds/hidd.nvidia/mmakefile.src @@ -7,7 +7,7 @@ CFLAGS := $(CFLAGS) -D__KERNEL__ FILES := nvidia_init nvidiaclass nvhardware nvidiabitmap planarbm -#unused MM- kernel-objs: kernel-pci-kobj +#unused MM- kernel-objs: kernel-hidd-pci-kobj %build_module mmake=hidd-nvidia \ modname=nvidia modtype=hidd \ diff --git a/workbench/hidds/sm502/mmakefile.src b/workbench/hidds/sm502/mmakefile.src index 6f64e57919..0d6ea815ff 100644 --- a/workbench/hidds/sm502/mmakefile.src +++ b/workbench/hidds/sm502/mmakefile.src @@ -8,7 +8,7 @@ FILES := \ bitmap #MM- workbench-hidds: hidd-sm502 -#MM- hidd-sm502-includes: kernel-pci-includes +#MM- hidd-sm502-includes: kernel-hidd-pci-includes %build_module mmake=hidd-sm502 \ modname=sm502 modtype=hidd \ -- 2.11.4.GIT