Remove legacy make rules
We don't have boot.img and tz.img in mendel anymore.
Test: m, check boot_arm64.img
Change-Id: I25b198d4fcdbf9069952883f6a9f40a004ebb63e
diff --git a/boot.mk b/boot.mk
index d313077..afbb3ce 100644
--- a/boot.mk
+++ b/boot.mk
@@ -20,15 +20,10 @@
boot: $(PRODUCT_OUT)/boot_$(USERSPACE_ARCH).img
-$(PRODUCT_OUT)/boot_$(USERSPACE_ARCH).img: $(PRODUCT_OUT)/boot.img
+$(PRODUCT_OUT)/boot_$(USERSPACE_ARCH).img: | out-dirs
+ $(LOG) boot fallocate
fallocate -l $(BOOT_SIZE_MB)M $(PRODUCT_OUT)/boot_$(USERSPACE_ARCH).img
mkfs.ext2 -F $(PRODUCT_OUT)/boot_$(USERSPACE_ARCH).img
-
-$(PRODUCT_OUT)/boot.img: linux-mtk | out-dirs
- $(LOG) linux-mtk extract
- find $(PRODUCT_OUT)/packages -name 'linux-image*$(USERSPACE_ARCH)*.deb' | xargs \
- dpkg --fsys-tarfile | \
- tar --strip-components 2 -C $(PRODUCT_OUT) -xf - ./boot/boot.img
- $(LOG) linux-mtk finished
+ $(LOG) boot finished
.PHONY:: boot
diff --git a/trustzone.mk b/trustzone.mk
deleted file mode 100644
index 9210da5..0000000
--- a/trustzone.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018 Google LLC
-#
-# 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
-#
-# https://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.
-
-ifeq ($(ROOTDIR),)
-$(error $$ROOTDIR IS NOT DEFINED -- don\'t forget to source setup.sh)
-endif
-
-include $(ROOTDIR)/build/preamble.mk
-
-tz: $(PRODUCT_OUT)/tz.img
-
-$(PRODUCT_OUT)/tz.img: trustzone | out-dirs
- $(LOG) linux-mtk extract
- find $(PRODUCT_OUT)/packages -name 'trustzone*$(USERSPACE_ARCH)*.deb' | xargs \
- dpkg --fsys-tarfile | \
- tar --strip-components 2 -C $(PRODUCT_OUT) -xf - ./boot/tz.img
- $(LOG) linux-mtk finished
-
-.PHONY:: tz
