Browse Source

more Numato Mimas v2 J2 bits and bytes

Waldemar Brodkorb 8 years ago
parent
commit
9a79ea17c1

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

@@ -251,7 +251,8 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 		|| ADK_TARGET_SIM
 	default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "ttyBF0" if ADK_TARGET_ARCH_BFIN
-	default "ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
+	default "ttyUL0" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
+				|| ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	default "ttyARC0" if ADK_TARGET_SYSTEM_NSIM_ARCV1 \
 				|| ADK_TARGET_SYSTEM_NSIM_ARCV2
 	default "ttyAMA0" if ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \
@@ -275,6 +276,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
 		|| ADK_TARGET_QEMU \
 		|| ADK_TARGET_SIM
 	default "9600" if ADK_TARGET_SYSTEM_FON_FON2100
+	default "9600" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP	
 	default "115200"
 

+ 5 - 0
target/sh/Makefile

@@ -10,6 +10,7 @@ KERNEL:=$(LINUX_DIR)/vmlinux
 else
 KERNEL:=$(LINUX_DIR)/arch/sh/boot/zImage
 endif
+OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id
 
 QEMU_ARGS:=-M r2d
 QEMU_ARGS+=${ADK_QEMU_ARGS}
@@ -57,7 +58,11 @@ endif
 
 # image creation and kernel install
 kernel-strip:
+ifeq ($(ADK_TARGET_SYSTEM_NUMATO_MIMASV2),y)
+	$(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
+else
 	@cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL)
+endif
 
 kernel-install: kernel-strip
 	@cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL}

+ 3 - 1
target/sh/kernel/numato-mimasv2

@@ -2,7 +2,9 @@ CONFIG_SUPERH=y
 CONFIG_SUPERH32=y
 CONFIG_CPU_SH2=y
 CONFIG_0PF_FPGA=y
-CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_SUBTYPE_0PF=y
 CONFIG_CACHE_OFF=y
 CONFIG_CMDLINE_EXTEND=y
+CONFIG_SERIAL_UARTLITE=y
+CONFIG_SERIAL_UARTLITE_0PF=y
+CONFIG_SERIAL_UARTLITE_CONSOLE=y

+ 1 - 0
target/sh/systems/numato-mimasv2

@@ -1,6 +1,7 @@
 config ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	bool "Numato Mimas v2 FPGA"
 	select ADK_CPU_SH2
+	select ADK_TARGET_WITH_SERIAL
 	help
 	  Support for Numato Mimas v2 FPGA with J2 Core Bitstream, sh2 architecture.