mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
92 lines
2.6 KiB
Plaintext
92 lines
2.6 KiB
Plaintext
From 9b3d75998e81fe9913656d40a6fbce99655d5b6a Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 13 Mar 2022 13:09:45 +0100
|
|
Subject: Fix build under Haiku
|
|
|
|
- We already define umode_t, don't redefine it.
|
|
- We have an header file named image.h which gets included instead of
|
|
the uboot one, use a more specific path.
|
|
|
|
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
|
|
index 900b261..0b7b3fa 100644
|
|
--- a/arch/arm/include/asm/types.h
|
|
+++ b/arch/arm/include/asm/types.h
|
|
@@ -3,7 +3,7 @@
|
|
|
|
#include <asm-generic/int-ll64.h>
|
|
|
|
-typedef unsigned short umode_t;
|
|
+//typedef unsigned short umode_t;
|
|
|
|
/*
|
|
* These aren't exported outside the kernel to avoid name space clashes
|
|
diff --git a/include/u-boot/ecdsa.h b/include/u-boot/ecdsa.h
|
|
index 53490c6..ebaac65 100644
|
|
--- a/include/u-boot/ecdsa.h
|
|
+++ b/include/u-boot/ecdsa.h
|
|
@@ -7,7 +7,7 @@
|
|
#define _ECDSA_H
|
|
|
|
#include <errno.h>
|
|
-#include <image.h>
|
|
+#include "../include/image.h"
|
|
|
|
/**
|
|
* crypto_algo API impementation for ECDSA;
|
|
diff --git a/lib/hash-checksum.c b/lib/hash-checksum.c
|
|
index 1970a74..74ab1fe 100644
|
|
--- a/lib/hash-checksum.c
|
|
+++ b/lib/hash-checksum.c
|
|
@@ -13,7 +13,7 @@
|
|
#include "fdt_host.h"
|
|
#endif
|
|
#include <hash.h>
|
|
-#include <image.h>
|
|
+#include "../include/image.h"
|
|
|
|
int hash_calculate(const char *name,
|
|
const struct image_region *region,
|
|
diff --git a/tools/imagetool.h b/tools/imagetool.h
|
|
index a766aa2..394d641 100644
|
|
--- a/tools/imagetool.h
|
|
+++ b/tools/imagetool.h
|
|
@@ -21,7 +21,7 @@
|
|
#include <unistd.h>
|
|
#include <u-boot/sha1.h>
|
|
|
|
-#include <image.h>
|
|
+#include "../include/image.h"
|
|
|
|
#include "fdt_host.h"
|
|
|
|
--
|
|
2.43.2
|
|
|
|
|
|
From 75dce0bdd3b8ebfcb56424ba81973b8c488a77d6 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Sun, 13 Mar 2022 15:04:42 +0100
|
|
Subject: Quirk to ignore invalid video mode
|
|
|
|
My TV has an invalid video mode in its EDID data, using it results in
|
|
incorrect timings and a black screen. Just ignore that mode (with a
|
|
pretty crude detection).
|
|
|
|
diff --git a/drivers/video/sunxi/sunxi_display.c b/drivers/video/sunxi/sunxi_display.c
|
|
index 8da44a1..a4935f9 100644
|
|
--- a/drivers/video/sunxi/sunxi_display.c
|
|
+++ b/drivers/video/sunxi/sunxi_display.c
|
|
@@ -289,6 +289,9 @@ static int sunxi_hdmi_edid_get_mode(struct sunxi_display_priv *sunxi_display,
|
|
|
|
/* Take the first usable detailed timing */
|
|
for (i = 0; i < 4; i++, t++) {
|
|
+ /* Ignore bogus EDID mode we can't handle */
|
|
+ if (EDID_DETAILED_TIMING_VERTICAL_ACTIVE(*t) == 540 && EDID_DETAILED_TIMING_HORIZONTAL_ACTIVE(*t) == 1920)
|
|
+ continue;
|
|
r = video_edid_dtd_to_ctfb_res_modes(t, mode);
|
|
if (r == 0)
|
|
break;
|
|
--
|
|
2.43.2
|
|
|