From de5885b090d586780f2c38691794782304a92a21 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 10 Jul 2013 13:56:31 +0200
Subject: varios fixes, add usb network card support

---
 target/arm/Makefile                     | 10 ++++++++--
 target/config/Config.in.runtime         |  2 +-
 target/linux/config/Config.in.netdevice | 12 ++++++++++++
 target/packages/pkg-available/mpdbox    |  1 +
 4 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'target')

diff --git a/target/arm/Makefile b/target/arm/Makefile
index af8d7b896..ea963cd72 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -11,6 +11,8 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
 KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
 else ifeq ($(ADK_TARGET_SYSTEM_SHARP_ZAURUS),y)
 KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
+else ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+KERNEL:=$(LINUX_DIR)/arch/arm/boot/zImage
 else
 KERNEL:=$(LINUX_DIR)/vmlinux
 endif
@@ -50,9 +52,13 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
+	#@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	#@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
+ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+	@echo "Use following command to install it on SD card:"
+	@echo "sudo ./scripts/install-rpi.sh /dev/sdb $(BIN_DIR)/$(ROOTFSTARBALL)"
+endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM),y)
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index f6fd11a26..ddd0e3d2a 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -35,7 +35,7 @@ config ADK_RUNTIME_TIMEZONE
 
 choice
 prompt "Console output on embedded system"
-default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA
+default ADK_RUNTIME_CONSOLE_BOTH if ADK_TARGET_WITH_VGA && !ADK_TARGET_SYSTEM_RASPBERRY_PI
 default ADK_RUNTIME_CONSOLE_VGA if ADK_TARGET_SYSTEM_RASPBERRY_PI
 default ADK_RUNTIME_CONSOLE_SERIAL
 
diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice
index 026d8602d..0bff56a1b 100644
--- a/target/linux/config/Config.in.netdevice
+++ b/target/linux/config/Config.in.netdevice
@@ -13,6 +13,9 @@ config ADK_KERNEL_PHYLIB
 config ADK_KERNEL_MII
 	boolean
 
+config ADK_KERNEL_USB_USBNET
+	boolean
+
 config ADK_KERNEL_NET_PCI
 	boolean
 
@@ -195,6 +198,15 @@ config ADK_KERNEL_R8169
 	default n
 	help
 
+config ADK_KERNEL_USB_NET_SMSC95XX
+	boolean
+	select ADK_KERNEL_NETDEVICES
+	select ADK_KERNEL_NET_ETHERNET
+	select ADK_KERNEL_USB_USBNET
+	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI
+	default n
+	help
+
 menu "Ethernet card support"
 depends on ADK_TARGET_WITH_PCI
 
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index 68636c3b3..304a3a163 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -30,3 +30,4 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MKSH_FULL
 	select ADK_KPACKAGE_KMOD_SND_INTEL8X0 if ADK_TARGET_SYSTEM_QEMU_I686
 	select ADK_PACKAGE_CIFS_UTILS
+	select ADK_KPACKAGE_KMOD_SND_USB_AUDIO
-- 
cgit v1.2.3