diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-03-01 13:19:12 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2015-03-01 13:19:12 +0100 |
| commit | f2ea9e8dbd4cc3c77ff4cc52688d7057d3289fab (patch) | |
| tree | 72ec81acffa69f2c89e52a38603a6f92fb1e72ae /target | |
| parent | dce7d2df8c73896aeef77118fe89fc7e88d035fe (diff) | |
| parent | 0943b7422376747a452bda5562c73d673cccbe68 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile | 2 | ||||
| -rw-r--r-- | target/arm/Makefile | 5 | ||||
| -rw-r--r-- | target/config/Config.in.adk | 12 | ||||
| -rw-r--r-- | target/ppc/Makefile | 2 |
4 files changed, 17 insertions, 4 deletions
diff --git a/target/Makefile b/target/Makefile index 3291862ba..ddb395b55 100644 --- a/target/Makefile +++ b/target/Makefile @@ -106,6 +106,8 @@ config-prepare: $(ADK_TOPDIR)/.config echo "no miniconfig found for target system"; \ exit 1; \ fi + @cd $(BUILD_DIR) && cmp -s .kernelconfig.board .kernelconfig || \ + cp .kernelconfig.board .kernelconfig endif prepare: $(ADK_TARGET_ARCH)-prepare diff --git a/target/arm/Makefile b/target/arm/Makefile index 9efddfac9..634bee924 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -108,11 +108,10 @@ kernel-install: kernel-strip dtb-install: ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) - env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ - dtbs $(MAKE_TRACE) + env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) dtbs $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ + env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \ imx6q-cubox-i.dtb imx6dl-cubox-i.dtb imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE) endif for x in $(LINUX_DIR)/arch/arm/boot/dts/*.dtb; do \ diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk index 86f38c2dd..90759cea2 100644 --- a/target/config/Config.in.adk +++ b/target/config/Config.in.adk @@ -110,4 +110,16 @@ config ADK_HOST_CYGWIN bool "Cygwin" endchoice + +config ADK_PRELINK + prompt "Prelink binaries and libraries in Image" + boolean + help + Do prelinking for faster loading of binaries. + +config ADK_PRELINK_OPTS + string "additional options to pass to prelink" + default "-mR" + depends on ADK_PRELINK + endmenu diff --git a/target/ppc/Makefile b/target/ppc/Makefile index e1df1ef29..9a5529642 100644 --- a/target/ppc/Makefile +++ b/target/ppc/Makefile @@ -71,7 +71,7 @@ kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} dtb-install: - env $(KERNEL_MAKE_ENV) $(MAKE) -C $(LINUX_DIR) $(KERNEL_MAKE_OPTS) \ + env $(KERNEL_MAKE_ENV) $(MAKE) $(KERNEL_MAKE_OPTS) \ -j${ADK_MAKE_JOBS} virtex440-ml507.dtb $(MAKE_TRACE) $(CP) $(LINUX_DIR)/arch/powerpc/boot/virtex440-ml507.dtb \ $(FW_DIR)/ppc.dtb |