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

[Oliver O'Halloran]

On Tue, Jul 9, 2019 at 7:09 AM Reza Arbab <arbab at linux.ibm.com> wrote:
>
> How did I notice one dup in aa56d9a2abdb ("Remove duplicate npu-common.o
> from $(HW_OBJS)"), but not the other five? Remove them too.
>
> Signed-off-by: Reza Arbab <arbab at linux.ibm.com>
> ---
>  hw/Makefile.inc | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/hw/Makefile.inc b/hw/Makefile.inc
> index 0e8c257fb80a..b6727bdfc133 100644
> --- 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).

> -HW_OBJS += vas.o sbe-p8.o dio-p9.o
> -HW_OBJS += lpc-port80h.o
> +HW_OBJS += npu2-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o
> +HW_OBJS += occ-sensor.o vas.o sbe-p8.o dio-p9.o lpc-port80h.o
>  HW=hw/built-in.a
>
>  include $(SRC)/hw/fsp/Makefile.inc
> --
> 1.8.3.1
>