Browse Source

fix qemu-system-aarc64 bootup

Waldemar Brodkorb 10 years ago
parent
commit
f76e4771d1
3 changed files with 3 additions and 2 deletions
  1. 1 1
      mk/image.mk
  2. 1 0
      target/config/Config.in.abi.default
  3. 1 1
      target/config/Config.in.runtime

+ 1 - 1
mk/image.mk

@@ -65,7 +65,7 @@ ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},)
 	gzip -9c ${ADK_TOPDIR}/.config > $(TARGET_DIR)/etc/adkconfig.gz
 	chmod 600 $(TARGET_DIR)/etc/adkconfig.gz
 endif
-ifneq ($(ADK_LINUX_X86_64)$(ADK_LINUX_PPC64)$(ADK_LINUX_SPARC64)$(ADK_TARGET_ABI_N32)$(ADK_TARGET_ABI_N64),)
+ifneq ($(ADK_LINUX_AARCH64)$(ADK_LINUX_X86_64)$(ADK_LINUX_PPC64)$(ADK_LINUX_SPARC64)$(ADK_TARGET_ABI_N32)$(ADK_TARGET_ABI_N64),)
 	test ! -d ${TARGET_DIR}/lib || mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH}
 	test ! -d ${TARGET_DIR}/lib || rm -rf ${TARGET_DIR}/lib
 	ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib

+ 1 - 0
target/config/Config.in.abi.default

@@ -48,6 +48,7 @@ config ADK_TARGET_LIBC_PATH
 	default "libx32" if ADK_x32
 	default "lib64" if ADK_n64 \
 				|| ADK_64 \
+				|| ADK_LINUX_AARCH64 \
 				|| ADK_LINUX_SPARC64 \
 				|| ADK_LINUX_PPC64 \
 				|| ADK_LINUX_X86_64

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

@@ -129,7 +129,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	string
 	default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
-	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM
+	default "ttyAMA0" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB || ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 || ADK_TARGET_SYSTEM_ARM_FM || ADK_TARGET_SYSTEM_QEMU_AARCH64
 	default "ttySC1" if ADK_TARGET_SYSTEM_QEMU_SH
 	default "ttymxc0" if ADK_TARGET_SYSTEM_CUBOX_I
 	default "ttyS0"