diff --git a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch index e4ac0870169..21d51588e6c 100644 --- a/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch +++ b/buildroot-external/board/asus/tinker/patches/uboot/0001-SPL-modify-load-address-of-U-Boot.patch @@ -1,8 +1,7 @@ -From 966cd1782632bc8279667955ec315e93c89495e6 Mon Sep 17 00:00:00 2001 -Message-Id: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch> +From 48021de3511573e8dda7c3c0446ba85eeb37921a Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 24 Apr 2020 12:41:50 +0000 -Subject: [PATCH 1/2] SPL: modify load address of U-Boot +Subject: [PATCH] SPL: modify load address of U-Boot Default load address of U-Boot is at sector 16384, which is where HAOS has its first partition. Use 0x2000 (8192) instead. @@ -15,23 +14,23 @@ Signed-off-by: Stefan Agner 2 files changed, 2 insertions(+) diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig -index a9c9a122f6..b839fdb570 100644 +index 303c3295be..398ba196b5 100644 --- a/configs/tinker-rk3288_defconfig +++ b/configs/tinker-rk3288_defconfig -@@ -92,3 +92,4 @@ CONFIG_VIDEO_ROCKCHIP=y +@@ -101,3 +101,4 @@ CONFIG_VIDEO_ROCKCHIP=y CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000 diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig -index f367c9370f..c52b0753ec 100644 +index 3267fdc082..1e781c18ae 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig -@@ -94,3 +94,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y +@@ -103,3 +103,4 @@ CONFIG_DISPLAY_ROCKCHIP_HDMI=y CONFIG_CONSOLE_SCROLL_LINES=10 CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x2000 -- -2.35.1 +2.43.0 diff --git a/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch index 15afd5148c6..63abf7eef8d 100644 --- a/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch +++ b/buildroot-external/board/asus/tinker/patches/uboot/0002-pmic-enable-LDO2-vcc33_mipi-at-bootup.patch @@ -1,10 +1,7 @@ -From 98674c65a6595e7ac554f7ec9d6f0228556756f6 Mon Sep 17 00:00:00 2001 -Message-Id: <98674c65a6595e7ac554f7ec9d6f0228556756f6.1645627366.git.stefan@agner.ch> -In-Reply-To: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch> -References: <966cd1782632bc8279667955ec315e93c89495e6.1645627366.git.stefan@agner.ch> +From defc964eaa9f4ccc9cd1568ade4e4d81f35b9e07 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 24 Apr 2020 11:37:55 +0000 -Subject: [PATCH 2/2] pmic: enable LDO2 vcc33_mipi at bootup +Subject: [PATCH] pmic: enable LDO2 vcc33_mipi at bootup Signed-off-by: Pascal Vizeli --- @@ -64,5 +61,5 @@ index f85209c649..6fa1bb0c66 100644 +} +#endif -- -2.35.1 +2.43.0 diff --git a/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-ata-dwc_ahci-Fix-support-for-other-platforms.patch b/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-ata-dwc_ahci-Fix-support-for-other-platforms.patch deleted file mode 100644 index 44e6ae29dfa..00000000000 --- a/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0001-ata-dwc_ahci-Fix-support-for-other-platforms.patch +++ /dev/null @@ -1,48 +0,0 @@ -From acadbae38f91965f204d6a5d49eb8b578970b818 Mon Sep 17 00:00:00 2001 -Message-ID: -From: Jonas Karlman -Date: Sun, 2 Jul 2023 20:47:17 +0000 -Subject: [PATCH] ata: dwc_ahci: Fix support for other platforms - -The dwc_ahci driver use platform specific defines, place the platform -specific code behind a ifdef CONFIG_ARCH_OMAP2PLUS to allow build and -use of the driver on Rockchip platform. - -Fixes: 02a4b4297901 ("drivers: block: dwc_ahci: Implement a driver for Synopsys DWC sata device") -Signed-off-by: Jonas Karlman ---- - drivers/ata/dwc_ahci.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/drivers/ata/dwc_ahci.c b/drivers/ata/dwc_ahci.c -index 826fea71cc..1dc91e7fce 100644 ---- a/drivers/ata/dwc_ahci.c -+++ b/drivers/ata/dwc_ahci.c -@@ -13,7 +13,9 @@ - #include - #include - #include -+#ifdef CONFIG_ARCH_OMAP2PLUS - #include -+#endif - #include - #include - -@@ -72,12 +74,14 @@ static int dwc_ahci_probe(struct udevice *dev) - return ret; - } - -+#ifdef CONFIG_ARCH_OMAP2PLUS - if (priv->wrapper_base) { - u32 val = TI_SATA_IDLE_NO | TI_SATA_STANDBY_NO; - - /* Enable SATA module, No Idle, No Standby */ - writel(val, priv->wrapper_base + TI_SATA_SYSCONFIG); - } -+#endif - - return ahci_probe_scsi(dev, (ulong)priv->base); - } --- -2.41.0 - diff --git a/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0002-board-rockchip-Add-Hardkernel-ODROID-M1.patch b/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0002-board-rockchip-Add-Hardkernel-ODROID-M1.patch deleted file mode 100644 index 11bb4978235..00000000000 --- a/buildroot-external/board/hardkernel/odroid-m1/patches/uboot/0002-board-rockchip-Add-Hardkernel-ODROID-M1.patch +++ /dev/null @@ -1,990 +0,0 @@ -From e52e7ff196b942c8bf8bee9e74d4f24619934a1b Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: -References: -From: Jonas Karlman -Date: Sun, 2 Jul 2023 20:47:19 +0000 -Subject: [PATCH] board: rockchip: Add Hardkernel ODROID-M1 - -Hardkernel ODROID-M1 is a single board computer with a RK3568B2 SoC, -a slightly modified version of the RK3568 SoC. - -Features tested on a ODROID-M1 8GB v1.0 2022-06-13: -- SD-card boot -- eMMC boot -- SPI Flash boot -- PCIe/NVMe/AHCI -- SATA port -- USB host - -Device tree is imported from linux v6.4. - -Signed-off-by: Jonas Karlman ---- - arch/arm/dts/Makefile | 1 + - arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi | 46 ++ - arch/arm/dts/rk3568-odroid-m1.dts | 744 ++++++++++++++++++++++ - board/rockchip/evb_rk3568/MAINTAINERS | 7 + - configs/odroid-m1-rk3568_defconfig | 103 +++ - doc/board/rockchip/rockchip.rst | 1 + - 6 files changed, 902 insertions(+) - create mode 100644 arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi - create mode 100644 arch/arm/dts/rk3568-odroid-m1.dts - create mode 100644 configs/odroid-m1-rk3568_defconfig - -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 480269fa60..334c1bafda 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -169,6 +169,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ - rk3566-anbernic-rgxx3.dtb \ - rk3566-radxa-cm3-io.dtb \ - rk3568-evb.dtb \ -+ rk3568-odroid-m1.dtb \ - rk3568-rock-3a.dtb - - dtb-$(CONFIG_ROCKCHIP_RK3588) += \ -diff --git a/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi -new file mode 100644 -index 0000000000..dc8ad98715 ---- /dev/null -+++ b/arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi -@@ -0,0 +1,46 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+ -+#include "rk356x-u-boot.dtsi" -+ -+/ { -+ aliases { -+ spi0 = &sfc; -+ }; -+ -+ chosen { -+ stdout-path = &uart2; -+ }; -+}; -+ -+&fspi_dual_io_pins { -+ bootph-all; -+}; -+ -+&sdhci { -+ cap-mmc-highspeed; -+ mmc-ddr-1_8v; -+ mmc-hs200-1_8v; -+ mmc-hs400-1_8v; -+ mmc-hs400-enhanced-strobe; -+ pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe>; -+}; -+ -+&sfc { -+ bootph-pre-ram; -+ u-boot,spl-sfc-no-dma; -+ -+ flash@0 { -+ bootph-pre-ram; -+ }; -+}; -+ -+&uart2 { -+ bootph-all; -+ clock-frequency = <24000000>; -+ status = "okay"; -+}; -+ -+&vcc5v0_usb_host { -+ /* Workaround until regulator implement basic reference counter */ -+ regulator-always-on; -+}; -diff --git a/arch/arm/dts/rk3568-odroid-m1.dts b/arch/arm/dts/rk3568-odroid-m1.dts -new file mode 100644 -index 0000000000..59ecf868db ---- /dev/null -+++ b/arch/arm/dts/rk3568-odroid-m1.dts -@@ -0,0 +1,744 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -+/* -+ * Copyright (c) 2022 Hardkernel Co., Ltd. -+ * -+ */ -+ -+/dts-v1/; -+#include -+#include -+#include -+#include -+#include "rk3568.dtsi" -+ -+/ { -+ model = "Hardkernel ODROID-M1"; -+ compatible = "rockchip,rk3568-odroid-m1", "rockchip,rk3568"; -+ -+ aliases { -+ ethernet0 = &gmac0; -+ i2c0 = &i2c3; -+ i2c3 = &i2c0; -+ mmc0 = &sdhci; -+ mmc1 = &sdmmc0; -+ serial0 = &uart1; -+ serial1 = &uart0; -+ }; -+ -+ chosen { -+ stdout-path = "serial2:1500000n8"; -+ }; -+ -+ dc_12v: dc-12v-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "dc_12v"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <12000000>; -+ regulator-max-microvolt = <12000000>; -+ }; -+ -+ hdmi-con { -+ compatible = "hdmi-connector"; -+ type = "a"; -+ -+ port { -+ hdmi_con_in: endpoint { -+ remote-endpoint = <&hdmi_out_con>; -+ }; -+ }; -+ }; -+ -+ ir-receiver { -+ compatible = "gpio-ir-receiver"; -+ gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&ir_receiver_pin>; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ -+ led_power: led-0 { -+ gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; -+ function = LED_FUNCTION_POWER; -+ color = ; -+ default-state = "keep"; -+ linux,default-trigger = "default-on"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&led_power_pin>; -+ }; -+ led_work: led-1 { -+ gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; -+ function = LED_FUNCTION_HEARTBEAT; -+ color = ; -+ linux,default-trigger = "heartbeat"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&led_work_pin>; -+ }; -+ }; -+ -+ rk809-sound { -+ compatible = "simple-audio-card"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&hp_det_pin>; -+ simple-audio-card,name = "Analog RK817"; -+ simple-audio-card,format = "i2s"; -+ simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; -+ simple-audio-card,mclk-fs = <256>; -+ simple-audio-card,widgets = -+ "Headphone", "Headphones", -+ "Speaker", "Speaker"; -+ simple-audio-card,routing = -+ "Headphones", "HPOL", -+ "Headphones", "HPOR", -+ "Speaker", "SPKO"; -+ -+ simple-audio-card,cpu { -+ sound-dai = <&i2s1_8ch>; -+ }; -+ -+ simple-audio-card,codec { -+ sound-dai = <&rk809>; -+ }; -+ }; -+ -+ vcc3v3_pcie: vcc3v3-pcie-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3_pcie"; -+ enable-active-high; -+ gpio = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc3v3_pcie_en_pin>; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ startup-delay-us = <5000>; -+ vin-supply = <&vcc3v3_sys>; -+ }; -+ -+ vcc3v3_sys: vcc3v3-sys-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3_sys"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ vin-supply = <&dc_12v>; -+ }; -+ -+ vcc5v0_sys: vcc5v0-sys-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_sys"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&dc_12v>; -+ }; -+ -+ vcc5v0_usb_host: vcc5v0-usb-host-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_usb_host"; -+ enable-active-high; -+ gpio = <&gpio0 RK_PA6 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc5v0_usb_host_en_pin>; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+ -+ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc5v0_usb_otg"; -+ enable-active-high; -+ gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&vcc5v0_usb_otg_en_pin>; -+ regulator-min-microvolt = <5000000>; -+ regulator-max-microvolt = <5000000>; -+ vin-supply = <&vcc5v0_sys>; -+ }; -+}; -+ -+&combphy0 { -+ /* Used for USB3 */ -+ phy-supply = <&vcc5v0_usb_host>; -+ status = "okay"; -+}; -+ -+&combphy1 { -+ /* Used for USB3 */ -+ phy-supply = <&vcc5v0_usb_otg>; -+ status = "okay"; -+}; -+ -+&combphy2 { -+ /* used for SATA */ -+ status = "okay"; -+}; -+ -+&cpu0 { -+ cpu-supply = <&vdd_cpu>; -+}; -+ -+&cpu1 { -+ cpu-supply = <&vdd_cpu>; -+}; -+ -+&cpu2 { -+ cpu-supply = <&vdd_cpu>; -+}; -+ -+&cpu3 { -+ cpu-supply = <&vdd_cpu>; -+}; -+ -+&gmac0 { -+ assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>; -+ assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>; -+ assigned-clock-rates = <0>, <125000000>; -+ clock_in_out = "output"; -+ phy-handle = <&rgmii_phy0>; -+ phy-mode = "rgmii"; -+ phy-supply = <&vcc3v3_sys>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&gmac0_miim -+ &gmac0_tx_bus2 -+ &gmac0_rx_bus2 -+ &gmac0_rgmii_clk -+ &gmac0_rgmii_bus>; -+ status = "okay"; -+ -+ tx_delay = <0x4f>; -+ rx_delay = <0x2d>; -+}; -+ -+&gpu { -+ mali-supply = <&vdd_gpu>; -+ status = "okay"; -+}; -+ -+&hdmi { -+ avdd-0v9-supply = <&vdda0v9_image>; -+ avdd-1v8-supply = <&vcca1v8_image>; -+ status = "okay"; -+}; -+ -+&hdmi_in { -+ hdmi_in_vp0: endpoint { -+ remote-endpoint = <&vp0_out_hdmi>; -+ }; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ -+&hdmi_sound { -+ status = "okay"; -+}; -+ -+&i2c0 { -+ status = "okay"; -+ -+ vdd_cpu: regulator@1c { -+ compatible = "tcs,tcs4525"; -+ reg = <0x1c>; -+ fcs,suspend-voltage-selector = <1>; -+ regulator-name = "vdd_cpu"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <800000>; -+ regulator-max-microvolt = <1150000>; -+ regulator-ramp-delay = <2300>; -+ vin-supply = <&vcc3v3_sys>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ rk809: pmic@20 { -+ compatible = "rockchip,rk809"; -+ reg = <0x20>; -+ interrupt-parent = <&gpio0>; -+ interrupts = ; -+ assigned-clocks = <&cru I2S1_MCLKOUT_TX>; -+ assigned-clock-parents = <&cru CLK_I2S1_8CH_TX>; -+ #clock-cells = <1>; -+ clock-names = "mclk"; -+ clocks = <&cru I2S1_MCLKOUT_TX>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pmic_int_l>, <&i2s1m0_mclk>; -+ rockchip,system-power-controller; -+ #sound-dai-cells = <0>; -+ vcc1-supply = <&vcc3v3_sys>; -+ vcc2-supply = <&vcc3v3_sys>; -+ vcc3-supply = <&vcc3v3_sys>; -+ vcc4-supply = <&vcc3v3_sys>; -+ vcc5-supply = <&vcc3v3_sys>; -+ vcc6-supply = <&vcc3v3_sys>; -+ vcc7-supply = <&vcc3v3_sys>; -+ vcc8-supply = <&vcc3v3_sys>; -+ vcc9-supply = <&vcc3v3_sys>; -+ wakeup-source; -+ -+ regulators { -+ vdd_logic: DCDC_REG1 { -+ regulator-name = "vdd_logic"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-init-microvolt = <900000>; -+ regulator-initial-mode = <0x2>; -+ regulator-min-microvolt = <500000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-ramp-delay = <6001>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vdd_gpu: DCDC_REG2 { -+ regulator-name = "vdd_gpu"; -+ regulator-always-on; -+ regulator-init-microvolt = <900000>; -+ regulator-initial-mode = <0x2>; -+ regulator-min-microvolt = <500000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-ramp-delay = <6001>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc_ddr: DCDC_REG3 { -+ regulator-name = "vcc_ddr"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-initial-mode = <0x2>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ }; -+ }; -+ -+ vdd_npu: DCDC_REG4 { -+ regulator-name = "vdd_npu"; -+ regulator-init-microvolt = <900000>; -+ regulator-initial-mode = <0x2>; -+ regulator-min-microvolt = <500000>; -+ regulator-max-microvolt = <1350000>; -+ regulator-ramp-delay = <6001>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc_1v8: DCDC_REG5 { -+ regulator-name = "vcc_1v8"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vdda0v9_image: LDO_REG1 { -+ regulator-name = "vdda0v9_image"; -+ regulator-always-on; -+ regulator-min-microvolt = <900000>; -+ regulator-max-microvolt = <900000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vdda_0v9: LDO_REG2 { -+ regulator-name = "vdda_0v9"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <900000>; -+ regulator-max-microvolt = <900000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vdda0v9_pmu: LDO_REG3 { -+ regulator-name = "vdda0v9_pmu"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <900000>; -+ regulator-max-microvolt = <900000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <900000>; -+ }; -+ }; -+ -+ vccio_acodec: LDO_REG4 { -+ regulator-name = "vccio_acodec"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vccio_sd: LDO_REG5 { -+ regulator-name = "vccio_sd"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <3300000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc3v3_pmu: LDO_REG6 { -+ regulator-name = "vcc3v3_pmu"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <3300000>; -+ }; -+ }; -+ -+ vcca_1v8: LDO_REG7 { -+ regulator-name = "vcca_1v8"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcca1v8_pmu: LDO_REG8 { -+ regulator-name = "vcca1v8_pmu"; -+ regulator-always-on; -+ regulator-boot-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-on-in-suspend; -+ regulator-suspend-microvolt = <1800000>; -+ }; -+ }; -+ -+ vcca1v8_image: LDO_REG9 { -+ regulator-name = "vcca1v8_image"; -+ regulator-always-on; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc_3v3: SWITCH_REG1 { -+ regulator-name = "vcc_3v3"; -+ regulator-always-on; -+ regulator-boot-on; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ -+ vcc3v3_sd: SWITCH_REG2 { -+ regulator-name = "vcc3v3_sd"; -+ -+ regulator-state-mem { -+ regulator-off-in-suspend; -+ }; -+ }; -+ }; -+ }; -+}; -+ -+&i2s0_8ch { -+ status = "okay"; -+}; -+ -+&i2s1_8ch { -+ rockchip,trcm-sync-tx-only; -+ status = "okay"; -+}; -+ -+&mdio0 { -+ rgmii_phy0: ethernet-phy@0 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <0x0>; -+ reset-assert-us = <20000>; -+ reset-deassert-us = <100000>; -+ reset-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; -+ }; -+}; -+ -+&pcie30phy { -+ status = "okay"; -+}; -+ -+&pcie3x2 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pcie_reset_pin>; -+ reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; -+ vpcie3v3-supply = <&vcc3v3_pcie>; -+ status = "okay"; -+}; -+ -+&pinctrl { -+ fspi { -+ fspi_dual_io_pins: fspi-dual-io-pins { -+ rockchip,pins = -+ /* fspi_clk */ -+ <1 RK_PD0 1 &pcfg_pull_none>, -+ /* fspi_cs0n */ -+ <1 RK_PD3 1 &pcfg_pull_none>, -+ /* fspi_d0 */ -+ <1 RK_PD1 1 &pcfg_pull_none>, -+ /* fspi_d1 */ -+ <1 RK_PD2 1 &pcfg_pull_none>; -+ }; -+ }; -+ -+ ir-receiver { -+ ir_receiver_pin: ir-receiver-pin { -+ /* external pullup to VCC3V3_SYS */ -+ rockchip,pins = <0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ leds { -+ led_power_pin: led-power-pin { -+ rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ led_work_pin: led-work-pin { -+ rockchip,pins = <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ pcie { -+ pcie_reset_pin: pcie-reset-pin { -+ rockchip,pins = <2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ vcc3v3_pcie_en_pin: vcc3v3-pcie-en-pin { -+ rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ pmic { -+ pmic_int_l: pmic-int-l { -+ rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>; -+ }; -+ }; -+ -+ rk809 { -+ hp_det_pin: hp-det-pin { -+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+ -+ usb { -+ vcc5v0_usb_host_en_pin: vcc5v0-usb-host-en-pin { -+ rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ vcc5v0_usb_otg_en_pin: vcc5v0-usb-dr-en-pin { -+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; -+ }; -+ }; -+}; -+ -+&pmu_io_domains { -+ pmuio1-supply = <&vcc3v3_pmu>; -+ pmuio2-supply = <&vcc3v3_pmu>; -+ vccio1-supply = <&vccio_acodec>; -+ vccio2-supply = <&vcc_1v8>; -+ vccio3-supply = <&vccio_sd>; -+ vccio4-supply = <&vcc_1v8>; -+ vccio5-supply = <&vcc_3v3>; -+ vccio6-supply = <&vcc_3v3>; -+ vccio7-supply = <&vcc_3v3>; -+ status = "okay"; -+}; -+ -+&saradc { -+ vref-supply = <&vcca_1v8>; -+ status = "okay"; -+}; -+ -+&sata2 { -+ status = "okay"; -+}; -+ -+&sdhci { -+ bus-width = <8>; -+ max-frequency = <200000000>; -+ non-removable; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&emmc_bus8 &emmc_clk &emmc_cmd &emmc_datastrobe &emmc_rstnout>; -+ vmmc-supply = <&vcc_3v3>; -+ vqmmc-supply = <&vcc_1v8>; -+ status = "okay"; -+}; -+ -+&sdmmc0 { -+ bus-width = <4>; -+ cap-sd-highspeed; -+ cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>; -+ disable-wp; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; -+ sd-uhs-sdr50; -+ vmmc-supply = <&vcc3v3_sd>; -+ vqmmc-supply = <&vccio_sd>; -+ status = "okay"; -+}; -+ -+&sfc { -+ /* Dual I/O mode as the D2 pin conflicts with the eMMC */ -+ pinctrl-0 = <&fspi_dual_io_pins>; -+ pinctrl-names = "default"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ status = "okay"; -+ -+ flash@0 { -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <100000000>; -+ spi-rx-bus-width = <2>; -+ spi-tx-bus-width = <1>; -+ -+ partitions { -+ compatible = "fixed-partitions"; -+ #address-cells = <1>; -+ #size-cells = <1>; -+ -+ partition@0 { -+ label = "SPL"; -+ reg = <0x0 0xe0000>; -+ }; -+ partition@e0000 { -+ label = "U-Boot Env"; -+ reg = <0xe0000 0x20000>; -+ }; -+ partition@100000 { -+ label = "U-Boot"; -+ reg = <0x100000 0x200000>; -+ }; -+ partition@300000 { -+ label = "splash"; -+ reg = <0x300000 0x100000>; -+ }; -+ partition@400000 { -+ label = "Filesystem"; -+ reg = <0x400000 0xc00000>; -+ }; -+ }; -+ }; -+}; -+ -+&tsadc { -+ rockchip,hw-tshut-mode = <1>; -+ rockchip,hw-tshut-polarity = <0>; -+ status = "okay"; -+}; -+ -+&uart2 { -+ status = "okay"; -+}; -+ -+&usb_host0_ehci { -+ status = "okay"; -+}; -+ -+&usb_host0_ohci { -+ status = "okay"; -+}; -+ -+&usb_host0_xhci { -+ dr_mode = "host"; -+ status = "okay"; -+}; -+ -+&usb_host1_ehci { -+ status = "okay"; -+}; -+ -+&usb_host1_ohci { -+ status = "okay"; -+}; -+ -+&usb_host1_xhci { -+ status = "okay"; -+}; -+ -+&usb2phy0 { -+ status = "okay"; -+}; -+ -+&usb2phy0_host { -+ phy-supply = <&vcc5v0_usb_host>; -+ status = "okay"; -+}; -+ -+&usb2phy0_otg { -+ phy-supply = <&vcc5v0_usb_otg>; -+ status = "okay"; -+}; -+ -+&usb2phy1 { -+ status = "okay"; -+}; -+ -+&usb2phy1_host { -+ phy-supply = <&vcc5v0_usb_host>; -+ status = "okay"; -+}; -+ -+&usb2phy1_otg { -+ phy-supply = <&vcc5v0_usb_host>; -+ status = "okay"; -+}; -+ -+&vop { -+ assigned-clocks = <&cru DCLK_VOP0>, <&cru DCLK_VOP1>; -+ assigned-clock-parents = <&pmucru PLL_HPLL>, <&cru PLL_VPLL>; -+ status = "okay"; -+}; -+ -+&vop_mmu { -+ status = "okay"; -+}; -+ -+&vp0 { -+ vp0_out_hdmi: endpoint@ROCKCHIP_VOP2_EP_HDMI0 { -+ reg = ; -+ remote-endpoint = <&hdmi_in_vp0>; -+ }; -+}; -diff --git a/board/rockchip/evb_rk3568/MAINTAINERS b/board/rockchip/evb_rk3568/MAINTAINERS -index 6b2e7c7575..a5b59da0f7 100644 ---- a/board/rockchip/evb_rk3568/MAINTAINERS -+++ b/board/rockchip/evb_rk3568/MAINTAINERS -@@ -7,6 +7,13 @@ F: configs/evb-rk3568_defconfig - F: arch/arm/dts/rk3568-evb-boot.dtsi - F: arch/arm/dts/rk3568-evb.dts - -+ODROID-M1 -+M: Jonas Karlman -+S: Maintained -+F: configs/odroid-m1-rk3568_defconfig -+F: arch/arm/dts/rk3568-odroid-m1-u-boot.dtsi -+F: arch/arm/dts/rk3568-odroid-m1.dts -+ - RADXA-CM3 - M: Jagan Teki - S: Maintained -diff --git a/configs/odroid-m1-rk3568_defconfig b/configs/odroid-m1-rk3568_defconfig -new file mode 100644 -index 0000000000..d090196219 ---- /dev/null -+++ b/configs/odroid-m1-rk3568_defconfig -@@ -0,0 +1,103 @@ -+CONFIG_ARM=y -+CONFIG_SKIP_LOWLEVEL_INIT=y -+CONFIG_COUNTER_FREQUENCY=24000000 -+CONFIG_ARCH_ROCKCHIP=y -+CONFIG_TEXT_BASE=0x00a00000 -+CONFIG_SPL_LIBCOMMON_SUPPORT=y -+CONFIG_SPL_LIBGENERIC_SUPPORT=y -+CONFIG_NR_DRAM_BANKS=2 -+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc00000 -+CONFIG_SF_DEFAULT_SPEED=24000000 -+CONFIG_SF_DEFAULT_MODE=0x1000 -+CONFIG_DEFAULT_DEVICE_TREE="rk3568-odroid-m1" -+CONFIG_ROCKCHIP_RK3568=y -+CONFIG_SPL_ROCKCHIP_COMMON_BOARD=y -+CONFIG_ROCKCHIP_SPI_IMAGE=y -+CONFIG_SPL_SERIAL=y -+CONFIG_SPL_STACK_R_ADDR=0x600000 -+CONFIG_SPL_STACK=0x400000 -+CONFIG_DEBUG_UART_BASE=0xFE660000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI=y -+CONFIG_SYS_LOAD_ADDR=0xc00800 -+CONFIG_PCI=y -+CONFIG_DEBUG_UART=y -+CONFIG_AHCI=y -+CONFIG_FIT=y -+CONFIG_FIT_VERBOSE=y -+CONFIG_SPL_FIT_SIGNATURE=y -+CONFIG_SPL_LOAD_FIT=y -+CONFIG_LEGACY_IMAGE_FORMAT=y -+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-odroid-m1.dtb" -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+CONFIG_SPL_MAX_SIZE=0x40000 -+CONFIG_SPL_PAD_TO=0x7f8000 -+CONFIG_SPL_HAS_BSS_LINKER_SECTION=y -+CONFIG_SPL_BSS_START_ADDR=0x4000000 -+CONFIG_SPL_BSS_MAX_SIZE=0x4000 -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -+CONFIG_SPL_STACK_R=y -+CONFIG_SPL_SPI_LOAD=y -+CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 -+CONFIG_SPL_ATF=y -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_GPT=y -+CONFIG_CMD_I2C=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_PCI=y -+CONFIG_CMD_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_PMIC=y -+CONFIG_CMD_REGULATOR=y -+# CONFIG_SPL_DOS_PARTITION is not set -+CONFIG_SPL_OF_CONTROL=y -+CONFIG_OF_LIVE=y -+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_SPL_REGMAP=y -+CONFIG_SPL_SYSCON=y -+CONFIG_AHCI_PCI=y -+CONFIG_DWC_AHCI=y -+CONFIG_SPL_CLK=y -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_SYS_I2C_ROCKCHIP=y -+CONFIG_MISC=y -+CONFIG_SUPPORT_EMMC_RPMB=y -+CONFIG_MMC_DW=y -+CONFIG_MMC_DW_ROCKCHIP=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_SDMA=y -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SPI_FLASH_SFDP_SUPPORT=y -+CONFIG_SPI_FLASH_MACRONIX=y -+CONFIG_ETH_DESIGNWARE=y -+CONFIG_GMAC_ROCKCHIP=y -+CONFIG_NVME_PCI=y -+CONFIG_PCIE_DW_ROCKCHIP=y -+CONFIG_PHY_ROCKCHIP_INNO_USB2=y -+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y -+CONFIG_SPL_PINCTRL=y -+CONFIG_DM_PMIC=y -+CONFIG_PMIC_RK8XX=y -+CONFIG_REGULATOR_RK8XX=y -+CONFIG_PWM_ROCKCHIP=y -+CONFIG_SPL_RAM=y -+CONFIG_SCSI=y -+CONFIG_DM_SCSI=y -+CONFIG_BAUDRATE=1500000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_SYS_NS16550_MEM32=y -+CONFIG_ROCKCHIP_SFC=y -+CONFIG_SYSRESET=y -+CONFIG_USB=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_EHCI_HCD=y -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_OHCI_HCD=y -+CONFIG_USB_OHCI_GENERIC=y -+CONFIG_USB_DWC3=y -+CONFIG_USB_DWC3_GENERIC=y -+CONFIG_ERRNO_STR=y -diff --git a/doc/board/rockchip/rockchip.rst b/doc/board/rockchip/rockchip.rst -index 99376fb54c..b3de15b36a 100644 ---- a/doc/board/rockchip/rockchip.rst -+++ b/doc/board/rockchip/rockchip.rst -@@ -95,6 +95,7 @@ List of mainline supported Rockchip boards: - - * rk3568 - - Rockchip Evb-RK3568 (evb-rk3568) -+ - Hardkernel ODROID-M1 (odroid-m1-rk3568) - - * rk3588 - - Rockchip EVB (evb-rk3588) --- -2.41.0 - diff --git a/buildroot-external/board/hardkernel/odroid-xu4/patches/uboot/0001-samsung-common-ignore-if-CROS-EC-is-not-supported.patch b/buildroot-external/board/hardkernel/odroid-xu4/patches/uboot/0001-samsung-common-ignore-if-CROS-EC-is-not-supported.patch deleted file mode 100644 index e698845521a..00000000000 --- a/buildroot-external/board/hardkernel/odroid-xu4/patches/uboot/0001-samsung-common-ignore-if-CROS-EC-is-not-supported.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 24252c65cfea76c5724044381bafb587a9fecd6a Mon Sep 17 00:00:00 2001 -Message-Id: <24252c65cfea76c5724044381bafb587a9fecd6a.1676446297.git.stefan@agner.ch> -From: Stefan Agner -Date: Wed, 15 Feb 2023 08:30:41 +0100 -Subject: [PATCH] samsung: common: ignore if CROS EC is not supported - -If the CROS device class is not compiled in, uclass returns not -supported. Ignore this case as well. - -Signed-off-by: Stefan Agner ---- - board/samsung/common/board.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c -index 16ce5cb892..663d7ca991 100644 ---- a/board/samsung/common/board.c -+++ b/board/samsung/common/board.c -@@ -223,7 +223,7 @@ int board_late_init(void) - char mmcbootdev_str[16]; - - ret = uclass_first_device_err(UCLASS_CROS_EC, &dev); -- if (ret && ret != -ENODEV) { -+ if (ret && ret != -ENODEV && ret != -EPFNOSUPPORT) { - /* Force console on */ - gd->flags &= ~GD_FLG_SILENT; - --- -2.39.1 - diff --git a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch index 97fb51736f6..c56843027f5 100644 --- a/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch +++ b/buildroot-external/board/hardkernel/patches/uboot/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch @@ -1,5 +1,4 @@ -From 5d2feca5947f84259bae41730ce54231578b37be Mon Sep 17 00:00:00 2001 -Message-Id: <5d2feca5947f84259bae41730ce54231578b37be.1645627508.git.stefan@agner.ch> +From 11f015e13ef0442b6d2bb734954291abde415f73 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 2 Sep 2019 15:42:04 +0200 Subject: [PATCH] HACK: mmc: meson-gx: limit to 24MHz @@ -23,5 +22,5 @@ index fcf4f03d1e..6ded4b619b 100644 cfg->name = dev->name; -- -2.35.1 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0001-arch-arm-dts-Add-NabuCasa-Green-board.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0001-arch-arm-dts-Add-NabuCasa-Green-board.patch index 7a0e374d886..539bf2705d6 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0001-arch-arm-dts-Add-NabuCasa-Green-board.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0001-arch-arm-dts-Add-NabuCasa-Green-board.patch @@ -1,8 +1,7 @@ -From 2ab36c774a9f16c10a2bffeb602a9c914ffacd00 Mon Sep 17 00:00:00 2001 -Message-ID: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From 501ac314ef709d6ecac3047310d5e48a473df638 Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Thu, 6 Jul 2023 10:06:35 +0000 -Subject: [PATCH 1/9] arch: arm: dts: Add NabuCasa Green board +Subject: [PATCH] arch: arm: dts: Add NabuCasa Green board --- arch/arm/dts/Makefile | 1 + @@ -15,17 +14,17 @@ Subject: [PATCH 1/9] arch: arm: dts: Add NabuCasa Green board create mode 100644 configs/green_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 480269fa60..b82ebfe371 100644 +index 9d28a485be..f78839f9cc 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -167,6 +167,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ +@@ -172,6 +172,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ dtb-$(CONFIG_ROCKCHIP_RK3568) += \ rk3566-anbernic-rgxx3.dtb \ + rk3566-ha-green.dtb \ + rk3566-quartz64-a.dtb \ + rk3566-quartz64-b.dtb \ rk3566-radxa-cm3-io.dtb \ - rk3568-evb.dtb \ - rk3568-rock-3a.dtb diff --git a/arch/arm/dts/rk3566-ha-green-u-boot.dtsi b/arch/arm/dts/rk3566-ha-green-u-boot.dtsi new file mode 100644 index 0000000000..83fa66d591 @@ -832,5 +831,5 @@ index 0000000000..0617d308aa +# CONFIG_BINMAN_FDT is not set +CONFIG_ERRNO_STR=y -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0002-configs-green-Support-USB-boot.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0002-configs-green-Support-USB-boot.patch index 9077b812855..68d5c61c54d 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0002-configs-green-Support-USB-boot.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0002-configs-green-Support-USB-boot.patch @@ -1,10 +1,7 @@ -From d4f52bc53540341dcb3408a3f2d4ec8bd1fe260a Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From 6441bdb22a25649ff8fd69aa8f8a7285d9c37266 Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Fri, 14 Jul 2023 14:13:39 +0000 -Subject: [PATCH 2/9] configs: green: Support USB boot +Subject: [PATCH] configs: green: Support USB boot --- configs/green_defconfig | 52 ++++++++++++++++++++++++++++------------- @@ -116,5 +113,5 @@ index 0617d308aa..14960b67d2 100644 +CONFIG_USB_DWC3=y CONFIG_ERRNO_STR=y -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0003-arch-arm-dts-rk3566-green-boot-order.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0003-arch-arm-dts-rk3566-green-boot-order.patch index 23b983ae9dd..de2570b7e67 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0003-arch-arm-dts-rk3566-green-boot-order.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0003-arch-arm-dts-rk3566-green-boot-order.patch @@ -1,10 +1,7 @@ -From c59235f8be1bdd261e1677177c1bef1bee1025ea Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From d8b8b614d19dbb3fa004677a2c2e50b685a80192 Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Fri, 14 Jul 2023 14:14:10 +0000 -Subject: [PATCH 3/9] arch: arm: dts: rk3566: green: boot order +Subject: [PATCH] arch: arm: dts: rk3566: green: boot order --- arch/arm/dts/rk3566-ha-green-u-boot.dtsi | 6 +++++- @@ -49,5 +46,5 @@ index 15d2b73433..bf0f81c3a1 100644 reg = <0>; spi-max-frequency = <100000000>; -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0004-arch-arm-dts-green-spi-nor-uboot.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0004-arch-arm-dts-green-spi-nor-uboot.patch index 7f151b5b40a..ca1463c4dcc 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0004-arch-arm-dts-green-spi-nor-uboot.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0004-arch-arm-dts-green-spi-nor-uboot.patch @@ -1,10 +1,7 @@ -From e525d29174f335fe9aa72da8642699609631b2be Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From e14d7d56b293ba01c5b73a4b3483795d78c75172 Mon Sep 17 00:00:00 2001 From: Zhangqun Ming Date: Sat, 15 Jul 2023 08:46:09 +0000 -Subject: [PATCH 4/9] arch: arm: dts: green: spi nor uboot +Subject: [PATCH] arch: arm: dts: green: spi nor uboot --- arch/arm/dts/rk3566-ha-green-u-boot.dtsi | 88 +++++++++++++++++++++++- @@ -154,5 +151,5 @@ index 14960b67d2..5f94c06279 100644 CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0005-board-green-add-Green-board-to-read-board-specific-E.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0005-board-green-add-Green-board-to-read-board-specific-E.patch index 8676bd096b6..380163bcf96 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0005-board-green-add-Green-board-to-read-board-specific-E.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0005-board-green-add-Green-board-to-read-board-specific-E.patch @@ -1,11 +1,7 @@ -From 0088369711a0b57b598121dad60b52de0426a180 Mon Sep 17 00:00:00 2001 -Message-ID: <0088369711a0b57b598121dad60b52de0426a180.1692346980.git.stefan@agner.ch> -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From acec57c77e10230fc32820046301cb2a59c431d4 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 17 Aug 2023 17:38:13 +0200 -Subject: [PATCH 5/9] board: green: add Green board to read board specific - EEPROM +Subject: [PATCH] board: green: add Green board to read board specific EEPROM Use board specific code to read serial number and MAC address from on-board I2C EEPROM. @@ -44,7 +40,7 @@ index ea9d358099..91afadf0e6 100644 &i2s0_8ch { diff --git a/arch/arm/mach-rockchip/rk3568/Kconfig b/arch/arm/mach-rockchip/rk3568/Kconfig -index 94e04b79e7..5858c3921d 100644 +index baa51349f4..42652dec03 100644 --- a/arch/arm/mach-rockchip/rk3568/Kconfig +++ b/arch/arm/mach-rockchip/rk3568/Kconfig @@ -17,6 +17,12 @@ config TARGET_ANBERNIC_RGXX3_RK3566 @@ -57,14 +53,15 @@ index 94e04b79e7..5858c3921d 100644 + Nabu Casa's Home Assistant Green single board computer with a RK3566 + SoC. + - endchoice - - config ROCKCHIP_BOOT_MODE_REG -@@ -33,5 +39,6 @@ config SYS_MALLOC_F_LEN - + config TARGET_ODROID_M1_RK3568 + bool "ODROID-M1" + help +@@ -44,6 +50,7 @@ config SYS_MALLOC_F_LEN source "board/rockchip/evb_rk3568/Kconfig" source "board/anbernic/rgxx3_rk3566/Kconfig" + source "board/hardkernel/odroid_m1/Kconfig" +source "board/nabucasa/ha-green/Kconfig" + source "board/pine64/quartz64_rk3566/Kconfig" endif diff --git a/board/nabucasa/ha-green/Kconfig b/board/nabucasa/ha-green/Kconfig @@ -207,5 +204,5 @@ index 0000000000..e42d9c8e8c + +#endif -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0006-green-spl-loader-uboot-order-sd-emmc-spi_nor.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0006-green-spl-loader-uboot-order-sd-emmc-spi_nor.patch index ed3b4d230c5..661e4cbedba 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0006-green-spl-loader-uboot-order-sd-emmc-spi_nor.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0006-green-spl-loader-uboot-order-sd-emmc-spi_nor.patch @@ -1,10 +1,7 @@ -From 9fd3b62354064d44fd391907f48d7800c6839c8a Mon Sep 17 00:00:00 2001 -Message-ID: <9fd3b62354064d44fd391907f48d7800c6839c8a.1692346980.git.stefan@agner.ch> -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From 51f1bdec59b8f62ac00a37e97a7bb8ebfc9f61d7 Mon Sep 17 00:00:00 2001 From: syan Date: Mon, 31 Jul 2023 09:39:55 +0000 -Subject: [PATCH 6/9] green: spl loader uboot order: sd-emmc-spi_nor +Subject: [PATCH] green: spl loader uboot order: sd-emmc-spi_nor --- arch/arm/dts/rk3566-ha-green-u-boot.dtsi | 2 +- @@ -24,5 +21,5 @@ index fa98078fce..48d7b61513 100644 }; -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0008-green-Fix-SPI-Flash-alias.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0007-green-Fix-SPI-Flash-alias.patch similarity index 76% rename from buildroot-external/board/nabucasa/green/patches/uboot/0008-green-Fix-SPI-Flash-alias.patch rename to buildroot-external/board/nabucasa/green/patches/uboot/0007-green-Fix-SPI-Flash-alias.patch index 49045102e83..34f53becd5b 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0008-green-Fix-SPI-Flash-alias.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0007-green-Fix-SPI-Flash-alias.patch @@ -1,10 +1,7 @@ -From 24c253f85e04cc09b675c41490bad0c69338c2c6 Mon Sep 17 00:00:00 2001 -Message-ID: <24c253f85e04cc09b675c41490bad0c69338c2c6.1692346980.git.stefan@agner.ch> -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From 0142d1a99d2aa4a6dad7181dcd74958b2ee0fe31 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 17 Aug 2023 17:51:07 +0200 -Subject: [PATCH 8/9] green: Fix SPI Flash alias +Subject: [PATCH] green: Fix SPI Flash alias Use the commonly used SPI flash bus 4. This allows to access SPI NOR flash from regular U-Boot as well. @@ -42,5 +39,5 @@ index a97391f295..71c9257d7d 100644 CONFIG_GMAC_ROCKCHIP=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0007-rockchip-rk3568-rock-3a-Fix-SPI-Flash-alias.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0007-rockchip-rk3568-rock-3a-Fix-SPI-Flash-alias.patch deleted file mode 100644 index 514d026a9dc..00000000000 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0007-rockchip-rk3568-rock-3a-Fix-SPI-Flash-alias.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 59eeea1cb0b1a0b254c759dceeface686aa8f24b Mon Sep 17 00:00:00 2001 -Message-ID: <59eeea1cb0b1a0b254c759dceeface686aa8f24b.1692346980.git.stefan@agner.ch> -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -From: Jonas Karlman -Date: Fri, 28 Jul 2023 12:05:40 +0000 -Subject: [PATCH 7/9] rockchip: rk3568-rock-3a: Fix SPI Flash alias - -The commit 64f79f88a751 ("rockchip: rk3568-rock-3a: Enable boot from SPI -NOR flash") enabled SPI flash support by overriding the spi0 alias. - -Correct this by adding a new spi4 alias in rk356x-u-boot.dtsi and -SF_DEFAULT_BUS=4 and SPL_DM_SEQ_ALIAS=y in defconfig. Also enabled -support for parsing and auto discovery of parameters, SFDP. - -Fixes: 64f79f88a751 ("rockchip: rk3568-rock-3a: Enable boot from SPI NOR flash") -Signed-off-by: Jonas Karlman -Reviewed-by: Kever Yang -(cherry picked from commit 52f6b96d27c8aabca697ac395e86a3481f1c53b7) ---- - arch/arm/dts/rk3568-rock-3a-u-boot.dtsi | 4 ---- - arch/arm/dts/rk356x-u-boot.dtsi | 1 + - configs/rock-3a-rk3568_defconfig | 3 +++ - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi -index bbf54f888f..cb40dc31d1 100644 ---- a/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi -+++ b/arch/arm/dts/rk3568-rock-3a-u-boot.dtsi -@@ -7,10 +7,6 @@ - #include "rk356x-u-boot.dtsi" - - / { -- aliases { -- spi0 = &sfc; -- }; -- - chosen { - stdout-path = &uart2; - }; -diff --git a/arch/arm/dts/rk356x-u-boot.dtsi b/arch/arm/dts/rk356x-u-boot.dtsi -index c340c2bba6..e7b46bb2d4 100644 ---- a/arch/arm/dts/rk356x-u-boot.dtsi -+++ b/arch/arm/dts/rk356x-u-boot.dtsi -@@ -9,6 +9,7 @@ - aliases { - mmc0 = &sdhci; - mmc1 = &sdmmc0; -+ spi4 = &sfc; - }; - - chosen { -diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig -index 753d03914d..92eb6b3f1c 100644 ---- a/configs/rock-3a-rk3568_defconfig -+++ b/configs/rock-3a-rk3568_defconfig -@@ -54,6 +54,7 @@ CONFIG_CMD_REGULATOR=y - CONFIG_SPL_OF_CONTROL=y - CONFIG_OF_LIVE=y - CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_SPL_DM_SEQ_ALIAS=y - CONFIG_SPL_REGMAP=y - CONFIG_SPL_SYSCON=y - CONFIG_SPL_CLK=y -@@ -66,6 +67,8 @@ CONFIG_MMC_DW_ROCKCHIP=y - CONFIG_MMC_SDHCI=y - CONFIG_MMC_SDHCI_SDMA=y - CONFIG_MMC_SDHCI_ROCKCHIP=y -+CONFIG_SF_DEFAULT_BUS=4 -+CONFIG_SPI_FLASH_SFDP_SUPPORT=y - CONFIG_SPI_FLASH_MACRONIX=y - CONFIG_SPI_FLASH_XTX=y - CONFIG_ETH_DESIGNWARE=y --- -2.41.0 - diff --git a/buildroot-external/board/nabucasa/green/patches/uboot/0009-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch b/buildroot-external/board/nabucasa/green/patches/uboot/0008-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch similarity index 71% rename from buildroot-external/board/nabucasa/green/patches/uboot/0009-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch rename to buildroot-external/board/nabucasa/green/patches/uboot/0008-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch index 8c4c64969f9..d16a81edbb4 100644 --- a/buildroot-external/board/nabucasa/green/patches/uboot/0009-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch +++ b/buildroot-external/board/nabucasa/green/patches/uboot/0008-arch-arm-dts-green-drop-SPI-NOR-flash-partitions.patch @@ -1,10 +1,7 @@ -From c0ee04d554802a7b7af3e6ec6b3d9b4160c75126 Mon Sep 17 00:00:00 2001 -Message-ID: -In-Reply-To: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> -References: <2ab36c774a9f16c10a2bffeb602a9c914ffacd00.1692346980.git.stefan@agner.ch> +From 846df62342a4904a91aace66e9204ae3ed4ca0af Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 18 Aug 2023 10:06:24 +0200 -Subject: [PATCH 9/9] arch: arm: dts: green: drop SPI NOR flash partitions +Subject: [PATCH] arch: arm: dts: green: drop SPI NOR flash partitions --- arch/arm/dts/rk3566-ha-green.dts | 27 --------------------------- @@ -49,5 +46,5 @@ index 91afadf0e6..68d836911e 100644 }; -- -2.41.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch index d3660f0834d..b0936eb9106 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0001-rpi-Use-CONFIG_OF_BOARD-instead-of-CONFIG_EMBED.patch @@ -1,5 +1,4 @@ -From 01b4d231cbb66ca193ba422a22d25c75d21ff8ee Mon Sep 17 00:00:00 2001 -Message-Id: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From 45df955b5aa0460b9c93f63fb4a38f10807c0694 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Tue, 10 Dec 2019 09:48:46 +0000 Subject: [PATCH] rpi: Use CONFIG_OF_BOARD instead of CONFIG_EMBED @@ -14,10 +13,10 @@ Signed-off-by: Pascal Vizeli 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig -index baa8c37810..f20aa164e5 100644 +index ac3b40c1c1..e6765878d1 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig -@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y +@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -27,10 +26,10 @@ index baa8c37810..f20aa164e5 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig -index baae6d4871..60987ad91a 100644 +index b6e06cfe20..0650344526 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig -@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y +@@ -25,7 +25,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -40,10 +39,10 @@ index baae6d4871..60987ad91a 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig -index f51f3de596..e6de8669d0 100644 +index eadc418927..7f52b508c4 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig -@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y +@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -53,10 +52,10 @@ index f51f3de596..e6de8669d0 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig -index bc1a318db4..70f4f8ed70 100644 +index 6890af4d1d..0767518279 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig -@@ -22,7 +22,7 @@ CONFIG_CMD_GPIO=y +@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -66,10 +65,10 @@ index bc1a318db4..70f4f8ed70 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig -index 1d356b4b2e..6f345c790b 100644 +index 29c10060cf..79b507405d 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig -@@ -23,7 +23,7 @@ CONFIG_CMD_GPIO=y +@@ -24,7 +24,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_FS_UUID=y @@ -79,5 +78,5 @@ index 1d356b4b2e..6f345c790b 100644 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-add-NVMe-to-boot-order.patch b/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-add-NVMe-to-boot-order.patch index 993356079ca..d169615ddfc 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-add-NVMe-to-boot-order.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0002-rpi-add-NVMe-to-boot-order.patch @@ -1,7 +1,4 @@ -From 8870872f359771effddd74bcb4c7e0a4316d99f7 Mon Sep 17 00:00:00 2001 -Message-Id: <8870872f359771effddd74bcb4c7e0a4316d99f7.1682350496.git.stefan@agner.ch> -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From f53b9a545132686b0286ce166203a57935502dbc Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Tue, 29 Dec 2020 23:34:52 +0100 Subject: [PATCH] rpi: add NVMe to boot order @@ -11,34 +8,19 @@ order. Signed-off-by: Stefan Agner --- - include/configs/rpi.h | 7 +++++++ - 1 file changed, 7 insertions(+) + board/raspberrypi/rpi/rpi.env | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/include/configs/rpi.h b/include/configs/rpi.h -index cd8fe8b518..7257659932 100644 ---- a/include/configs/rpi.h -+++ b/include/configs/rpi.h -@@ -131,6 +131,12 @@ - #define BOOT_TARGET_MMC(func) - #endif +diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env +index 30228285ed..89f6c5a839 100644 +--- a/board/raspberrypi/rpi/rpi.env ++++ b/board/raspberrypi/rpi/rpi.env +@@ -74,4 +74,4 @@ pxefile_addr_r=0x02500000 + fdt_addr_r=0x02600000 + ramdisk_addr_r=0x02700000 -+#if CONFIG_IS_ENABLED(CMD_NVME) -+ #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) -+#else -+ #define BOOT_TARGET_NVME(func) -+#endif -+ - #if CONFIG_IS_ENABLED(CMD_USB) - #define BOOT_TARGET_USB(func) func(USB, usb, 0) - #else -@@ -151,6 +157,7 @@ - - #define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_MMC(func) \ -+ BOOT_TARGET_NVME(func) \ - BOOT_TARGET_USB(func) \ - BOOT_TARGET_PXE(func) \ - BOOT_TARGET_DHCP(func) +-boot_targets=mmc usb pxe dhcp ++boot_targets=mmc nvme usb pxe dhcp -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0003-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch b/buildroot-external/board/raspberrypi/patches/uboot/0003-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch index 2c75da7d530..57c400ef979 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0003-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0003-Revert-nvme-Correct-the-prps-per-page-calculation-me.patch @@ -1,7 +1,4 @@ -From 60afc919643d212439a63908c83523879af21032 Mon Sep 17 00:00:00 2001 -Message-Id: <60afc919643d212439a63908c83523879af21032.1682350496.git.stefan@agner.ch> -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From 8e63cbe8892eb6edc02674d42078a9f116ee8224 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 23 Sep 2021 23:43:31 +0200 Subject: [PATCH] Revert "nvme: Correct the prps per page calculation method" @@ -26,10 +23,10 @@ Cc: Wesley Sheng 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c -index 6d0d3f3ca2..73db80a294 100644 +index c39cd41aa3..03a652863c 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c -@@ -52,7 +52,7 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, +@@ -53,7 +53,7 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, u64 *prp_pool; int length = total_len; int i, nprps; @@ -39,5 +36,5 @@ index 6d0d3f3ca2..73db80a294 100644 length -= (page_size - offset); -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch b/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch index 0dd7beb0648..71c9fa17c5c 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0004-usb-xhci-brcm-Make-driver-compatible-with-downstream.patch @@ -1,7 +1,4 @@ -From cca49e815fbdcbb436f238d362b5f145471153dc Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From c4f0a3c6147e7f8c32cb8806a0c2531b9d3852b7 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 7 Oct 2021 12:02:39 +0200 Subject: [PATCH] usb: xhci-brcm: Make driver compatible with downstream device @@ -29,5 +26,5 @@ index fe17924028..0c6938187b 100644 }; -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0005-nvme-improve-readability-of-nvme_setup_prps.patch b/buildroot-external/board/raspberrypi/patches/uboot/0005-nvme-improve-readability-of-nvme_setup_prps.patch index 130f6587989..f42ce062581 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0005-nvme-improve-readability-of-nvme_setup_prps.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0005-nvme-improve-readability-of-nvme_setup_prps.patch @@ -1,7 +1,4 @@ -From 11176a6ca068e0b572abbe5da8fef1d57bd40e7a Mon Sep 17 00:00:00 2001 -Message-Id: <11176a6ca068e0b572abbe5da8fef1d57bd40e7a.1682350496.git.stefan@agner.ch> -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From 66e2d5b7ba776587a4ebaca100f27798fa804c54 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 23 Sep 2021 23:52:44 +0200 Subject: [PATCH] nvme: improve readability of nvme_setup_prps() @@ -15,10 +12,10 @@ Signed-off-by: Stefan Agner 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c -index 73db80a294..751abc3cd5 100644 +index 03a652863c..5c4fbd08dc 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c -@@ -47,12 +47,12 @@ static int nvme_wait_csts(struct nvme_dev *dev, u32 mask, u32 val) +@@ -48,12 +48,12 @@ static int nvme_wait_csts(struct nvme_dev *dev, u32 mask, u32 val) static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, int total_len, u64 dma_addr) { @@ -33,7 +30,7 @@ index 73db80a294..751abc3cd5 100644 u32 num_pages; length -= (page_size - offset); -@@ -91,8 +91,8 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, +@@ -92,8 +92,8 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, i = 0; while (nprps) { if ((i == (prps_per_page - 1)) && nprps > 1) { @@ -45,5 +42,5 @@ index 73db80a294..751abc3cd5 100644 prp_pool += page_size; } -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0006-nvme-Use-pointer-for-CPU-addressed-buffers.patch b/buildroot-external/board/raspberrypi/patches/uboot/0006-nvme-Use-pointer-for-CPU-addressed-buffers.patch index 8482c0ec644..905e5613e78 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0006-nvme-Use-pointer-for-CPU-addressed-buffers.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0006-nvme-Use-pointer-for-CPU-addressed-buffers.patch @@ -1,7 +1,4 @@ -From 3bccb6eb7f9e8e996cd50409eb96450c313953ec Mon Sep 17 00:00:00 2001 -Message-Id: <3bccb6eb7f9e8e996cd50409eb96450c313953ec.1682350496.git.stefan@agner.ch> -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From 4e7236a0e4a75dfca366ffc4ffb23a4bd43a52e7 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 23 Sep 2021 23:58:35 +0200 Subject: [PATCH] nvme: Use pointer for CPU addressed buffers @@ -18,10 +15,10 @@ Signed-off-by: Stefan Agner 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c -index 751abc3cd5..352c94ea91 100644 +index 5c4fbd08dc..43ef819d11 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c -@@ -45,11 +45,11 @@ static int nvme_wait_csts(struct nvme_dev *dev, u32 mask, u32 val) +@@ -46,11 +46,11 @@ static int nvme_wait_csts(struct nvme_dev *dev, u32 mask, u32 val) } static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, @@ -35,7 +32,7 @@ index 751abc3cd5..352c94ea91 100644 u64 *prp_pool; int length = total_len; int i, nprps; -@@ -63,10 +63,10 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, +@@ -64,10 +64,10 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, } if (length) @@ -48,7 +45,7 @@ index 751abc3cd5..352c94ea91 100644 return 0; } -@@ -96,11 +96,11 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, +@@ -97,11 +97,11 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, i = 0; prp_pool += page_size; } @@ -63,7 +60,7 @@ index 751abc3cd5..352c94ea91 100644 flush_dcache_range((ulong)dev->prp_pool, (ulong)dev->prp_pool + num_pages * page_size); -@@ -447,42 +447,42 @@ static int nvme_alloc_sq(struct nvme_dev *dev, u16 qid, +@@ -448,42 +448,42 @@ static int nvme_alloc_sq(struct nvme_dev *dev, u16 qid, } int nvme_identify(struct nvme_dev *dev, unsigned nsid, @@ -116,7 +113,7 @@ index 751abc3cd5..352c94ea91 100644 { struct nvme_command c; int ret; -@@ -490,7 +490,7 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, +@@ -491,7 +491,7 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, memset(&c, 0, sizeof(c)); c.features.opcode = nvme_admin_get_features; c.features.nsid = cpu_to_le32(nsid); @@ -125,7 +122,7 @@ index 751abc3cd5..352c94ea91 100644 c.features.fid = cpu_to_le32(fid); ret = nvme_submit_admin_cmd(dev, &c, result); -@@ -510,13 +510,13 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, +@@ -511,13 +511,13 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, } int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11, @@ -141,7 +138,7 @@ index 751abc3cd5..352c94ea91 100644 c.features.fid = cpu_to_le32(fid); c.features.dword11 = cpu_to_le32(dword11); -@@ -567,7 +567,7 @@ static int nvme_set_queue_count(struct nvme_dev *dev, int count) +@@ -568,7 +568,7 @@ static int nvme_set_queue_count(struct nvme_dev *dev, int count) u32 q_count = (count - 1) | ((count - 1) << 16); status = nvme_set_features(dev, NVME_FEAT_NUM_QUEUES, @@ -150,7 +147,7 @@ index 751abc3cd5..352c94ea91 100644 if (status < 0) return status; -@@ -619,7 +619,7 @@ static int nvme_get_info_from_identify(struct nvme_dev *dev) +@@ -629,7 +629,7 @@ static int nvme_get_info_from_identify(struct nvme_dev *dev) if (!ctrl) return -ENOMEM; @@ -159,7 +156,7 @@ index 751abc3cd5..352c94ea91 100644 if (ret) { free(ctrl); return -EIO; -@@ -704,7 +704,7 @@ static int nvme_blk_probe(struct udevice *udev) +@@ -717,7 +717,7 @@ static int nvme_blk_probe(struct udevice *udev) ns->dev = ndev; /* extract the namespace id from the block device name */ ns->ns_id = trailing_strtol(udev->name); @@ -168,7 +165,7 @@ index 751abc3cd5..352c94ea91 100644 free(id); return -EIO; } -@@ -738,7 +738,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, +@@ -751,7 +751,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, u64 prp2; u64 total_len = blkcnt << desc->log2blksz; u64 temp_len = total_len; @@ -177,7 +174,7 @@ index 751abc3cd5..352c94ea91 100644 u64 slba = blknr; u16 lbas = 1 << (dev->max_transfer_shift - ns->lba_shift); -@@ -872,7 +872,7 @@ int nvme_init(struct udevice *udev) +@@ -889,7 +889,7 @@ int nvme_init(struct udevice *udev) char name[20]; memset(id, 0, sizeof(*id)); @@ -260,5 +257,5 @@ index 2cdf8ce320..8ff823cd81 100644 /** * nvme_scan_namespace - scan all namespaces attached to NVMe controllers -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0007-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch b/buildroot-external/board/raspberrypi/patches/uboot/0007-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch index 680c4a16818..746327eff08 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0007-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0007-nvme-translate-virtual-addresses-into-the-bus-s-addr.patch @@ -1,7 +1,4 @@ -From ca73fb28fa86b7de243b6713d2756dee445c5f56 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From f992eee16640831a3b2d8c093395a4dcaceff647 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 24 Sep 2021 00:27:39 +0200 Subject: [PATCH] nvme: translate virtual addresses into the bus's address @@ -29,10 +26,10 @@ Signed-off-by: Stefan Agner 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/drivers/nvme/nvme.c b/drivers/nvme/nvme.c -index 352c94ea91..fdfc49677b 100644 +index 43ef819d11..9cd9037630 100644 --- a/drivers/nvme/nvme.c +++ b/drivers/nvme/nvme.c -@@ -66,7 +66,7 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, +@@ -67,7 +67,7 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, buffer += (page_size - offset); if (length <= page_size) { @@ -41,7 +38,7 @@ index 352c94ea91..fdfc49677b 100644 return 0; } -@@ -91,16 +91,16 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, +@@ -92,16 +92,16 @@ static int nvme_setup_prps(struct nvme_dev *dev, u64 *prp2, i = 0; while (nprps) { if ((i == (prps_per_page - 1)) && nprps > 1) { @@ -62,7 +59,7 @@ index 352c94ea91..fdfc49677b 100644 flush_dcache_range((ulong)dev->prp_pool, (ulong)dev->prp_pool + num_pages * page_size); -@@ -353,6 +353,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev) +@@ -354,6 +354,7 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev) int result; u32 aqa; u64 cap = dev->cap; @@ -70,7 +67,7 @@ index 352c94ea91..fdfc49677b 100644 struct nvme_queue *nvmeq; /* most architectures use 4KB as the page size */ unsigned page_shift = 12; -@@ -393,8 +394,10 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev) +@@ -394,8 +395,10 @@ static int nvme_configure_admin_queue(struct nvme_dev *dev) dev->ctrl_config |= NVME_CC_IOSQES | NVME_CC_IOCQES; writel(aqa, &dev->bar->aqa); @@ -83,7 +80,7 @@ index 352c94ea91..fdfc49677b 100644 result = nvme_enable_ctrl(dev); if (result) -@@ -420,7 +423,7 @@ static int nvme_alloc_cq(struct nvme_dev *dev, u16 qid, +@@ -421,7 +424,7 @@ static int nvme_alloc_cq(struct nvme_dev *dev, u16 qid, memset(&c, 0, sizeof(c)); c.create_cq.opcode = nvme_admin_create_cq; @@ -92,7 +89,7 @@ index 352c94ea91..fdfc49677b 100644 c.create_cq.cqid = cpu_to_le16(qid); c.create_cq.qsize = cpu_to_le16(nvmeq->q_depth - 1); c.create_cq.cq_flags = cpu_to_le16(flags); -@@ -437,7 +440,7 @@ static int nvme_alloc_sq(struct nvme_dev *dev, u16 qid, +@@ -438,7 +441,7 @@ static int nvme_alloc_sq(struct nvme_dev *dev, u16 qid, memset(&c, 0, sizeof(c)); c.create_sq.opcode = nvme_admin_create_sq; @@ -101,7 +98,7 @@ index 352c94ea91..fdfc49677b 100644 c.create_sq.sqid = cpu_to_le16(qid); c.create_sq.qsize = cpu_to_le16(nvmeq->q_depth - 1); c.create_sq.sq_flags = cpu_to_le16(flags); -@@ -458,14 +461,14 @@ int nvme_identify(struct nvme_dev *dev, unsigned nsid, +@@ -459,14 +462,14 @@ int nvme_identify(struct nvme_dev *dev, unsigned nsid, memset(&c, 0, sizeof(c)); c.identify.opcode = nvme_admin_identify; c.identify.nsid = cpu_to_le32(nsid); @@ -118,7 +115,7 @@ index 352c94ea91..fdfc49677b 100644 } c.identify.cns = cpu_to_le32(cns); -@@ -490,7 +493,7 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, +@@ -491,7 +494,7 @@ int nvme_get_features(struct nvme_dev *dev, unsigned fid, unsigned nsid, memset(&c, 0, sizeof(c)); c.features.opcode = nvme_admin_get_features; c.features.nsid = cpu_to_le32(nsid); @@ -127,7 +124,7 @@ index 352c94ea91..fdfc49677b 100644 c.features.fid = cpu_to_le32(fid); ret = nvme_submit_admin_cmd(dev, &c, result); -@@ -516,7 +519,7 @@ int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11, +@@ -517,7 +520,7 @@ int nvme_set_features(struct nvme_dev *dev, unsigned fid, unsigned dword11, memset(&c, 0, sizeof(c)); c.features.opcode = nvme_admin_set_features; @@ -136,7 +133,7 @@ index 352c94ea91..fdfc49677b 100644 c.features.fid = cpu_to_le32(fid); c.features.dword11 = cpu_to_le32(dword11); -@@ -771,7 +774,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, +@@ -784,7 +787,7 @@ static ulong nvme_blk_rw(struct udevice *udev, lbaint_t blknr, c.rw.slba = cpu_to_le64(slba); slba += lbas; c.rw.length = cpu_to_le16(lbas - 1); @@ -172,5 +169,5 @@ index bc1d612dde..f52103c009 100644 + #endif /* __DRIVER_NVME_H__ */ -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/patches/uboot/0008-Revert-pci-Check-region-ranges-are-addressable.patch b/buildroot-external/board/raspberrypi/patches/uboot/0008-Revert-pci-Check-region-ranges-are-addressable.patch index a75614922ec..dd8529340a1 100644 --- a/buildroot-external/board/raspberrypi/patches/uboot/0008-Revert-pci-Check-region-ranges-are-addressable.patch +++ b/buildroot-external/board/raspberrypi/patches/uboot/0008-Revert-pci-Check-region-ranges-are-addressable.patch @@ -1,7 +1,4 @@ -From 89df39ccb71062a06f4548c11fba9101dfd82445 Mon Sep 17 00:00:00 2001 -Message-Id: <89df39ccb71062a06f4548c11fba9101dfd82445.1682350496.git.stefan@agner.ch> -In-Reply-To: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> -References: <01b4d231cbb66ca193ba422a22d25c75d21ff8ee.1682350496.git.stefan@agner.ch> +From 5743e55d697959bcdcb58744bfc75d2fa99cca61 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 24 Apr 2023 15:44:15 +0200 Subject: [PATCH] Revert "pci: Check region ranges are addressable" @@ -18,10 +15,10 @@ Signed-off-by: Stefan Agner 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c -index 9343cfc62a..ac2a8c8aa0 100644 +index e0d01f6a85..ed3513480a 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c -@@ -1027,22 +1027,7 @@ static int decode_regions(struct pci_controller *hose, ofnode parent_node, +@@ -1039,22 +1039,7 @@ static int decode_regions(struct pci_controller *hose, ofnode parent_node, if (!IS_ENABLED(CONFIG_SYS_PCI_64BIT) && type == PCI_REGION_MEM && upper_32_bits(pci_addr)) { @@ -46,5 +43,5 @@ index 9343cfc62a..ac2a8c8aa0 100644 } -- -2.40.0 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch index b1e46eaf831..fee8f7ca66b 100644 --- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0001-drivers-bcm283x-don-t-explicitly-disable-init.patch @@ -1,5 +1,5 @@ -From 85fb54b621c1ca79f1ec8634b0597a038338e51d Mon Sep 17 00:00:00 2001 -Message-Id: <85fb54b621c1ca79f1ec8634b0597a038338e51d.1668448114.git.stefan@agner.ch> +From d93052cd62449759535c295d5b77dbd73d644478 Mon Sep 17 00:00:00 2001 +Message-ID: From: Stefan Agner Date: Thu, 14 Apr 2022 12:15:26 +0200 Subject: [PATCH] drivers: bcm283x: don't explicitly disable init @@ -19,7 +19,7 @@ Signed-off-by: Stefan Agner 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c -index 7d172cdac0..fcba07f1c5 100644 +index 09a9868a38..cad24aab08 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -51,12 +51,6 @@ static int bcm283x_pl011_serial_probe(struct udevice *dev) @@ -36,19 +36,17 @@ index 7d172cdac0..fcba07f1c5 100644 } diff --git a/include/configs/rpi.h b/include/configs/rpi.h -index 7257659932..7fdf2a891d 100644 +index 8e56bdc84a..c137bd7e19 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h -@@ -33,6 +33,9 @@ +@@ -31,4 +31,7 @@ */ - #define CONFIG_SYS_SDRAM_SIZE SZ_128M + #define CFG_SYS_SDRAM_SIZE SZ_128M -+/* Define PL011 default clock */ -+#define CONFIG_PL011_CLOCK 48000000 ++/* PL011 Serial Configuration */ ++#define CFG_PL011_CLOCK 48000000 + - /* Devices */ - /* LCD */ - + #endif -- -2.38.1 +2.43.0 diff --git a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch index 206eec06d8d..cfba22d4faf 100644 --- a/buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch +++ b/buildroot-external/board/raspberrypi/yellow/patches/uboot/0002-drivers-bcm283x-allow-to-spawn-any-PL011-UART.patch @@ -1,7 +1,7 @@ -From 921f4b6d8cb3b997dd5c54fd436bb8223046421e Mon Sep 17 00:00:00 2001 -Message-Id: <921f4b6d8cb3b997dd5c54fd436bb8223046421e.1668448114.git.stefan@agner.ch> -In-Reply-To: <85fb54b621c1ca79f1ec8634b0597a038338e51d.1668448114.git.stefan@agner.ch> -References: <85fb54b621c1ca79f1ec8634b0597a038338e51d.1668448114.git.stefan@agner.ch> +From 6ec30bbcaff0f45ce9a25f75e741eb3971d457b9 Mon Sep 17 00:00:00 2001 +Message-ID: <6ec30bbcaff0f45ce9a25f75e741eb3971d457b9.1705959834.git.stefan@agner.ch> +In-Reply-To: +References: From: Stefan Agner Date: Thu, 14 Apr 2022 12:18:41 +0200 Subject: [PATCH] drivers: bcm283x: allow to spawn any PL011 UART @@ -22,7 +22,7 @@ Signed-off-by: Stefan Agner 1 file changed, 27 deletions(-) diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c -index fcba07f1c5..98628e1ca4 100644 +index cad24aab08..1ca2c5d831 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -11,37 +11,10 @@ @@ -64,5 +64,5 @@ index fcba07f1c5..98628e1ca4 100644 * Read the ofdata here rather than in an of_to_plat() method * since we need the soc simple-bus to be probed so that the 'ranges' -- -2.38.1 +2.43.0 diff --git a/buildroot-external/configs/green_defconfig b/buildroot-external/configs/green_defconfig index 889e862c014..49c8f1a7135 100755 --- a/buildroot-external/configs/green_defconfig +++ b/buildroot-external/configs/green_defconfig @@ -140,7 +140,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/u-boot/u-boot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="green" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot-external/configs/khadas_vim3_defconfig b/buildroot-external/configs/khadas_vim3_defconfig index c8fadf4595f..f8195aac728 100644 --- a/buildroot-external/configs/khadas_vim3_defconfig +++ b/buildroot-external/configs/khadas_vim3_defconfig @@ -134,7 +134,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="khadas-vim3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/khadas/vim3/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 437b9d2fea8..a6383176d31 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/buildroot-external/configs/odroid_c2_defconfig @@ -134,7 +134,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c2/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 991b7771890..0ee8a83418a 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/buildroot-external/configs/odroid_c4_defconfig @@ -132,7 +132,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-c4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-c4/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/odroid_m1_defconfig b/buildroot-external/configs/odroid_m1_defconfig index de895cb3bb3..76f6346cc73 100644 --- a/buildroot-external/configs/odroid_m1_defconfig +++ b/buildroot-external/configs/odroid_m1_defconfig @@ -135,7 +135,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/u-boot/u-boot.git" -BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2023.07.02" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="v2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-m1-rk3568" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index b28fdb6e992..e2350f94b87 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/buildroot-external/configs/odroid_n2_defconfig @@ -134,7 +134,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-n2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-n2/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index e9368748bdb..babf2f9cf18 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/buildroot-external/configs/odroid_xu4_defconfig @@ -134,7 +134,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="odroid-xu3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/hardkernel/odroid-xu4/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index afb8831aee2..fd9f479a4dc 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -136,7 +136,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index cd7f5f42ca9..e4358f2cf2f 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -138,7 +138,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index a4865304355..1577ba6d982 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -139,7 +139,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index d431c71fa5e..2c205199efd 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/buildroot-external/configs/rpi4_64_defconfig @@ -139,7 +139,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4-64/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index b980ac41ce7..55aabc4ba09 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/buildroot-external/configs/rpi4_defconfig @@ -138,7 +138,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi4/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index f5e3d27bbfd..fa3a2258103 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/buildroot-external/configs/tinker_defconfig @@ -133,7 +133,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-s-rk3288" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/asus/tinker/uboot.config" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y diff --git a/buildroot-external/configs/yellow_defconfig b/buildroot-external/configs/yellow_defconfig index 494c18ee57a..f0630e3a32b 100644 --- a/buildroot-external/configs/yellow_defconfig +++ b/buildroot-external/configs/yellow_defconfig @@ -140,7 +140,7 @@ BR2_TARGET_ROOTFS_SQUASHFS4_LZ4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_4" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/yellow/uboot.config" BR2_PACKAGE_HOST_DOSFSTOOLS=y diff --git a/buildroot-external/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch b/buildroot-external/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch index d236d8bdd56..f768b1d5a35 100644 --- a/buildroot-external/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch +++ b/buildroot-external/patches/uboot/0001-CMD-read-string-from-fileinto-env.patch @@ -1,5 +1,4 @@ -From c8df96af414e6c9b1e6ff8ac5a56b6d3cb365636 Mon Sep 17 00:00:00 2001 -Message-Id: +From d44635df07c79c6e6e6832a5c59d27d27aacfa75 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Sun, 5 Aug 2018 20:43:03 +0000 Subject: [PATCH] CMD: read string from fileinto env @@ -13,12 +12,12 @@ Signed-off-by: Pascal Vizeli create mode 100644 cmd/fileenv.c diff --git a/cmd/Kconfig b/cmd/Kconfig -index 02c298fdbe..959fff5b76 100644 +index df6d71c103..6cda4909d5 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig -@@ -1448,6 +1448,11 @@ config CMD_SETEXPR_FMT - Evaluate format string expression and store result in an environment - variable. +@@ -1689,6 +1689,11 @@ config CMD_XXD + help + Print file as hexdump to standard output +config CMD_FILEENV + bool "fileenv" @@ -29,11 +28,11 @@ index 02c298fdbe..959fff5b76 100644 menu "Android support commands" diff --git a/cmd/Makefile b/cmd/Makefile -index e31ac15ef7..eed8c7ebfe 100644 +index 9a6790cc17..a521653ff8 100644 --- a/cmd/Makefile +++ b/cmd/Makefile -@@ -143,6 +143,7 @@ obj-$(CONFIG_CMD_SCSI) += scsi.o disk.o - obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o +@@ -164,6 +164,7 @@ obj-$(CONFIG_CMD_SHA1SUM) += sha1sum.o + obj-$(CONFIG_CMD_SEAMA) += seama.o obj-$(CONFIG_CMD_SETEXPR) += setexpr.o obj-$(CONFIG_CMD_SETEXPR_FMT) += printf.o +obj-$(CONFIG_CMD_FILEENV) += fileenv.o @@ -93,5 +92,5 @@ index 0000000000..9891cb05ab + " - Read file from fat32 and store it as env." +); -- -2.35.1 +2.43.0