Skip to content

GitLab

U
u-boot
Commit 0b099335 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Upgraded u-boot to 2021.04

parent 918df1a6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 815 additions and 441 deletions
Makefile
View file @ 0b099335
This diff is collapsed.
u-boot-2020.04-sunxi_env_in_mmc0.patch deleted 100644 → 0
View file @ 918df1a6
diff -uNr u-boot-2020.04/include/configs/sunxi-common.h u-boot-2020.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-2020.04/include/configs/sunxi-common.h 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2020-05-30 20:01:25.717364330 +0930
@@ -134,13 +134,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
-#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1
-/* If we have two devices (most likely eMMC + MMC), favour the eMMC */
-#define CONFIG_SYS_MMC_ENV_DEV 1
-#else
-/* Otherwise, use the only device we have */
#define CONFIG_SYS_MMC_ENV_DEV 0
-#endif
#define CONFIG_SYS_MMC_MAX_DEVICE 4
#endif
u-boot-2020.04-boot_from_mmc1.patch → u-boot-2021.04-boot_from_mmc1.patch
View file @ 0b099335
diff -uNr u-boot-2020.04/include/config_mender_defines.h u-boot-2020.04-boot_from_mmc1/include/config_mender_defines.h
--- u-boot-2020.04/include/config_mender_defines.h 2020-05-30 20:14:13.527252484 +0930
+++ u-boot-2020.04-boot_from_mmc1/include/config_mender_defines.h 2020-05-30 20:40:22.384134573 +0930
diff -uNr u-boot-2021.04/include/config_mender_defines.h u-boot-2021.04-boot_from_mmc1/include/config_mender_defines.h
--- u-boot-2021.04/include/config_mender_defines.h 2023-04-13 11:03:08.366781741 +0930
+++ u-boot-2021.04-boot_from_mmc1/include/config_mender_defines.h 2023-04-13 11:02:30.588673331 +0930
@@ -3,7 +3,7 @@
#define MENDER_ROOTFS_PART_A_NUMBER 2
#define MENDER_ROOTFS_PART_B_NUMBER 3
......
u-boot-2020.04-exynos_wdt.patch → u-boot-2021.04-exynos_wdt.patch
View file @ 0b099335
diff -uNr u-boot-2020.04/arch/arm/dts/exynos5250.dtsi u-boot-2020.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi
--- u-boot-2020.04/arch/arm/dts/exynos5250.dtsi 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi 2022-01-02 06:03:27.582648707 +0000
diff -uNr u-boot-2021.04/arch/arm/dts/exynos5250.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi
--- u-boot-2021.04/arch/arm/dts/exynos5250.dtsi 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos5250.dtsi 2023-04-13 10:58:58.408061884 +0930
@@ -120,6 +120,17 @@
};
};
......@@ -19,9 +19,9 @@ diff -uNr u-boot-2020.04/arch/arm/dts/exynos5250.dtsi u-boot-2020.04-exynos_wdt/
pwm: pwm@12dd0000 {
compatible = "samsung,exynos4210-pwm";
reg = <0x12dd0000 0x100>;
diff -uNr u-boot-2020.04/arch/arm/dts/exynos54xx.dtsi u-boot-2020.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi
--- u-boot-2020.04/arch/arm/dts/exynos54xx.dtsi 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi 2022-01-02 03:55:22.324186023 +0000
diff -uNr u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi
--- u-boot-2021.04/arch/arm/dts/exynos54xx.dtsi 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos54xx.dtsi 2023-04-13 10:58:58.409061886 +0930
@@ -210,6 +210,17 @@
mem-type = "ddr3";
};
......@@ -40,9 +40,9 @@ diff -uNr u-boot-2020.04/arch/arm/dts/exynos54xx.dtsi u-boot-2020.04-exynos_wdt/
pwm: pwm@12dd0000 {
compatible = "samsung,exynos4210-pwm";
reg = <0x12dd0000 0x100>;
diff -uNr u-boot-2020.04/arch/arm/dts/exynos7420.dtsi u-boot-2020.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi
--- u-boot-2020.04/arch/arm/dts/exynos7420.dtsi 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi 2022-01-02 06:09:27.195643087 +0000
diff -uNr u-boot-2021.04/arch/arm/dts/exynos7420.dtsi u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi
--- u-boot-2021.04/arch/arm/dts/exynos7420.dtsi 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/arch/arm/dts/exynos7420.dtsi 2023-04-13 10:58:58.409061886 +0930
@@ -79,4 +79,15 @@
pinctrl-names = "default";
pinctrl-0 = <&serial2_bus>;
......@@ -59,10 +59,10 @@ diff -uNr u-boot-2020.04/arch/arm/dts/exynos7420.dtsi u-boot-2020.04-exynos_wdt/
+ reg = <0x105c0000 0x5000>;
+ };
};
diff -uNr u-boot-2020.04/board/samsung/common/board.c u-boot-2020.04-exynos_wdt/board/samsung/common/board.c
--- u-boot-2020.04/board/samsung/common/board.c 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/board/samsung/common/board.c 2022-01-02 06:12:20.839955900 +0000
@@ -32,6 +32,8 @@
diff -uNr u-boot-2021.04/board/samsung/common/board.c u-boot-2021.04-exynos_wdt/board/samsung/common/board.c
--- u-boot-2021.04/board/samsung/common/board.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/board/samsung/common/board.c 2023-04-13 10:58:58.409061886 +0930
@@ -37,6 +37,8 @@
#include <samsung/misc.h>
#include <dm/pinctrl.h>
#include <dm.h>
......@@ -71,7 +71,7 @@ diff -uNr u-boot-2020.04/board/samsung/common/board.c u-boot-2020.04-exynos_wdt/
DECLARE_GLOBAL_DATA_PTR;
@@ -113,6 +115,20 @@
@@ -118,6 +120,20 @@
return exynos_init();
}
......@@ -92,9 +92,9 @@ diff -uNr u-boot-2020.04/board/samsung/common/board.c u-boot-2020.04-exynos_wdt/
int dram_init(void)
{
unsigned int i;
diff -uNr u-boot-2020.04/drivers/watchdog/exynos_wdt.c u-boot-2020.04-exynos_wdt/drivers/watchdog/exynos_wdt.c
--- u-boot-2020.04/drivers/watchdog/exynos_wdt.c 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/drivers/watchdog/exynos_wdt.c 2022-01-02 05:32:27.856245283 +0000
diff -uNr u-boot-2021.04/drivers/watchdog/exynos_wdt.c u-boot-2021.04-exynos_wdt/drivers/watchdog/exynos_wdt.c
--- u-boot-2021.04/drivers/watchdog/exynos_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/drivers/watchdog/exynos_wdt.c 2023-04-13 10:58:58.409061886 +0930
@@ -0,0 +1,344 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
......@@ -440,9 +440,9 @@ diff -uNr u-boot-2020.04/drivers/watchdog/exynos_wdt.c u-boot-2020.04-exynos_wdt
+ .priv_auto_alloc_size = sizeof(struct exynos_wdt_priv),
+ .ofdata_to_platdata = exynos_wdt_ofdata_to_platdata,
+};
diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-exynos_wdt/drivers/watchdog/Kconfig
--- u-boot-2020.04/drivers/watchdog/Kconfig 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/drivers/watchdog/Kconfig 2022-01-02 05:32:57.601020588 +0000
diff -uNr u-boot-2021.04/drivers/watchdog/Kconfig u-boot-2021.04-exynos_wdt/drivers/watchdog/Kconfig
--- u-boot-2021.04/drivers/watchdog/Kconfig 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/drivers/watchdog/Kconfig 2023-04-13 11:00:12.647277514 +0930
@@ -14,6 +14,7 @@
default 128000 if ARCH_MX25 || ARCH_MX31 || ARCH_MX5 || ARCH_MX6
default 128000 if ARCH_MX7 || ARCH_VF610
......@@ -451,7 +451,7 @@ diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-exynos_wdt/driv
default 60000
help
Watchdog timeout in msec
@@ -75,7 +76,7 @@
@@ -77,7 +78,7 @@
config WDT_ASPEED
bool "Aspeed ast2400/ast2500 watchdog timer support"
......@@ -460,7 +460,7 @@ diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-exynos_wdt/driv
default y if ARCH_ASPEED
help
Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices.
@@ -148,12 +149,24 @@
@@ -176,12 +177,24 @@
config WDT_ORION
bool "Orion watchdog timer support"
......@@ -483,12 +483,12 @@ diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-exynos_wdt/driv
+ This provides basic infrastructure to support Samsung Exynos
+ watchdog.
+
config WDT_SANDBOX
bool "Enable Watchdog Timer support for Sandbox"
depends on SANDBOX && WDT
diff -uNr u-boot-2020.04/drivers/watchdog/Makefile u-boot-2020.04-exynos_wdt/drivers/watchdog/Makefile
--- u-boot-2020.04/drivers/watchdog/Makefile 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-exynos_wdt/drivers/watchdog/Makefile 2022-01-02 05:34:50.219933632 +0000
config WDT_K3_RTI
bool "Texas Instruments K3 RTI watchdog"
depends on WDT && ARCH_K3
diff -uNr u-boot-2021.04/drivers/watchdog/Makefile u-boot-2021.04-exynos_wdt/drivers/watchdog/Makefile
--- u-boot-2021.04/drivers/watchdog/Makefile 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-exynos_wdt/drivers/watchdog/Makefile 2023-04-13 10:58:58.409061886 +0930
@@ -10,7 +10,6 @@
else
obj-$(CONFIG_IMX_WATCHDOG) += imx_watchdog.o
......@@ -497,11 +497,11 @@ diff -uNr u-boot-2020.04/drivers/watchdog/Makefile u-boot-2020.04-exynos_wdt/dri
obj-$(CONFIG_XILINX_TB_WATCHDOG) += xilinx_tb_wdt.o
obj-$(CONFIG_OMAP_WATCHDOG) += omap_wdt.o
obj-$(CONFIG_DESIGNWARE_WATCHDOG) += designware_wdt.o
@@ -22,6 +21,7 @@
@@ -23,6 +22,7 @@
obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o
obj-$(CONFIG_WDT_ORION) += orion_wdt.o
+obj-$(CONFIG_WDT_EXYNOS) += exynos_wdt.o
obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
obj-$(CONFIG_WDT_MT7620) += mt7620_wdt.o
u-boot-2020.04-odroid_board_detection_fix.patch → u-boot-2021.04-odroid_board_detection_fix.patch
View file @ 0b099335
diff -uNr u-boot-2020.04/board/samsung/common/exynos5-dt-types.c u-boot-2020.04-odroid_board_detection_fix/board/samsung/common/exynos5-dt-types.c
--- u-boot-2020.04/board/samsung/common/exynos5-dt-types.c 2020-04-13 15:02:18.000000000 +0000
+++ u-boot-2020.04-odroid_board_detection_fix/board/samsung/common/exynos5-dt-types.c 2021-12-30 08:51:44.151701989 +0000
@@ -41,7 +41,7 @@
diff -uNr u-boot-2021.04/board/samsung/common/exynos5-dt-types.c u-boot-2021.04-odroid_board_detection_fix/board/samsung/common/exynos5-dt-types.c
--- u-boot-2021.04/board/samsung/common/exynos5-dt-types.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-odroid_board_detection_fix/board/samsung/common/exynos5-dt-types.c 2023-04-13 10:47:53.888103021 +0930
@@ -43,7 +43,7 @@
{ EXYNOS5_BOARD_ODROID_XU3_REV02, 2, 375, "xu3" },
{ EXYNOS5_BOARD_ODROID_XU4_REV01, 1, 1293, "xu4" },
{ EXYNOS5_BOARD_ODROID_HC1_REV01, 1, 1322, "hc1" },
......
u-boot-2021.04-orangepi-3-lts.patch 0 → 100644
View file @ 0b099335
diff -uNr u-boot-2021.04/arch/arm/dts/Makefile u-boot-2021.04-orangepi-3-lts/arch/arm/dts/Makefile
--- u-boot-2021.04/arch/arm/dts/Makefile 2021-04-05 15:03:29.000000000 +0000
+++ u-boot-2021.04-orangepi-3-lts/arch/arm/dts/Makefile 2022-11-19 05:29:39.041585689 +0000
@@ -613,6 +613,7 @@
dtb-$(CONFIG_MACH_SUN50I_H6) += \
sun50i-h6-beelink-gs1.dtb \
sun50i-h6-orangepi-3.dtb \
+ sun50i-h6-orangepi-3-lts.dtb \
sun50i-h6-orangepi-lite2.dtb \
sun50i-h6-orangepi-one-plus.dtb \
sun50i-h6-pine-h64.dtb \
diff -uNr u-boot-2021.04/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts u-boot-2021.04-orangepi-3-lts/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts
--- u-boot-2021.04/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-orangepi-3-lts/arch/arm/dts/sun50i-h6-orangepi-3-lts.dts 2022-11-19 05:29:39.049585841 +0000
@@ -0,0 +1,180 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2018 Amarula Solutions
+ * Author: Jagan Teki <jagan@amarulasolutions.com>
+ */
+
+/dts-v1/;
+
+#include "sun50i-h6.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+ model = "OrangePi 3 LTS";
+ compatible = "xunlong,orangepi-3-lts", "allwinner,sun50i-h6";
+
+ aliases {
+ serial0 = &uart0;
+ ethernet0 = &emac;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+};
+
+&emac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ext_rgmii_pins>;
+ phy-mode = "rgmii";
+ phy-handle = <&ext_rgmii_phy>;
+ phy-supply = <&reg_aldo2>;
+ allwinner,rx-delay-ps = <200>;
+ allwinner,tx-delay-ps = <200>;
+ status = "okay";
+};
+
+&mdio {
+ ext_rgmii_phy: ethernet-phy@1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
+};
+
+&mmc0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc0_pins>;
+ vmmc-supply = <&reg_cldo1>;
+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+ bus-width = <4>;
+ status = "okay";
+};
+
+&mmc2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&mmc2_pins>;
+ vmmc-supply = <&reg_cldo1>;
+ non-removable;
+ cap-mmc-hw-reset;
+ bus-width = <8>;
+ status = "okay";
+};
+
+&r_i2c {
+ status = "okay";
+
+ axp805: pmic@36 {
+ compatible = "x-powers,axp805", "x-powers,axp806";
+ reg = <0x36>;
+ interrupt-parent = <&r_intc>;
+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ x-powers,self-working-mode;
+
+ regulators {
+ reg_aldo1: aldo1 {
+ regulator-always-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-pl";
+ };
+
+ reg_aldo2: aldo2 {
+ regulator-always-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-ac200";
+ };
+
+ reg_aldo3: aldo3 {
+ regulator-always-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc25-dram";
+ };
+
+ reg_bldo1: bldo1 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-name = "vcc-bias-pll";
+ };
+
+ reg_bldo2: bldo2 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-name = "vcc-efuse-pcie-hdmi-io";
+ };
+
+ reg_bldo3: bldo3 {
+ regulator-always-on;
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-name = "vcc-dcxoio";
+ };
+
+ bldo4 {
+ /* unused */
+ };
+
+ reg_cldo1: cldo1 {
+ regulator-always-on;
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-3v3";
+ };
+
+ reg_cldo2: cldo2 {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-wifi-1";
+ };
+
+ reg_cldo3: cldo3 {
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-name = "vcc-wifi-2";
+ };
+
+ reg_dcdca: dcdca {
+ regulator-always-on;
+ regulator-min-microvolt = <810000>;
+ regulator-max-microvolt = <1080000>;
+ regulator-name = "vdd-cpu";
+ };
+
+ reg_dcdcc: dcdcc {
+ regulator-min-microvolt = <810000>;
+ regulator-max-microvolt = <1080000>;
+ regulator-name = "vdd-gpu";
+ };
+
+ reg_dcdcd: dcdcd {
+ regulator-always-on;
+ regulator-min-microvolt = <980000>;
+ regulator-max-microvolt = <980000>;
+ regulator-name = "vdd-sys";
+ };
+
+ reg_dcdce: dcdce {
+ regulator-always-on;
+ regulator-min-microvolt = <1200000>;
+ regulator-max-microvolt = <1200000>;
+ regulator-name = "vcc-dram";
+ };
+
+ sw {
+ /* unused */
+ };
+ };
+ };
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_ph_pins>;
+ status = "okay";
+};
diff -uNr u-boot-2021.04/configs/orangepi_3_lts_defconfig u-boot-2021.04-orangepi-3-lts/configs/orangepi_3_lts_defconfig
--- u-boot-2021.04/configs/orangepi_3_lts_defconfig 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2021.04-orangepi-3-lts/configs/orangepi_3_lts_defconfig 2022-11-19 05:54:09.445660184 +0000
@@ -0,0 +1,32 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN50I_H6=y
+CONFIG_SUNXI_DRAM_H6_LPDDR3=y
+CONFIG_SUNXI_DRAM_DDR3=n
+CONFIG_DRAM_ODT_EN=y
+CONFIG_MMC0_CD_PIN="PF6"
+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_HDMI_DDC_EN="PH2"
+# CONFIG_PSCI_RESET is not set
+CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-3-lts"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL=y
+CONFIG_SPL_I2C=y
+CONFIG_R_I2C_ENABLE=y
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+# CONFIG_SPL_DOS_PARTITION is not set
+# CONFIG_SPL_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+# CONFIG_BOOTM_EFI is not set
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_OPENRTOS is not set
+# CONFIG_BOOTM_OSE is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
+# CONFIG_CMD_NFS is not set
+# CONFIG_CMD_UNZIP is not set
+# CONFIG_CMD_BOOTEFI is not set
+# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
+# CONFIG_EFI_LOADER is not set
u-boot-2020.04-serial-number-fix.patch → u-boot-2021.04-serial-number-fix.patch
View file @ 0b099335
diff -uNr u-boot-2020.04/board/raspberrypi/rpi/rpi.c u-boot-2020.04-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-2020.04/board/raspberrypi/rpi/rpi.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2020-05-30 19:51:58.277978268 +0930
@@ -371,9 +371,6 @@
diff -uNr u-boot-2021.04/board/raspberrypi/rpi/rpi.c u-boot-2021.04-serial-number-fix/board/raspberrypi/rpi/rpi.c
--- u-boot-2021.04/board/raspberrypi/rpi/rpi.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-serial-number-fix/board/raspberrypi/rpi/rpi.c 2023-04-13 10:43:10.147266609 +0930
@@ -388,9 +388,6 @@
int ret;
char serial_string[17] = { 0 };
......@@ -11,29 +11,26 @@ diff -uNr u-boot-2020.04/board/raspberrypi/rpi/rpi.c u-boot-2020.04-serial-numbe
BCM2835_MBOX_INIT_HDR(msg);
BCM2835_MBOX_INIT_TAG_NO_REQ(&msg->get_board_serial, GET_BOARD_SERIAL);
diff -uNr u-boot-2020.04/board/sunxi/board.c u-boot-2020.04-serial-number-fix/board/sunxi/board.c
--- u-boot-2020.04/board/sunxi/board.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-serial-number-fix/board/sunxi/board.c 2020-05-30 19:51:58.277978268 +0930
@@ -781,6 +781,7 @@
diff -uNr u-boot-2021.04/board/sunxi/board.c u-boot-2021.04-serial-number-fix/board/sunxi/board.c
--- u-boot-2021.04/board/sunxi/board.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-serial-number-fix/board/sunxi/board.c 2023-04-13 10:46:21.979832095 +0930
@@ -852,6 +852,7 @@
uint8_t mac_addr[6];
char ethaddr[16];
int i, ret;
int i;
+ const char *env_serial;
ret = sunxi_get_sid(sid);
if (ret == 0 && sid[0] != 0) {
@@ -829,10 +830,10 @@
eth_env_set_enetaddr(ethaddr, mac_addr);
}
if (!get_unique_sid(sid))
return;
@@ -880,9 +881,10 @@
eth_env_set_enetaddr(ethaddr, mac_addr);
}
- if (!env_get("serial#")) {
- snprintf(serial_string, sizeof(serial_string),
- "%08x%08x", sid[0], sid[3]);
-
- if (!env_get("serial#")) {
+ env_serial = env_get("serial#");
+ snprintf(serial_string, sizeof(serial_string),
+ "%08x%08x", sid[0], sid[3]);
snprintf(serial_string, sizeof(serial_string),
"%08x%08x", sid[0], sid[3]);
+ if (!env_serial || (env_serial && !strcmp(serial_string, env_serial))) {
env_set("serial#", serial_string);
}
env_set("serial#", serial_string);
}
u-boot-2020.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch → u-boot-2021.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers.patch
View file @ 0b099335
diff -uNr u-boot-2020.04/arch/arm/mach-sunxi/clock_sun6i.c u-boot-2020.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c
--- u-boot-2020.04/arch/arm/mach-sunxi/clock_sun6i.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c 2021-05-10 23:26:33.607420988 +0930
@@ -115,11 +115,10 @@
diff -uNr u-boot-2021.04/arch/arm/mach-sunxi/clock_sun6i.c u-boot-2021.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c
--- u-boot-2021.04/arch/arm/mach-sunxi/clock_sun6i.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-sunxi-h3-Fix-PLL1-setup-to-never-use-dividers/arch/arm/mach-sunxi/clock_sun6i.c 2023-04-13 10:41:33.653982168 +0930
@@ -117,11 +117,10 @@
int k = 1;
int m = 1;
......
u-boot-2021.04-sunxi_env_in_mmc0.patch 0 → 100644
View file @ 0b099335
diff -uNr u-boot-2021.04/include/configs/sunxi-common.h u-boot-2021.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h
--- u-boot-2021.04/include/configs/sunxi-common.h 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-sunxi_env_in_mmc0/include/configs/sunxi-common.h 2023-04-13 10:40:05.032720933 +0930
@@ -134,6 +134,7 @@
#define CONFIG_BOARD_SIZE_LIMIT 0x7e000
#endif
+#define CONFIG_SYS_MMC_ENV_DEV 0
#define CONFIG_SYS_MMC_MAX_DEVICE 4
#endif
u-boot-2020.04-sunxi_wdt.patch → u-boot-2021.04-sunxi_wdt.patch
View file @ 0b099335
diff -uNr u-boot-2020.04/board/sunxi/board.c u-boot-2020.04-sunxi_wdt/board/sunxi/board.c
--- u-boot-2020.04/board/sunxi/board.c 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-sunxi_wdt/board/sunxi/board.c 2020-05-30 20:04:51.966871529 +0930
@@ -40,6 +40,7 @@
diff -uNr u-boot-2021.04/board/sunxi/board.c u-boot-2021.04-sunxi_wdt/board/sunxi/board.c
--- u-boot-2021.04/board/sunxi/board.c 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-sunxi_wdt/board/sunxi/board.c 2023-04-13 10:31:39.312230182 +0930
@@ -46,6 +46,7 @@
#include <spl.h>
#include <sy8106a.h>
#include <asm/setup.h>
......@@ -9,8 +9,8 @@ diff -uNr u-boot-2020.04/board/sunxi/board.c u-boot-2020.04-sunxi_wdt/board/sunx
#if defined CONFIG_VIDEO_LCD_PANEL_I2C && !(defined CONFIG_SPL_BUILD)
/* So that we can use pin names in Kconfig and sunxi_name_to_gpio() */
@@ -316,6 +317,20 @@
return spl;
@@ -351,6 +352,20 @@
return NULL;
}
+#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_WDT_SUNXI)
......@@ -30,10 +30,10 @@ diff -uNr u-boot-2020.04/board/sunxi/board.c u-boot-2020.04-sunxi_wdt/board/sunx
int dram_init(void)
{
struct boot_file_head *spl = get_spl_header(SPL_DRAM_HEADER_VERSION);
diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-2020.04/drivers/watchdog/Kconfig 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-sunxi_wdt/drivers/watchdog/Kconfig 2020-05-30 20:11:06.916793584 +0930
@@ -75,7 +75,7 @@
diff -uNr u-boot-2021.04/drivers/watchdog/Kconfig u-boot-2021.04-sunxi_wdt/drivers/watchdog/Kconfig
--- u-boot-2021.04/drivers/watchdog/Kconfig 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-sunxi_wdt/drivers/watchdog/Kconfig 2023-04-13 10:33:54.814629614 +0930
@@ -77,7 +77,7 @@
config WDT_ASPEED
bool "Aspeed ast2400/ast2500 watchdog timer support"
......@@ -42,7 +42,7 @@ diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-sunxi_wdt/drive
default y if ARCH_ASPEED
help
Select this to enable watchdog timer for Aspeed ast2500/ast2400 devices.
@@ -148,12 +148,22 @@
@@ -176,12 +176,22 @@
config WDT_ORION
bool "Orion watchdog timer support"
......@@ -63,23 +63,23 @@ diff -uNr u-boot-2020.04/drivers/watchdog/Kconfig u-boot-2020.04-sunxi_wdt/drive
+ This provides basic infrastructure to support Sunxi watchdog
+ hardware, with a max timeout of ~16secs.
+
config WDT_SANDBOX
bool "Enable Watchdog Timer support for Sandbox"
depends on SANDBOX && WDT
diff -uNr u-boot-2020.04/drivers/watchdog/Makefile u-boot-2020.04-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-2020.04/drivers/watchdog/Makefile 2020-04-14 00:32:18.000000000 +0930
+++ u-boot-2020.04-sunxi_wdt/drivers/watchdog/Makefile 2020-05-30 20:04:51.967871531 +0930
@@ -22,6 +22,7 @@
config WDT_K3_RTI
bool "Texas Instruments K3 RTI watchdog"
depends on WDT && ARCH_K3
diff -uNr u-boot-2021.04/drivers/watchdog/Makefile u-boot-2021.04-sunxi_wdt/drivers/watchdog/Makefile
--- u-boot-2021.04/drivers/watchdog/Makefile 2021-04-06 00:33:29.000000000 +0930
+++ u-boot-2021.04-sunxi_wdt/drivers/watchdog/Makefile 2023-04-13 10:31:39.312230182 +0930
@@ -23,6 +23,7 @@
obj-$(CONFIG_WDT_BCM6345) += bcm6345_wdt.o
obj-$(CONFIG_WDT_CORTINA) += cortina_wdt.o
obj-$(CONFIG_WDT_ORION) += orion_wdt.o
+obj-$(CONFIG_WDT_SUNXI) += sunxi_wdt.o
obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o
obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o
obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o
diff -uNr u-boot-2020.04/drivers/watchdog/sunxi_wdt.c u-boot-2020.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-2020.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2020.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2020-05-30 20:04:51.967871531 +0930
obj-$(CONFIG_WDT_MT7620) += mt7620_wdt.o
diff -uNr u-boot-2021.04/drivers/watchdog/sunxi_wdt.c u-boot-2021.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c
--- u-boot-2021.04/drivers/watchdog/sunxi_wdt.c 1970-01-01 09:30:00.000000000 +0930
+++ u-boot-2021.04-sunxi_wdt/drivers/watchdog/sunxi_wdt.c 2023-04-13 10:31:39.312230182 +0930
@@ -0,0 +1,274 @@
+/*
+ * sunxi Watchdog Driver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment