From 9f116a7e41e437095f9e689ddc0a67f9428ef311 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 2 May 2013 15:18:50 +0200 Subject: enable RTC, fix libc.so generation --- mk/image.mk | 4 ++-- package/eglibc/Makefile | 6 +++--- target/linux/config/Config.in.misc | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mk/image.mk b/mk/image.mk index ec681a48e..f8e995ce2 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -55,7 +55,7 @@ ifeq ($(ADK_LINUX_X86_64),y) mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/lib/ ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib - -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/usr/lib/ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) @@ -65,7 +65,7 @@ ifeq ($(ADK_TARGET_ABI_N32),y) mv ${TARGET_DIR}/lib/* ${TARGET_DIR}/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/lib/ ln -sf /${ADK_TARGET_LIBC_PATH} ${TARGET_DIR}/lib - -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} + -mkdir ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} 2>/dev/null mv ${TARGET_DIR}/usr/lib/* ${TARGET_DIR}/usr/${ADK_TARGET_LIBC_PATH} rm -rf ${TARGET_DIR}/usr/lib/ (cd ${TARGET_DIR}/usr ; ln -sf ${ADK_TARGET_LIBC_PATH} lib) diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index fe30f490e..9f37255cf 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -58,13 +58,13 @@ eglibc-dev-install: # install linker script -cp ./files/libc.so.$(CPU_ARCH) $(IDIR_EGLIBC_DEV)/usr/lib/libc.so ifeq ($(ADK_TARGET_ABI_O32),y) - $(SED) "s#@@ELFFORMAT@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + $(SED) "s#@@ELFTARGET@@#elf32-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so endif ifeq ($(ADK_TARGET_ABI_N32),y) - $(SED) "s#@@ELFFORMAT@@#elf32-ntradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + $(SED) "s#@@ELFTARGET@@#elf32-ntradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so endif ifeq ($(ADK_TARGET_ABI_N64),y) - $(SED) "s#@@ELFFORMAT@@#elf64-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so + $(SED) "s#@@ELFTARGET@@#elf64-tradlittlemips#" $(IDIR_EGLIBC_DEV)/usr/lib/libc.so endif ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt* ${IDIR_EGLIBC_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/libc_nonshared.a ${IDIR_EGLIBC_DEV}/usr/lib diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 084f19112..57b64d5e9 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -55,8 +55,10 @@ config ADK_KERNEL_RTC_DRV_CMOS default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_NATIVE_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n - depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40) + depends on (ADK_TARGET_SYSTEM_PCENGINES_ALIX1C || ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 || ADK_TARGET_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_IBM_X40 || ADK_NATIVE_SYSTEM_LEMOTE_YEELONG || ADK_TARGET_SYSTEM_LEMOTE_YEELONG) help PC CMOS RTC support. -- cgit v1.2.3