diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-17 14:10:52 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-17 14:10:52 +0000 |
| commit | d4e65539e570d5872003710b5a1064489911d33d (patch) | |
| tree | 94a7bb9eac9d8fb7cd28cc09fcab1fa61ee49866 /hw | |
| parent | c4b21ed1cfd2b5c7d191f9e095d3f1b8b28e2513 (diff) | |
| parent | 2b42f31eae2c24507c38326b3534cd9292e7dfcf (diff) | |
Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20190316' into staging
Fix lost interrupts.
Update seabios-hppa.
# gpg: Signature made Sat 16 Mar 2019 16:13:42 GMT
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-hppa-20190316:
Update seabios-hppa to latest upstream
target/hppa: Avoid squishing DISAS_IAQ_N_STALE_EXIT
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/hppa/hppa_hardware.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/hppa/hppa_hardware.h b/hw/hppa/hppa_hardware.h index 2c61b1f77c..af2f5ee2bd 100644 --- a/hw/hppa/hppa_hardware.h +++ b/hw/hppa/hppa_hardware.h @@ -19,7 +19,7 @@ #define LASI_PS2KBD_HPA 0xffd08000 #define LASI_PS2MOU_HPA 0xffd08100 #define LASI_GFX_HPA 0xf8000000 -#define CPU_HPA 0xfff10000 +#define CPU_HPA 0xfffb0000 #define MEMORY_HPA 0xfffbf000 #define PCI_HPA DINO_HPA /* PCI bus */ @@ -36,5 +36,5 @@ #define PORT_SERIAL1 (DINO_UART_HPA + 0x800) #define PORT_SERIAL2 (LASI_UART_HPA + 0x800) -#define HPPA_MAX_CPUS 32 /* max. number of SMP CPUs */ +#define HPPA_MAX_CPUS 8 /* max. number of SMP CPUs */ #define CPU_CLOCK_MHZ 250 /* emulate a 250 MHz CPU */ |