optimize shuttle and ibmx40 hardware profile

scripts/install.sh

@@ -125,7 +125,7 @@ EOF
 	--grub-setup=./bin/tools/sbin/grub-setup \
 	--grub-mkimage=./bin/tools/bin/grub-mkimage \
 	--grub-mkdevicemap=./bin/tools/sbin/grub-mkdevicemap \
-	--no-floppy --root-directory=$tmp $1
+	--no-floppy --modules=ext2 --root-directory=$tmp $1
 umount $tmp
 printf "Successfully installed.\n"
 rm -rf $tmp

target/Config.in

@@ -695,8 +695,8 @@ config ADK_TARGET_ROOTFS_NFSROOT
 
 config ADK_TARGET_ROOTFS_USB
 	bool "Boot from USB stick"
+	select ADK_KERNEL_NLS
 	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_USB
 	select ADK_KERNEL_USB_EHCI_HCD

target/Config.in.x86

@@ -2,7 +2,7 @@ choice
 depends on ADK_LINUX_X86
 prompt "Hardware model"
 
-config ADK_HARDWARE_GENERIC
+config ADK_HARDWARE_GENERIC_X86
 	bool "Generic x86 system (i686)"
 	select ADK_CPU_I686
 	help
@@ -17,13 +17,6 @@ config ADK_HARDWARE_IBMX40
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_HDD
-	select ADK_KERNEL_NLS
-	select ADK_KERNEL_EXT2_FS
-	select ADK_KERNEL_SCSI
-	select ADK_KERNEL_ATA
-	select ADK_KERNEL_BLK_DEV_SD
-	select ADK_KERNEL_INPUT_KEYBOARD
-	select ADK_KERNEL_SWAP
 	help
          Hardware profile for IBM X40 laptop's.
 

target/Config.in.x86_64

@@ -2,7 +2,7 @@ choice
 depends on ADK_LINUX_X86_64
 prompt "Hardware model"
 
-config ADK_HARDWARE_GENERIC
+config ADK_HARDWARE_GENERIC_X86_64
 	bool "Generic x86_64/amd64 system"
 	help
 	  Generic x86_64/amd64 system.

target/linux/config/Config.in.block

@@ -50,6 +50,7 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_ATA
 	select ADK_KERNEL_ATA_SFF
 	select ADK_KERNEL_BLK_DEV_SD
+	default y if ADK_HARDWARE_IBMX40
 	default y if ADK_HARDWARE_QEMU_X86
 	default y if ADK_HARDWARE_QEMU_X86_64
 	default n

target/linux/config/Config.in.input

@@ -2,19 +2,35 @@ menu "Input devices"
 depends on ADK_TARGET_WITH_USB || ADK_TARGET_WITH_INPUT
 
 config ADK_KERNEL_INPUT
-	bool
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
 	default n
 
 config ADK_KERNEL_INPUT_KEYBOARD
-	bool
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
+	default n
+
+config ADK_KERNEL_KEYBOARD_ATKBD
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
+	default n
+
+config ADK_KERNEL_INPUT_MOUSEDEV
+	boolean
+	default y if ADK_HARDWARE_IBMX40
+	default y if ADK_HARDWARE_SHUTTLE
 	default n
 
 config ADK_KERNEL_HID_SUPPORT
-	bool
+	boolean
 	default n
 
 config ADK_KERNEL_HID
-	bool
+	boolean
 	select ADK_KERNEL_HID_SUPPORT
 	default n
 
@@ -37,14 +53,14 @@ config ADK_KPACKAGE_KMOD_KEYBOARD_ATKBD
 
 config ADK_KPACKAGE_KMOD_INPUT_MOUSEDEV
 	prompt "kmod-input-mouse................. Mouse support (PS/2)"
-	select ADK_KERNEL_INPUT
 	tristate
+	select ADK_KERNEL_INPUT
 	default n
 
 config ADK_KPACKAGE_KMOD_INPUT_EVDEV
 	prompt "kmod-input-evdev................. Event support"
-	select ADK_KERNEL_INPUT
 	tristate
+	select ADK_KERNEL_INPUT
 	default n
 
 endmenu

target/linux/config/Config.in.netdevice

@@ -139,18 +139,6 @@ config ADK_KERNEL_ATH_COMMON
 config ADK_KPACKAGE_KMOD_P54_COMMON
 	tristate
 
-config ADK_MOD_KERNEL_MAC80211
-	tristate
-	select ADK_MOD_KERNEL_CFG80211
-	select ADK_MOD_KERNEL_LIB80211
-	select ADK_KPACKAGE_KMOD_CRYPTO_AES
-	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
-	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
-	select ADK_KERNEL_CRC32
-	select ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_WLAN_80211
-	default n
-
 config ADK_KERNEL_MAC80211_DEBUG_MENU
 	boolean
 
@@ -161,39 +149,31 @@ config ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 config ADK_KERNEL_MAC80211_DEBUGFS
 	boolean
 
-menu "Wireless card support"
-depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB
-
 config ADK_KPACKAGE_KMOD_MAC80211
-	prompt "kmod-mac80211.................. mac80211 softmac"
 	tristate
+	select ADK_KERNEL_WIRELESS
+	select ADK_KERNEL_WLAN_80211
 	select ADK_MOD_KERNEL_CFG80211
 	select ADK_MOD_KERNEL_LIB80211
 	select ADK_KPACKAGE_KMOD_CRYPTO_AES
 	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
 	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
-	select ADK_KERNEL_WIRELESS
-	select ADK_KERNEL_WLAN_80211
-	select ADK_KERNEL_CRC32
-	default y if ADK_HARDWARE_IBMX40
-	default n
 
 config ADK_DEBUG_MAC80211
 	boolean
-	prompt "enable verbose debugging messages in mac80211"
 	select ADK_KERNEL_MAC80211_VERBOSE_DEBUG
 	select ADK_KERNEL_MAC80211_DEBUGFS
 	select ADK_KERNEL_DEBUG_FS
-	depends on ADK_KPACKAGE_KMOD_MAC80211
-	default n
-	help
+
+menu "Wireless card support"
+depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI || ADK_TARGET_WITH_USB || ADK_TARGET_WITH_SSB
 
 config ADK_KPACKAGE_KMOD_ATH5K
 	prompt "kmod-ath5k................... Atheros 5xxx wireless cards"
 	tristate
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KERNEL_ATH_COMMON
-	depends on ADK_KPACKAGE_KMOD_MAC80211
+	select ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default y if ADK_HARDWARE_IBMX40
 	default n
@@ -203,7 +183,7 @@ config ADK_KPACKAGE_KMOD_ATH5K
 config ADK_KERNEL_ATH5K_DEBUG
 	prompt "enable debugging info via debugfs"
 	boolean
-	select ADK_KERNEL_DEBUG_FS
+	select ADK_DEBUG_MAC80211
 	depends on ADK_KPACKAGE_KMOD_ATH5K
 	default n
 	help
@@ -222,7 +202,6 @@ config ADK_KPACKAGE_KMOD_B43
 	prompt "kmod-b43..................... Broadcom B43xx wireless cards"
 	tristate
 	select ADK_KPACKAGE_KMOD_FW_LOADER
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_SSB || ADK_TARGET_WITH_MINIPCI
 	default n
 	help
@@ -231,7 +210,6 @@ config ADK_KPACKAGE_KMOD_B43
 config ADK_KPACKAGE_KMOD_RTL8187
 	prompt "kmod-rtl8187................. Realtek RTL8187/RTL8187B wireless cards"
 	tristate
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	default n
 	help
 	  Driver for Realtek RTL8187/RTL8187B wireless chips.
@@ -242,7 +220,6 @@ config ADK_KPACKAGE_KMOD_P54_USB
 	select ADK_KPACKAGE_KMOD_P54_COMMON
 	select ADK_KPACKAGE_KMOD_FW_LOADER
 	select ADK_PACKAGE_P54_FIRMWARE
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_PACKAGE_KMOD_USB_CONTROLLER
 	default n
 	help
@@ -253,7 +230,6 @@ config ADK_KPACKAGE_KMOD_RT2400PCI
 	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_MAC80211_LEDS
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
 	help
@@ -265,7 +241,6 @@ config ADK_KPACKAGE_KMOD_RT2500PCI
 	tristate
 	select ADK_KERNEL_RT2X00
 	select ADK_KERNEL_MAC80211_LEDS
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
 	help
@@ -279,7 +254,6 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 	select ADK_KERNEL_MAC80211_LEDS
 	select ADK_KPACKAGE_KMOD_CRC_ITU_T
 	select ADK_PACKAGE_RT61_FIRMWARE
-	depends on ADK_KPACKAGE_KMOD_MAC80211
 	depends on ADK_TARGET_WITH_MINIPCI || ADK_TARGET_WITH_PCI
 	default n
 	help
@@ -289,6 +263,7 @@ config ADK_KPACKAGE_KMOD_RT61PCI
 config ADK_KERNEL_RT2X00_DEBUG
 	prompt "enable debugging info"
 	boolean
+	select ADK_DEBUG_MAC80211
 	depends on ADK_KPACKAGE_KMOD_RT61PCI || \
 		ADK_KPACKAGE_KMOD_RT2500PCI || \
 		ADK_KPACKAGE_KMOD_RT2400PCI	

target/tools/grub/patches/nls.patch

@@ -0,0 +1,31 @@
+diff -Nur grub-1.98.orig/include/grub/i18n.h grub-1.98/include/grub/i18n.h
+--- grub-1.98.orig/include/grub/i18n.h	2010-03-06 21:51:37.000000000 +0100
++++ grub-1.98/include/grub/i18n.h	2010-11-18 19:46:58.740685644 +0100
+@@ -24,18 +24,6 @@
+ 
+ extern const char *(*EXPORT_VAR(grub_gettext)) (const char *s);
+ 
+-/* NLS can be disabled through the configure --disable-nls option.  */
+-#if ENABLE_NLS
+-
+-# ifdef GRUB_UTIL
+-
+-#  include <locale.h>
+-#  include <libintl.h>
+-
+-# endif /* GRUB_UTIL */
+-
+-#else /* ! ENABLE_NLS */
+-
+ /* Disabled NLS.
+    The casts to 'const char *' serve the purpose of producing warnings
+    for invalid uses of the value returned from these functions.
+@@ -47,8 +35,6 @@
+ #  define grub_gettext(str) ((const char *) (str))
+ # endif /* GRUB_UTIL */
+ 
+-#endif /* ENABLE_NLS */
+-
+ #ifdef GRUB_UTIL
+ # define _(str) gettext(str)
+ #else

target/x86/Makefile

@@ -9,6 +9,12 @@ include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
 
+$(TOOLS_BUILD_DIR):
+	@mkdir -p $(TOOLS_BUILD_DIR)
+
+tools-compile: $(TOOLS_BUILD_DIR)
+	$(MAKE) -C ../tools/grub prepare compile install
+
 createinitcrypt:
 	$(SED) 's#^CONFIG_INITRAMFS_SOURCE.*#CONFIG_INITRAMFS_SOURCE="./initramfs_list"#' $(LINUX_DIR)/.config
 	echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config
@@ -32,7 +38,7 @@ ifeq ($(ADK_HARDWARE_QEMU_X86),y)
 endif
 endif
 ifeq ($(FS),usb)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+imageinstall: tools-compile $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "To install everything to USB use scripts/install.sh"
 endif

target/x86/kernel.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.36
-# Thu Nov 18 12:56:27 2010
+# Thu Nov 18 19:58:19 2010
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -489,38 +489,9 @@ CONFIG_HAVE_IDE=y
 #
 CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=y
-CONFIG_SCSI_DMA=y
-# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
 # CONFIG_SCSI_NETLINK is not set
-# CONFIG_SCSI_PROC_FS is not set
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-# CONFIG_BLK_DEV_SD is not set
-# 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 is not set
-# CONFIG_CHR_DEV_SCH is not set
-# CONFIG_SCSI_MULTI_LUN is not set
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-# CONFIG_SCSI_SPI_ATTRS is not set
-# CONFIG_SCSI_FC_ATTRS is not set
-# CONFIG_SCSI_ISCSI_ATTRS is not set
-# CONFIG_SCSI_SAS_LIBSAS is not set
-# CONFIG_SCSI_SRP_ATTRS is not set
-# CONFIG_SCSI_LOWLEVEL is not set
-# CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 # CONFIG_FUSION is not set
@@ -675,7 +646,9 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Console display driver support
 #
-# CONFIG_VGA_CONSOLE is not set
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=512
 CONFIG_DUMMY_CONSOLE=y
 # CONFIG_SOUND is not set
 # CONFIG_HID_SUPPORT is not set
@@ -756,34 +729,8 @@ CONFIG_TMPFS=y
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 # CONFIG_CONFIGFS_FS is not set
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-# CONFIG_AFFS_FS is not set
-# CONFIG_HFS_FS is not set
-# CONFIG_HFSPLUS_FS is not set
-# CONFIG_BEFS_FS is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-# CONFIG_LOGFS is not set
-# CONFIG_CRAMFS is not set
-# CONFIG_SQUASHFS is not set
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-# CONFIG_OMFS_FS is not set
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-# CONFIG_UFS_FS is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
-# CONFIG_NFSD is not set
-# CONFIG_SMB_FS is not set
-# CONFIG_CEPH_FS is not set
-# CONFIG_CIFS is not set
-# CONFIG_NCP_FS is not set
-# CONFIG_CODA_FS is not set
-# CONFIG_AFS_FS is not set
+# CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
 
 #
 # Partition Types

target/x86_64/Makefile

@@ -9,6 +9,12 @@ include $(TOPDIR)/mk/image.mk
 
 KERNEL:=$(LINUX_DIR)/arch/x86/boot/bzImage
 
+$(TOOLS_BUILD_DIR):
+	@mkdir -p $(TOOLS_BUILD_DIR)
+
+tools-compile: $(TOOLS_BUILD_DIR)
+	$(MAKE) -C ../tools/grub prepare compile install
+
 ifeq ($(FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
 	@cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel
@@ -22,7 +28,7 @@ ifeq ($(ADK_HARDWARE_QEMU_X86_64),y)
 endif
 endif
 ifeq ($(FS),usb)
-imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
+imageinstall: tools-compile $(BIN_DIR)/$(ROOTFSTARBALL)
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "To install everything to USB use scripts/install.sh"
 endif

target/x86_64/kernel.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.36
-# Thu Nov 18 17:36:07 2010
+# Thu Nov 18 20:10:57 2010
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -439,17 +439,7 @@ CONFIG_RPS=y
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
-CONFIG_WIRELESS=y
-# CONFIG_CFG80211 is not set
-# CONFIG_LIB80211 is not set
-
-#
-# CFG80211 needs to be enabled for MAC80211
-#
-
-#
-# Some wireless drivers require a rate control algorithm
-#
+# CONFIG_WIRELESS is not set
 # CONFIG_WIMAX is not set
 # CONFIG_RFKILL is not set
 # CONFIG_NET_9P is not set
@@ -621,11 +611,7 @@ CONFIG_SSB_POSSIBLE=y
 #
 # Graphics support
 #
-CONFIG_AGP=y
-CONFIG_AGP_AMD64=y
-# CONFIG_AGP_INTEL is not set
-# CONFIG_AGP_SIS is not set
-# CONFIG_AGP_VIA is not set
+# CONFIG_AGP is not set
 # CONFIG_VGA_ARB is not set
 # CONFIG_DRM is not set
 # CONFIG_VGASTATE is not set