Browse Source

build: remove leftover olpc support code

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 45084
Felix Fietkau 10 years ago
parent
commit
b872533e68
2 changed files with 4 additions and 20 deletions
  1. 4 4
      config/Config-images.in
  2. 0 16
      package/kernel/linux/modules/sound.mk

+ 4 - 4
config/Config-images.in

@@ -186,7 +186,7 @@ menu "Target Images"
 
 
 	config GRUB_IMAGES
 	config GRUB_IMAGES
 		bool "Build GRUB images (Linux x86 or x86_64 host only)"
 		bool "Build GRUB images (Linux x86 or x86_64 host only)"
-		depends on TARGET_x86_64 || (TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc))
+		depends on TARGET_x86_64 || (TARGET_x86 && !TARGET_x86_rdc)
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		select PACKAGE_grub2
 		select PACKAGE_grub2
 		default y
 		default y
@@ -241,7 +241,7 @@ menu "Target Images"
 
 
 	config TARGET_IMAGES_PAD
 	config TARGET_IMAGES_PAD
 		bool "Pad images to filesystem size (for JFFS2)"
 		bool "Pad images to filesystem size (for JFFS2)"
-		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		depends on GRUB_IMAGES
 
 
 	config TARGET_IMAGES_GZIP
 	config TARGET_IMAGES_GZIP
 		bool "GZip images"
 		bool "GZip images"
@@ -254,7 +254,7 @@ menu "Target Images"
 
 
 	config TARGET_KERNEL_PARTSIZE
 	config TARGET_KERNEL_PARTSIZE
 		int "Kernel partition size (in MB)"
 		int "Kernel partition size (in MB)"
-		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		depends on GRUB_IMAGES
 		default 4
 		default 4
 
 
 	config TARGET_ROOTFS_PARTSIZE
 	config TARGET_ROOTFS_PARTSIZE
@@ -266,7 +266,7 @@ menu "Target Images"
 
 
 	config TARGET_ROOTFS_PARTNAME
 	config TARGET_ROOTFS_PARTNAME
 		string "Root partition on target device"
 		string "Root partition on target device"
-		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+		depends on GRUB_IMAGES
 		help
 		help
 		  Override the root partition on the final device. If left empty,
 		  Override the root partition on the final device. If left empty,
 		  it will be mounted by PARTUUID which makes the kernel find the
 		  it will be mounted by PARTUUID which makes the kernel find the

+ 0 - 16
package/kernel/linux/modules/sound.mk

@@ -145,22 +145,6 @@ endef
 $(eval $(call KernelPackage,sound-i8x0))
 $(eval $(call KernelPackage,sound-i8x0))
 
 
 
 
-define KernelPackage/sound-cs5535audio
-  TITLE:=CS5535 PCI Controller
-  DEPENDS:=+kmod-ac97
-  KCONFIG:=CONFIG_SND_CS5535AUDIO
-  FILES:=$(LINUX_DIR)/sound/pci/cs5535audio/snd-cs5535audio.ko
-  AUTOLOAD:=$(call AutoLoad,36,snd-cs5535audio)
-  $(call AddDepends/sound)
-endef
-
-define KernelPackage/sound-cs5535audio/description
- Support for the integrated AC97 sound device on olpc
-endef
-
-$(eval $(call KernelPackage,sound-cs5535audio))
-
-
 define KernelPackage/sound-soc-core
 define KernelPackage/sound-soc-core
   TITLE:=SoC sound support
   TITLE:=SoC sound support
   DEPENDS:=+kmod-regmap +kmod-ac97
   DEPENDS:=+kmod-regmap +kmod-ac97