diff options
| author | Helge Deller <deller@gmx.de> | 2023-10-23 13:37:06 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2023-10-23 13:37:06 +0200 |
| commit | 888d51209f7c8b0ea3e2b3c03cf323ec5f50996f (patch) | |
| tree | 5721994a78ca2d2d8521872c8b66a58491c365fe | |
| parent | 2c6061668f09053c7c536c82b429d97fc66e3e2a (diff) | |
| download | seabios-hppa-888d51209f7c8b0ea3e2b3c03cf323ec5f50996f.zip seabios-hppa-888d51209f7c8b0ea3e2b3c03cf323ec5f50996f.tar.gz seabios-hppa-888d51209f7c8b0ea3e2b3c03cf323ec5f50996f.tar.bz2 | |
parisc: Use new default sw_id for the machines
2004000160 for the B160L, and 2004003700 for the C3700.
Signed-off-by: Helge Deller <deller@gmx.de>
| -rw-r--r-- | src/parisc/b160l.h | 3 | ||||
| -rw-r--r-- | src/parisc/c3700.h | 2 | ||||
| -rw-r--r-- | src/parisc/parisc.c | 15 |
3 files changed, 11 insertions, 9 deletions
diff --git a/src/parisc/b160l.h b/src/parisc/b160l.h index 1899590..c90ec9a 100644 --- a/src/parisc/b160l.h +++ b/src/parisc/b160l.h @@ -1,7 +1,6 @@ /* AUTO-GENERATED FILE FOR QEMU */ #define PARISC_MODEL "9000/778/B160L" -#define PARISC_PDC_MODEL 0x5020, 0x481, 0x0,\ -0x2020202, 0x7794d7fe, 0x100000f0, 0x4, 0xba, 0xba +#define PARISC_PDC_MODEL 0x5020, 0x481, 0x0, 0x2020202, 2004000160, 0x100000f0, 0x4, 0xba, 0xba #define PARISC_PDC_VERSION 0x0008 #define PARISC_PDC_CPUID 0x01e8 #define PARISC_PDC_CAPABILITIES 0x0002 diff --git a/src/parisc/c3700.h b/src/parisc/c3700.h index 2c1862a..7962747 100644 --- a/src/parisc/c3700.h +++ b/src/parisc/c3700.h @@ -4,7 +4,7 @@ #define PARISC_MODEL "9000/785/C3700" -#define PARISC_PDC_MODEL 0x5dc0, 0x481, 0x0, 0x2, 0x777c3e84, 0x100000f0, 0x8, 0xb2, 0xb2 +#define PARISC_PDC_MODEL 0x5dc0, 0x481, 0x0, 0x2, 2004003700, 0x100000f0, 0x8, 0xb2, 0xb2 #define PARISC_PDC_VERSION 0x0301 diff --git a/src/parisc/parisc.c b/src/parisc/parisc.c index fbc6675..d4eea02 100644 --- a/src/parisc/parisc.c +++ b/src/parisc/parisc.c @@ -2719,7 +2719,7 @@ unsigned long romfile_loadstring_to_int(const char *name, unsigned long defval) void __VISIBLE start_parisc_firmware(void) { unsigned int i, cpu_hz; - unsigned long iplstart, iplend; + unsigned long iplstart, iplend, sw_id; char *str; char bootdrive = (char)cmdline; // c = hdd, d = CD/DVD @@ -2818,11 +2818,14 @@ void __VISIBLE start_parisc_firmware(void) /* 0,1 = default 8x16 font, 2 = 16x32 font */ sti_font = romfile_loadstring_to_int("opt/font", 0); - current_machine->pdc_model.sw_id = romfile_loadstring_to_int("opt/hostid", - current_machine->pdc_model.sw_id); - /* and store in 32-bit machine too */ - machine_B160L.pdc_model.sw_id = current_machine->pdc_model.sw_id; - dprintf(0, "fw_cfg: machine hostid %lu\n", current_machine->pdc_model.sw_id); + sw_id = romfile_loadstring_to_int("opt/hostid", + current_machine->pdc_model.sw_id); + if (sw_id != current_machine->pdc_model.sw_id) { + current_machine->pdc_model.sw_id = sw_id; + /* and store in 32-bit machine too */ + machine_B160L.pdc_model.sw_id = sw_id; + } + dprintf(0, "fw_cfg: machine hostid %lu\n", sw_id); str = romfile_loadfile("/etc/qemu-version", NULL); if (str) |