From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.groups.io with SMTP id smtpd.web10.50.1571665592336567651 for ; Mon, 21 Oct 2019 06:46:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=nXNUc5Bc; spf=pass (domain: linaro.org, ip: 209.85.221.68, mailfrom: leif.lindholm@linaro.org) Received: by mail-wr1-f68.google.com with SMTP id z9so14066715wrl.11 for ; Mon, 21 Oct 2019 06:46:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=Sn5VLoy3STQdbqaBRfAn8UAqDdiAGippVrtcBDsct0w=; b=nXNUc5Bc8N/niu1ijJos8pCc0y3YR7hpJfhp1Ew5NwWRO4aC+2mhp2vq4ukephkct8 4pxyVM99eFk/8VhaDpielxBHIu1aOO0nHCt27Ct6p5HDfgQXlEQtJCruObmwrgqzFX8r 0bCPjmN27Ji0y7mNcL1eb28XcYk3/BC1UDMiXmMvttoomDVWZyT7jzh7pQ/9TZJo1ggw Zp6yau82TGlfUDTWb12mDsDcwVhnNRSMZ7UyRxvmrR06XB5VSyUwjL9JElJU2Swfp9lw c6nHhGFv/nI+vQ1MAfsiWkHdaz3S+aQyoqXV5CBKlJbYmr86sbNoV0d9tWI8+/P2atej ZAig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=Sn5VLoy3STQdbqaBRfAn8UAqDdiAGippVrtcBDsct0w=; b=ke6IqJpa389TAyW51pmQD7otu8tOhWzZhHxflxDHxu740hYpJFhDhu7K1MkLkeNCHN GC3zLY87MLwuHRRmBScmpgJOd6TwNXM4/SeUUrXyrY3ViW1Wk3hYfBZY3ItTY5OzY8hO LQHy7R9xdscayPGA16cwn2aAoLhv4c31AgGpe4yzBfFtFNpKMCmt7i9aimW1R5d4CehC WqeF44P6ho5H5d1gh8t1G8mgV216R1wYVGiv4lAOf8G1s5q/vu9v2fBf9Uf35eRVMaPC gBGcd8hshDzmG1QGulhYEiuDu40voSTbL8GNinJCFjT7PVayfhRaXqbS+RWaaxXNVjoI uC9Q== X-Gm-Message-State: APjAAAVAz7ef69PC1oePv4EnjRuC0US/P53yUWFu21eEcuTLWVP6LqNK 0oERurwQwf0dyUn88H140vCQMA== X-Google-Smtp-Source: APXvYqzqMn/DjTHIF/ZzD3TL5Era88qG+3vgqt+43LTvkgKqZwFf/Il+aSwZ4chQDLU7iFTIzRJZSA== X-Received: by 2002:adf:8567:: with SMTP id 94mr16701369wrh.65.1571665590860; Mon, 21 Oct 2019 06:46:30 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id a71sm14209607wme.11.2019.10.21.06.46.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Oct 2019 06:46:30 -0700 (PDT) Date: Mon, 21 Oct 2019 14:46:28 +0100 From: "Leif Lindholm" To: Ard Biesheuvel , Pete Batard Cc: Philippe =?iso-8859-1?Q?Mathieu-Daud=E9?= , edk2-devel-groups-io Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/1] Platforms/RPi3: Restructure platform in preparation for Pi 4 Message-ID: <20191021134628.GC16820@bivouac.eciton.net> References: <20191021112506.1456-1-pete@akeo.ie> <6baf8d74-3639-593c-419a-c4e8d4e6b7d0@redhat.com> <1a295e8f-a679-0a03-283a-850e93c97bab@akeo.ie> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit On Mon, Oct 21, 2019 at 03:24:47PM +0200, Ard Biesheuvel wrote: > On Mon, 21 Oct 2019 at 15:09, Philippe Mathieu-Daudé wrote: > > > > On 10/21/19 2:52 PM, Pete Batard wrote: > > > Hi Philippe, > > > > > > On 2019.10.21 13:28, Philippe Mathieu-Daudé wrote: > > >> Hi Pete, > > >> > > >> On 10/21/19 1:25 PM, Pete Batard wrote: > > >>> In preparation for adding Raspberry Pi 4 support, the Pi 3 platform > > >>> is restructured by factorizing all the drivers and libraries that are > > >>> going to be commonly used by the two platforms. > > >>> > > >>> Because much of the Pi 4 SoC is an extension of the Pi 3 one this > > >>> means that almost everything, except the ACPI tables, is moved up > > >>> into a new common RaspberryPi/ subdirectory that will serve both > > >>> platforms. The .dec is also moved to this directory, under a new > > >>> RaspberryPi.dec name, and existing references to it are updated. > > >>> > ... > > >> > > >> This change seems not related to the rest of your refactor. > > > > > > It is. See https://edk2.groups.io/g/devel/message/49288 > > > > > > The problem is we have no choice but to break the patch in two sections, > > > one that applies to edk2-platforms and the other to edk2-non-osi, since > > > these are separate repos, and the LogoDxe changes belong to non-osi. > > > > > > We need to have part of the non-osi patch that is applied to > > > edk2-platforms, and it would make little sense to break it down into the > > > non-osi related and platforms related, since it still relies on the > > > non-osi changes having been applied. > > > > I see. > > > > > > > > If anything, I guess we could consider that the non-osi patch should > > > come first. Still, whatever we do here, as long as only one of non-osi > > > and platform is applied, builds are going to be broken, and there is no > > > way to fix that unless you do consider the set of platforms + non-osi as > > > a single patch. > > > > Agreed, this is a egg/chicken problem. > > > > I dealt with this in the past by just making sure the non-osi and > platform changes are applied at the same time. So it is good to make > note of this in the cover letter, but other than that, there is no way > we can apply interdependent changes to two separate repositories at > the same time without either breaking bisect for one of them, or > making a huge effort to add temporary code, defines etc that will be > removed again right after the changes have landed. Agreed. My preference would be to treat edk2-non-osi as the chicken, and edk2-platforms the egg. I could put the requisite edk2-non-osi hash into the edk2-platforms commit message before pushing, adding a line like: "This commit requires the edk2-non-osi in use to contain commit in order to build." If I'm feeling nitpicky, that could replace the comment "No other changes are being applied at this stage." Pete: would you be OK with those two changes? Best Regards, Leif