diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-23 11:49:59 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-23 11:49:59 -0500 |
| commit | 5469963394eba2df7c0a093a3792dc82e060cd65 (patch) | |
| tree | 2c0dfdf11e86232d49d59b1a4bc0f06ce7c14a22 /Makefile.target | |
| parent | 53878a132aaadbedbe8fe0e44afa032a4ed73aea (diff) | |
| parent | 3c30dd5a68e9fee6af67cfd0d14ed7520820f36a (diff) | |
Merge remote-tracking branch 'origin/master' into staging
* origin/master: (27 commits)
target-arm: Move reset handling to arm_cpu_reset
target-arm: Drop cpu_reset_model_id()
target-arm: Move cache ID register setup to cpu specific init fns
target-arm: Move OMAP cp15_i_{max,min} reset to cpu_state_reset
target-arm: Move feature register setup to per-CPU init fns
target-arm: Move iWMMXT wCID reset to cpu_state_reset
target-arm: Drop JTAG_ID documentation
target-arm: Move SCTLR reset value setup to per cpu init fns
target-arm: Move CTR setup to per cpu init fns
target-arm: Move MVFR* setup to per cpu init fns
target-arm: Move FPSID config to cpu init fns
target-arm: Move feature bit settings to CPU init fns
target-arm: Add QOM subclasses for each ARM cpu implementation
target-arm: remind to keep arm features in sync with linux-user/elfload.c
tci: GETPC() macro must return an uintptr_t
gdbstub: Synchronize CPU state unconditionally in gdb_set_cpu_pc
softfloat: make USE_SOFTFLOAT_STRUCT_TYPES compile
target-xtensa: add tests for LOOPNEZ and LOOPGTZ
target-xtensa: fix LOOPNEZ/LOOPGTZ translation
qtest: add m48t59 tests for Sparc
...
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.target b/Makefile.target index a0540cd663..7eda443bc0 100644 --- a/Makefile.target +++ b/Makefile.target @@ -365,6 +365,7 @@ endif obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o obj-arm-y += versatile_pci.o +obj-arm-y += versatile_i2c.o obj-arm-y += cadence_uart.o obj-arm-y += cadence_ttc.o obj-arm-y += cadence_gem.o |