diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-25 22:16:37 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-07-25 22:16:37 +0200 |
| commit | 82bab389a4f5e871dae68ff376fb74537b1e75b6 (patch) | |
| tree | 00bb643162853e282e04eeae6c1f06e232216027 | |
| parent | f94dbc199e0abcdd3b8cc9d9d7226d8a1a6b47e1 (diff) | |
| parent | dba433e831fb3fe7ea5e6ced99c92643b8e7f9e8 (diff) | |
Merge branch 'master' of gogs.waldemar-brodkorb.de:linux/openadk
122 files changed, 1467 insertions, 346 deletions
diff --git a/.travis.yml b/.travis.yml index 2c3eaa7ed..7231374c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,11 @@ git: depth: 3 matrix: include: - - env: ARCH=arm SYSTEM=linksys-nslu2 + - env: ARCH=arm SYSTEM=linksys-nslu2 ENDIAN=big + - env: ARCH=arm SYSTEM=raspberry-pi + - env: ARCH=arm SYSTEM=raspberry-pi2 + - env: ARCH=arm SYSTEM=raspberry-pi3 + - env: ARCH=arm SYSTEM=beaglebone-black - env: ARCH=avr32 SYSTEM=atmel-ngw100 - env: ARCH=avr32 SYSTEM=grasshopper - env: ARCH=cris SYSTEM=foxboard-lx832 diff --git a/Makefile.adk b/Makefile.adk index df0d98d4c..663ab584a 100644 --- a/Makefile.adk +++ b/Makefile.adk @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. ADK_TOPDIR:= $(shell pwd) -GMAKE_FMK= ${MAKE} -f $(PWD)/mk/build.mk +GMAKE_FMK= ${MAKE} -f ${ADK_TOPDIR}/mk/build.mk GMAKE_INV= ${GMAKE_FMK} --no-print-directory _UNLIMIT= __limit=$$(ulimit -dH 2>/dev/null); \ diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk index 17227afed..72fc56693 100644 --- a/mk/kernel-vars.mk +++ b/mk/kernel-vars.mk @@ -7,23 +7,23 @@ KERNEL_MAKE_OPTS:= V=1 \ CC="$(TARGET_CC)" \ HOSTCC="${HOST_CC}" \ HOSTCXX="${HOST_CXX}" \ - DISABLE_PAX_PLUGINS=y \ + SHELL='${SHELL}' \ CONFIG_SHELL='${SHELL}' # regex for relocs needs pcre ifeq ($(OS_FOR_BUILD),Darwin) -KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix' +KERNEL_MAKE_OPTS+= HOSTLDFLAGS='-lpcreposix -Wl,-no_pie' endif # non-Linux platforms need elf.h ifneq ($(OS_FOR_BUILD),Linux) KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}' -KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${ADK_TOPDIR}/adk/include -DKBUILD_NO_NLS' +KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -DKBUILD_NO_NLS' else KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}' endif -ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO)$(ADK_TARGET_SYSTEM_ORANGE_PI0),y) KERNEL_MAKE_OPTS+= LOADADDR=0x40008000 endif diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk index 7648bf435..efb321010 100644 --- a/mk/kernel-ver.mk +++ b/mk/kernel-ver.mk @@ -15,17 +15,17 @@ KERNEL_FILE_VER:= $(ADK_TARGET_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif -ifeq ($(ADK_TARGET_KERNEL_VERSION_4_11),y) |