add updates for atheros SOC support from Mike A., thx

SVN-Revision: 2866
2006-01-09 16:03:36 +00:00 · 2006-01-09 16:03:36 +00:00 · ab551ba31e
parent 2647efdaab
commit ab551ba31e
7 changed files with 10558 additions and 6649 deletions
--- a/openwrt/target/linux/Config.in
+++ b/openwrt/target/linux/Config.in
@ -364,6 +364,7 @@ config BR2_PACKAGE_KMOD_IDE
 	prompt "kmod-ide.......................... IDE support"
 	tristate
 	default m
+	depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
 	help
 	  Kernel modules for IDE support
 	  useful for usb mass storage devices (e.g. on WL-HDD)
@ -450,6 +451,7 @@ comment "Multimedia devices support"
 config BR2_PACKAGE_KMOD_PWC
 	prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m

 config BR2_PACKAGE_KMOD_SOUNDCORE
@ -519,6 +521,7 @@ comment "Network devices support"
 config BR2_PACKAGE_KMOD_NET_3C59X
 	prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 	help
 	  This option enables driver support for a large number of 10mbps and 
@ -533,6 +536,7 @@ config BR2_PACKAGE_KMOD_NET_3C59X
 config BR2_PACKAGE_KMOD_NET_8139TOO
 	prompt "kmod-net-8139too.................. RealTek RTL-8139 PCI Fast Ethernet Adapter kernel support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 	help
 	  This is a driver for the Fast Ethernet PCI network cards based on 
@ -541,6 +545,7 @@ config BR2_PACKAGE_KMOD_NET_8139TOO
 config BR2_PACKAGE_KMOD_NET_AIRO
 	prompt "kmod-net-airo..................... Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards kernel support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 	help
 	  This is the standard Linux driver to support Cisco/Aironet ISA and 
@ -572,6 +577,7 @@ config BR2_PACKAGE_KMOD_NET_B44
 config BR2_PACKAGE_KMOD_NET_HERMES
 	prompt "kmod-net-hermes................... Hermes chipset 802.11b support (Orinoco/Prism2/Symbol) kernel support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 	help
 	  A driver for 802.11b wireless cards based based on the "Hermes" or 
@ -612,6 +618,7 @@ config BR2_PACKAGE_KMOD_NET_HERMES_PLX
 config BR2_PACKAGE_KMOD_NET_NATSEMI
 	prompt "kmod-net-natsemi.................. National Semiconductor DP8381x series PCI Ethernet kernel support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 	help
 	  This driver is for the National Semiconductor DP83810 series, 
@ -621,6 +628,7 @@ config BR2_PACKAGE_KMOD_NET_NATSEMI
 config BR2_PACKAGE_KMOD_NET_PRISM54
 	prompt "kmod-net-prism54.................. Intersil Prism GT/Duette/Indigo PCI/PCMCIA cards kernel support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m
 	help
 	  Enable PCI and Cardbus support for the following chipset based cards: 
@ -662,6 +670,7 @@ config BR2_PACKAGE_KMOD_PCMCIA_CORE
 	prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support"
 	depends BR2_LINUX_PCMCIA_SUPPORT
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m

 config BR2_PACKAGE_KMOD_PCMCIA_SERIAL
@ -675,6 +684,7 @@ comment "USB support"
 config BR2_PACKAGE_KMOD_USB
 	prompt "kmod-usb-core..................... USB support"
 	tristate
+	default n if BR2_LINUX_2_4_AR531X
 	default m

 config BR2_PACKAGE_KMOD_USB_UHCI
@ -785,6 +795,7 @@ config BR2_PACKAGE_KMOD_BLUETOOTH
 	prompt "kmod-bluetooth.................... Bluetooth drivers and network stack"
 	tristate
 	default m
+	default n if BR2_LINUX_2_4_AR531X
 	help
 	  Bluetooth drivers and network stack

--- a/openwrt/target/linux/image/squashfs.mk
+++ b/openwrt/target/linux/image/squashfs.mk
@ -1,3 +1,10 @@
+ifeq ($(BR2_LINUX_2_4_AR531X),)
+        endian := be
+else
+        endian := le
+endif
+
+
 squashfs-prepare:
 	$(MAKE) -C squashfs prepare $(MAKE_TRACE)

@ -10,7 +17,7 @@ squashfs-clean:

 $(KDIR)/root.squashfs: install-prepare
 	@mkdir -p $(KDIR)/root/jffs
-	$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -le $(MAKE_TRACE)
+	$(STAGING_DIR)/bin/mksquashfs-lzma $(KDIR)/root $@ -nopad -noappend -root-owned -$(endian) $(MAKE_TRACE)
 	
 ifeq ($(IB),)
 squashfs-install: compile-targets $(BOARD)-compile
--- a/openwrt/target/linux/linux-2.4/config/ar531x
+++ b/openwrt/target/linux/linux-2.4/config/ar531x
@ -88,6 +88,8 @@ CONFIG_NEW_IRQ=y
 CONFIG_NEW_TIME_C=y
 CONFIG_NONCOHERENT_IO=y
 CONFIG_EARLY_PRINTK_HACK=y
+CONFIG_VENETDEV=y
+CONFIG_MARVELL_ENET_PHY=y
 # CONFIG_SCSI is not set

 #
@ -126,7 +128,7 @@ CONFIG_CPU_VR41XX=y
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_16KB is not set
 # CONFIG_PAGE_SIZE_64KB is not set
-# CONFIG_CPU_ADVANCED is not set
+CONFIG_CPU_ADVANCED=y
 # CONFIG_CPU_HAS_LLSC is not set
 # CONFIG_CPU_HAS_LLDSCD is not set
 # CONFIG_CPU_HAS_WB is not set
@ -285,8 +287,9 @@ CONFIG_PARPORT=m
 # CONFIG_BLK_DEV_SX8 is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_NBD=m
-# CONFIG_BLK_DEV_RAM is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=3072
+CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_STATS is not set

 #
@ -596,8 +599,6 @@ CONFIG_NET_RANDOM=y
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
-# CONFIG_VENETDEV is not set
-CONFIG_MARVELL_ENET_PHY=y
 # CONFIG_SUNLANCE is not set
 # CONFIG_SUNBMAC is not set
 # CONFIG_SUNQE is not set
--- a/openwrt/target/linux/linux-2.4/patches/ar531x/000-atheros-support.patch
+++ b/openwrt/target/linux/linux-2.4/patches/ar531x/000-atheros-support.patch
--- a/openwrt/target/linux/linux-2.4/patches/ar531x/001-ar531x-ethernet.patch
+++ b/openwrt/target/linux/linux-2.4/patches/ar531x/001-ar531x-ethernet.patch
--- a/openwrt/target/linux/package/alsa/Config.in
+++ b/openwrt/target/linux/package/alsa/Config.in
@ -2,6 +2,7 @@ config BR2_PACKAGE_KMOD_ALSA
 	prompt "kmod-alsa......................... Alsa Sound Drivers"
 	tristate
 	default m if CONFIG_DEVEL
+        depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM
 	depends BR2_PACKAGE_KMOD_USB_CONTROLLER
 	select BR2_PACKAGE_KMOD_SOUNDCORE
 	help
--- a/openwrt/target/linux/package/madwifi/Makefile
+++ b/openwrt/target/linux/package/madwifi/Makefile
@ -28,6 +28,14 @@ ifeq ($(ARCH),i386)
 HAL_TARGET:=i386-elf
 endif

+ifneq ($(BR2_LINUX_2_4_AR531X),)
+	BUS := AHB
+	bus := ahb
+else
+	BUS := PCI
+	bus := pci
+endif
+
 include $(TOPDIR)/package/rules.mk

 $(eval $(call PKG_template,KMOD_MADWIFI,kmod-madwifi,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE))))
@ -42,7 +50,9 @@ $(PKG_BUILD_DIR)/.built:
 		CROSS_COMPILE="$(TARGET_CROSS)" \
 		TARGET="$(HAL_TARGET)" \
 		TOOLPREFIX="$(KERNEL_CROSS)" \
+		TOOLPATH="$(KERNEL_CROSS)" \
 		KERNELPATH="$(KERNEL_DIR)" \
+		BUS="$(BUS)" \
 		all
 	touch $@

@ -54,7 +64,7 @@ $(IPKG_KMOD_MADWIFI):
 	install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi
 	cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(LINUX_KMOD_SUFFIX) \
 		$(PKG_BUILD_DIR)/ath_hal/ath_hal.$(LINUX_KMOD_SUFFIX) \
-		$(PKG_BUILD_DIR)/ath/ath_pci.$(LINUX_KMOD_SUFFIX) \
+		$(PKG_BUILD_DIR)/ath/ath_$(bus).$(LINUX_KMOD_SUFFIX) \
 		$(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(LINUX_KMOD_SUFFIX) \
 		$(PKG_BUILD_DIR)/net80211/*.$(LINUX_KMOD_SUFFIX) \
 		$(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/