libqos: Relocate I2C files
Commit c4efe1cada
(qtest: add libqos
including PCI support) created a libqos/ subdirectory but left the
existing I2C libqos files libi2c*.[hc] in tests/. Clean this up.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367502986-15104-1-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
743bddb4b3
commit
cc9936a32f
@ -119,14 +119,16 @@ tests/test-visitor-serialization$(EXESUF): tests/test-visitor-serialization.o $(
|
|||||||
tests/test-mul64$(EXESUF): tests/test-mul64.o libqemuutil.a
|
tests/test-mul64$(EXESUF): tests/test-mul64.o libqemuutil.a
|
||||||
|
|
||||||
libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o
|
libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o
|
||||||
|
libqos-obj-y += tests/libqos/i2c.o
|
||||||
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o tests/libqos/fw_cfg-pc.o
|
libqos-pc-obj-y = $(libqos-obj-y) tests/libqos/pci-pc.o tests/libqos/fw_cfg-pc.o
|
||||||
libqos-pc-obj-y += tests/libqos/malloc-pc.o
|
libqos-pc-obj-y += tests/libqos/malloc-pc.o
|
||||||
|
libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o
|
||||||
|
|
||||||
tests/rtc-test$(EXESUF): tests/rtc-test.o
|
tests/rtc-test$(EXESUF): tests/rtc-test.o
|
||||||
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
tests/m48t59-test$(EXESUF): tests/m48t59-test.o
|
||||||
tests/fdc-test$(EXESUF): tests/fdc-test.o
|
tests/fdc-test$(EXESUF): tests/fdc-test.o
|
||||||
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
tests/hd-geo-test$(EXESUF): tests/hd-geo-test.o
|
||||||
tests/tmp105-test$(EXESUF): tests/tmp105-test.o
|
tests/tmp105-test$(EXESUF): tests/tmp105-test.o $(libqos-omap-obj-y)
|
||||||
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
|
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)
|
||||||
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)
|
||||||
|
|
||||||
@ -137,7 +139,6 @@ QTEST_TARGETS=$(foreach TARGET,$(TARGETS), $(if $(check-qtest-$(TARGET)-y), $(TA
|
|||||||
check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
|
check-qtest-$(CONFIG_POSIX)=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
|
||||||
|
|
||||||
qtest-obj-y = tests/libqtest.o libqemuutil.a libqemustub.a
|
qtest-obj-y = tests/libqtest.o libqemuutil.a libqemustub.a
|
||||||
qtest-obj-y += tests/libi2c.o tests/libi2c-omap.o
|
|
||||||
$(check-qtest-y): $(qtest-obj-y)
|
$(check-qtest-y): $(qtest-obj-y)
|
||||||
|
|
||||||
.PHONY: check-help
|
.PHONY: check-help
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
* See the COPYING file in the top-level directory.
|
* See the COPYING file in the top-level directory.
|
||||||
*/
|
*/
|
||||||
#include "libi2c.h"
|
#include "libqos/i2c.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
@ -6,7 +6,7 @@
|
|||||||
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
||||||
* See the COPYING file in the top-level directory.
|
* See the COPYING file in the top-level directory.
|
||||||
*/
|
*/
|
||||||
#include "libi2c.h"
|
#include "libqos/i2c.h"
|
||||||
#include "libqtest.h"
|
#include "libqtest.h"
|
||||||
|
|
||||||
void i2c_send(I2CAdapter *i2c, uint8_t addr,
|
void i2c_send(I2CAdapter *i2c, uint8_t addr,
|
@ -7,7 +7,7 @@
|
|||||||
* See the COPYING file in the top-level directory.
|
* See the COPYING file in the top-level directory.
|
||||||
*/
|
*/
|
||||||
#include "libqtest.h"
|
#include "libqtest.h"
|
||||||
#include "libi2c.h"
|
#include "libqos/i2c.h"
|
||||||
#include "hw/misc/tmp105_regs.h"
|
#include "hw/misc/tmp105_regs.h"
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user