From d0a428a6556ea5a006e22e28b0b1cd037885fe20 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 22 Nov 2023 01:07:12 +0000
Subject: [PATCH] add gmac0 read mac form eeprom,pcie30x1
---
u-boot/arch/arm/mach-rockchip/kernel_dtb.c | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/u-boot/arch/arm/mach-rockchip/kernel_dtb.c b/u-boot/arch/arm/mach-rockchip/kernel_dtb.c
old mode 100755
new mode 100644
index 3d3aa6a..ce492b9
--- a/u-boot/arch/arm/mach-rockchip/kernel_dtb.c
+++ b/u-boot/arch/arm/mach-rockchip/kernel_dtb.c
@@ -287,7 +287,7 @@
printf("Can't increase blob size: %s\n", fdt_strerror(ret));
return ret;
}
-
+#if 0
static int fdt_fixup_panel_init_sequence(void *fdt, int node,const struct display_fixup_data *data)
{
#if 0
@@ -345,6 +345,7 @@
printf("Can't increase blob size: %s\n", fdt_strerror(ret));
return ret;
}
+#endif
static int fdt_fixup_setprop_u32(void *fdt, int node, const char *name, u32 data)
{
@@ -391,12 +392,14 @@
static void fdt_fixup_panel_node(void *blob, int node, const char *name,
const struct display_fixup_data *data)
{
+/*
if (!strcmp(name, "dsi")) {
fdt_setprop_u32(blob, node, "dsi,flags", data->flags);
fdt_setprop_u32(blob, node, "dsi,format", data->format);
fdt_setprop_u32(blob, node, "dsi,lanes", data->lanes);
fdt_fixup_panel_init_sequence(blob, node,data);
}
+*/
fdt_fixup_setprop_u32(blob, node, "prepare-delay-ms", data->delay_prepare);
fdt_fixup_setprop_u32(blob, node, "enable-delay-ms", data->delay_enable);
fdt_fixup_setprop_u32(blob, node, "disable-delay-ms", data->delay_disable);
@@ -488,16 +491,16 @@
static void fdt_fixup_display_route(void *blob, const struct display_fixup_data *data)
{
if (data->type == PANEL_TYPE_DSI) {
- fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_OKAY, data);
+ fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_OKAY, data);
fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_DISABLED, data);
fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
} else if (data->type == PANEL_TYPE_EDP) {
- fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_DISABLED, data);
+ fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_OKAY, data);
fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_DISABLED, data);
} else if (data->type == PANEL_TYPE_LVDS) {
fdt_fixup_display_sub_route(blob, "lvds", FDT_STATUS_OKAY, data);
- fdt_fixup_display_sub_route(blob, "dsi", FDT_STATUS_DISABLED, data);
+ fdt_fixup_display_sub_route(blob, "dsi1", FDT_STATUS_DISABLED, data);
fdt_fixup_display_sub_route(blob, "edp", FDT_STATUS_DISABLED, data);
}
}
@@ -812,12 +815,10 @@
return -ENODEV;
}
- if (IS_ENABLED(CONFIG_EMBED_KERNEL_DTB_ALWAYS)) {
- resource_init_list();
- printf("Always embed kernel dtb\n");
- goto dtb_embed;
- }
-
+#ifdef CONFIG_EMBED_KERNEL_DTB_ALWAYS
+ printf("Always embed kernel dtb\n");
+ goto dtb_embed;
+#endif
ret = rockchip_read_dtb_file((void *)fdt_addr);
if (!ret) {
if (!dtb_check_ok((void *)fdt_addr, (void *)gd->fdt_blob)) {
@@ -828,7 +829,10 @@
}
}
+#ifdef CONFIG_EMBED_KERNEL_DTB
+#ifdef CONFIG_EMBED_KERNEL_DTB_ALWAYS
dtb_embed:
+#endif
if (gd->fdt_blob_kern) {
if (!dtb_check_ok((void *)gd->fdt_blob_kern, (void *)gd->fdt_blob)) {
printf("Embedded kernel dtb mismatch this platform!\n");
@@ -847,7 +851,9 @@
memcpy((void *)fdt_addr, gd->fdt_blob_kern,
fdt_totalsize(gd->fdt_blob_kern));
printf("DTB: %s\n", CONFIG_EMBED_KERNEL_DTB_PATH);
- } else {
+ } else
+#endif
+ {
printf("Failed to get kernel dtb, ret=%d\n", ret);
return -ENOENT;
}
--
Gitblit v1.6.2