summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Desaulniers <ndesaulniers@google.com>2020-01-29 11:12:24 -0800
committerNick Desaulniers <ndesaulniers@google.com>2020-01-29 13:47:36 -0800
commitaa78a2e9e8460026dab81a779153b2e55a6acdf9 (patch)
tree0e2b31174461bfd7d195fc4c46d3c1787330d490
parentb0cb3756fa6df51dfafc599f92685c4dceac8715 (diff)
downloadbeagle-x15-aa78a2e9e8460026dab81a779153b2e55a6acdf9.tar.gz
beagle_x15: use prebuilt u-boot
In order to remove final arm32 gcc cross compiler, we need to be able to build u-boot with Clang, but are facing: https://bugs.llvm.org/show_bug.cgi?id=44562 Until that is fixed, move to a prebuilt binary for u-boot to unblock removing old GCC as per: https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86/+/master/GCC_4_9_DEPRECATION.md Bug: 147296060 Test: lunch beagle_x15 && m && find $OUT -name MLO && \ find $OUT -name u-boot.img Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Change-Id: I848dba99e622e07560888a62d84bc9cb55f92050
-rw-r--r--BoardConfig.mk6
-rw-r--r--bootloader/MLObin0 -> 130318 bytes
-rw-r--r--bootloader/u-boot.imgbin0 -> 1070516 bytes
3 files changed, 6 insertions, 0 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 181d2b6..529a74e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,6 +79,12 @@ endif
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
+# Copy uboot prebuilts
+PRODUCT_COPY_FILES += \
+ device/ti/beagle_x15/bootloader/MLO:$(TARGET_OUT)/MLO \
+ device/ti/beagle_x15/bootloader/u-boot.img:$(TARGET_OUT)/u-boot.img \
+
+
# Copy kernel modules (including pvrsrvkm.ko) into /vendor/lib/modules
BOARD_ALL_MODULES := $(shell find $(LOCAL_KERNEL_HOME) -type f -iname '*.ko')
BOARD_VENDOR_KERNEL_MODULES += $(BOARD_ALL_MODULES)
diff --git a/bootloader/MLO b/bootloader/MLO
new file mode 100644
index 0000000..649fdba
--- /dev/null
+++ b/bootloader/MLO
Binary files differ
diff --git a/bootloader/u-boot.img b/bootloader/u-boot.img
new file mode 100644
index 0000000..7123e2e
--- /dev/null
+++ b/bootloader/u-boot.img
Binary files differ