summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-06-08 08:37:20 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-08 08:37:41 +0200
commitbd8b249679a8250f7f086bde5f187dd9af81beca (patch)
tree76153610e70f5440de753c4976fac133e8bb9afc
parentb9d3aca2cef4df6fcf5d9534e51ecd0797a12688 (diff)
use ADK_TARGET_KARCH for kernel stuff, fix ppc build
-rw-r--r--mk/kernel-vars.mk2
-rw-r--r--package/glibc/Makefile2
-rw-r--r--package/musl/Makefile12
-rw-r--r--package/uclibc/Makefile4
-rw-r--r--rules.mk7
5 files changed, 14 insertions, 13 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 29202fe91..c4c596c9e 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -2,7 +2,7 @@
# material, please see the LICENCE file in the top-level directory.
KERNEL_MAKE_OPTS:= V=1 \
- ARCH="$(ADK_TARGET_ARCH)" \
+ ARCH="$(ADK_TARGET_KARCH)" \
CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \
HOSTCC="${CC_FOR_BUILD}" \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 95fae1d5f..26e6a1998 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -72,7 +72,7 @@ endif
done
# header package
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) \
- HOSTCC=$(CC_FOR_BUILD) ARCH=$(ADK_TARGET_ARCH) V=1 \
+ HOSTCC=$(CC_FOR_BUILD) ARCH=$(ADK_TARGET_KARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_GLIBC_DEV)/usr \
headers_install
(cd $(WRKBUILD); \
diff --git a/package/musl/Makefile b/package/musl/Makefile
index b21218b71..2c3302322 100644
--- a/package/musl/Makefile
+++ b/package/musl/Makefile
@@ -35,12 +35,6 @@ endif
ifeq ($(ADK_TARGET_CPU_ARCH),i486)
MARCH:= i386
endif
-ifeq ($(ADK_TARGET_CPU_ARCH),mips64el)
-MARCH:= mips
-endif
-ifeq ($(ADK_TARGET_CPU_ARCH),mips64)
-MARCH:= mips
-endif
ifeq ($(ADK_TARGET_CPU_ARCH),ppc)
MARCH:= powerpc
endif
@@ -50,9 +44,11 @@ endif
ifeq ($(ADK_TARGET_CPU_ARCH),sh4eb)
MARCH:= sheb
endif
-ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
+ifeq ($(ADK_LINUX_ARM),y)
+ifeq ($(ADK_TARGET_ABI),eabihf)
MARCH:= armhf
endif
+endif
ifeq ($(ADK_TARGET_ABI_X32),y)
MARCH:= x32
endif
@@ -73,7 +69,7 @@ endif
musl-dev-install:
${INSTALL_DIR} ${IDIR_MUSL_DEV}/usr/lib
${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_MUSL_DEV}/usr/lib
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_ARCH) V=1 \
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_KARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_MUSL_DEV)/usr \
headers_install
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
diff --git a/package/uclibc/Makefile b/package/uclibc/Makefile
index 71c06edfe..505ed4a7b 100644
--- a/package/uclibc/Makefile
+++ b/package/uclibc/Makefile
@@ -25,10 +25,8 @@ CONFIG_STYLE:= manual
BUILD_STYLE:= manual
INSTALL_STYLE:= manual
-# do nothing, uClibc is already build in toolchain directory
do-install:
${INSTALL_DIR} $(IDIR_UCLIBC)/$(ADK_TARGET_LIBC_PATH) $(IDIR_UCLIBC)/etc
- # create timezone file
test -z $(ADK_RUNTIME_TIMEZONE) || \
grep $(ADK_RUNTIME_TIMEZONE) ./files/tz.lst | \
cut -f 2 > $(IDIR_UCLIBC)/etc/TZ
@@ -54,7 +52,7 @@ uclibc-dev-install:
for file in libcrypt libdl libm libresolv libutil; do \
cd $(IDIR_UCLIBC_DEV)/$(ADK_TARGET_LIBC_PATH); ln -sf $$file-$(GIT_VERSION).so $$file.so; \
done
- $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_ARCH) V=1 \
+ $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-linux-$(KERNEL_VERSION)-$(KERNEL_RELEASE)/linux-$(KERNEL_VERSION) ARCH=$(ADK_TARGET_KARCH) V=1 \
INSTALL_HDR_PATH=$(IDIR_UCLIBC_DEV)/usr \
headers_install
$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
diff --git a/rules.mk b/rules.mk
index 359071ad5..b5d53d0ec 100644
--- a/rules.mk
+++ b/rules.mk
@@ -57,6 +57,13 @@ ADK_PARAMETER_NETCONSOLE_DST_IP:= $(strip $(subst ",, $(ADK_PARAMETER_NETCONSOLE
ADK_JFFS2_OPTS:= $(strip $(subst ",, $(ADK_JFFS2_OPTS)))
ADK_WGET_TIMEOUT:= $(strip $(subst ",, $(ADK_WGET_TIMEOUT)))
+ADK_TARGET_KARCH:=$(ADK_TARGET_ARCH)
+
+# translate toolchain arch to kernel arch
+ifeq ($(ADK_TARGET_ARCH),ppc)
+ADK_TARGET_KARCH:=powerpc
+endif
+
include $(TOPDIR)/mk/vars.mk
ifneq (${show},)