From 2484dc396a420ae5a5061e4b25307ee6107bcc31 Mon Sep 17 00:00:00 2001
From: Phil Sutter <phil.sutter@viprinet.com>
Date: Thu, 12 Jan 2012 19:36:20 +0100
Subject: add support for 64bit kernels on supporting targets

This is more commonly known as 32bit userland support on 64bit
architectures.

For simplicity's sake though, this implementation works the other way
round: just build a 64bit-able linker and compiler, but no
64bit-libraries at all (i.e., no multilib). This is then just enough to
compile a 64bit kernel, as that doesn't link to anything. The
alternative would have been to build a native 64bit compiler with
multilib-support in order to cross-compile a 32bit userland, resulting
in a multilib system without need for it.

In order to allow compilation of a 64bit kernel for a given target
system, have it select ADK_TARGET_KERNEL_MAY_64BIT. Upon selection of
that target, the symbol ADK_64BIT_KERNEL will occur in the "Global
settings" menu. Since certain aspects of the 64bit kernel .config may
greatly differ from it's 32bit counterpart, it has to be shipped
separately: target/<arch>/kernel64.config is the place to be.

Conflicts:

	target/Makefile
	toolchain/gcc/Makefile

Untested, due to conflicts (original patch conflicts with
multiple kernel version support).
---
 target/Makefile | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'target/Makefile')

diff --git a/target/Makefile b/target/Makefile
index 470e9e4e9..9222cd3bc 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -6,6 +6,12 @@ include $(TOPDIR)/mk/rootfs.mk
 
 all: install
 
+ifeq (${ADK_64BIT_KERNEL},y)
+KERNEL_CFG:=kernel64.config
+else
+KERNEL_CFG:=kernel.config
+endif
+
 ### Kernel .config Creation
 # The following target combines all kernel-related variables and
 # config files into a single one to be used as the final kernel
@@ -48,15 +54,15 @@ config-prepare: $(TOPDIR)/.config
 	    >${BUILD_DIR}/.kernelconfig.nokernel
 ifeq ($(ADK_NATIVE),y)
 	@if [ -f /etc/adktarget ];then \
-		cp $(TOPDIR)/target/$(ARCH)/kernel.config ${BUILD_DIR}/.kernelconfig.board; \
+		cp $(TOPDIR)/target/$(ARCH)/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
 	else \
 	if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \
 	fi
 else
-	if [ -f ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ];then \
-		cp ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
+	if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
+		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
 	else \
-		cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig.board; \
+		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
 	fi
 endif
 	@(cat ${BUILD_DIR}/.kernelconfig.{modules,kernel} | \
@@ -89,10 +95,10 @@ endif
 	@-rm -f ${BUILD_DIR}/.kernelconfig.tmp
 else
 config-prepare: $(TOPDIR)/.config
-	if [ -f ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ];then \
-		cp ${ADK_TARGET_ARCH}/kernel.config.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
+	if [ -f ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ];then \
+		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG}.$(ADK_TARGET_SYSTEM) ${BUILD_DIR}/.kernelconfig.board; \
 	else \
-		cp ${ADK_TARGET_ARCH}/kernel.config ${BUILD_DIR}/.kernelconfig.board; \
+		cp ${ADK_TARGET_ARCH}/${KERNEL_CFG} ${BUILD_DIR}/.kernelconfig.board; \
 	fi
 endif
 
-- 
cgit v1.2.3