aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2024-01-14 18:48:42 +0100
committerHelge Deller <deller@gmx.de>2024-01-14 18:48:42 +0100
commit4fe73e002958641d074ca4d9380c3294f1d51354 (patch)
treeab0d1f16998143d75afd26c009f156bc44d6276f
parent42bd4933a1cee75184bbf5347f5203769fd7f70d (diff)
downloadseabios-hppa-4fe73e002958641d074ca4d9380c3294f1d51354.zip
seabios-hppa-4fe73e002958641d074ca4d9380c3294f1d51354.tar.gz
seabios-hppa-4fe73e002958641d074ca4d9380c3294f1d51354.tar.bz2
Fix 32-bit build
-rw-r--r--src/parisc/head.S5
-rw-r--r--src/parisc/hppa.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/parisc/head.S b/src/parisc/head.S
index 9e58477..d97ea4b 100644
--- a/src/parisc/head.S
+++ b/src/parisc/head.S
@@ -281,10 +281,7 @@ END(startup)
/*******************************************************/
ENTRY(start_kernel)
- bve,l (%r22),%rp
- nop
- .word 0xfffdead0 /* halt emulator */
- nop
+ bv,n 0(%r22)
END(start_kernel)
/*******************************************************
diff --git a/src/parisc/hppa.h b/src/parisc/hppa.h
index 4d8a6e5..ec149a2 100644
--- a/src/parisc/hppa.h
+++ b/src/parisc/hppa.h
@@ -210,8 +210,13 @@ static inline u32 ror(u32 word, unsigned int shift)
/* F_EXTEND() is used to access I/O ports. ROM_EXTEND() to access firmware ROM/RAM */
+#if defined(__LP64__)
#define F_EXTEND(x) ((unsigned long)(0xfffffffful<<32) | (x))
#define ROM_EXTEND(x) ((unsigned long)(0xfffffff0ul<<32) | (x))
+#else
+#define F_EXTEND(x) ((unsigned long)(x))
+#define ROM_EXTEND(x) ((unsigned long)(x))
+#endif
static inline void builtin_console_out(char c)
{