diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2012-12-12 12:49:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@betelgeuse.canonical.com> | 2012-12-12 12:49:56 +0000 |
| commit | 2c71818b6322613d6aeccd699002bcc5ccb221e9 (patch) | |
| tree | 5c3e362a1155804f2fbf2af06ca131aa3db28e4f | |
| parent | 87576e4c07fe4655569bf2e0da8568d23d901a3a (diff) | |
| parent | 2b9ffe0bb14383f1c14a5ae98645bb49cd740f7a (diff) | |
Merge "tasks: uboot: kernel: build uboot from source for origen quad" into linaro-jb
| -rw-r--r-- | tasks/kernel.mk | 5 | ||||
| -rw-r--r-- | tasks/uboot.mk | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tasks/kernel.mk b/tasks/kernel.mk index bf3498d..8f2bb49 100644 --- a/tasks/kernel.mk +++ b/tasks/kernel.mk @@ -58,11 +58,6 @@ ifeq ($(INCLUDE_PERF),1) $(MAKE) EXTRA_CFLAGS="$(TARGET_EXTRA_CFLAGS) $(LOCAL_CFLAGS) -isystem $(REALTOP)/bionic/libc/include -isystem $(REALTOP)/bionic/libc/kernel/common -isystem $(REALTOP)/bionic/libc/kernel/arch-arm -isystem $(REALTOP)/bionic/libc/arch-arm/include -I$(REALTOP)/external/elfutils/libelf -isystem $(REALTOP)/bionic/libm/include -isystem $(shell dirname $(KERNEL_TOOLS_PREFIX))/../include -I$(KERNEL_OUT)/tools/perf" BASIC_LDFLAGS="-nostdlib -Wl,-dynamic-linker,/system/bin/linker,-z,muldefs$(shell if test $(PLATFORM_SDK_VERSION) -lt 16; then echo -ne ',-T$(REALTOP)/$(BUILD_SYSTEM)/armelf.x'; fi),-z,nocopyreloc,--no-undefined -L$(REALTOP)/$(TARGET_OUT_STATIC_LIBRARIES) -L$(REALTOP)/$(PRODUCT_OUT)/system/lib -L$(REALTOP)/external/elfutils -L$(realpath $(PRODUCT_OUT))/obj/STATIC_LIBRARIES/libelf_intermediates -lpthread -lelf -lm -lc $(REALTOP)/$(TARGET_CRTBEGIN_DYNAMIC_O) $(REALTOP)/$(TARGET_CRTEND_O)" $(KERNEL_VERBOSE) O=$(KERNEL_OUT)/tools/perf/ OUTPUT=$(KERNEL_OUT)/tools/perf/ ARCH=$(ARCH) CROSS_COMPILE=$(KERNEL_TOOLS_PREFIX) LD=$$LD prefix=/system NO_DWARF=1 NO_NEWT=1 NO_LIBPERL=1 NO_LIBPYTHON=1 NO_GTK2=1 NO_STRLCPY=1 WERROR=0 && \ cp -f $(KERNEL_OUT)/tools/perf/perf $(REALTOP)/$(PRODUCT_OUT)/system/bin/ endif -ifeq ($(TARGET_PRODUCT), origen_quad) -ifeq ($(USE_EMMC_UBOOT), true) - cp -f $(KERNEL_OUT)/arch/arm/boot/zImage $(REALTOP)/$(PRODUCT_OUT)/boot/ -endif -endif android_kernel_modules: $(INSTALLED_KERNEL_TARGET) $(ACP) export PATH=$(KERNEL_COMPILER_PATHS):$(PATH) &&\ diff --git a/tasks/uboot.mk b/tasks/uboot.mk index e579897..6a3e7d9 100644 --- a/tasks/uboot.mk +++ b/tasks/uboot.mk @@ -26,6 +26,12 @@ ifeq ($(USE_PREBUILT_UBOOT), false) # PATH ahead of everything else android_uboot: $(ACP) mkdir -p $(PRODUCT_OUT)/obj/u-boot +ifeq ($(TARGET_PRODUCT), origen_quad) + if [ -e $(TOP)/vendor/insignal/origen_quad/exynos4x12/exynos4x12.bl1.bin ]; then \ + mkdir -p $(TOP)/u-boot/firmware/origen_quad; \ + cp $(TOP)/vendor/insignal/origen_quad/exynos4x12/exynos4x12.bl1.bin $(TOP)/u-boot/firmware/origen_quad/bl1.fw; \ + fi +endif cd $(TOP)/u-boot &&\ if [ -e $(UBOOT_TCDIR)/$(UBOOT_TCPREFIX)ld.bfd ]; then ln -sf $(UBOOT_TCDIR)/$(UBOOT_TCPREFIX)ld.bfd $(UBOOT_TCPREFIX)ld; fi &&\ export PATH=`pwd`:$(UBOOT_TCDIR):$(PATH) && \ @@ -57,11 +63,9 @@ ifeq ($(TARGET_PRODUCT), origen) mkdir -p $(PRODUCT_OUT)/boot cp $(PRODUCT_OUT)/obj/u-boot/spl/origen-spl.bin $(PRODUCT_OUT)/boot/u-boot-mmc-spl.bin endif -endif - ifeq ($(TARGET_PRODUCT), origen_quad) -ifeq ($(USE_PREBUILT_UBOOT), true) -$(PRODUCT_OUT)/u-boot.bin: + mkdir -p $(PRODUCT_OUT)/boot + cp $(PRODUCT_OUT)/obj/u-boot/spl/origen_quad-spl.bin $(PRODUCT_OUT)/boot/u-boot-mmc-spl.bin endif endif |