Merge pull request #1 from techflashYT/v4.4

USB, SD Card, IOS 58, Update defconfig

.gitignore

@@ -114,3 +114,6 @@ all.config
 # Kdevelop4
 *.kdev4
 git.diff
+
+# ignore Techflash's script to load the kernel to his Wii
+wiiload.sh

arch/powerpc/configs/wii_defconfig

@@ -4,22 +4,23 @@ CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_EXPERT=y
 # CONFIG_ELF_CORE is not set
-CONFIG_PERF_EVENTS=y
+CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_PPC_CHRP is not set
 # CONFIG_PPC_PMAC is not set
 CONFIG_EMBEDDED6xx=y
+CONFIG_GAMECUBE_UDBG=y
 CONFIG_WII=y
 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
 CONFIG_PREEMPT=y
 CONFIG_BINFMT_MISC=m
-CONFIG_KEXEC=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE="console=ttyUSB0,115200 root=/dev/sda1 force_keyboard_port=4 loader=ios nobats rootwait video=gcnfb:progressive,60Hz,TV=NTSC"
+CONFIG_CMDLINE_FORCE=y
 # CONFIG_SECCOMP is not set
 CONFIG_ADVANCED_OPTIONS=y
 CONFIG_NET=y
@@ -45,12 +46,19 @@ CONFIG_MAC80211=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_STANDALONE is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_GAMECUBE_SD=y
+CONFIG_WII_MEM2=y
+CONFIG_WII_SD=y
 CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_COUNT=2
+CONFIG_BLK_DEV_NBD=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=y
+CONFIG_PPP_DEFLATE=y
+CONFIG_PPP_MPPE=y
+CONFIG_PPPOE=y
 CONFIG_B43=y
 CONFIG_B43_SDIO=y
 # CONFIG_B43_PHY_LP is not set
@@ -68,6 +76,7 @@ CONFIG_INPUT_MISC=y
 CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_SERPORT is not set
+CONFIG_GAMECUBE_SI=y
 CONFIG_LEGACY_PTY_COUNT=64
 # CONFIG_DEVKMEM is not set
 # CONFIG_HW_RANDOM is not set
@@ -80,25 +89,41 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
 CONFIG_SSB_DEBUG=y
 CONFIG_FB=y
+CONFIG_FB_SIMPLE=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SEQUENCER=y
 CONFIG_SND_MIXER_OSS=y
 CONFIG_SND_PCM_OSS=y
 CONFIG_SND_SEQUENCER_OSS=y
 # CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_DRIVERS is not set
+CONFIG_SND_GAMECUBE=y
+CONFIG_SND_GAMECUBE_MIC=y
+# CONFIG_SND_USB is not set
+CONFIG_SOUND_PRIME=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_WACOM=m
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_WII_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_UAS=y
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CONSOLE=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=y
+CONFIG_USB_SERIAL_PL2303=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_GENERIC=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
 CONFIG_FUSE_FS=m
 CONFIG_ISO9660_FS=y
 CONFIG_JOLIET=y
@@ -113,14 +138,15 @@ CONFIG_CIFS=m
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_CRC_CCITT=y
+CONFIG_XZ_DEC=y
 CONFIG_PRINTK_TIME=y
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
 CONFIG_LATENCYTOP=y
 CONFIG_SCHED_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_DMA_API_DEBUG=y
+CONFIG_KGDB=y
 CONFIG_PPC_EARLY_DEBUG=y
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_PPC_EARLY_DEBUG_MEMCONS=y
 # CONFIG_CRYPTO_HW is not set

arch/powerpc/platforms/embedded6xx/starlet-es.c

@@ -133,7 +133,6 @@ EXPORT_SYMBOL_GPL(starlet_es_get_device);
 
 /*
  *
- */
 static int starlet_es_get_title_count(unsigned long *count)
 {
 	struct starlet_es_device *es_dev = starlet_es_get_device();
@@ -163,9 +162,6 @@ static int starlet_es_get_title_count(unsigned long *count)
 	return error;
 }
 
-/*
- *
- */
 static int starlet_es_get_titles(u64 *titles, unsigned long count)
 {
 	struct starlet_es_device *es_dev = starlet_es_get_device();
@@ -192,7 +188,7 @@ static int starlet_es_get_titles(u64 *titles, unsigned long count)
 	es_small_buf_put(count_buf);
 
 	return error;
-}
+}*/
 
 /*
  * This call may be used in a non-sleeping context
@@ -453,7 +449,7 @@ int starlet_es_reload_ios_and_launch(u64 title)
 }
 EXPORT_SYMBOL_GPL(starlet_es_reload_ios_and_launch);
 
-static int starlet_es_find_newest_title(struct starlet_es_device *es_dev,
+/*static int starlet_es_find_newest_title(struct starlet_es_device *es_dev,
 					u64 *title,
 					u64 title_min, u64 title_max)
 {
@@ -517,7 +513,7 @@ static int starlet_es_load_preferred_ios(struct starlet_es_device *es_dev,
 	}
 
 	return error;
-}
+}*/
 
 static int starlet_nwc24_stop_scheduler(void)
 {
@@ -556,11 +552,11 @@ static int starlet_es_init(struct starlet_es_device *es_dev)
 		ios_min = 0x100000000ULL | STARLET_ES_IOS_MIN;
 		ios_max = 0x100000000ULL | STARLET_ES_IOS_MAX;
 
-		error = starlet_es_load_preferred_ios(es_dev, ios_min, ios_max);
-		if (error)
-			drv_printk(KERN_WARNING, "unable to load preferred"
-				   " IOS version (min %llx, max %llx)\n",
-				   ios_min, ios_max);
+		// error = starlet_es_load_preferred_ios(es_dev, ios_min, ios_max);
+		// if (error)
+		//	drv_printk(KERN_WARNING, "unable to load preferred"
+		//		   " IOS version (min %llx, max %llx)\n",
+		//		   ios_min, ios_max);
 	}
 
 	/*

drivers/usb/host/rvl-sthcd.c

@@ -2036,7 +2036,7 @@ static int sthcd_rescan_thread(void *arg)
 		sthcd_oh_rescan(oh);
 
 		/* re-check again after the configured interval */
-		wait_event_timeout(&sthcd->rescan_waitq, 0, STHCD_RESCAN_INTERVAL*HZ);
+		wait_event_timeout(sthcd->rescan_waitq, 0, STHCD_RESCAN_INTERVAL*HZ);
 	}
 	return 0;
 }