From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mx.groups.io with SMTP id smtpd.web10.3.1571664300358170278 for ; Mon, 21 Oct 2019 06:25:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=In8N4C3g; spf=pass (domain: linaro.org, ip: 209.85.221.66, mailfrom: ard.biesheuvel@linaro.org) Received: by mail-wr1-f66.google.com with SMTP id z9so13977367wrl.11 for ; Mon, 21 Oct 2019 06:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=kRdJVInzg3OERHXPYzVP2WT/nSXxv0y/DnW6264bn7M=; b=In8N4C3gCoT7AQ48593juDnjZ8PmhWJO8ue+CJ1hX/8XbpEwAeY/3TfsE8NlFTp+Uk 8OE4c9R1feNUlx1nU/xOriBy0+5FFPpNBm9aapU1gy8Ngc6XbrQEBs6p2wPL/im6HB8X 4+tcr8AeLUVhuypEzpcs3VS6ahtFytRb8HV3r78j6ruB7F4L+6Set4Se1SIFx3ixlXcT nZ4m1WXHj7TWGUCGLU4mFKKEzuFMSazZ6tqwxyJTP88ZeAJ581SKnaD4X+s+rwgN3EHn R7tYveZr1qKaiVD9NLRtLJMCwkJLVFFk3KmdfTZSfhDi6G1Py71fjhLkglA5YBTqTTJ2 B7nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=kRdJVInzg3OERHXPYzVP2WT/nSXxv0y/DnW6264bn7M=; b=OhhPth6oOxRmmzkMKJDoN9yUYcdjWaQ2CED3SOeKQRr8i6wNGLi6c0Pp9HCocHoFWM igedZZcDGC6E/vecamVtdh3/fe+JGoORiCUJqdOssAQ7yZNZ68JYt1MADe4YnbJLWXW9 XtQnepjBIl+y2TBEWebqcF0/4G6IjEkznWmSUa2s1TRQOeJXQd+zTVKZKofs7t5/oDrh uMIqfs/t1oK1bD4ecvMq9VBLx2gomiB2cUrVw/TuF8UH8jw/1Wi9ntdXQ9xFnwRGU3P5 dMfD02S95teakgCBI5XkLhr97Scn0AKe7/wcCAiEiLU9YUjnP7deK/Mhmudln8WXzALt wCBA== X-Gm-Message-State: APjAAAXh7qWz4GWMKvsFgRfNmAn0+7LObl3XM4Ckx8OO508dT9/i8sw2 mpDtKVNCpH7KfaIIXv+MJNBpviTEyixIG1lMixf9iw== X-Google-Smtp-Source: APXvYqy4m40+uaKp3yCpe9ArVPJ3agHFBl846uKbJrAyL9l7qeqEaR3rAFNQDvF0ErrjXNGJrElecM323QAdXKuIMiQ= X-Received: by 2002:adf:fd88:: with SMTP id d8mr145901wrr.200.1571664298876; Mon, 21 Oct 2019 06:24:58 -0700 (PDT) MIME-Version: 1.0 References: <20191021112506.1456-1-pete@akeo.ie> <6baf8d74-3639-593c-419a-c4e8d4e6b7d0@redhat.com> <1a295e8f-a679-0a03-283a-850e93c97bab@akeo.ie> In-Reply-To: From: "Ard Biesheuvel" Date: Mon, 21 Oct 2019 15:24:47 +0200 Message-ID: Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/1] Platforms/RPi3: Restructure platform in preparation for Pi 4 To: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= Cc: edk2-devel-groups-io , Pete Batard , Leif Lindholm Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 21 Oct 2019 at 15:09, Philippe Mathieu-Daud=C3=A9 wrote: > > On 10/21/19 2:52 PM, Pete Batard wrote: > > Hi Philippe, > > > > On 2019.10.21 13:28, Philippe Mathieu-Daud=C3=A9 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 th= e > > 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 a= s > > 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.