[rootfs-stage32] Sort kernel modules in .conf, delete REQUIRED_FIRMWARE

1 files changed, 52 insertions, 166 deletions

diff --git a/core/rootfs/rootfs-stage32/module.conf b/core/rootfs/rootfs-stage32/module.conf
index 41afc704..9fad7527 100644
--- a/core/rootfs/rootfs-stage32/module.conf
+++ b/core/rootfs/rootfs-stage32/module.conf
@@ -93,185 +93,71 @@ REQUIRED_DIRECTORIES="
 	/$LIB64
 "
 REQUIRED_KERNEL_MODULES="
+	kernel/arch
+	kernel/crypto
+	kernel/drivers/acpi
+	kernel/drivers/ata
+	kernel/drivers/atm
+	kernel/drivers/auxdisplay
+	kernel/drivers/bcma
+	kernel/drivers/block
+	kernel/drivers/bluetooth
+	kernel/drivers/char
 	kernel/drivers/cpufreq
-	kernel/drivers/memstick
-	kernel/drivers/mfd
+	kernel/drivers/crypto
+	kernel/drivers/dca
+	kernel/drivers/dma
+	kernel/drivers/edac
+	kernel/drivers/firewire
+	kernel/drivers/firmware
 	kernel/drivers/gpio
-	kernel/drivers/block
-	kernel/drivers/uwb
-	kernel/drivers/w1
-	kernel/drivers/regulator
+	kernel/drivers/hid
+	kernel/drivers/hv
+	kernel/drivers/i2c
+	kernel/drivers/idle
+	kernel/drivers/input
 	kernel/drivers/leds
-	kernel/drivers/firmware
-	kernel/drivers/watchdog
+	kernel/drivers/md
+	kernel/drivers/media/common
 	kernel/drivers/media/rc
 	kernel/drivers/media/video
-	kernel/drivers/media/common
+	kernel/drivers/memstick
+	kernel/drivers/message
+	kernel/drivers/mfd
+	kernel/drivers/misc
 	kernel/drivers/mmc
-	kernel/drivers/staging
-	kernel/drivers/firewire
-	kernel/drivers/bluetooth
-	kernel/drivers/power
-	kernel/drivers/video
-	kernel/drivers/uio
-	kernel/drivers/md
-	kernel/drivers/virtio
-	kernel/drivers/pci
-	kernel/drivers/acpi
-	kernel/drivers/input
-	kernel/drivers/ssb
-	kernel/drivers/spi
-	kernel/drivers/crypto
-	kernel/drivers/bcma
+	kernel/drivers/net/macvtap.ko
+	kernel/drivers/net/veth.ko
+	kernel/drivers/net/vxlan.ko
 	kernel/drivers/nfc
-	kernel/drivers/usb
-	kernel/drivers/char
-	kernel/drivers/vhost
-	kernel/drivers/i2c
-	kernel/drivers/ata
-	kernel/drivers/tty
+	kernel/drivers/nvme
 	kernel/drivers/parport
-	kernel/drivers/misc
+	kernel/drivers/pci
+	kernel/drivers/platform
+	kernel/drivers/power
+	kernel/drivers/pps
+	kernel/drivers/regulator
+	kernel/drivers/rtc
 	kernel/drivers/scsi
-	kernel/drivers/nvme
-	kernel/drivers/message
-	kernel/drivers/auxdisplay
+	kernel/drivers/spi
+	kernel/drivers/ssb
+	kernel/drivers/staging
 	kernel/drivers/target
-	kernel/drivers/dca
-	kernel/drivers/dma
-	kernel/drivers/rtc
-	kernel/drivers/pps
-	kernel/drivers/hid
-	kernel/drivers/atm
-	kernel/drivers/platform
-	kernel/drivers/edac
-	kernel/drivers/hv
-	kernel/drivers/idle
+	kernel/drivers/tty
+	kernel/drivers/uio
+	kernel/drivers/usb
+	kernel/drivers/uwb
+	kernel/drivers/vhost
+	kernel/drivers/video
+	kernel/drivers/virtio
+	kernel/drivers/w1
+	kernel/drivers/watchdog
 	kernel/drivers/xen
-	kernel/ubuntu/aufs
-	kernel/arch
-	kernel/lib
 	kernel/fs
-	kernel/crypto
+	kernel/fs/autofs4/autofs4
+	kernel/lib
 	kernel/net
 	kernel/sound
-	kernel/fs/autofs4/autofs4
-	kernel/drivers/net/macvtap.ko
-	kernel/drivers/net/veth.ko
-	kernel/drivers/net/vxlan.ko
+	kernel/ubuntu/aufs
 	kernel/virt
 "
-REQUIRED_FIRMWARE="
-	3com
-	acenic
-	adaptec
-	advansys
-	ar3k
-	asihpi
-	av7110
-	bnx2
-	bnx2x
-	brcm
-	cis
-	cpia2
-	cxgb3
-	cxgb4
-	dabusb
-	dsp56k
-	e100
-	ea
-	edgeport
-	emi26
-	emi62
-	ene-ub6250
-	ess
-	hp
-	isci
-	kaweth
-	keyspan
-	keyspan_pda
-	korg
-	libertas
-	matrox
-	mrvl
-	mwl8k
-	ositech
-	r128
-	radeon
-	RTL8192E
-	RTL8192SE
-	rtl_nic
-	sb16
-	scripts
-	slicoss
-	sun
-	sxg
-	tehuti
-	ti-connectivity
-	tigon
-	ttusb-budget
-	ueagle-atm
-	usbdux
-	vicam
-	vxge
-	yam
-	yamaha
-	agere_ap_fw.bin
-	agere_sta_fw.bin
-	aic94xx-seq.fw
-	ath3k-1.fw
-	atmel_at76c502_3com.bin
-	atmel_at76c502.bin
-	atmel_at76c502d.bin
-	atmel_at76c502e.bin
-	atmel_at76c504_2958.bin
-	atmel_at76c504a_2958.bin
-	atmel_at76c504.bin
-	atmel_at76c506.bin
-	atmsar11.fw
-	carl9170-1.fw
-	f2255usb.bin
-	GPL-3
-	htc_7010.fw
-	htc_9271.fw
-	i2400m-fw-usb-1.4.sbcf
-	i2400m-fw-usb-1.5.sbcf
-	i6050-fw-usb-1.5.sbcf
-	intelliport2.bin
-	lbtf_usb.bin
-	lgs8g75.fw
-	mts_cdma.fw
-	mts_edge.fw
-	mts_gsm.fw
-	mts_mt9234mu.fw
-	mts_mt9234zba.fw
-	mwl8335_duplex.fw
-	NPE-B
-	NPE-C
-	phanfw.bin
-	rt2561.bin
-	rt2561s.bin
-	rt2661.bin
-	rt2860.bin
-	rt2870.bin
-	rt3070.bin
-	rt3071.bin
-	rt3090.bin
-	rt73.bin
-	s2250.fw
-	s2250_loader.fw
-	TDA7706_OM_v2.5.1_boot.txt
-	TDA7706_OM_v3.0.2_boot.txt
-	ti_3410.fw
-	ti_5052.fw
-	tlg2300_firmware.bin
-	tr_smctr.bin
-	usbduxfast_firmware.bin
-	usbdux_firmware.bin
-	usbduxsigma_firmware.bin
-	vntwusb.fw
-	WHENCE.ubuntu
-	whiteheat.fw
-	whiteheat_loader.fw
-"
-