diff --git a/FunKey/board/funkey/patches/uboot/0001-add-funkey-dts.patch b/FunKey/board/funkey/patches/uboot/0001-add-funkey-dts.patch deleted file mode 100644 index 516b56a..0000000 --- a/FunKey/board/funkey/patches/uboot/0001-add-funkey-dts.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- /dev/null 2019-03-22 21:33:35.539154398 +0100 -+++ a/arch/arm/dts/sun8i-v3s-funkey.dts 2019-03-22 22:22:37.417295027 +0100 -@@ -0,0 +1,83 @@ -+/* -+ * Copyright (C) 2019 Michel Stempin -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+ -+/dts-v1/; -+#include "sun8i-v3s.dtsi" -+#include "sunxi-common-regulators.dtsi" -+ -+/ { -+ model = "FunKey"; -+ compatible = "funkey", "allwinner,sun8i-v3s"; -+ -+ aliases { -+ serial0 = &uart0; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+}; -+ -+&mmc0 { -+ pinctrl-0 = <&mmc0_pins_a>; -+ pinctrl-names = "default"; -+ broken-cd; -+ bus-width = <4>; -+ vmmc-supply = <®_vcc3v3>; -+ status = "okay"; -+}; -+ -+&uart0 { -+ pinctrl-0 = <&uart0_pins_a>; -+ pinctrl-names = "default"; -+ status = "okay"; -+}; -+ -+&usb_otg { -+ dr_mode = "otg"; -+ status = "okay"; -+}; -+ -+&usbphy { -+ usb0_id_det-gpio = <&pio 5 6 GPIO_ACTIVE_HIGH>; -+ status = "okay"; -+}; diff --git a/FunKey/board/funkey/patches/uboot/0001-silent-boot.patch b/FunKey/board/funkey/patches/uboot/0001-silent-boot.patch deleted file mode 100644 index 8484dd9..0000000 --- a/FunKey/board/funkey/patches/uboot/0001-silent-boot.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 diff --git a/FunKey/board/funkey/patches/uboot/0002-add-funkey-dts-to-Makfile.patch b/FunKey/board/funkey/patches/uboot/0002-add-funkey-dts-to-Makfile.patch deleted file mode 100644 index ecf419d..0000000 --- a/FunKey/board/funkey/patches/uboot/0002-add-funkey-dts-to-Makfile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 469dd71..e91a8d3 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -281,6 +281,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ - sun8i-h3-orangepi-plus2e.dtb \ - sun8i-h3-nanopi-neo.dtb - dtb-$(CONFIG_MACH_SUN8I_V3S) += \ -+ sun8i-v3s-funkey.dtb \ - sun8i-v3s-licheepi-zero.dtb - dtb-$(CONFIG_MACH_SUN50I) += \ - sun50i-a64-pine64-plus.dtb \ diff --git a/FunKey/board/funkey/patches/uboot/0002-fix-bootargs-when-building-without-net.patch b/FunKey/board/funkey/patches/uboot/0002-fix-bootargs-when-building-without-net.patch deleted file mode 100644 index 49f218c..0000000 --- a/FunKey/board/funkey/patches/uboot/0002-fix-bootargs-when-building-without-net.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 \ diff --git a/FunKey/board/funkey/patches/uboot/0003-do-not-set-enetaddr.patch b/FunKey/board/funkey/patches/uboot/0003-do-not-set-enetaddr.patch deleted file mode 100644 index 80ebc6e..0000000 --- a/FunKey/board/funkey/patches/uboot/0003-do-not-set-enetaddr.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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), diff --git a/FunKey/board/funkey/patches/uboot/a/arch/arm/dts/sun8i-v3s-funkey.dts b/FunKey/board/funkey/patches/uboot/a/arch/arm/dts/sun8i-v3s-funkey.dts deleted file mode 100644 index 6eac415..0000000 --- a/FunKey/board/funkey/patches/uboot/a/arch/arm/dts/sun8i-v3s-funkey.dts +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (C) 2019 Michel Stempin - * - * This file is dual-licensed: you can use it either under the terms - * of the GPL or the X11 license, at your option. Note that this dual - * licensing only applies to this file, and not this project as a - * whole. - * - * a) This file is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of the - * License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * Or, alternatively, - * - * b) Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/dts-v1/; -#include "sun8i-v3s.dtsi" -#include "sunxi-common-regulators.dtsi" - -/ { - model = "FunKey"; - compatible = "funkey", "allwinner,sun8i-v3s"; - - aliases { - serial0 = &uart0; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; -}; - -&mmc0 { - pinctrl-0 = <&mmc0_pins_a>; - pinctrl-names = "default"; - broken-cd; - bus-width = <4>; - vmmc-supply = <®_vcc3v3>; - status = "okay"; -}; - -&uart0 { - pinctrl-0 = <&uart0_pins_a>; - pinctrl-names = "default"; - status = "okay"; -}; - -&usb_otg { - dr_mode = "otg"; - status = "okay"; -}; - -&usbphy { - usb0_id_det-gpio = <&pio 5 6 GPIO_ACTIVE_HIGH>; - status = "okay"; -}; diff --git a/FunKey/board/funkey/rootfs-overlay/etc/issue b/FunKey/board/funkey/rootfs-overlay/etc/issue index aaf44f5..bc72de7 100644 --- a/FunKey/board/funkey/rootfs-overlay/etc/issue +++ b/FunKey/board/funkey/rootfs-overlay/etc/issue @@ -5,6 +5,6 @@ |___| |_____|__|__||__|\__||_____|___ | FUN ON A KEYCHAIN |_____| ----------------------------------------------------- - Version 0.5 + Version 0.6 ----------------------------------------------------- diff --git a/FunKey/configs/funkey_defconfig b/FunKey/configs/funkey_defconfig index 392c477..fdd0701 100644 --- a/FunKey/configs/funkey_defconfig +++ b/FunKey/configs/funkey_defconfig @@ -81,7 +81,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/FunKey-Project/u-boot" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="32ab1804cd7c5858be8009e35ca07502dc8765c7" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="02e613eaddaacaf0ac0f0b941b90d9645be29f56" BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_FUNKEY_PATH)/board/funkey/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y