u-boot v2018.11 migration + tons of patches touchups

2025-07-05 20:49:06 +00:00 · 2019-01-14 16:52:22 -05:00 · 2019-01-14 16:52:22 -05:00 · 9363e3ec4d
commit 9363e3ec4d
parent 6c35ed9c19
19 changed files with 67 additions and 127 deletions
--- a/patch/u-boot/u-boot-rockchip64-dev/add-board-rockpi4b.patch
+++ b/patch/u-boot/u-boot-rockchip64-dev/add-board-rockpi4b.patch
@ -625,8 +625,8 @@ index 0000000..41dc902
 +	u-boot,dm-spl;
 +	bus-width = <8>;
 +	max-frequency = <25000000>;
-+	mmc-hs400-1_8v;
-+	mmc-hs400-enhanced-strobe;
+	//mmc-hs400-1_8v;
+	//mmc-hs400-enhanced-strobe;
 +	non-removable;
 +	status = "okay";
 +};
@ -735,7 +735,7 @@ index 0000000..41dc902
 +		#size-cells = <1>;
 +		compatible = "spi-flash";
 +		reg = <0x0>;
-+		spi-max-frequency = <25000000>;
+		spi-max-frequency = <3000000>;
 +		status = "okay";
 +
 +		partitions {
--- a/patch/u-boot/u-boot-sunxi/add-a20-olinuxino-micro-emmc-support.patch
+++ b/patch/u-boot/u-boot-sunxi/add-a20-olinuxino-micro-emmc-support.patch
@ -99,33 +99,6 @@ index 0000000..a39247a
 +        };
 +};
 +
-diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro.dts
-index 7e3006f..eb701e3 100644
--- a/arch/arm/dts/sun7i-a20-olinuxino-micro.dts
-+++ b/arch/arm/dts/sun7i-a20-olinuxino-micro.dts
-@@ -95,7 +95,7 @@
-
- &gmac {
- 	pinctrl-names = "default";
-	pinctrl-0 = <&gmac_pins_mii_a>;
-+	pinctrl-0 = <&gmac_pins_mii_a>,<&gmac_txerr>;
- 	phy = <&phy1>;
- 	phy-mode = "mii";
- 	status = "okay";
-@@ -226,6 +226,13 @@
- };
-
- &pio {
-+	gmac_txerr: gmac_txerr@0 {
-+		allwinner,pins = "PA17";
-+		allwinner,function = "gmac";
-+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
-+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
-+	};
-+
- 	mmc3_cd_pin_olinuxinom: mmc3_cd_pin@0 {
- 		allwinner,pins = "PH11";
- 		allwinner,function = "gpio_in";
 diff --git a/configs/A20-OLinuXino_MICRO_eMMC_defconfig b/configs/A20-OLinuXino_MICRO_eMMC_defconfig
 new file mode 100644
 index 0000000..1ec93e4
--- a/patch/u-boot/u-boot-sunxi/add-bananapi-bpi-zero.patch
+++ b/patch/u-boot/u-boot-sunxi/add-bananapi-bpi-zero.patch
@ -1,15 +1,15 @@
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index aaaa9d8..b6eebe8 100644
+index d36447d..3093c11 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -341,6 +341,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
+@@ -365,6 +365,7 @@ dtb-$(CONFIG_MACH_SUN8I_A83T) += \
 	sun8i-a83t-cubietruck-plus.dtb \
 	sun8i-a83t-tbs-a711.dts
 dtb-$(CONFIG_MACH_SUN8I_H3) += \
 +	sun8i-h2-plus-bananapi-m2-zero.dtb \
+ 	sun8i-h2-plus-libretech-all-h3-cc.dtb \
+ 	sun8i-h2-plus-orangepi-r1.dtb \
 	sun8i-h2-plus-orangepi-zero.dtb \
- 	sun8i-h2-plus-nanopi-duo.dtb \
- 	sun8i-h2-plus-sunvell-r69.dtb \
 diff --git a/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts
 new file mode 100644
 index 0000000..61de91d
@ -124,7 +124,7 @@ index 0000000..61de91d
 +
 +&mmc1 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins_a>;
+	pinctrl-0 = <&mmc1_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	vqmmc-supply = <&reg_vcc3v3>;
 +	mmc-pwrseq = <&wifi_pwrseq>;
--- a/patch/u-boot/u-boot-sunxi/add-beelink-x2.patch
+++ b/patch/u-boot/u-boot-sunxi/add-beelink-x2.patch
@ -75,7 +75,7 @@ index 0000000..515a3da
 +
 +&mmc1 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins_a>;
+	pinctrl-0 = <&mmc1_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	non-removable;
--- a/patch/u-boot/u-boot-sunxi/add-nanopi-duo.patch
+++ b/patch/u-boot/u-boot-sunxi/add-nanopi-duo.patch
@ -123,7 +123,7 @@ index 0000000..b6afe20
 +
 +&mmc0 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
--- a/patch/u-boot/u-boot-sunxi/add-nanopi-m1-plus2-emmc.patch
+++ b/patch/u-boot/u-boot-sunxi/add-nanopi-m1-plus2-emmc.patch
@ -99,7 +99,7 @@ index 0000000..fdf2c87
 +		     "allwinner,sun50i-a64-mmc",
 +		     "allwinner,sun5i-a13-mmc";
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
@ -159,15 +159,14 @@ index 0000000..f710366
 +CONFIG_USB_EHCI_HCD=y
 +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index c9ace9f..d1bd78c
+index d36447d..49a94d7 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -332,7 +332,8 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
+@@ -388,6 +389,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
 	sun8i-v3s-licheepi-zero.dtb
 dtb-$(CONFIG_MACH_SUN50I_H5) += \
+ 	sun50i-h5-libretech-all-h3-cc.dtb \
+	sun50i-h5-nanopi-m1-plus2.dts \
 	sun50i-h5-nanopi-neo2.dtb \
 	sun50i-h5-nanopi-neo-plus2.dtb \
-+	sun50i-h5-nanopi-m1-plus2.dts \
- 	sun50i-h5-orangepi-pc2.dtb \
- 	sun50i-h5-orangepi-prime.dtb \
- 	sun50i-h5-orangepi-zero-plus2.dtb
+ 	sun50i-h5-orangepi-zero-plus.dtb \
--- a/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch
+++ b/patch/u-boot/u-boot-sunxi/add-nanopineoplus2.patch
@ -1,15 +1,3 @@
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index fee4680..295a675 100644
--- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -377,6 +377,7 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
- dtb-$(CONFIG_MACH_SUN8I_V3S) += \
- 	sun8i-v3s-licheepi-zero.dtb
- dtb-$(CONFIG_MACH_SUN50I_H5) += \
-+	sun50i-h5-nanopi-neo-plus2.dtb \
- 	sun50i-h5-nanopi-neo2.dtb \
- 	sun50i-h5-nanopi-neo-plus2.dtb \
- 	sun50i-h5-orangepi-zero-plus.dtb \
 diff --git a/configs/nanopi_neo_plus2_defconfig b/configs/nanopi_neo_plus2_defconfig
 new file mode 100644
 index 0000000..ff99213
@ -123,7 +111,7 @@ index 0000000..7d12774
 +		     "allwinner,sun50i-a64-mmc",
 +		     "allwinner,sun5i-a13-mmc";
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
--- a/patch/u-boot/u-boot-sunxi/add-orangepi-zeroplus.patch
+++ b/patch/u-boot/u-boot-sunxi/add-orangepi-zeroplus.patch
@ -1,15 +1,3 @@
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index fee4680..295a675 100644
--- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -333,6 +333,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
- 	sun8i-v3s-licheepi-zero.dtb
- dtb-$(CONFIG_MACH_SUN50I_H5) += \
- 	sun50i-h5-nanopi-neo2.dtb \
- 	sun50i-h5-nanopi-neo-plus2.dtb \
-+	sun50i-h5-orangepi-zero-plus.dtb \
- 	sun50i-h5-nanopi-m1-plus2.dts \
- 	sun50i-h5-orangepi-pc2.dtb \
 diff --git a/configs/orangepizero_plus_defconfig b/configs/orangepizero_plus_defconfig
 new file mode 100644
 index 0000000..ff99213
@ -126,7 +114,7 @@ index 0000000..7d12774
 +		     "allwinner,sun50i-a64-mmc",
 +		     "allwinner,sun5i-a13-mmc";
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
--- a/patch/u-boot/u-boot-sunxi/add-orangepi-zeroplus2_h3.patch
+++ b/patch/u-boot/u-boot-sunxi/add-orangepi-zeroplus2_h3.patch
@ -1,15 +1,3 @@
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 9cc5c1e0aa..a3ef6854c2 100644
--- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -318,6 +318,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
- 	sun8i-h3-orangepi-pc-plus.dtb \
- 	sun8i-h3-orangepi-plus.dtb \
- 	sun8i-h3-orangepi-plus2e.dtb \
-+	sun8i-h3-orangepi-zero-plus2.dtb \
- 	sun8i-h3-nanopi-m1.dtb \
- 	sun8i-h3-nanopi-m1-plus.dtb \
- 	sun8i-h3-nanopi-neo.dtb \
 diff --git a/arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts b/arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts
 new file mode 100644
 index 0000000000..b03e3a51a2
--- a/patch/u-boot/u-boot-sunxi/add-sunvell-r69.patch
+++ b/patch/u-boot/u-boot-sunxi/add-sunvell-r69.patch
@ -155,7 +155,7 @@ index 0000000..4b41116
 +
 +&mmc0 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; /* PF6 */
@ -165,7 +165,7 @@ index 0000000..4b41116
 +
 +&mmc1 {
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc1_pins_a>;
+	pinctrl-0 = <&mmc1_pins>;
 +	vmmc-supply = <&reg_vcc_wifi>;
 +	mmc-pwrseq = <&wifi_pwrseq>;
 +	bus-width = <4>;
--- a/patch/u-boot/u-boot-sunxi/add-xx-nanopi-k1-plus-emmc.patch
+++ b/patch/u-boot/u-boot-sunxi/add-xx-nanopi-k1-plus-emmc.patch
@ -90,7 +90,7 @@ index 0000000..c08af78
 +		     "allwinner,sun50i-a64-mmc",
 +		     "allwinner,sun5i-a13-mmc";
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
--- a/patch/u-boot/u-boot-sunxi/add-xx-nanopineocore2.patch
+++ b/patch/u-boot/u-boot-sunxi/add-xx-nanopineocore2.patch
@ -1,15 +1,20 @@
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 6b064ad..2ef6fae 100644
+old mode 100644
+new mode 100755
+index d36447d..7311063
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
-@@ -378,6 +378,7 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
- 	sun8i-v3s-licheepi-zero.dtb
+@@ -388,8 +393,9 @@ dtb-$(CONFIG_MACH_SUN8I_V3S) += \
 dtb-$(CONFIG_MACH_SUN50I_H5) += \
- 	sun50i-h5-nanopi-neo-plus2.dtb \
-+	sun50i-h5-nanopi-neo-core2.dtb \
+ 	sun50i-h5-libretech-all-h3-cc.dtb \
+ 	sun50i-h5-nanopi-m1-plus2.dts \
 	sun50i-h5-nanopi-neo2.dtb \
+	sun50i-h5-nanopi-neo-core2.dtb \
 	sun50i-h5-nanopi-neo-plus2.dtb \
 	sun50i-h5-orangepi-zero-plus.dtb \
+ 	sun50i-h5-orangepi-pc2.dtb \
+ 	sun50i-h5-nanopi-k1-plus.dtb \
+ dtb-$(CONFIG_MACH_SUN50I_H6) += \
 diff --git a/arch/arm/dts/sun50i-h5-nanopi-neo-core2.dts b/arch/arm/dts/sun50i-h5-nanopi-neo-core2.dts
 new file mode 100644
 index 0000000..dd25549
@ -98,7 +103,7 @@ index 0000000..dd25549
 +		     "allwinner,sun50i-a64-mmc",
 +		     "allwinner,sun5i-a13-mmc";
 +	pinctrl-names = "default";
-+	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>;
+	pinctrl-0 = <&mmc0_pins>;
 +	vmmc-supply = <&reg_vcc3v3>;
 +	bus-width = <4>;
 +	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
--- a/patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patch
+++ b/patch/u-boot/u-boot-sunxi/add_emmc_orangepiwin.patch
@ -12,8 +12,8 @@ index 2c39d10..819fd97
 	};
 
 	chosen {
-@@ -83,12 +84,44 @@
-        status = "okay";
+@@ -63,11 +63,43 @@
+ 	status = "okay";
 };
 
 +&i2c1 {
@ -30,9 +30,8 @@ index 2c39d10..819fd97
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins>;
- 	vmmc-supply = <&reg_vcc3v3>;
- 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>;
- 	cd-inverted;
+ 	vmmc-supply = <&reg_dcdc1>;
+ 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
 +	disable-wp;
 +	bus-width = <4>;
 +	status = "okay";
@ -71,17 +70,15 @@ index 2c39d10..819fd97
 	usb1_vbus-supply = <&reg_usb1_vbus>;
 	status = "okay";
 diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig
-old mode 100644
-new mode 100755
-index 7039d68..29006a8
+index ab889ea..6f16cc0 100644
 --- a/configs/orangepi_win_defconfig
 +++ b/configs/orangepi_win_defconfig
-@@ -3,6 +3,8 @@ CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN50I=y
+@@ -5,6 +5,8 @@ CONFIG_MACH_SUN50I=y
 CONFIG_RESERVE_ALLWINNER_BOOT0_HEADER=y
- CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-orangepi-win"
+ CONFIG_SPL_SPI_SUNXI=y
+ CONFIG_NR_DRAM_BANKS=1
 +CONFIG_MMC0_CD_PIN="PH13"
 +CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- CONFIG_SPL=y
 # CONFIG_CMD_FLASH is not set
+ # CONFIG_SPL_DOS_PARTITION is not set
--- a/patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch
+++ b/patch/u-boot/u-boot-sunxi/enable-autoboot-keyed.patch
@ -1,16 +1,16 @@
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 53eae8953e..1e931a0eb0 100644
+index 1f3fa15..3e1e9b8 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -696,6 +696,8 @@ config ARCH_SUNXI
- 	select USB_STORAGE if DISTRO_DEFAULTS
+@@ -843,6 +845,8 @@ config ARCH_SUNXI
 	select USB_KEYBOARD if DISTRO_DEFAULTS
+ 	select USB_STORAGE if DISTRO_DEFAULTS
 	select USE_TINY_PRINTF
 +	imply AUTOBOOT_KEYED
 +	imply AUTOBOOT_KEYED_CTRLC
+ 	imply CMD_DM
 	imply CMD_GPT
- 	imply FAT_WRITE
- 	imply PRE_CONSOLE_BUFFER
+ 	imply CMD_UBI if NAND
 diff --git a/cmd/Kconfig b/cmd/Kconfig
 index d6d130edfa..46ed3a9d76 100644
 --- a/cmd/Kconfig
--- a/patch/u-boot/u-boot-sunxi/enable-ethernet-orangepiprime.patch
+++ b/patch/u-boot/u-boot-sunxi/enable-ethernet-orangepiprime.patch
@ -1,13 +1,13 @@
 diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
-index 27163ce..f19a3d8 100644
+index 7e10ebe..8d13489 100644
 --- a/configs/orangepi_prime_defconfig
 +++ b/configs/orangepi_prime_defconfig
-@@ -4,6 +4,8 @@ CONFIG_SPL=y
- CONFIG_MACH_SUN50I_H5=y
- CONFIG_DRAM_CLK=624
- CONFIG_DRAM_ZQ=3881977
+@@ -10,6 +10,8 @@ CONFIG_NR_DRAM_BANKS=1
+ # CONFIG_SPL_DOS_PARTITION is not set
+ # CONFIG_SPL_EFI_PARTITION is not set
+ CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime"
 +CONFIG_MACPWR="PD6"
 +CONFIG_SPL_SPI_SUNXI=y
- CONFIG_DEFAULT_DEVICE_TREE="sun50i-h5-orangepi-prime"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
- # CONFIG_CMD_FLASH is not set
+ CONFIG_SUN8I_EMAC=y
+ CONFIG_USB_EHCI_HCD=y
+ CONFIG_USB_MUSB_GADGET=y
--- a/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch
+++ b/patch/u-boot/u-boot-sunxi/fix-usb1-vbus-opiwin.patch
@ -1,11 +1,13 @@
 diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig
-index a3e278f..39e83f1 100644
+old mode 100644
+new mode 100755
+index ab889ea..61c24ba
 --- a/configs/orangepi_win_defconfig
 +++ b/configs/orangepi_win_defconfig
-@@ -12,6 +12,9 @@ CONFIG_SPL=y
- # CONFIG_CMD_FLASH is not set
+@@ -10,6 +10,9 @@ CONFIG_NR_DRAM_BANKS=1
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
+ CONFIG_DEFAULT_DEVICE_TREE="sun50i-a64-orangepi-win"
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
 +CONFIG_USB1_VBUS_PIN="PD7"
 +CONFIG_USB_HOST=y
@ -50,11 +52,11 @@ index cf76c35..a7d36a5 100644
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pins_a>;
-@@ -90,5 +112,6 @@
+@@ -198,6 +198,7 @@
 };
 
 &usbphy {
-       status = "okay";
 +	usb1_vbus-supply = <&reg_usb1_vbus>;
-+	status = "okay";
+ 	status = "okay";
 };
+ 
--- a/patch/u-boot/u-boot-sunxi/lower-default-DRAM-freq-A64-H5.patch
+++ b/patch/u-boot/u-boot-sunxi/lower-default-DRAM-freq-A64-H5.patch
@ -1,13 +1,13 @@
 diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
-index 2309f59999..716e9c5e26 100644
+index 6277abc..84c087e 100644
 --- a/arch/arm/mach-sunxi/Kconfig
 +++ b/arch/arm/mach-sunxi/Kconfig
-@@ -278,7 +278,7 @@ config DRAM_CLK
+@@ -394,7 +394,7 @@ config DRAM_CLK
 	default 312 if MACH_SUN6I || MACH_SUN8I
 	default 360 if MACH_SUN4I || MACH_SUN5I || MACH_SUN7I || \
 		       MACH_SUN8I_V3S
 -	default 672 if MACH_SUN50I
 +	default 648 if MACH_SUN50I || MACH_SUN50I_H5
+ 	default 744 if MACH_SUN50I_H6
 	---help---
 	Set the dram clock speed, valid range 240 - 480 (prior to sun9i),
- 	must be a multiple of 24. For the sun9i (A80), the tested values