diff options
| -rw-r--r-- | Config.in | 6 | ||||
| -rw-r--r-- | mk/build.mk | 1 | ||||
| -rw-r--r-- | mk/kernel-ver.mk | 6 | ||||
| -rw-r--r-- | mk/vars.mk | 1 | ||||
| -rw-r--r-- | target/config/Config.in | 6 | ||||
| -rw-r--r-- | toolchain/gcc/Makefile | 6 |
6 files changed, 25 insertions, 1 deletions
@@ -108,6 +108,11 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_ choice prompt "Kernel Version" + +config ADK_KERNEL_VERSION_3_13_3 + prompt "3.13.3" + boolean + config ADK_KERNEL_VERSION_3_12_6 prompt "3.12.6" boolean @@ -124,6 +129,7 @@ endchoice config ADK_KERNEL_VERSION string + default "3.13.3" if ADK_KERNEL_VERSION_3_13_3 default "3.12.6" if ADK_KERNEL_VERSION_3_12_6 default "3.11.10" if ADK_KERNEL_VERSION_3_11_10 default "3.4.71" if ADK_KERNEL_VERSION_3_4_71 diff --git a/mk/build.mk b/mk/build.mk index 07fcbc793..b7fd053ad 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -30,6 +30,7 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_PACKAGE_PACEMAKER_PYTHON_GUI=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_GRUB=n \ + ADK_PACKAGE_U_BOOT=n \ ADK_PACKAGE_CRYPTINIT=n \ ADK_PACKAGE_PAM=n \ ADK_PACKAGE_VIRTINST=n \ diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 34c639a62..c1cf488d2 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -4,6 +4,12 @@ KERNEL_MOD_VERSION:= $(KERNEL_VERSION) KERNEL_RELEASE:= 1 KERNEL_MD5SUM:= ab2fcc368e20d804e77970196154fb9e endif +ifeq ($(ADK_KERNEL_VERSION_3_13_3),y) +KERNEL_VERSION:= 3.13.3 +KERNEL_MOD_VERSION:= $(KERNEL_VERSION) +KERNEL_RELEASE:= 1 +KERNEL_MD5SUM:= ad98a0c623a124a25dab86406ddc7119 +endif ifeq ($(ADK_KERNEL_VERSION_3_12_6),y) KERNEL_VERSION:= 3.12.6 KERNEL_MOD_VERSION:= $(KERNEL_VERSION) diff --git a/mk/vars.mk b/mk/vars.mk index bc6689cb8..c39f14a4b 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -153,6 +153,7 @@ TARGET_CONFIGURE_OPTS= PATH='${TARGET_PATH}' \ GCC='$(TARGET_CC)' \ CXX='$(TARGET_CXX)' \ CROSS='$(TARGET_CROSS)' \ + CROSS_COMPILE='$(TARGET_CROSS)' \ ARCH=${ARCH} HOST_CONFIGURE_OPTS= CC_FOR_BUILD='${CC_FOR_BUILD}' \ diff --git a/target/config/Config.in b/target/config/Config.in index 99e810528..12e2b8003 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -170,6 +170,7 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-sparc64" if ADK_TARGET_SYSTEM_QEMU_SPARC64 default "qemu-i686" if ADK_TARGET_SYSTEM_QEMU_I686 default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI + default "cubox-i" if ADK_TARGET_SYSTEM_CUBOX_I choice prompt "Qemu Emulation using VirtIO drivers" @@ -455,6 +456,9 @@ config ADK_CPU_MICROBLAZE config ADK_CPU_RASPBERRY_PI boolean +config ADK_CPU_CUBOX_I + boolean + config ADK_TARGET_CPU_ARCH string default "x86_64" if ADK_CPU_X86_64 @@ -519,11 +523,13 @@ config ADK_TARGET_CFLAGS default "-march=armv5te -mtune=arm926ej-s" if ADK_CPU_ARMV5 default "-march=armv5te -mtune=iwmmxt" if ADK_CPU_XSCALE default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_RASPBERRY_PI + default "-march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard" if ADK_CPU_CUBOX_I config ADK_TARGET_CMDLINE string default "dwc_otg.fiq_split_enable=1" if ADK_TARGET_SYSTEM_RASPBERRY_PI default "console=tty no_auto_cmd" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default "console=ttymxc0,115200" if ADK_TARGET_SYSTEM_CUBOX_I default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100 default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP default "console=ttyS0,115200 console=tty0 geodewdt.nowayout=1" if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index c547591a0..7566d3f20 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -90,7 +90,11 @@ endif endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) -GCC_CONFOPTS+= --with-arch=armv6 --with-fpu=vfp --with-float=hard +GCC_CONFOPTS+= --with-arch=armv6 --with-tune=arm1176jzf-s --with-fpu=vfp --with-float=hard +endif + +ifeq ($(ADK_TARGET_SYSTEM_CUBOX_I),y) +GCC_CONFOPTS+= --with-arch=armv7-a --with-tune=cortex-a9 --with-fpu=neon --with-float=hard endif ifneq ($(ADK_TARGET_ABI),) |