Эх сурвалжийг харах

dragino-ms14: finetune config, serial and network working

Waldemar Brodkorb 2 сар өмнө
parent
commit
be9f6e9eb8

+ 1 - 0
target/config/Config.in.runtime

@@ -400,6 +400,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttySTM0" if ADK_TARGET_SYSTEM_ST_STM32F746G
 	default "ttyGF0" if ADK_TARGET_SYSTEM_QEMU_M68K_VIRT
 	default "ttyPIC1" if ADK_TARGET_SYSTEM_MICROCHIP_PIC32
+	default "ttyATH0" if ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	default "ttyS0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_SPEED

+ 15 - 2
target/mips/Makefile

@@ -15,6 +15,9 @@ endif
 ifeq ($(ADK_TARGET_KERNEL_UIMAGEBIN),y)
 KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.bin
 endif
+ifeq ($(ADK_TARGET_KERNEL_VMLINUX_BIN),y)
+KERNEL:=$(LINUX_DIR)/arch/mips/boot/vmlinux.bin
+endif
 
 OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
@@ -97,12 +100,22 @@ targethelp:
 endif
 
 kernel-strip:
-ifeq ($(ADK_TARGET_KERNEL_UIMAGE)$(ADK_TARGET_KERNEL_UIMAGEBIN),)
+ifeq ($(ADK_TARGET_KERNEL_UIMAGE)$(ADK_TARGET_KERNEL_UIMAGEBIN)$(ADK_TARGET_KERNEL_VMLINUX_BIN),)
 	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 else
 	$(CP) $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
 endif
 
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_12)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_18)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
+VENDOR:=qca/
+endif
+
+dtb-install:
+ifeq ($(ADK_TARGET_SYSTEM_DRAGINO_MS14S),y)
+	${KERNEL_MAKE} $(VENDOR)ar9331_dragino_ms14.dtb $(MAKE_TRACE)
+	cp $(LINUX_DIR)/arch/mips/boot/dts/$(VENDOR)ar9331_dragino_ms14.dtb ${FW_DIR}/
+endif
+
 kernel-install: kernel-strip
 	$(CP) $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}
 
@@ -123,7 +136,7 @@ ifeq (${ADK_TARGET_FS},genimage)
 imageinstall: ${FW_DIR}/${GENIMAGE} targethelp
 endif
 ifeq ($(ADK_TARGET_FS),nfsroot)
-imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
+imageinstall: dtb-install kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp
 endif
 ifeq ($(ADK_TARGET_FS),ubifs)
 imageinstall: $(FW_DIR)/$(ROOTFSUBIFS) targethelp

+ 4 - 8
target/mips/kernel/dragino-ms14s

@@ -1,12 +1,8 @@
 CONFIG_MIPS=y
 CONFIG_ATH79=y
-CONFIG_ATH79_MACH_Linino=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_AG71XX=y
-CONFIG_AG71XX_AR8216_SUPPORT=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=1
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_AR933X=y
+CONFIG_SERIAL_AR933X_CONSOLE=y
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_ATH79=y

+ 2 - 3
target/mips/systems/dragino-ms14s

@@ -1,16 +1,15 @@
 config ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	bool "Dragino2 ms14-s"
 	select ADK_TARGET_BIG_ENDIAN
-	select ADK_TARGET_CPU_MIPS_MIPS32
+	select ADK_TARGET_CPU_MIPS_MIPS32R2
 	select ADK_TARGET_BOARD_ATH79
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_SERIAL
-	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 	select ADK_TARGET_WITH_BLOCK
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
+	select ADK_TARGET_KERNEL_VMLINUX_BIN
 	help
 	  Support for Dragino2 ms14-s.