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.web09.572.1571668121815720182 for ; Mon, 21 Oct 2019 07:28:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@akeo-ie.20150623.gappssmtp.com header.s=20150623 header.b=wrpwDRrs; spf=none, err=permanent DNS error (domain: akeo.ie, ip: 209.85.221.66, mailfrom: pete@akeo.ie) Received: by mail-wr1-f66.google.com with SMTP id n15so3451851wrw.13 for ; Mon, 21 Oct 2019 07:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=Ptox34RahnIuz0C+Zhu03STGM3PNdMBKIzq3KWdWvzk=; b=wrpwDRrsf04kLSK+gHMXCYHw7KRbt6+GmJfYK8IELF3qc3HsCBj7dDObHtttLgT6nj Dt1ZDuaMEPF1MYdYlV/NLBKo/9FqF4QPOh8xIG3M9Q/q5asqp71Pd993anoHf2Veo+GB +kYJG4bcDOUKhVoezXSYnlAVCYyZ/xLw6tlbGQx904eXcqkBvmJGeoiIGppbqumeONx7 YjUuHI7uvnv+vV2YaEg4PdK0RyPfVrwPJo2cWXBF7AG8bJ/wzY5oGVeni6RtgZJdTu0v efuKEafkuMqY8ccNbBO5+oHL6xnU/awBB5yp5CNMnhYcm+IWEbN/w8SfOr2BFPLaOA42 rrNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Ptox34RahnIuz0C+Zhu03STGM3PNdMBKIzq3KWdWvzk=; b=FrF3l/iB6A3FRZ8FQs04+rQxek2z9hqg4K+AAMbUgvlv9XZda4Gyi3k7rdsgvRrVjj 9UN4LXU7DHSW5LdBIoavDY4sFYFdvP8cl2DaHAY5xt/HrSSgnwZiXWI1Dr6CGMd4+Yys Z90ALYQNuiykrRujy8ZsG2AvbB2tbAYKaLGrZ6oYos3tqpYgJHMTM+kbbXF0TVTMKh/I 1SWiP4KazQR8Vc4yoC+dt+54az8Rmp6gRYMWdqY2IQ4u42zRQdSVhHsxY2uGoT0sR5sL Ym3XRBkd5ymOQr0nhmqr9CL9GTrHKkoBY6geDFjOtj1jmzGfL6cdjXUPd6CQ89H5CBer 46nw== X-Gm-Message-State: APjAAAXeyvG3+LIOgB5sV5HbVLOJvmUVNW3IHrWAy0ye8pIqihstwWJ0 R3Bjh5p7wcSyarV7jHLdK2+2mmFbErb8tA== X-Google-Smtp-Source: APXvYqxr0NFAcZQ6B1dau1IlLGW5ZVb9Jk69fqPiXjhKsl7JuAi2cw4emliUcu+AyUumv0caHBMiaQ== X-Received: by 2002:adf:ec0b:: with SMTP id x11mr427563wrn.107.1571668119867; Mon, 21 Oct 2019 07:28:39 -0700 (PDT) Return-Path: Received: from [10.0.0.122] ([84.203.44.122]) by smtp.googlemail.com with ESMTPSA id b1sm7428393wru.83.2019.10.21.07.28.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 07:28:38 -0700 (PDT) Subject: Re: [edk2-devel] [edk2-platforms][PATCH 1/1] Platforms/RPi3: Restructure platform in preparation for Pi 4 To: Leif Lindholm , Ard Biesheuvel Cc: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , edk2-devel-groups-io References: <20191021112506.1456-1-pete@akeo.ie> <6baf8d74-3639-593c-419a-c4e8d4e6b7d0@redhat.com> <1a295e8f-a679-0a03-283a-850e93c97bab@akeo.ie> <20191021134628.GC16820@bivouac.eciton.net> From: "Pete Batard" Message-ID: <240b08f4-e91e-8003-f7a6-5b0e1169b4b6@akeo.ie> Date: Mon, 21 Oct 2019 15:28:37 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <20191021134628.GC16820@bivouac.eciton.net> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit Hi Leif, On 2019.10.21 14:46, Leif Lindholm wrote: > 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? Sounds good. Feel free to go ahead with these changes, thanks. /Pete > > Best Regards, > > Leif >