diff options
author | Ian Zerny <zerny@google.com> | 2018-08-28 00:29:45 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-08-28 00:29:45 -0700 |
commit | d90d5a69f9b7dc299bbefb74f4bafb43a1534a36 (patch) | |
tree | 0640d4e16c9dc9fa022e1b2b4e97edaa354ce37b | |
parent | 62226a7f964804cbf853167c4576e0d98cdfcced (diff) | |
parent | e5e81d266a6b30b88200a3f0ec69e19a4634d57c (diff) | |
download | u-boot-d90d5a69f9b7dc299bbefb74f4bafb43a1534a36.tar.gz |
Merge "Revert "Add Android.bp to build U-Boot's mkimage."" am: a2acd31a58 am: 72d7fbb699android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
am: e5e81d266a
Change-Id: I3b3ab413deaec896cc64ea4d621386288f31e555
25 files changed, 0 insertions, 118 deletions
diff --git a/Android.bp b/Android.bp deleted file mode 100644 index cf80822330..0000000000 --- a/Android.bp +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2018 Google Inc. All rights reserved. -// -// 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. - -// NOTE: image-sig (RSA signature) support is broken because the U-Boot code -// requires API features from openssl which are not provided by boringssl - -cc_binary_host { - name: "mkimage", - - cflags: [ - "-D__KERNEL_STRICT_NAMES", - "-D_GNU_SOURCE", - "-DMKIMAGE_DTC=\"dtc\"", - "-DUSE_HOSTCC", - "-Wno-missing-field-initializers", - "-Wno-pointer-arith", - "-Wno-unused-parameter", - "-Wno-visibility", - "-include linux/kconfig.h", - "-include compiler.h", - ], - - srcs: [ - "common/bootm.c", - "common/hash.c", - "common/image.c", - "common/image-fit.c", - "lib/crc32.c", - "lib/fdtdec.c", - "lib/fdtdec_common.c", - "lib/libfdt/fdt_region.c", - "lib/libfdt/fdt_ro.c", - "lib/md5.c", - "lib/rc4.c", - "lib/sha1.c", - "lib/sha256.c", - "tools/aisimage.c", - "tools/atmelimage.c", - "tools/default_image.c", - "tools/fit_common.c", - "tools/fit_image.c", - "tools/gpimage.c", - "tools/gpimage-common.c", - "tools/image-host.c", - "tools/imagetool.c", - "tools/imximage.c", - "tools/kwbimage.c", - "tools/libfdt/fdt.c", - "tools/libfdt/fdt_addresses.c", - "tools/libfdt/fdt_empty_tree.c", - "tools/libfdt/fdt_overlay.c", - "tools/libfdt/fdt_rw.c", - "tools/libfdt/fdt_strerror.c", - "tools/libfdt/fdt_sw.c", - "tools/libfdt/fdt_wip.c", - "tools/lpc32xximage.c", - "tools/mkimage.c", - "tools/mxsimage.c", - "tools/omapimage.c", - "tools/os_support.c", - "tools/pbl_crc32.c", - "tools/pblimage.c", - "tools/rkcommon.c", - "tools/rkimage.c", - "tools/rksd.c", - "tools/rkspi.c", - "tools/socfpgaimage.c", - "tools/stm32image.c", - "tools/ublimage.c", - "tools/vybridimage.c", - "tools/zynqimage.c", - "tools/zynqmpbif.c", - "tools/zynqmpimage.c", - ], - - local_include_dirs: [ - "prebuilt-intermediates", - "scripts/dtc/libfdt", - "tools", - ], -} diff --git a/prebuilt-intermediates/bootm.h b/prebuilt-intermediates/bootm.h deleted file mode 120000 index e045d8cb06..0000000000 --- a/prebuilt-intermediates/bootm.h +++ /dev/null @@ -1 +0,0 @@ -../include/bootm.h
\ No newline at end of file diff --git a/prebuilt-intermediates/bootstage.h b/prebuilt-intermediates/bootstage.h deleted file mode 120000 index e10131e134..0000000000 --- a/prebuilt-intermediates/bootstage.h +++ /dev/null @@ -1 +0,0 @@ -../include/bootstage.h
\ No newline at end of file diff --git a/prebuilt-intermediates/command.h b/prebuilt-intermediates/command.h deleted file mode 120000 index 3d918c0d16..0000000000 --- a/prebuilt-intermediates/command.h +++ /dev/null @@ -1 +0,0 @@ -../include/command.h
\ No newline at end of file diff --git a/prebuilt-intermediates/compiler.h b/prebuilt-intermediates/compiler.h deleted file mode 120000 index 715e568a91..0000000000 --- a/prebuilt-intermediates/compiler.h +++ /dev/null @@ -1 +0,0 @@ -../include/compiler.h
\ No newline at end of file diff --git a/prebuilt-intermediates/config.h b/prebuilt-intermediates/config.h deleted file mode 120000 index 31c4e5c758..0000000000 --- a/prebuilt-intermediates/config.h +++ /dev/null @@ -1 +0,0 @@ -../include/config.h
\ No newline at end of file diff --git a/prebuilt-intermediates/fdt_support.h b/prebuilt-intermediates/fdt_support.h deleted file mode 120000 index b515e50acb..0000000000 --- a/prebuilt-intermediates/fdt_support.h +++ /dev/null @@ -1 +0,0 @@ -../include/fdt_support.h
\ No newline at end of file diff --git a/prebuilt-intermediates/generated/autoconf.h b/prebuilt-intermediates/generated/autoconf.h deleted file mode 100644 index 710cecca97..0000000000 --- a/prebuilt-intermediates/generated/autoconf.h +++ /dev/null @@ -1 +0,0 @@ -/* Empty */ diff --git a/prebuilt-intermediates/generated/timestamp_autogenerated.h b/prebuilt-intermediates/generated/timestamp_autogenerated.h deleted file mode 100644 index 9ce5c78d1e..0000000000 --- a/prebuilt-intermediates/generated/timestamp_autogenerated.h +++ /dev/null @@ -1,3 +0,0 @@ -#define U_BOOT_DATE "Jan 1 2000" -#define U_BOOT_TIME "00:00:00" -#define U_BOOT_TZ "0000" diff --git a/prebuilt-intermediates/generated/version_autogenerated.h b/prebuilt-intermediates/generated/version_autogenerated.h deleted file mode 100644 index c3c8b1829f..0000000000 --- a/prebuilt-intermediates/generated/version_autogenerated.h +++ /dev/null @@ -1 +0,0 @@ -#define PLAIN_VERSION "2018.07" diff --git a/prebuilt-intermediates/hash.h b/prebuilt-intermediates/hash.h deleted file mode 120000 index 3d1f7613c3..0000000000 --- a/prebuilt-intermediates/hash.h +++ /dev/null @@ -1 +0,0 @@ -../include/hash.h
\ No newline at end of file diff --git a/prebuilt-intermediates/image.h b/prebuilt-intermediates/image.h deleted file mode 120000 index ff803f71ae..0000000000 --- a/prebuilt-intermediates/image.h +++ /dev/null @@ -1 +0,0 @@ -../include/image.h
\ No newline at end of file diff --git a/prebuilt-intermediates/imximage.h b/prebuilt-intermediates/imximage.h deleted file mode 120000 index 85bcd1fbd4..0000000000 --- a/prebuilt-intermediates/imximage.h +++ /dev/null @@ -1 +0,0 @@ -../include/imximage.h
\ No newline at end of file diff --git a/prebuilt-intermediates/linker_lists.h b/prebuilt-intermediates/linker_lists.h deleted file mode 120000 index fadc1cf72c..0000000000 --- a/prebuilt-intermediates/linker_lists.h +++ /dev/null @@ -1 +0,0 @@ -../include/linker_lists.h
\ No newline at end of file diff --git a/prebuilt-intermediates/linux/compiler-clang.h b/prebuilt-intermediates/linux/compiler-clang.h deleted file mode 120000 index c5b66b4bb0..0000000000 --- a/prebuilt-intermediates/linux/compiler-clang.h +++ /dev/null @@ -1 +0,0 @@ -../../include/linux/compiler-clang.h
\ No newline at end of file diff --git a/prebuilt-intermediates/linux/compiler.h b/prebuilt-intermediates/linux/compiler.h deleted file mode 120000 index e1089acd92..0000000000 --- a/prebuilt-intermediates/linux/compiler.h +++ /dev/null @@ -1 +0,0 @@ -../../include/linux/compiler.h
\ No newline at end of file diff --git a/prebuilt-intermediates/linux/kconfig.h b/prebuilt-intermediates/linux/kconfig.h deleted file mode 120000 index 0acd2ec14c..0000000000 --- a/prebuilt-intermediates/linux/kconfig.h +++ /dev/null @@ -1 +0,0 @@ -../../include/linux/kconfig.h
\ No newline at end of file diff --git a/prebuilt-intermediates/linux/libfdt.h b/prebuilt-intermediates/linux/libfdt.h deleted file mode 120000 index fb14cd340c..0000000000 --- a/prebuilt-intermediates/linux/libfdt.h +++ /dev/null @@ -1 +0,0 @@ -../../include/linux/libfdt.h
\ No newline at end of file diff --git a/prebuilt-intermediates/linux/libfdt_env.h b/prebuilt-intermediates/linux/libfdt_env.h deleted file mode 120000 index 9070c9df2f..0000000000 --- a/prebuilt-intermediates/linux/libfdt_env.h +++ /dev/null @@ -1 +0,0 @@ -../../include/linux/libfdt_env.h
\ No newline at end of file diff --git a/prebuilt-intermediates/rc4.h b/prebuilt-intermediates/rc4.h deleted file mode 120000 index 976089ddb6..0000000000 --- a/prebuilt-intermediates/rc4.h +++ /dev/null @@ -1 +0,0 @@ -../include/rc4.h
\ No newline at end of file diff --git a/prebuilt-intermediates/tee b/prebuilt-intermediates/tee deleted file mode 120000 index 7212bf0db8..0000000000 --- a/prebuilt-intermediates/tee +++ /dev/null @@ -1 +0,0 @@ -../include/tee
\ No newline at end of file diff --git a/prebuilt-intermediates/timestamp.h b/prebuilt-intermediates/timestamp.h deleted file mode 120000 index ea7a630284..0000000000 --- a/prebuilt-intermediates/timestamp.h +++ /dev/null @@ -1 +0,0 @@ -../include/timestamp.h
\ No newline at end of file diff --git a/prebuilt-intermediates/u-boot b/prebuilt-intermediates/u-boot deleted file mode 120000 index 0d1a07f244..0000000000 --- a/prebuilt-intermediates/u-boot +++ /dev/null @@ -1 +0,0 @@ -../include/u-boot
\ No newline at end of file diff --git a/prebuilt-intermediates/version.h b/prebuilt-intermediates/version.h deleted file mode 120000 index bb576071e8..0000000000 --- a/prebuilt-intermediates/version.h +++ /dev/null @@ -1 +0,0 @@ -../include/version.h
\ No newline at end of file diff --git a/prebuilt-intermediates/watchdog.h b/prebuilt-intermediates/watchdog.h deleted file mode 120000 index d214f992ee..0000000000 --- a/prebuilt-intermediates/watchdog.h +++ /dev/null @@ -1 +0,0 @@ -../include/watchdog.h
\ No newline at end of file |