Browse Source

varios fixes, add usb network card support

Waldemar Brodkorb 11 years ago
parent
commit
de5885b090

+ 1 - 1
package/bcm2835-firmware/Makefile

@@ -6,7 +6,7 @@ include ${TOPDIR}/rules.mk
 PKG_NAME:=		bcm2835-firmware
 PKG_VERSION:=		0.3
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		e564b5d20153abc9b71d0bde8ece72f3
+PKG_MD5SUM:=		c05d3ceac71e884a95d7731cc2b5f39f
 PKG_DESCR:=		firmware for raspberry pi (bcm2835)
 PKG_SECTION:=		base
 PKG_SITES:=		http://openadk.org/distfiles/

+ 8 - 2
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)"

+ 1 - 1
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
 

+ 12 - 0
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
 

+ 1 - 0
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