diff options
author | Ian Zerny | 2018-08-28 02:29:45 -0500 |
---|---|---|
committer | android-build-merger | 2018-08-28 02:29:45 -0500 |
commit | d90d5a69f9b7dc299bbefb74f4bafb43a1534a36 (patch) | |
tree | 0640d4e16c9dc9fa022e1b2b4e97edaa354ce37b | |
parent | 62226a7f964804cbf853167c4576e0d98cdfcced (diff) | |
parent | e5e81d266a6b30b88200a3f0ec69e19a4634d57c (diff) | |
download | u-boot-d90d5a69f9b7dc299bbefb74f4bafb43a1534a36.tar.gz u-boot-d90d5a69f9b7dc299bbefb74f4bafb43a1534a36.tar.xz u-boot-d90d5a69f9b7dc299bbefb74f4bafb43a1534a36.zip |
Merge "Revert "Add Android.bp to build U-Boot's mkimage."" am: a2acd31a58 am: 72d7fbb699android10-dev
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 @@ | |||
1 | // Copyright 2018 Google Inc. All rights reserved. | ||
2 | // | ||
3 | // Licensed under the Apache License, Version 2.0 (the "License"); | ||
4 | // you may not use this file except in compliance with the License. | ||
5 | // You may obtain a copy of the License at | ||
6 | // | ||
7 | // http://www.apache.org/licenses/LICENSE-2.0 | ||
8 | // | ||
9 | // Unless required by applicable law or agreed to in writing, software | ||
10 | // distributed under the License is distributed on an "AS IS" BASIS, | ||
11 | // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
12 | // See the License for the specific language governing permissions and | ||
13 | // limitations under the License. | ||
14 | |||
15 | // NOTE: image-sig (RSA signature) support is broken because the U-Boot code | ||
16 | // requires API features from openssl which are not provided by boringssl | ||
17 | |||
18 | cc_binary_host { | ||
19 | name: "mkimage", | ||
20 | |||
21 | cflags: [ | ||
22 | "-D__KERNEL_STRICT_NAMES", | ||
23 | "-D_GNU_SOURCE", | ||
24 | "-DMKIMAGE_DTC=\"dtc\"", | ||
25 | "-DUSE_HOSTCC", | ||
26 | "-Wno-missing-field-initializers", | ||
27 | "-Wno-pointer-arith", | ||
28 | "-Wno-unused-parameter", | ||
29 | "-Wno-visibility", | ||
30 | "-include linux/kconfig.h", | ||
31 | "-include compiler.h", | ||
32 | ], | ||
33 | |||
34 | srcs: [ | ||
35 | "common/bootm.c", | ||
36 | "common/hash.c", | ||
37 | "common/image.c", | ||
38 | "common/image-fit.c", | ||
39 | "lib/crc32.c", | ||
40 | "lib/fdtdec.c", | ||
41 | "lib/fdtdec_common.c", | ||
42 | "lib/libfdt/fdt_region.c", | ||
43 | "lib/libfdt/fdt_ro.c", | ||
44 | "lib/md5.c", | ||
45 | "lib/rc4.c", | ||
46 | "lib/sha1.c", | ||
47 | "lib/sha256.c", | ||
48 | "tools/aisimage.c", | ||
49 | "tools/atmelimage.c", | ||
50 | "tools/default_image.c", | ||
51 | "tools/fit_common.c", | ||
52 | "tools/fit_image.c", | ||
53 | "tools/gpimage.c", | ||
54 | "tools/gpimage-common.c", | ||
55 | "tools/image-host.c", | ||
56 | "tools/imagetool.c", | ||
57 | "tools/imximage.c", | ||
58 | "tools/kwbimage.c", | ||
59 | "tools/libfdt/fdt.c", | ||
60 | "tools/libfdt/fdt_addresses.c", | ||
61 | "tools/libfdt/fdt_empty_tree.c", | ||
62 | "tools/libfdt/fdt_overlay.c", | ||
63 | "tools/libfdt/fdt_rw.c", | ||
64 | "tools/libfdt/fdt_strerror.c", | ||
65 | "tools/libfdt/fdt_sw.c", | ||
66 | "tools/libfdt/fdt_wip.c", | ||
67 | "tools/lpc32xximage.c", | ||
68 | "tools/mkimage.c", | ||
69 | "tools/mxsimage.c", | ||
70 | "tools/omapimage.c", | ||
71 | "tools/os_support.c", | ||
72 | "tools/pbl_crc32.c", | ||
73 | "tools/pblimage.c", | ||
74 | "tools/rkcommon.c", | ||
75 | "tools/rkimage.c", | ||
76 | "tools/rksd.c", | ||
77 | "tools/rkspi.c", | ||
78 | "tools/socfpgaimage.c", | ||
79 | "tools/stm32image.c", | ||
80 | "tools/ublimage.c", | ||
81 | "tools/vybridimage.c", | ||
82 | "tools/zynqimage.c", | ||
83 | "tools/zynqmpbif.c", | ||
84 | "tools/zynqmpimage.c", | ||
85 | ], | ||
86 | |||
87 | local_include_dirs: [ | ||
88 | "prebuilt-intermediates", | ||
89 | "scripts/dtc/libfdt", | ||
90 | "tools", | ||
91 | ], | ||
92 | } | ||
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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | /* 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 @@ | |||
1 | #define U_BOOT_DATE "Jan 1 2000" | ||
2 | #define U_BOOT_TIME "00:00:00" | ||
3 | #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 @@ | |||
1 | #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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../../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 @@ | |||
1 | ../../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 @@ | |||
1 | ../../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 @@ | |||
1 | ../../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 @@ | |||
1 | ../../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../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 @@ | |||
1 | ../include/watchdog.h \ No newline at end of file | ||