From: Arne Fitzenreiter <arne_f@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] u-boot: remove seperate mkinit pass
Date: Sun, 10 Sep 2023 06:22:56 +0000 [thread overview]
Message-ID: <20230910062256.4004064-1-arne_f@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3294 bytes --]
this is not needed anymore because the kernel is now build after
all other programs.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
---
config/rootfiles/common/aarch64/u-boot | 1 +
config/rootfiles/common/aarch64/u-boot-mkimage | 1 -
lfs/u-boot | 11 ++---------
make.sh | 1 -
4 files changed, 3 insertions(+), 11 deletions(-)
delete mode 100644 config/rootfiles/common/aarch64/u-boot-mkimage
diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot
index a9b9ed435..241b19d3d 100644
--- a/config/rootfiles/common/aarch64/u-boot
+++ b/config/rootfiles/common/aarch64/u-boot
@@ -5,6 +5,7 @@ boot/u-boot-rpi3.bin
boot/u-boot-rpi4.bin
boot/uEnv.txt
boot/uboot.env
+usr/bin/mkimage
#usr/share/u-boot
#usr/share/u-boot/nanopi_r2c
usr/share/u-boot/nanopi_r2c/u-boot-rockchip.bin
diff --git a/config/rootfiles/common/aarch64/u-boot-mkimage b/config/rootfiles/common/aarch64/u-boot-mkimage
deleted file mode 100644
index 80864b79c..000000000
--- a/config/rootfiles/common/aarch64/u-boot-mkimage
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/mkimage
diff --git a/lfs/u-boot b/lfs/u-boot
index 2ad92df05..af4d6acd7 100644
--- a/lfs/u-boot
+++ b/lfs/u-boot
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2023 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -84,7 +84,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-ifneq "$(MKIMAGE)" "1"
# Raspberry Pi 3
-mkdir -pv /usr/share/u-boot/rpi
cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_config
@@ -93,6 +92,7 @@ ifneq "$(MKIMAGE)" "1"
cd $(DIR_APP) && install -v -m 644 u-boot.bin \
/usr/share/u-boot/rpi/u-boot-rpi3.bin
cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi3.bin
+ cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
cd $(DIR_APP) && make distclean
# Raspberry Pi 4
@@ -200,12 +200,5 @@ ifneq "$(MKIMAGE)" "1"
# patch real Kernel version to uEnv.txt
sed -e "s/xxxKVERxxx/$(KVER)/g" -i /boot/uEnv.txt
-else
- # mkimage
- cd $(DIR_APP) && make CROSS_COMPILE="" rpi_3_config
- cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" tools
- cd $(DIR_APP) && install -v -m 755 tools/mkimage /usr/bin
-endif
-
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index acb692140..6ede05406 100755
--- a/make.sh
+++ b/make.sh
@@ -1114,7 +1114,6 @@ buildipfire() {
lfsmake2 unzip
lfsmake2 which
lfsmake2 bc
- lfsmake2 u-boot MKIMAGE=1
lfsmake2 cpio
lfsmake2 mdadm
lfsmake2 dracut
--
2.34.1
reply other threads:[~2023-09-10 6:22 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230910062256.4004064-1-arne_f@ipfire.org \
--to=arne_f@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox