Przeglądaj źródła

some kernel abstraction layer fixes, partially for ibm x40 bootup

Waldemar Brodkorb 10 lat temu
rodzic
commit
2ba976bcf2

+ 0 - 1
TODO

@@ -27,5 +27,4 @@ new or update packages:
 - lms perl 
 
 system target specific:
-- fix ibm x40 bootup
 - microblaze: add cfgfs partition to dts, add partition to spartan dts

+ 2 - 1
target/config/Config.in

@@ -429,7 +429,8 @@ config ADK_TARGET_CMDLINE
 	default "console=ttymxc0,115200 console=tty0" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_VGA
 	default "console=tty0 console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I && ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40
+	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA
+	default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP

+ 3 - 0
target/linux/config/Config.in.aufs

@@ -1,3 +1,5 @@
+menu "Overlay filesystems"
+
 config ADK_KERNEL_AUFS_FS
 	prompt "Aufs (Advanced multi layered unification filesystem) support"
 	tristate
@@ -89,3 +91,4 @@ config ADK_KERNEL_AUFS_DEBUG
 	  It will have a negative impact to the performance.
 
 endif
+endmenu

+ 9 - 0
target/linux/config/Config.in.block

@@ -88,6 +88,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
 	boolean
 
 config ADK_KERNEL_ATA_PIIX
+	prompt "ATA PIIX support"
 	tristate
 	select ADK_KERNEL_SCSI
 	select ADK_KERNEL_SCSI_DMA
@@ -96,6 +97,8 @@ config ADK_KERNEL_ATA_PIIX
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
+	default y if ADK_TARGET_SYSTEM_IBM_X40
+	default n
 
 config ADK_KERNEL_SCSI_SYM53C8XX_2
 	tristate
@@ -149,6 +152,7 @@ config ADK_KERNEL_PATA_IMX
 	select ADK_KERNEL_AHCI_IMX
 	select ADK_KERNEL_SATA_PMP
 	select ADK_KERNEL_SATA_AHCI_PLATFORM
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 
@@ -161,6 +165,7 @@ config ADK_KERNEL_PATA_PXA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
 	select ADK_KERNEL_PATA_PCMCIA
+	depends on ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default n
 
@@ -171,6 +176,7 @@ config ADK_KERNEL_MMC_AT91
 	select ADK_KERNEL_MMC_BLOCK
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
+	depends on ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default n
 
@@ -185,6 +191,7 @@ config ADK_KERNEL_MMC_SDHCI_BCM2708
 	select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
 	select ADK_KERNEL_MMC_SDHCI_PLTFM
 	select ADK_KERNEL_MMC_SDHCI_BCM2708_DMA
+	depends on ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default n
 
@@ -205,6 +212,7 @@ config ADK_KERNEL_MMC_SDHCI_ESDHC_IMX
 	select ADK_KERNEL_MMC_SDHCI_IO_ACCESSORS
 	select ADK_KERNEL_MMC_SDHCI_PLTFM
 	select ADK_KERNEL_MMC_UNSAFE_RESUME
+	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	default y if ADK_TARGET_SYSTEM_CUBOX_I
 	default n
 
@@ -217,6 +225,7 @@ config ADK_KERNEL_PATA_RB532
 	select ADK_KERNEL_ATA_BMDMA
 	select ADK_KERNEL_BLK_DEV
 	select ADK_KERNEL_BLK_DEV_SD
+	depends on ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default y if ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	default n
 

+ 29 - 15
target/linux/config/Config.in.fs

@@ -11,9 +11,6 @@ config ADK_KERNEL_EXPORTFS
 	boolean
 	default y
 
-config ADK_KERNEL_YAFFS_FS
-	tristate
-
 config ADK_KERNEL_YAFFS_YAFFS1
 	boolean
 
@@ -56,19 +53,8 @@ config ADK_KERNEL_JFFS2_ZLIB
 	boolean
 	default n
 
-config ADK_KERNEL_JFFS2_FS
-	tristate
-	prompt "JFFS2 filesystem"
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
-	select ADK_KERNEL_JFFS2_ZLIB
+menu "Filesystems"
 
-config ADK_KERNEL_SQUASHFS
-	prompt "SquashFS filesystem"
-	tristate
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_SQUASHFS_XZ
-	default n
 
 config ADK_KERNEL_EXT2_FS
 	prompt "EXT2 filesystem support"
@@ -244,6 +230,33 @@ config ADK_KERNEL_UDF_FS
 	  if written to by other UDF utilities, such as DirectCD.
 	  Please read <file:Documentation/filesystems/udf.txt>.
 
+config ADK_KERNEL_JFFS2_FS
+	tristate
+	prompt "JFFS2 filesystem"
+	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
+	select ADK_KERNEL_JFFS2_ZLIB
+
+config ADK_KERNEL_SQUASHFS
+	prompt "SquashFS filesystem"
+	tristate
+	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_SQUASHFS_XZ
+	default n
+
+config ADK_KERNEL_YAFFS_FS
+	prompt "YAFFS2 filesystem"
+	select ADK_KERNEL_YAFFS_YAFFS1
+	select ADK_KERNEL_YAFFS_YAFFS2
+	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
+	select ADK_KERNEL_YAFFS_SHORT_NAMES_IN_RAM
+	tristate
+	help
+	  YAFFS2 filesystem for NAND devices
+
+endmenu
+
+menu "Filesystem features"
 config ADK_KERNEL_INOTIFY
 	prompt "Inotify file change notification support"
 	boolean
@@ -266,6 +279,7 @@ config ADK_KERNEL_INOTIFY_USER
 	  directories via a single open fd.  Events are read from the file
 	  descriptor, which is also select()- and poll()-able.
 
+endmenu
 source target/linux/config/Config.in.fsnet
 source target/linux/config/Config.in.nls
 source target/linux/config/Config.in.aufs

+ 3 - 0
target/linux/config/Config.in.fsnet

@@ -1,3 +1,5 @@
+menu "Network filesystems"
+
 config ADK_KERNEL_FS_POSIX_ACL
 	boolean
 	default y
@@ -172,3 +174,4 @@ config ADK_KERNEL_RPCSEC_GSS_KRB5
 	default n
 	help
 
+endmenu

+ 2 - 1
target/linux/config/Config.in.graphics

@@ -16,6 +16,7 @@ config ADK_KERNEL_VT_CONSOLE
 config ADK_KERNEL_VGA_CONSOLE
 	boolean
 	default y if ADK_HARDWARE_VBOX
+	default y if ADK_TARGET_SYSTEM_IBM_X40
 	default n
 
 config ADK_KERNEL_FONTS
@@ -196,7 +197,7 @@ config ADK_KERNEL_FB_BCM2708
 	 Framebuffer support for Raspberry PI.
 
 config ADK_HARDWARE_GRAPHICS_INTEL_I915
-	prompt "Support for Intel graphic cards (AGP/DRM/KMS/NM10)"
+	prompt "Support for Intel graphic cards (AGP/DRM/KMS)"
 	boolean
 	select ADK_KERNEL_FB
 	select ADK_KERNEL_DRM

+ 1 - 0
target/linux/config/Config.in.input

@@ -104,6 +104,7 @@ config ADK_KERNEL_LOGITECH_DINOVO
 	boolean
 	select ADK_KERNEL_HID_LOGITECH
 	select ADK_KERNEL_HID_LOGITECH_DJ
+	depends on ADK_KERNEL_USB_HID
 	default n
 	help
 	  Support for Logitech DiNovo keyboard/mouse combination.

+ 1 - 1
target/x86/sys-available/ibm-x40

@@ -7,10 +7,10 @@ config ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_TARGET_CPU_WITH_SSE
 	select ADK_TARGET_CPU_WITH_SSE2
 	select ADK_TARGET_CPU_WITH_MTRR
+	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_WITH_CARDBUS
 	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_MINIPCI