| Message ID | 1547049531-759-1-git-send-email-arbab@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/9] Remove duplicate npu2-common.o from $(HW_OBJS) | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | master/apply_patch Successfully applied |
| snowpatch_ozlabs/snowpatch_job_snowpatch-skiboot | success | Test snowpatch/job/snowpatch-skiboot on branch master |
On 10/1/19 2:58 am, Reza Arbab wrote: > We've listed npu2-common.o twice. Remove one. > > Signed-off-by: Reza Arbab<arbab@linux.ibm.com> Whoops. Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Reza Arbab <arbab@linux.ibm.com> writes:
> We've listed npu2-common.o twice. Remove one.
Thanks for the cleanups - series merged to master as of 38cf215cb505cc2875061e4be57c7aa0236762df
diff --git a/hw/Makefile.inc b/hw/Makefile.inc index 005772a..a4d5cb3 100644 --- a/hw/Makefile.inc +++ b/hw/Makefile.inc @@ -8,7 +8,7 @@ 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-common.o npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o +HW_OBJS += npu2-opencapi.o phys-map.o sbe-p9.o capp.o occ-sensor.o HW_OBJS += vas.o sbe-p8.o HW=hw/built-in.a
We've listed npu2-common.o twice. Remove one. Signed-off-by: Reza Arbab <arbab@linux.ibm.com> --- hw/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)