From 60fcf012420dd4eadfe273611852f35c6808c1d5 Mon Sep 17 00:00:00 2001 From: Martin Ayotte Date: Tue, 16 Oct 2018 11:56:43 -0400 Subject: [PATCH] add missing SDMMC0_PWR_H for rockpro64 + add uboot_custom_postprocess code --- config/sources/rockchip64.conf | 5 +- .../add-missing-SDMMC0_PWR_H-rockpro64.patch | 46 +++++++++++++++++++ .../add-u-boot-delay-rockpro64.patch | 13 ++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 patch/u-boot/u-boot-rockchip64-dev/add-missing-SDMMC0_PWR_H-rockpro64.patch create mode 100644 patch/u-boot/u-boot-rockchip64-dev/add-u-boot-delay-rockpro64.patch diff --git a/config/sources/rockchip64.conf b/config/sources/rockchip64.conf index 828e0b0fb9..f4225f6b96 100644 --- a/config/sources/rockchip64.conf +++ b/config/sources/rockchip64.conf @@ -79,7 +79,10 @@ uboot_custom_postprocess() # bootloader image if [[ $BOARD == rockpro64 ]]; then # 3399 - echo "TBD" + tools/mkimage -n rk3399 -T rksd -d $SRC/cache/sources/rkbin-tools/rk33/rk3399_ddr_933MHz_v1.13.bin idbloader.bin + tools/mkimage -n rk3399 -T rksd -d spl/u-boot-spl.bin idbspl.img + cat idbspl.img >> idbloader.img + loaderimage --pack --uboot ./u-boot.bin uboot.img else # 3328 tools/mkimage -n rk3328 -T rksd -d $SRC/cache/sources/rkbin-tools/rk33/rk3328_ddr_786MHz_v1.06.bin idbloader.bin diff --git a/patch/u-boot/u-boot-rockchip64-dev/add-missing-SDMMC0_PWR_H-rockpro64.patch b/patch/u-boot/u-boot-rockchip64-dev/add-missing-SDMMC0_PWR_H-rockpro64.patch new file mode 100644 index 0000000000..a984050b2c --- /dev/null +++ b/patch/u-boot/u-boot-rockchip64-dev/add-missing-SDMMC0_PWR_H-rockpro64.patch @@ -0,0 +1,46 @@ +diff --git a/arch/arm/dts/rk3399-rockpro64.dts b/arch/arm/dts/rk3399-rockpro64.dts +index 12c7900..41dc902 100644 +--- a/arch/arm/dts/rk3399-rockpro64.dts ++++ b/arch/arm/dts/rk3399-rockpro64.dts +@@ -374,6 +374,19 @@ + }; + }; + ++ vcc3v0_sd: vcc3v0-sd { ++ compatible = "regulator-fixed"; ++ enable-active-high; ++ gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&sdmmc0_pwr_h>; ++ regulator-always-on; ++ regulator-max-microvolt = <3000000>; ++ regulator-min-microvolt = <3000000>; ++ regulator-name = "vcc3v0_sd"; ++ vin-supply = <&vcc3v3_sys>; ++ }; ++ + vcc3v3_s3: SWITCH_REG1 { + regulator-name = "vcc3v3_s3"; + regulator-always-on; +@@ -438,6 +451,13 @@ + }; + }; + ++ sd { ++ sdmmc0_pwr_h: sdmmc0-pwr-h { ++ rockchip,pins = ++ ; ++ }; ++ }; ++ + sdio-pwrseq { + wifi_enable_h: wifi-enable-h { + rockchip,pins = <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; +@@ -470,6 +490,7 @@ + }; + + &sdmmc { ++ vmmc-supply = <&vcc3v0_sd>; + u-boot,dm-spl; + bus-width = <4>; + status = "okay"; diff --git a/patch/u-boot/u-boot-rockchip64-dev/add-u-boot-delay-rockpro64.patch b/patch/u-boot/u-boot-rockchip64-dev/add-u-boot-delay-rockpro64.patch new file mode 100644 index 0000000000..1b8f3ccb39 --- /dev/null +++ b/patch/u-boot/u-boot-rockchip64-dev/add-u-boot-delay-rockpro64.patch @@ -0,0 +1,13 @@ +diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig +index 867f2e1..4a013c9 100644 +--- a/configs/rockpro64-rk3399_defconfig ++++ b/configs/rockpro64-rk3399_defconfig +@@ -14,7 +14,7 @@ CONFIG_DEBUG_UART=y + CONFIG_FIT=y + CONFIG_SPL_LOAD_FIT=y + CONFIG_SPL_FIT_GENERATOR="board/rockchip/rockpro64_rk3399/mk_fit_atf.sh" +-CONFIG_BOOTDELAY=0 ++CONFIG_BOOTDELAY=2 + # CONFIG_DISPLAY_CPUINFO is not set + CONFIG_ANDROID_BOOTLOADER=y + CONFIG_SPL_BOOTROM_SUPPORT=y