From patchwork Sun Sep 10 06:22:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 7162 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4Rk0CL52gZz3wtK for ; Sun, 10 Sep 2023 06:23:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4Rk0CK0JzNzyP; Sun, 10 Sep 2023 06:23:09 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4Rk0CJ6c06z2yPg; Sun, 10 Sep 2023 06:23:08 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4Rk0CH0fMqz2xN0 for ; Sun, 10 Sep 2023 06:23:07 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4Rk0CG1ysPzyP; Sun, 10 Sep 2023 06:23:06 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1694326986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=A3N4JB4KND9mj+DfS54Mj2S9pi5KWR9Bk4rIj3uliGg=; b=gvkjZarK24co4d90tMPHDkf3MKdSMNysfiFeBHfPI+QNCpWpcgaM9MOKer+gZZQ5wdlCfY PNgWMjrxSAvERJCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1694326986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=A3N4JB4KND9mj+DfS54Mj2S9pi5KWR9Bk4rIj3uliGg=; b=hi9hhGS2Y1nZzlHLuFUXdDX7e0enbyHgXH9J7GjWCw+GAcjdrtclUJJbKfIo9uSt0a18v6 odehtjtPOSLAiPXJUmwbjJngekXPY/5kgj/S3U/flTRDYOjTR/v9oiGOClHtYEBidTLk+l ritIfvGGAqud1tT9+8W3oIUPzBvXCtqKybkSW/Ye4bKFxpgz8C9pPjlcqW09VidfaV4VE+ ugxUAH4QjRB/GvM+gB84+HTTGrMnZNRmtnnclpb+7zrBFwAj73yB7MnL0Rjlm/6eWJFbR3 El33R+FJTA3iEMCbN7XvjDAbSqLAhIM4UeF4XS30wxVG0iwJrIsa8XCLjWD6qA== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] u-boot: remove seperate mkinit pass Date: Sun, 10 Sep 2023 06:22:56 +0000 Message-Id: <20230910062256.4004064-1-arne_f@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arne Fitzenreiter Errors-To: development-bounces@lists.ipfire.org Sender: "Development" this is not needed anymore because the kernel is now build after all other programs. Signed-off-by: Arne Fitzenreiter --- 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 # +# Copyright (C) 2007-2023 IPFire Team # # # # 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