diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-11 13:37:09 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-11 13:38:21 +0200 |
| commit | f76e4771d1654bd40196f8a1f5f421d9ea879f1f (patch) | |
| tree | 455920325c3286944039e4d85960a213660561e6 | |
| parent | f31f46b5d34279223179d5eaf0af5f16df78adb6 (diff) | |
fix qemu-system-aarc64 bootup
| -rw-r--r-- | mk/image.mk | 2 | ||||
| -rw-r--r-- | target/config/Config.in.abi.default | 1 | ||||
| -rw-r--r-- | target/config/Config.in.runtime | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mk/image.mk b/mk/image.mk index e72f0a1af..321794f76 100644 --- a/mk/image.mk +++ b/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 diff --git a/target/config/Config.in.abi.default b/target/config/Config.in.abi.default index 64aff0782..7a66c54a8 100644 --- a/target/config/Config.in.abi.default +++ b/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 diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 708a1c931..7f48513a2 100644 --- a/target/config/Config.in.runtime +++ b/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" |