[Skiboot] [PATCH v2 1/8] Dedup $(HW_OBJS)

Stewart Smith stewart at linux.ibm.com
Mon Jul 15 13:44:57 AEST 2019

Reza Arbab <arbab at linux.ibm.com> writes:
> On Tue, Jul 09, 2019 at 01:36:17PM +1000, Oliver O'Halloran wrote:
>>On Tue, Jul 9, 2019 at 7:09 AM Reza Arbab <arbab at linux.ibm.com> wrote:
>>> --- a/hw/Makefile.inc
>>> +++ b/hw/Makefile.inc
>>> @@ -6,10 +6,8 @@ HW_OBJS += nx.o nx-rng.o nx-crypto.o nx-compress.o nx-842.o nx-gzip.o
>>>  HW_OBJS += phb3.o sfc-ctrl.o fake-rtc.o bt.o p8-i2c.o prd.o
>>>  HW_OBJS += dts.o lpc-rtc.o npu.o npu-hw-procedures.o xive.o phb4.o
>>>  HW_OBJS += fake-nvram.o lpc-mbox.o npu2.o npu2-hw-procedures.o
>>> -HW_OBJS += npu2-common.o phys-map.o sbe-p9.o capp.o occ-sensor.o vas.o
>>> -HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o
>>Looks like screwed up conflict resolutions. It might be a better idea
>>to split the common files into seperate groups to make this sort of
>>thing easier to spot (and avoid in the first place).
> Could also put one item per line, alphabetized. Not very compact, but it 
> prevents this kind of thing and also makes diffs much easier to read.  
> We have a few other files with long lists:
> core/Makefile.inc
> hdata/Makefile.inc
> hw/Makefile.inc
> hw/fsp/Makefile.inc
> hw/ipmi/Makefile.inc

I have a WIP patch that will make things either more complicated or
simpler in this regard, I'll see if I can get it in a state to submit
though :)

Stewart Smith
OPAL Architect, IBM.

More information about the Skiboot mailing list