mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-13 00:19:17 +00:00
6c26c35344
* Add initial support for Odroid N2+ * Update C4 config and test booting * Updates to C4, N2, N2+ - merge C4 and N2 legacy under meson64, same u-boot - upgrade legacy kernel to meed DTB from mainline - merge N2 and N2+, add a hack to display + in motd when N2+ is detected - shortly spin N2 fan at startup - merged N2 mainline and legacy boot script - add upstream patches * One of the regulators were breaking booting of Odroid N2 Co-authored-by: Werner <EvilOlaf@users.noreply.github.com>
73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
diff --git a/common/cmd_cfgload.c b/common/cmd_cfgload.c
|
|
index 7dd4ec3..c7089a4 100644
|
|
--- a/common/cmd_cfgload.c
|
|
+++ b/common/cmd_cfgload.c
|
|
@@ -23,7 +23,7 @@ static int do_load_cfgload(cmd_tbl_t *cmdtp, int flag, int argc,
|
|
debug ("* cfgload: cmdline image address = 0x%08lx\n", addr);
|
|
}
|
|
|
|
- snprintf(cmd, sizeof(cmd), "load mmc %d:1 0x%08lx boot.ini; source 0x%08lx",
|
|
+ snprintf(cmd, sizeof(cmd), "ext4load mmc %d:1 0x%08lx boot/boot.ini; source 0x%08lx",
|
|
devno, addr, addr);
|
|
return run_command(cmd, 0);
|
|
}
|
|
@@ -32,7 +32,7 @@ U_BOOT_CMD(
|
|
cfgload, 2, 0, do_load_cfgload,
|
|
"read 'boot.ini' from FAT partiton",
|
|
"\n"
|
|
- " - read boot.ini from the first partiton treated as FAT partiton"
|
|
+ " - read boot.ini from the first partiton"
|
|
);
|
|
|
|
/* vim: set ts=4 sw=4 tw=80: */
|
|
diff --git a/common/edid-decode.c b/common/edid-decode.c
|
|
index a4c1a0c..ae11a02 100644
|
|
--- a/common/edid-decode.c
|
|
+++ b/common/edid-decode.c
|
|
@@ -1735,10 +1735,10 @@ void save_edid_bin(unsigned char *edid, unsigned int blk_len)
|
|
return;
|
|
}
|
|
|
|
- ret = file_exists("mmc", part, "edid.bin", FS_TYPE_ANY);
|
|
+ ret = file_exists("mmc", part, "/boot/edid.bin", FS_TYPE_ANY);
|
|
if (!ret) {
|
|
printf("NOT EXIST, now build edid.bin\n");
|
|
- sprintf(str, "fatwrite mmc %s 0x%lx edid.bin 0x%x",
|
|
+ sprintf(str, "ext4write mmc %s 0x%lx /boot/edid.bin 0x%x",
|
|
part, (unsigned long)edid, (128 * blk_len));
|
|
run_command(str, 0);
|
|
}
|
|
@@ -1756,18 +1756,18 @@ void save_display_bin(bool config, char *modeline)
|
|
return;
|
|
}
|
|
|
|
- ret = file_exists("mmc", part, "display.bin", FS_TYPE_ANY);
|
|
+ ret = file_exists("mmc", part, "/boot/display.bin", FS_TYPE_ANY);
|
|
if(!ret) {
|
|
printf("NOT EXIST, now build display.bin\n");
|
|
|
|
if (config == true) {
|
|
sprintf(result, "Auto Detect OK:%s,%s(%s)", bestmode, getenv("voutmode"), modeline);
|
|
- sprintf(str, "fatwrite mmc %s 0x%lx display.bin 0x78",
|
|
+ sprintf(str, "ext4write mmc %s 0x%lx /boot/display.bin 0x78",
|
|
part, (unsigned long)result);
|
|
run_command(str, 0);
|
|
} else {
|
|
sprintf(result, "Auto Detect FAIL:%s,%s", bestmode, getenv("voutmode"));
|
|
- sprintf(str, "fatwrite mmc %s 0x%lx display.bin 0x78",
|
|
+ sprintf(str, "ext4write mmc %s 0x%lx /boot/display.bin 0x78",
|
|
part, (unsigned long)result);
|
|
run_command(str, 0);
|
|
}
|
|
diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h
|
|
index 663b0f0..71e73c2 100644
|
|
--- a/include/configs/odroid-g12-common.h
|
|
+++ b/include/configs/odroid-g12-common.h
|
|
@@ -450,6 +450,7 @@
|
|
#define CONFIG_CMD_FAT 1
|
|
#define CONFIG_CMD_EXT2 1
|
|
#define CONFIG_CMD_EXT4 1
|
|
+#define CONFIG_CMD_EXT4_WRITE 1
|
|
#define CONFIG_CMD_GPIO 1
|
|
#define CONFIG_CMD_RUN 1
|
|
#define CONFIG_CMD_REBOOT 1
|