diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2013-04-24 10:13:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2013-04-24 10:13:51 +0000 |
| commit | 302d48b904ac4c6d02ae0fcd77dff57e718d9211 (patch) | |
| tree | 99e0a4f72a850ed079299044fe6e71e8de927486 | |
| parent | ac49246963d5191d6391b9e164fe42d012470dd4 (diff) | |
| parent | eb8eed44b10542389c018433233682d377c26793 (diff) | |
| download | build-302d48b904ac4c6d02ae0fcd77dff57e718d9211.tar.gz | |
Merge "core: Add support for Device tree blob for HiSilicon" into linaro_android_4.2.2
| -rw-r--r-- | core/Makefile | 6 | ||||
| -rw-r--r-- | core/config.mk | 5 | ||||
| -rw-r--r-- | target/board/Android.mk | 4 |
3 files changed, 15 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 856216caf9..2a712a49e5 100644 --- a/core/Makefile +++ b/core/Makefile @@ -380,6 +380,7 @@ ifneq ($(strip $(TARGET_NO_KERNEL)),true) # the boot image, which is a collection of other images. INTERNAL_BOOTIMAGE_ARGS := \ $(addprefix --second ,$(INSTALLED_2NDBOOTLOADER_TARGET)) \ + $(addprefix --dt ,$(INSTALLED_DTB_TARGET)) \ --kernel $(INSTALLED_KERNEL_TARGET) \ --ramdisk $(INSTALLED_RAMDISK_TARGET) @@ -395,6 +396,11 @@ ifdef BOARD_KERNEL_BASE INTERNAL_BOOTIMAGE_ARGS += --base $(BOARD_KERNEL_BASE) endif +TARGET_TAG_ADDRESS := $(strip $(TARGET_TAG_ADDRESS)) +ifdef TARGET_TAG_ADDRESS + INTERNAL_BOOTIMAGE_ARGS += --tags-addr $(TARGET_TAG_ADDRESS) +endif + BOARD_KERNEL_PAGESIZE := $(strip $(BOARD_KERNEL_PAGESIZE)) ifdef BOARD_KERNEL_PAGESIZE INTERNAL_BOOTIMAGE_ARGS += --pagesize $(BOARD_KERNEL_PAGESIZE) diff --git a/core/config.mk b/core/config.mk index d7cf8619f2..99114c0f78 100644 --- a/core/config.mk +++ b/core/config.mk @@ -275,6 +275,7 @@ endif endif + # --------------------------------------------------------------- # Generic tools. @@ -288,7 +289,11 @@ ICUDATA := $(HOST_OUT_EXECUTABLES)/icudata$(HOST_EXECUTABLE_SUFFIX) SIGNAPK_JAR := $(HOST_OUT_JAVA_LIBRARIES)/signapk$(COMMON_JAVA_PACKAGE_SUFFIX) MKBOOTFS := $(HOST_OUT_EXECUTABLES)/mkbootfs$(HOST_EXECUTABLE_SUFFIX) MINIGZIP := $(HOST_OUT_EXECUTABLES)/minigzip$(HOST_EXECUTABLE_SUFFIX) +ifeq (,$(strip $(PREBUILT_MKBOOTIMG))) MKBOOTIMG := $(HOST_OUT_EXECUTABLES)/mkbootimg$(HOST_EXECUTABLE_SUFFIX) +else +MKBOOTIMG := $(PREBUILT_MKBOOTIMG) +endif MKYAFFS2 := $(HOST_OUT_EXECUTABLES)/mkyaffs2image$(HOST_EXECUTABLE_SUFFIX) APICHECK := $(HOST_OUT_EXECUTABLES)/apicheck$(HOST_EXECUTABLE_SUFFIX) FS_GET_STATS := $(HOST_OUT_EXECUTABLES)/fs_get_stats$(HOST_EXECUTABLE_SUFFIX) diff --git a/target/board/Android.mk b/target/board/Android.mk index c4656f263a..b95e34b5ba 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -24,6 +24,10 @@ else INSTALLED_KERNEL_TARGET := endif +ifeq ($(strip $(TARGET_HAS_DEVICETREE)),true) + INSTALLED_DTB_TARGET := $(PRODUCT_OUT)/boot/$(or $(INSTALLED_DTB_TARGET_NAME),board.dtb) +endif + -include $(TARGET_DEVICE_DIR)/AndroidBoard.mk # Generate a file that contains various information about the |