From patchwork Wed May 22 07:02:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3111 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 30DBF40F8A for ; Wed, 22 May 2024 09:02:49 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-57837716b64sf21632a12.2 for ; Wed, 22 May 2024 00:02:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361369; cv=pass; d=google.com; s=arc-20160816; b=XMdBWktoYcMTgMlms05sjt00WZN4pNURzX3I4x2u5WjjFYORJIOxVGpCbB2bgIwVou Luu5SFvgjzMrHu5+q5JlPUuPAE+PA9HKtSK3VZGn+lRC3SlUHetQ+9AOZ4/i6+WSwxAD os2mHErLSr5h74UoZFP3oHPH/7wstf6+3sApi5Km9cysEkdSqbktaGzc7she2vVHLpUD q2WieXbccqH16rOkJ5re4xpqASAEh9g19dqsptmY9Fga93STLGs5gbelky+o4Xzp9KV0 umRMo1UC65hD3oTcc3eClHdnRepErM56veHUcU5oGzqca91edleKWeFx0u7Zc1C+T0NU ka1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=0kkZ9w/LNl6vbzV1SgGHl+1hpA3KLIf4shjPFDb/2Eg=; fh=KKIwbp46dsesFdos2GpKdtwW/U7tCTKUrI7jzqsXyhs=; b=PCR1YEGs/A9HLgKmhwW+ZRZBf+98wG66bi3kD8BtUQDhIBv3kHbi3rJo3YNXE0HH0m 4E+XXkTU2WopXlcpxf8LYhTDJAB+5WNLfvWZEo7FgIlrEJHVPPPRl3rnYxWIGcSTzKQ/ feLGXWQHaC+cz1/6A+GNZ8OY9dkDxYiLV4Ke5I7Wao/2kXFxPYLT/KyLgYZ7OEj+vPNx hqokhIgA85MSl2evXq/a0nkc1wlsOPyfWAr8IXXenjrkxArrUpsnI/rZzZK4Rjg/Z/dg KFj8kV4hKur+4C3KXM0LdnXS4ndLEm808MSOA0jJNzKHOM15L0S2IFBCUOVSN+AS0OPA g+6g==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m5P3o2uB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1716361369; x=1716966169; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=0kkZ9w/LNl6vbzV1SgGHl+1hpA3KLIf4shjPFDb/2Eg=; b=ULTJ8TwBgm7Qylfhh2qI+IWgPWrsNrr0ZURiR4rBn4eXnu8LtqGzQfr2GHQJkRRQwc U+aU73fwevtRWcF7otrAAgDnzcwvIy51DSAN7uE21IiEV0IB3RZkTUvp3uuhSoYOHLd4 j1M4NISfNHiKNc58v4yN/jxibWygId424dyRE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361369; x=1716966169; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0kkZ9w/LNl6vbzV1SgGHl+1hpA3KLIf4shjPFDb/2Eg=; b=Kr1yOA3AE+r52v9bDeMr3shUg7knXlpaFWSQMIEp8HHExiSYNVCKv1N3gZf40/EJE7 5t1ur/2MYDFM6QdIy8SMPdEui0vvcecs1gUPra9yctkhKM8UBP4kbdjnyrq9hQ4yA6md CESkOM+AjT3g4LhaoyKdxxSWsvMm1o/Qd/e8odkpA+11NZ4Vy2mgKApnO4NFe6vvIBdm rh2j8YOxoqkCVZL5qM0RouFQyWHFFdik+gRWDw6nRTpaO73f/ygxv/Czvge7KWAe1roa arbnq1fG+q5kpxBeGvI/G1gpK/0CDRVIzGUsEjvUxc0GrSOPgEl595ZqcqkJTePNEZdy hhnw== X-Forwarded-Encrypted: i=2; AJvYcCX4foaWD7iSNpGZ3NHI/J6zRqONXjdYf6kc18hC6D7Nl5gyquA1Sw7O7OMxPcjyUhod3XwCBdqJiMwct64OmpyDLAAHbQ7YkAMacS0AgwmNf/x3WoFcl/1K0jJNJw== X-Gm-Message-State: AOJu0YwH27JsfCi5U56zPDaJ5BC4Mb8sseFDcN9M4g63OwXicpBAdKSa /Od9yFahp/5tKD9y14RLNbkuwsZjKrBN1AjbKTgxRKL7yy377ZiSMidrOatW1TNurQ== X-Google-Smtp-Source: AGHT+IE2r0i7D9x5Yd2giQ+qRrIiAfyC3E1OTBar9HeHvrcZANPF8zGACirlgyMz5aPhw2jMkh5OrQ== X-Received: by 2002:a50:d74e:0:b0:573:55ca:8f15 with SMTP id 4fb4d7f45d1cf-57832c11a20mr811107a12.39.1716361368928; Wed, 22 May 2024 00:02:48 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:321f:b0:578:3557:291e with SMTP id 4fb4d7f45d1cf-5783557295els97041a12.0.-pod-prod-03-eu; Wed, 22 May 2024 00:02:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhuDLvu8eYEpz08f+q9WyTgHWjAEHTSoeJR9K7c4Ky6LKwS8uv2jQk/zEV9b951IwJeHYyGhZYZ6PpjKZ/AdCfJn9sq9R8oUbyxyJNOZUy8Osk X-Received: by 2002:a50:d606:0:b0:575:d74:338c with SMTP id 4fb4d7f45d1cf-578329dd6e9mr739527a12.10.1716361367315; Wed, 22 May 2024 00:02:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361367; cv=none; d=google.com; s=arc-20160816; b=BhgTbf98aaBD86eL05BjL6nh314DII7Mq51ju24GDSskBGsfw5hYSD6IMg2ms/zG43 Fpv6HhV1fHKn4jvI95O7iHBLMLY/4c13wWdEuaH9XocuzytTXpX3SxNsyS2pEcFq8kn9 SQouuVHvyDo3tl+JsXqNsKpRyPSp/Io9+rOmbC+K4aZO20sgJJYBbLdfvoGUqjlBmRbW hmYr3at7pXvZqlz2xyNW4pl4QFzh65QgItnXz0rnDdjRZt6wJzMGZ04XTOCcR3tzjtuF nSjZOTpMl/bDmIzNKKPoj/eYH+nWgVOmlw8mFRzzjYxG/XwLE+5uit+AmTnvOsA6MRb2 ZaXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=J8QxtZpzTcjGG+oRZ9JSw66OD0qcS8ljXwjBF2rY3Yg=; fh=fqm0n0PUZxcnl4xfmI+JngJ/63sdTu4zc4O9K7OkYJU=; b=LzEMc3RQI18QLuLzU5gzVSU7IDIPZKs6B/rqSevW0YTW7Lb5s4rB+hglrw+E0wPuAz R+kJmv40baRBw1sWyR2Im9thlgYA6kG/xwi/u8QSMwD3v4r8nfxIOF+AVIzOfamIh1rK +zpeSWFFDEaeIIXn2pPuf3YzcHuxcw2aPulUEQQinY5Oiy7nwKlYYromm1czhCpSCvM9 3In+a8zZrwP5f9OIpXd2IznMcycYMFeCU07ijyHP9CJhAbGkUvMnRUvIkUeAVgloA/A+ RkqzoHs8fnaP/T1ibQBRf4AzdiXQQ0yMeHhjoOtVKLePceBpPYjqmh0ne03H3gHtrBjq mIlw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m5P3o2uB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 4fb4d7f45d1cf-5733ce2cff6sor1668205a12.2.2024.05.22.00.02.47 for (Google Transport Security); Wed, 22 May 2024 00:02:47 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCU1uK+SN9U4k8tw6/waUGoGkvlagT0qMRKHpWUHyZUeOFIK2exw7VcC7Z0v7h1/cxwmfi/zJz0vg5/b7/ORzP7Iq8Vo1WghgOOEyTOPL/cpOV80 X-Received: by 2002:a50:8e14:0:b0:56e:34e0:4699 with SMTP id 4fb4d7f45d1cf-57832be2ef7mr796154a12.30.1716361366902; Wed, 22 May 2024 00:02:46 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.02.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:02:46 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 02/18] board/pine64/rock64: make the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:21 +0200 Message-ID: <20240522070238.3282121-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=m5P3o2uB; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This commit allows the U-Boot patch to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- ...3328-needs-itb-image-to-boot-properly.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch index 2d35b78daaf2..7c8473603457 100644 --- a/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch +++ b/board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-properly.patch @@ -1,4 +1,4 @@ -From 211bf049084e6e374dac253138fa813682910146 Mon Sep 17 00:00:00 2001 +From d312c4e40bf816823bdcfd066dd2511b23e83c9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20=C5=81yszczek?= Date: Tue, 5 Feb 2019 22:08:54 +0100 Subject: [PATCH] Makefile: rk3328 needs itb image to boot properly @@ -7,16 +7,18 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Łyszczek +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile -index 8086f3c93e..a6425b5b03 100644 +index 149f83994814..ebbdf2596b9b 100644 --- a/Makefile +++ b/Makefile -@@ -799,6 +799,11 @@ ifneq ($(BUILD_ROM),) - ALL-$(CONFIG_X86_RESET_VECTOR) += u-boot.rom +@@ -923,6 +923,11 @@ ifeq ($(CONFIG_SYS_COREBOOT)$(CONFIG_SPL),yy) + ALL-$(CONFIG_BINMAN) += u-boot-x86-with-spl.bin endif +# rk3328 needs itb image to boot properly @@ -24,9 +26,9 @@ index 8086f3c93e..a6425b5b03 100644 +ALL-y += u-boot.itb +endif + - # enable combined SPL/u-boot/dtb rules for tegra - ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) - ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin + # Build a combined spl + u-boot image for sunxi + ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) + ALL-y += u-boot-sunxi-with-spl.bin -- -2.18.1 +2.43.0