From 848da4f1318cc12619512f4e66c6b281155c5f8a Mon Sep 17 00:00:00 2001
From: Alistair Strachan
Date: Tue, 16 Oct 2018 15:24:16 -0700
Subject: Build the x15 U-Boot binaries from source.

This change builds a config for U-Boot and then builds the MLO and
u-boot.img files from the external/u-boot source tree. It uses symlinks
to the host toolchain to preserve the Android build system's hermetic
requirements. (The recommended configs were derived from the Things
configs.)

Bug: 110964307
Change-Id: I634c607ca5c07d24d46278aaf8215c70bc2e6aa0
Signed-off-by: Alistair Strachan <astrachan@google.com>
---
 mergeconfig.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100755 mergeconfig.sh

(limited to 'mergeconfig.sh')

diff --git a/mergeconfig.sh b/mergeconfig.sh
new file mode 100755
index 0000000..70f0d1f
--- /dev/null
+++ b/mergeconfig.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+#
+# Copyright 2015 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+args=( "$@" )
+confs=( )
+
+KERNEL_PATH=${args[0]}
+OUTPUT=${args[1]}
+TARGET_ARCH=${args[2]}
+TARGET_CROSS_COMPILE=${args[3]}
+
+unset "args[0]"
+unset "args[1]"
+unset "args[2]"
+unset "args[3]"
+
+curdir=$(pwd)
+
+# Explicitly record the list of config files used to build .config, and
+# canonicalize the path since we have to have our current directory in
+# the kernel source tree.
+for conf in ${args[*]} ; do
+	fullpath=$conf
+	if [ ${fullpath:0:1} != "/" ] ; then
+		fullpath=$curdir/$fullpath
+	fi
+	confs+=($fullpath)
+	echo $conf
+done > $OUTPUT/config.list
+
+cd $KERNEL_PATH
+
+ARCH=$TARGET_ARCH CROSS_COMPILE=$TARGET_CROSS_COMPILE ./scripts/kconfig/merge_config.sh -O $OUTPUT ${confs[*]} > $OUTPUT/merge_config.log
-- 
cgit v1.2.3-54-g00ecf