Просмотр исходного кода

olpc-xo-1: add help text, fix WLAN detection

Waldemar Brodkorb 1 неделя назад
Родитель
Сommit
f02975437e
3 измененных файлов с 7 добавлено и 0 удалено
  1. 2 0
      scripts/install.sh
  2. 1 0
      target/linux/config/Config.in.misc
  3. 4 0
      target/x86/Makefile

+ 2 - 0
scripts/install.sh

@@ -661,6 +661,8 @@ case $target {
 	;;
 	;;
 (olpc-xo-1)
 (olpc-xo-1)
         cp $ADK_TOPDIR/target/x86/olpc-xo-1/olpc.fth "$R/boot/"
         cp $ADK_TOPDIR/target/x86/olpc-xo-1/olpc.fth "$R/boot/"
+	mkdir -p "$R/lib/firmware/libertas"
+        cp $ADK_TOPDIR/target/x86/olpc-xo-1/usb8388.bin "$R/lib/firmware/libertas/"
 	;;
 	;;
 }
 }
 
 

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

@@ -16,6 +16,7 @@ config ADK_LINUX_KERNEL_COMMON_CLK
 config ADK_LINUX_KERNEL_FIRMWARE_IN_KERNEL
 config ADK_LINUX_KERNEL_FIRMWARE_IN_KERNEL
 	bool 
 	bool 
 	default y if ADK_LINUX_KERNEL_R8169 && ADK_LINUX_KERNEL_ROOT_NFS
 	default y if ADK_LINUX_KERNEL_R8169 && ADK_LINUX_KERNEL_ROOT_NFS
+	default y if ADK_TARGET_SYSTEM_OLPC_XO_1
 	default n
 	default n
 
 
 config ADK_LINUX_KERNEL_EXTRA_FIRMWARE
 config ADK_LINUX_KERNEL_EXTRA_FIRMWARE

+ 4 - 0
target/x86/Makefile

@@ -42,6 +42,10 @@ endif
 ifeq ($(ADK_TARGET_FS),archive)
 ifeq ($(ADK_TARGET_FS),archive)
 targethelp:
 targethelp:
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
 	@echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)"
+ifeq ($(ADK_TARGET_SYSTEM_OLPC_XO_1),y)
+	@echo "Use following command to install it on SD card:"
+	@echo "sudo ./scripts/install.sh $(ADK_TARGET_SYSTEM) /dev/sdX $(FW_DIR)/$(ROOTFSTARBALL)"
+endif
 ifeq ($(ADK_TARGET_QEMU),y)
 ifeq ($(ADK_TARGET_QEMU),y)
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "Use following command to create a QEMU Image:"