From 3c1610a752c7c42fdbc9bcb5404d104c4f9e616f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 17 Aug 2005 19:47:34 +0000 Subject: [PATCH] fix ar7 compile SVN-Revision: 1691 --- openwrt/target/linux/image/ar7/Makefile | 4 +- openwrt/target/linux/linux-2.4/Makefile | 4 +- openwrt/target/linux/linux-2.4/config/ar7 | 111 ++-------------------- 3 files changed, 10 insertions(+), 109 deletions(-) diff --git a/openwrt/target/linux/image/ar7/Makefile b/openwrt/target/linux/image/ar7/Makefile index 8a369edb62..c6a9045b48 100644 --- a/openwrt/target/linux/image/ar7/Makefile +++ b/openwrt/target/linux/image/ar7/Makefile @@ -38,7 +38,7 @@ $(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux cat $^ | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false) ifeq ($(IB),) -$(KDIR)/vmlinux.bin: $(KDIR)/vmlinux.lzma +$(KDIR)/vmlinux.bin: $(KDIR)/vmlinux.lzma compile $(TARGET_CROSS)ld -T $(PKG_BUILD_DIR)/zimage.script -r -b binary $< -o $(KDIR)/zimage.o $(TARGET_CROSS)ld -static -G 0 --defsym kernel_entry=$(KERNEL_ENTRY) -T $(PKG_BUILD_DIR)/ld.script \ $(PKG_BUILD_DIR)/loader.o \ @@ -48,7 +48,7 @@ $(KDIR)/vmlinux.bin: $(KDIR)/vmlinux.lzma $(TARGET_CROSS)objcopy -O srec $(KDIR)/loader $(KDIR)/ram_zimage.sre $(STAGING_DIR)/bin/srec2bin $(KDIR)/ram_zimage.sre $@ -$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: $(KDIR)/vmlinux.bin +$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: $(KDIR)/vmlinux.bin endif $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-kernel.bin: diff --git a/openwrt/target/linux/linux-2.4/Makefile b/openwrt/target/linux/linux-2.4/Makefile index 36e18e7054..afff6c11fa 100644 --- a/openwrt/target/linux/linux-2.4/Makefile +++ b/openwrt/target/linux/linux-2.4/Makefile @@ -168,10 +168,10 @@ $(eval $(call KMOD_template,SCHED,sched,\ )) $(eval $(call KMOD_template,VIDEODEV,videodev,\ $(MODULES_DIR)/kernel/drivers/media/video/videodev.o \ -)) +,CONFIG_VIDEO_DEV)) $(eval $(call KMOD_template,PWC,pwc,\ $(MODULES_DIR)/kernel/drivers/usb/pwc.o \ -)) +,CONFIG_USB_PWC)) $(TARGETS): $(PACKAGE_DIR) diff --git a/openwrt/target/linux/linux-2.4/config/ar7 b/openwrt/target/linux/linux-2.4/config/ar7 index 100c31c850..6c8e8f7f1b 100644 --- a/openwrt/target/linux/linux-2.4/config/ar7 +++ b/openwrt/target/linux/linux-2.4/config/ar7 @@ -1,5 +1,5 @@ # -# Automatically generated make config: don't edit +# Automatically generated by make menuconfig: don't edit # CONFIG_MIPS=y CONFIG_MIPS32=y @@ -89,7 +89,6 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set CONFIG_NONCOHERENT_IO=y CONFIG_SWAP_IO_SPACE=y -CONFIG_AR7_PAGING=y # CONFIG_MIPS_AU1000 is not set # @@ -178,10 +177,6 @@ CONFIG_MTD_PARTITIONS=y # CONFIG_MTD_CONCAT is not set # CONFIG_MTD_REDBOOT_PARTS is not set # CONFIG_MTD_CMDLINE_PARTS is not set - -# -# User Modules And Translation Layers -# CONFIG_MTD_CHAR=y CONFIG_MTD_BLOCK=y # CONFIG_FTL is not set @@ -250,10 +245,6 @@ CONFIG_MTD_AR7_BUSWIDTH=2 # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_MTDRAM is not set # CONFIG_MTD_BLKMTD is not set - -# -# Disk-On-Chip Device Drivers -# # CONFIG_MTD_DOC1000 is not set # CONFIG_MTD_DOC2000 is not set # CONFIG_MTD_DOC2001 is not set @@ -436,10 +427,6 @@ CONFIG_ATM=m CONFIG_ATM_BR2684=m # CONFIG_ATM_BR2684_IPFILTER is not set CONFIG_VLAN_8021Q=y - -# -# -# # CONFIG_IPX is not set # CONFIG_ATALK is not set # CONFIG_DECNET is not set @@ -506,20 +493,12 @@ CONFIG_IPSEC_NAT_TRAVERSAL=y # SCSI support # CONFIG_SCSI=m - -# -# SCSI support type (disk, tape, CD-ROM) -# CONFIG_BLK_DEV_SD=m CONFIG_SD_EXTRA_DEVS=5 # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set # CONFIG_BLK_DEV_SR is not set CONFIG_CHR_DEV_SG=m - -# -# Some SCSI devices (e.g. CD jukebox) support multiple LUNs -# # CONFIG_SCSI_DEBUG_QUEUES is not set CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_CONSTANTS is not set @@ -667,10 +646,6 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500_NONCS is not set # CONFIG_AIRONET4500_PROC is not set # CONFIG_HERMES is not set - -# -# Prism54 PCI/PCMCIA GT/Duette Driver - 802.11(a/b/g) -# # CONFIG_PRISM54 is not set # CONFIG_NET_WIRELESS is not set @@ -748,14 +723,6 @@ CONFIG_AR7_VLYNQ_PORTS=2 # Joysticks # # CONFIG_INPUT_GAMEPORT is not set - -# -# Input core support is needed for gameports -# - -# -# Input core support is needed for joysticks -# # CONFIG_QIC02_TAPE is not set # CONFIG_IPMI_HANDLER is not set # CONFIG_IPMI_PANIC_EVENT is not set @@ -973,17 +940,15 @@ CONFIG_NLS_DEFAULT="iso8859-1" # # Multimedia devices # -CONFIG_VIDEO_DEV=m +# CONFIG_VIDEO_DEV=m # # Video For Linux # -CONFIG_VIDEO_PROC_FS=y +# CONFIG_VIDEO_PROC_FS=y # CONFIG_I2C_PARPORT is not set # CONFIG_VIDEO_BT848 is not set # CONFIG_VIDEO_PMS is not set -# CONFIG_VIDEO_BWQCAM is not set -# CONFIG_VIDEO_CQCAM is not set # CONFIG_VIDEO_CPIA is not set # CONFIG_VIDEO_SAA5249 is not set # CONFIG_TUNER_3036 is not set @@ -1011,70 +976,7 @@ CONFIG_VIDEO_PROC_FS=y # # USB support # -CONFIG_USB=m -# CONFIG_USB_DEBUG is not set -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set -CONFIG_USB_EHCI_HCD=m -# CONFIG_USB_UHCI is not set -CONFIG_USB_UHCI_ALT=m -CONFIG_USB_OHCI=m -# CONFIG_USB_AUDIO is not set -# CONFIG_USB_EMI26 is not set -# CONFIG_USB_MIDI is not set -CONFIG_USB_STORAGE=m -# CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -# CONFIG_USB_STORAGE_ISD200 is not set -CONFIG_USB_STORAGE_DPCM=y -CONFIG_USB_STORAGE_HP8200e=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_ACM=m -CONFIG_USB_PRINTER=m -# CONFIG_USB_HID is not set -# CONFIG_USB_HIDINPUT is not set -# CONFIG_USB_HIDDEV is not set -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set -# CONFIG_USB_AIPTEK is not set -# CONFIG_USB_WACOM is not set -# CONFIG_USB_KBTAB is not set -# CONFIG_USB_POWERMATE is not set -# CONFIG_USB_DC2XX is not set -# CONFIG_USB_MDC800 is not set -# CONFIG_USB_SCANNER is not set -# CONFIG_USB_MICROTEK is not set -# CONFIG_USB_HPUSBSCSI is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_OV511 is not set -CONFIG_USB_PWC=m -# CONFIG_USB_SE401 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_W9968CF is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_DABUSB is not set -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_RTL8150 is not set -# CONFIG_USB_KAWETH is not set -# CONFIG_USB_CATC is not set -# CONFIG_USB_CDCETHER is not set -# CONFIG_USB_USBNET is not set -# CONFIG_USB_USS720 is not set - -# -# USB Serial Converter support -# -# CONFIG_USB_SERIAL is not set -# CONFIG_USB_RIO500 is not set -# CONFIG_USB_AUERSWALD is not set -# CONFIG_USB_TIGL is not set -# CONFIG_USB_BRLVGER is not set -# CONFIG_USB_LCD is not set +# CONFIG_USB is not set # # Support for USB gadgets @@ -1096,8 +998,7 @@ CONFIG_BLUEZ_BNEP_PROTO_FILTER=y # # Bluetooth device drivers # -CONFIG_BLUEZ_HCIUSB=m -CONFIG_BLUEZ_HCIUSB_SCO=y +# CONFIG_BLUEZ_HCIUSB is not set CONFIG_BLUEZ_HCIUART=m CONFIG_BLUEZ_HCIUART_H4=y CONFIG_BLUEZ_HCIUART_BCSP=y @@ -1114,7 +1015,7 @@ CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y # CONFIG_CROSSCOMPILE=y # CONFIG_RUNTIME_DEBUG is not set -# CONFIG_REMOTE_DEBUG is not set +# CONFIG_KGDB is not set # CONFIG_GDB_CONSOLE is not set # CONFIG_DEBUG_INFO is not set CONFIG_MAGIC_SYSRQ=y