funkey/FunKey-OS
1
0
Fork 0
mirror of https://github.com/FunKey-Project/FunKey-OS.git synced 2026-03-22 03:42:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimized boot time and USB back to working

Browse Source
This commit is contained in:
Michel-FK
2019-05-03 19:42:15 +02:00
parent 523736709c
commit e70026f931
12 changed files with 247 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
FunKey/board/funkey/patches/uboot/0001-silent-boot.patch Normal file
View File

@@ -0,0 +1,47 @@
--- a/board/sunxi/board.c 2017-08-12 11:24:24.000000000 +0200
+++ b/board/sunxi/board.c 2019-04-27 23:04:05.811352883 +0200
@@ -540,9 +540,9 @@
power_failed |= axp_set_sw(IS_ENABLED(CONFIG_AXP_SW_ON));
#endif
#endif
- printf("DRAM:");
+ //printf("DRAM:");
ramsize = sunxi_dram_init();
- printf(" %d MiB\n", (int)(ramsize >> 20));
+ //printf(" %d MiB\n", (int)(ramsize >> 20));
if (!ramsize)
hang();
--- a/common/console.c 2017-08-12 11:24:24.000000000 +0200
+++ b/common/console.c 2019-04-27 22:30:13.944154949 +0200
@@ -695,7 +695,7 @@
if (getenv("silent") != NULL)
gd->flags |= GD_FLG_SILENT;
else
- gd->flags &= ~GD_FLG_SILENT;
+ gd->flags |= GD_FLG_SILENT;
#endif
}
--- a/common/spl/spl.c 2017-08-12 11:24:24.000000000 +0200
+++ b/common/spl/spl.c 2019-04-27 23:06:27.269590207 +0200
@@ -316,7 +316,7 @@
loader = spl_ll_find_loader(spl_boot_list[i]);
#if defined(CONFIG_SPL_SERIAL_SUPPORT) && defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
if (loader)
- printf("Trying to boot from %s", loader->name);
+ ;//printf("Trying to boot from %s", loader->name);
else
puts("SPL: Unsupported Boot Device!\n");
#endif
@@ -407,8 +407,9 @@
gd->have_console = 1;
- puts("\nU-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
+ /*puts("\nU-Boot SPL " PLAIN_VERSION " (" U_BOOT_DATE " - " \
U_BOOT_TIME ")\n");
+ */
#ifdef CONFIG_SPL_DISPLAY_PRINT
spl_display_print();
#endif

31
FunKey/board/funkey/patches/uboot/0002-fix-bootargs-when-building-without-net.patch Normal file
View File

@@ -0,0 +1,31 @@
--- a/include/configs/sunxi-common.h 2017-08-12 11:24:24.000000000 +0200
+++ b/include/configs/sunxi-common.h 2019-05-02 23:02:22.078624435 +0200
@@ -475,14 +475,26 @@
#define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \
"fel "
+#if CONFIG_IS_ENABLED(CMD_PXE)
+# define BOOT_TARGET_PXE(func) func(PXE, pxe, na)
+#else
+# define BOOT_TARGET_PXE(func)
+#endif
+
+#if CONFIG_IS_ENABLED(CMD_DHCP)
+# define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na)
+#else
+# define BOOT_TARGET_DHCP(func)
+#endif
+
#define BOOT_TARGET_DEVICES(func) \
func(FEL, fel, na) \
BOOT_TARGET_DEVICES_MMC(func) \
BOOT_TARGET_DEVICES_MMC_EXTRA(func) \
BOOT_TARGET_DEVICES_SCSI(func) \
BOOT_TARGET_DEVICES_USB(func) \
- func(PXE, pxe, na) \
- func(DHCP, dhcp, na)
+ BOOT_TARGET_PXE(func) \
+ BOOT_TARGET_DHCP(func)
#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
#define BOOTCMD_SUNXI_COMPAT \

18
FunKey/board/funkey/patches/uboot/0003-do-not-set-enetaddr.patch Normal file
View File

@@ -0,0 +1,18 @@
--- a/board/sunxi/board.c 2019-05-02 23:50:23.708139670 +0200
+++ b/board/sunxi/board.c 2019-05-02 23:51:19.105112063 +0200
@@ -652,6 +652,7 @@
if ((sid[3] & 0xffffff) == 0)
sid[3] |= 0x800000;
+#if defined(CONFIG_CMD_NET)
for (i = 0; i < 4; i++) {
sprintf(ethaddr, "ethernet%d", i);
if (!fdt_get_alias(fdt, ethaddr))
@@ -675,6 +676,7 @@
eth_setenv_enetaddr(ethaddr, mac_addr);
}
+#endif
if (!getenv("serial#")) {
snprintf(serial_string, sizeof(serial_string),