From 2f5e1d4358ba6d765b6e3aa96beccc7a0700323f Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Wed, 7 Sep 2011 12:14:00 +0000 Subject: [PATCH] arm-kernel: config and modulbuild for arm. --- config/kernel/kernel.config.arm-ipfire | 22 +++++++++++----------- lfs/compat-wireless | 6 ++++++ lfs/linux | 2 ++ make.sh | 23 +++++++++++++---------- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/config/kernel/kernel.config.arm-ipfire b/config/kernel/kernel.config.arm-ipfire index 1603d66e15..fc29fd7cf8 100644 --- a/config/kernel/kernel.config.arm-ipfire +++ b/config/kernel/kernel.config.arm-ipfire @@ -764,7 +764,7 @@ CONFIG_KS959_DONGLE=m # CONFIG_USB_IRDA=m CONFIG_SIGMATEL_FIR=m -CONFIG_TOSHIBA_FIR=m +# CONFIG_TOSHIBA_FIR is not set CONFIG_VLSI_FIR=m CONFIG_MCS_FIR=m CONFIG_BT=m @@ -1035,7 +1035,7 @@ CONFIG_SCSI_BNX2_ISCSI=m CONFIG_BE2ISCSI=m CONFIG_BLK_DEV_3W_XXXX_RAID=m CONFIG_SCSI_3W_9XXX=m -CONFIG_SCSI_ACARD=m +# CONFIG_SCSI_ACARD is not set CONFIG_SCSI_AACRAID=m CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=253 @@ -1057,7 +1057,7 @@ CONFIG_SCSI_AIC94XX=m CONFIG_SCSI_MVSAS=m CONFIG_SCSI_MVSAS_DEBUG=y CONFIG_SCSI_DPT_I2O=m -CONFIG_SCSI_ADVANSYS=m +# CONFIG_SCSI_ADVANSYS is not set CONFIG_SCSI_ARCMSR=m CONFIG_MEGARAID_NEWGEN=y CONFIG_MEGARAID_MM=m @@ -1095,7 +1095,7 @@ CONFIG_SCSI_QLA_ISCSI=m CONFIG_SCSI_LPFC=m CONFIG_SCSI_DC395x=m CONFIG_SCSI_DC390T=m -CONFIG_SCSI_NSP32=m +# CONFIG_SCSI_NSP32 is not set # CONFIG_SCSI_DEBUG is not set CONFIG_SCSI_PMCRAID=m # CONFIG_SCSI_SRP is not set @@ -1111,7 +1111,7 @@ CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m -CONFIG_SCSI_OSD_INITIATOR=m +# CONFIG_SCSI_OSD_INITIATOR is not set CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_OSD_DPRINT_SENSE=1 # CONFIG_SCSI_OSD_DEBUG is not set @@ -1267,7 +1267,7 @@ CONFIG_NET_ETHERNET=y CONFIG_MII=m # CONFIG_AX88796 is not set CONFIG_HAPPYMEAL=m -CONFIG_SUNGEM=m +# CONFIG_SUNGEM is not set CONFIG_CASSINI=m CONFIG_NET_VENDOR_3COM=y CONFIG_VORTEX=m @@ -1302,7 +1302,7 @@ CONFIG_NET_PCI=y CONFIG_PCNET32=m CONFIG_AMD8111_ETH=m CONFIG_ADAPTEC_STARFIRE=m -CONFIG_B44=m +# CONFIG_B44 is not set CONFIG_B44_PCI_AUTOSELECT=y CONFIG_B44_PCICORE_AUTOSELECT=y CONFIG_B44_PCI=y @@ -1522,7 +1522,7 @@ CONFIG_ATM_FORE200E=m CONFIG_ATM_FORE200E_USE_TASKLET=y CONFIG_ATM_FORE200E_TX_RETRY=16 CONFIG_ATM_FORE200E_DEBUG=0 -CONFIG_ATM_HE=m +# CONFIG_ATM_HE is not set CONFIG_ATM_HE_USE_SUNI=y CONFIG_ATM_SOLOS=m CONFIG_IEEE802154_DRIVERS=m @@ -2246,7 +2246,7 @@ CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_TTM=m CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON is not set CONFIG_DRM_MGA=m CONFIG_DRM_VIA=m CONFIG_DRM_SAVAGE=m @@ -2310,7 +2310,7 @@ CONFIG_FB_ATY_CT=y CONFIG_FB_ATY_GX=y CONFIG_FB_ATY_BACKLIGHT=y CONFIG_FB_S3=m -CONFIG_FB_SAVAGE=m +# CONFIG_FB_SAVAGE is not set CONFIG_FB_SAVAGE_I2C=y CONFIG_FB_SAVAGE_ACCEL=y CONFIG_FB_SIS=m @@ -2555,7 +2555,7 @@ CONFIG_USB_EHCI_HCD=m CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m # CONFIG_USB_ISP1760_HCD is not set -CONFIG_USB_ISP1362_HCD=m +# CONFIG_USB_ISP1362_HCD is not set CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 71f3bc9f31..cd8002c3fd 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -97,6 +97,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # Build Updated asix usb-lan driver cd $(DIR_APP)/drivers/net/usb && tar xvf $(DIR_DL)/asix-3.5.0a.tar.bz2 +ifeq "$(MACHINE)" "arm" + # B43+B44 driver doesn't build on arm + cd $(DIR_APP) && sed -i -e "s|CONFIG_B43=m||g" config.mk + cd $(DIR_APP) && sed -i -e "s|CONFIG_B44=m||g" config.mk +endif + cd $(DIR_APP) && make KLIB=/lib/modules/$(KVER)-$(VERSUFIX) \ KMODPATH_ARG='INSTALL_MOD_PATH=' KMODDIR=kernel install-modules diff --git a/lfs/linux b/lfs/linux index 62475ee049..fe3f33cee5 100644 --- a/lfs/linux +++ b/lfs/linux @@ -235,9 +235,11 @@ endif rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN +ifneq "$(MACHINE)" "arm" # Disable geode_aes modul mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko \ /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/crypto/geode-aes.ko.off +endif endif @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-* diff --git a/make.sh b/make.sh index c9ef62a410..b3970520f8 100755 --- a/make.sh +++ b/make.sh @@ -407,28 +407,31 @@ buildipfire() { fi # Default kernel build - #ipfiremake linux + ipfiremake linux ipfiremake v4l-dvb - # Virtualization helpers are only available for x86. if [ "${MACHINE}" != "arm" ]; then + # Virtualization helpers are only available for x86. ipfiremake kqemu ipfiremake kvm-kmod + #unsupported arch (armv5) + ipfiremake madwifi + #todo enable alsa driver in kernel config + ipfiremake alsa KMOD=1 + #undefined declaration in echo canceler try to fix later + ipfiremake mISDN fi - #ipfiremake madwifi - #ipfiremake alsa KMOD=1 - #ipfiremake mISDN ipfiremake dahdi KMOD=1 ipfiremake cryptodev - #ipfiremake compat-wireless + ipfiremake compat-wireless # ipfiremake r8169 # ipfiremake r8168 # ipfiremake r8101 - #ipfiremake e1000 - #ipfiremake e1000e - #ipfiremake igb + ipfiremake e1000 + ipfiremake e1000e + ipfiremake igb ipfiremake pkg-config - #ipfiremake linux-atm + ipfiremake linux-atm ipfiremake cpio installmake strip -- 2.39.2