diff --git a/config/sources/families/imx6.conf b/config/sources/families/imx6.conf index 251dea089..783f78455 100644 --- a/config/sources/families/imx6.conf +++ b/config/sources/families/imx6.conf @@ -4,6 +4,7 @@ GOVERNOR=interactive SERIALCON=ttymxc0 ARCH=armhf UBOOT_TARGET_MAP=';;SPL:SPL.sdhc u-boot.img:u-boot.img.sdhc' +BOOTPATCHDIR='legacy/u-boot-imx6' case $BRANCH in diff --git a/config/sources/families/imx7d.conf b/config/sources/families/imx7d.conf index aa50d4970..2b8652188 100644 --- a/config/sources/families/imx7d.conf +++ b/config/sources/families/imx7d.conf @@ -14,14 +14,14 @@ case $BRANCH in KERNELBRANCH='branch:imx_4.14.98_2.0.0_ga' KERNELDIR='linux-imx7' BOOTBRANCH='branch:imx_v2018.03_4.14.98_2.0.0_ga' - BOOTPATCHDIR="u-boot-imx7d-legacy" + BOOTPATCHDIR="legacy" ;; current | default) KERNELSOURCE='https://source.codeaurora.org/external/imx/linux-imx' KERNELBRANCH='branch:imx_5.4.70_2.3.0' KERNELDIR='linux-imx7-current' BOOTBRANCH='branch:imx_v2020.04_5.4.70_2.3.0' - BOOTPATCHDIR="u-boot-imx7d-current" + BOOTPATCHDIR="v2020.04" ;; esac diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index 0fcf4c085..5f83aeaf3 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -6,6 +6,7 @@ ARCH=arm64 SERIALCON=ttyAML0 SRC_LOADADDR='LOADADDR=0x1080000' BOOTBRANCH="${BOOTBRANCH_BOARD:-"tag:v2022.07"}" +BOOTPATCHDIR="${BOOTPATCHDIR:-"v2022.07"}" OVERLAY_PREFIX='meson' # this family does not need it diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 18aadf051..25d4affb6 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -17,7 +17,7 @@ case $BOARD in BOOTDIR='u-boot-odroidc1' BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTBRANCH='branch:odroidc-v2011.03' - + BOOTPATCHDIR="legacy" UBOOT_COMPILER="arm-linux-gnueabihf-" UBOOT_USE_GCC='< 4.9' diff --git a/config/sources/families/include/mvebu-clearfog.inc b/config/sources/families/include/mvebu-clearfog.inc index c8f07d653..4be6650fb 100644 --- a/config/sources/families/include/mvebu-clearfog.inc +++ b/config/sources/families/include/mvebu-clearfog.inc @@ -7,7 +7,7 @@ case $BRANCH in BOOTSOURCE='https://github.com/SolidRun/u-boot' BOOTBRANCH='branch:v2018.01-solidrun-a38x' BOOTDIR='u-boot-armada' - BOOTPATCHDIR='u-boot-clearfog' + BOOTPATCHDIR='legacy/u-boot-clearfog' BOOTSCRIPT='boot-mvebu.cmd:boot.cmd' UBOOT_TARGET_MAP=";sdhc;u-boot-spl-sdhc.kwb:u-boot.mmc ;mmc;u-boot-spl-mmc.kwb:u-boot.emmc @@ -22,7 +22,7 @@ case $BRANCH in BOOTSOURCE='https://github.com/SolidRun/u-boot' BOOTBRANCH='branch:v2018.01-solidrun-a38x' BOOTDIR='u-boot-armada' - BOOTPATCHDIR='u-boot-clearfog' + BOOTPATCHDIR='legacy/u-boot-clearfog' BOOTSCRIPT='boot-mvebu.cmd:boot.cmd' UBOOT_TARGET_MAP=";sdhc;u-boot-spl-sdhc.kwb:u-boot.mmc ;mmc;u-boot-spl-mmc.kwb:u-boot.emmc diff --git a/config/sources/families/include/mvebu-helios4.inc b/config/sources/families/include/mvebu-helios4.inc index d0ff88073..e6c29dcea 100644 --- a/config/sources/families/include/mvebu-helios4.inc +++ b/config/sources/families/include/mvebu-helios4.inc @@ -5,7 +5,7 @@ case $BRANCH in BOOTSOURCE=$MAINLINE_UBOOT_SOURCE BOOTBRANCH='tag:v2019.04' BOOTDIR=$MAINLINE_UBOOT_DIR - BOOTPATCHDIR='u-boot-helios4' + BOOTPATCHDIR='legacy/u-boot-helios4' BOOTSCRIPT='boot-mvebu.cmd:boot.cmd' UBOOT_TARGET_MAP=";sdhc;u-boot-spl.kwb:u-boot.mmc diff --git a/config/sources/families/include/sunxi_common.inc b/config/sources/families/include/sunxi_common.inc index 3264ff7dc..68ffc4488 100644 --- a/config/sources/families/include/sunxi_common.inc +++ b/config/sources/families/include/sunxi_common.inc @@ -29,7 +29,7 @@ esac case "$KERNEL_VERSION_LEVEL" in - 5.10 | 5.15 | 5.16 | 5.17 | 5.18 | 5.19) + 5.10 | 5.15 | 5.16 | 5.17 | 5.18 | 5.19 | 6.0) KERNELSOURCE=$MAINLINE_KERNEL_SOURCE KERNELSOURCENAME='name=origin' KERNELBRANCH="branch:linux-${KERNEL_VERSION_LEVEL}.y" diff --git a/config/sources/families/mt7623.conf b/config/sources/families/mt7623.conf index 8c0d9f754..09112daa4 100644 --- a/config/sources/families/mt7623.conf +++ b/config/sources/families/mt7623.conf @@ -1,7 +1,7 @@ BOOTSCRIPT='boot-mt7623.cmd:boot.cmd' BOOTENV_FILE='mt7623.txt' UBOOT_TARGET_MAP=";;$SRC/packages/blobs/mt7623n/BPI-R2-HEAD440-0k.img $SRC/packages/blobs/mt7623n/BPI-R2-HEAD1-512b.img $SRC/packages/blobs/mt7623n/BPI-R2-preloader-2k.img $SRC/packages/blobs/mt7623n/BPI-R2-EMMC-boot0-0K-0905.img u-boot.bin" -BOOTPATCHDIR='u-boot-mt7623' +BOOTPATCHDIR='legacy' ARCH=armhf ATF_COMPILE="no" diff --git a/config/sources/families/mvebu64.conf b/config/sources/families/mvebu64.conf index fe4578b94..4cf1ce3ad 100644 --- a/config/sources/families/mvebu64.conf +++ b/config/sources/families/mvebu64.conf @@ -1,6 +1,7 @@ enable_extension "marvell-tools" ARCH=arm64 BOOTBRANCH='branch:v2022.04' +BOOTPATCHDIR="v2022.07" BOOTENV_FILE='mvebu64.txt' BOOTSCRIPT_OUTPUT='boot.scr' ATFSOURCE='https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git' diff --git a/config/sources/families/odroidxu4.conf b/config/sources/families/odroidxu4.conf index 4b2558eac..8eeab5e3c 100644 --- a/config/sources/families/odroidxu4.conf +++ b/config/sources/families/odroidxu4.conf @@ -3,6 +3,7 @@ BOOTSOURCE='https://github.com/hardkernel/u-boot.git' BOOTSCRIPT='boot-odroid-xu4.ini:boot.ini' BOOTDIR='u-boot-odroidxu' BOOTBRANCH='branch:odroidxu4-v2017.05' +BOOTPATCHDIR="legacy" UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/bl2.bin.hardkernel.720k_uboot u-boot-dtb.bin sd_fuse/tzsw.bin.hardkernel' case $BRANCH in diff --git a/config/sources/families/rk35xx.conf b/config/sources/families/rk35xx.conf index ce6b1ae6b..5dc1112dd 100644 --- a/config/sources/families/rk35xx.conf +++ b/config/sources/families/rk35xx.conf @@ -2,7 +2,7 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTSOURCE='https://github.com/radxa/u-boot.git' BOOTBRANCH='branch:stable-4.19-rock3' -BOOTPATCHDIR="u-boot-rk35xx" +BOOTPATCHDIR="legacy" OVERLAY_PREFIX='rk35xx' case $BRANCH in diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf index 4a6144e3f..a7454715c 100644 --- a/config/sources/families/rockchip-rk3588.conf +++ b/config/sources/families/rockchip-rk3588.conf @@ -2,7 +2,7 @@ source "${BASH_SOURCE%/*}/include/rockchip64_common.inc" BOOTSOURCE='https://github.com/radxa/u-boot.git' BOOTBRANCH='branch:stable-5.10-rock5' -BOOTPATCHDIR="u-boot-rockchip-rk3588" +BOOTPATCHDIR="legacy" OVERLAY_PREFIX='rockchip-rk3588' diff --git a/config/sources/families/rockchip.conf b/config/sources/families/rockchip.conf index 0203c6a54..1cf22a9cf 100644 --- a/config/sources/families/rockchip.conf +++ b/config/sources/families/rockchip.conf @@ -7,8 +7,10 @@ UBOOT_TARGET_MAP=";;$SRC/packages/blobs/rockchip/rk3288_boot.bin u-boot-rockchip BOOTDELAY=1 if [[ $BOARD == miqi ]]; then BOOTBRANCH='tag:v2017.11' + BOOTPATCHDIR='legacy' else BOOTBRANCH='tag:v2022.04' + BOOTPATCHDIR='v2022.07' fi SERIALCON=ttyS2 diff --git a/config/sources/families/rockpis.conf b/config/sources/families/rockpis.conf index 67d286c53..e5cde47be 100644 --- a/config/sources/families/rockpis.conf +++ b/config/sources/families/rockpis.conf @@ -28,7 +28,7 @@ case $BRANCH in BOOTCONFIG="rockpi-s-rk3308_defconfig" BOOTSOURCE='https://github.com/piter75/rockchip-u-boot.git' BOOTBRANCH='branch:rockpis-next-dev' - BOOTPATCHDIR="u-boot-rockpis" + BOOTPATCHDIR="legacy" UBOOT_COMPILER="aarch64-linux-gnu-" BOOTSCRIPT='boot-rockpis.cmd:boot.cmd' UBOOT_USE_GCC='< 8.0' diff --git a/config/sources/families/s5p6818.conf b/config/sources/families/s5p6818.conf index 9074ba85a..2c77ec714 100644 --- a/config/sources/families/s5p6818.conf +++ b/config/sources/families/s5p6818.conf @@ -2,6 +2,7 @@ ARCH=arm64 BOOTSOURCE='https://github.com/rafaello7/u-boot-nanopi-m3' BOOTBRANCH='branch:master' BOOTDIR='u-boot-s5p6818' +BOOTPATCHDIR='legacy/u-boot-s5p6818' BOOTSCRIPT='boot-s5p6818.cmd:boot.cmd' BOOTENV_FILE='s5p6818.txt' UBOOT_TARGET_MAP=";;boot.img bootemmc.img" diff --git a/config/sources/families/sun50iw9.conf b/config/sources/families/sun50iw9.conf index 52d7f02bf..7b8635540 100644 --- a/config/sources/families/sun50iw9.conf +++ b/config/sources/families/sun50iw9.conf @@ -16,7 +16,7 @@ case $BRANCH in KERNELDIR='linux-orangepi' BOOTSOURCE='https://github.com/orangepi-xunlong/u-boot-orangepi.git' BOOTBRANCH='branch:v2018.05-sun50iw9' - BOOTPATCHDIR=u-boot-${LINUXFAMILY} + BOOTPATCHDIR="legacy" UBOOT_TARGET_MAP=";;dts/${BOARD}-u-boot.dts boot0_sdcard.fex boot_package.fex u-boot.bin:u-boot.fex" UBOOT_COMPILER="arm-linux-gnueabi-" UBOOT_USE_GCC='> 6.0' diff --git a/patch/u-boot/u-boot-mt7623/fix-dependencies-ugly-boot.patch b/patch/u-boot/legacy/board_bananapir2/fix-dependencies-ugly-boot.patch similarity index 100% rename from patch/u-boot/u-boot-mt7623/fix-dependencies-ugly-boot.patch rename to patch/u-boot/legacy/board_bananapir2/fix-dependencies-ugly-boot.patch diff --git a/patch/u-boot/u-boot-imx7d-current/u-boot-enable-CMD_IMPORTENV.patch b/patch/u-boot/legacy/board_imx7sabre/u-boot-enable-CMD_IMPORTENV.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-current/u-boot-enable-CMD_IMPORTENV.patch rename to patch/u-boot/legacy/board_imx7sabre/u-boot-enable-CMD_IMPORTENV.patch diff --git a/patch/u-boot/u-boot-imx7d-current/u-boot-remove-predefined-mmcroot.patch b/patch/u-boot/legacy/board_imx7sabre/u-boot-remove-predefined-mmcroot.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-current/u-boot-remove-predefined-mmcroot.patch rename to patch/u-boot/legacy/board_imx7sabre/u-boot-remove-predefined-mmcroot.patch diff --git a/patch/u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch b/patch/u-boot/legacy/board_imx7sabre/u-boot-update-boot-scripts.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-legacy/u-boot-update-boot-scripts.patch rename to patch/u-boot/legacy/board_imx7sabre/u-boot-update-boot-scripts.patch diff --git a/patch/u-boot/u-boot-rockchip/board_miqi/0001-fixing-dtc-error.patch b/patch/u-boot/legacy/board_miqi/0001-fixing-dtc-error.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_miqi/0001-fixing-dtc-error.patch rename to patch/u-boot/legacy/board_miqi/0001-fixing-dtc-error.patch diff --git a/patch/u-boot/u-boot-rockchip/board_miqi/101-u-boot-0003-rockchip-miqi-enable-led-gpio&keyboard.patch b/patch/u-boot/legacy/board_miqi/101-u-boot-0003-rockchip-miqi-enable-led-gpio&keyboard.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_miqi/101-u-boot-0003-rockchip-miqi-enable-led-gpio&keyboard.patch rename to patch/u-boot/legacy/board_miqi/101-u-boot-0003-rockchip-miqi-enable-led-gpio&keyboard.patch diff --git a/patch/u-boot/u-boot-clearfog/libfdt_fix.patch b/patch/u-boot/legacy/board_miqi/libfdt_fix.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/libfdt_fix.patch rename to patch/u-boot/legacy/board_miqi/libfdt_fix.patch diff --git a/patch/u-boot/u-boot-rockchip/board_miqi/miqi-boot-alias.patch b/patch/u-boot/legacy/board_miqi/miqi-boot-alias.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_miqi/miqi-boot-alias.patch rename to patch/u-boot/legacy/board_miqi/miqi-boot-alias.patch diff --git a/patch/u-boot/u-boot-meson/cfgload-boot-ext4-improvements.patch b/patch/u-boot/legacy/board_odroidc1/cfgload-boot-ext4-improvements.patch similarity index 100% rename from patch/u-boot/u-boot-meson/cfgload-boot-ext4-improvements.patch rename to patch/u-boot/legacy/board_odroidc1/cfgload-boot-ext4-improvements.patch diff --git a/patch/u-boot/u-boot-meson/ext4fs-fix-invalid-extent-block-error.patch b/patch/u-boot/legacy/board_odroidc1/ext4fs-fix-invalid-extent-block-error.patch similarity index 100% rename from patch/u-boot/u-boot-meson/ext4fs-fix-invalid-extent-block-error.patch rename to patch/u-boot/legacy/board_odroidc1/ext4fs-fix-invalid-extent-block-error.patch diff --git a/patch/u-boot/u-boot-meson/fix_build_for_recent_host-side_libfdt.patch b/patch/u-boot/legacy/board_odroidc1/fix_build_for_recent_host-side_libfdt.patch similarity index 100% rename from patch/u-boot/u-boot-meson/fix_build_for_recent_host-side_libfdt.patch rename to patch/u-boot/legacy/board_odroidc1/fix_build_for_recent_host-side_libfdt.patch diff --git a/patch/u-boot/u-boot-odroidxu4/enable-distro-bootcmd.patch b/patch/u-boot/legacy/board_odroidxu4/enable-distro-bootcmd.patch similarity index 100% rename from patch/u-boot/u-boot-odroidxu4/enable-distro-bootcmd.patch rename to patch/u-boot/legacy/board_odroidxu4/enable-distro-bootcmd.patch diff --git a/patch/u-boot/u-boot-odroid/fix_build_for_recent_host-side_libfdt.patch b/patch/u-boot/legacy/board_odroidxu4/fix_build_for_recent_host-side_libfdt.patch similarity index 100% rename from patch/u-boot/u-boot-odroid/fix_build_for_recent_host-side_libfdt.patch rename to patch/u-boot/legacy/board_odroidxu4/fix_build_for_recent_host-side_libfdt.patch diff --git a/patch/u-boot/u-boot-sun50iw9/u-boot-sun50iw9-legacy.patch b/patch/u-boot/legacy/board_orangepizero2/u-boot-sun50iw9-legacy.patch similarity index 100% rename from patch/u-boot/u-boot-sun50iw9/u-boot-sun50iw9-legacy.patch rename to patch/u-boot/legacy/board_orangepizero2/u-boot-sun50iw9-legacy.patch diff --git a/patch/u-boot/u-boot-rk35xx/add-trust-ini.patch b/patch/u-boot/legacy/board_rock-3a/add-trust-ini.patch similarity index 100% rename from patch/u-boot/u-boot-rk35xx/add-trust-ini.patch rename to patch/u-boot/legacy/board_rock-3a/add-trust-ini.patch diff --git a/patch/u-boot/u-boot-rk35xx/board_rock-3a/general-soc-based-image-names.patch b/patch/u-boot/legacy/board_rock-3a/general-soc-based-image-names.patch similarity index 100% rename from patch/u-boot/u-boot-rk35xx/board_rock-3a/general-soc-based-image-names.patch rename to patch/u-boot/legacy/board_rock-3a/general-soc-based-image-names.patch diff --git a/patch/u-boot/u-boot-rockchip-rk3588/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch b/patch/u-boot/legacy/board_rock-5b/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip-rk3588/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch rename to patch/u-boot/legacy/board_rock-5b/radxa_vendor_uboot_rock-5b_fix_source_so_boot_scr_works.patch diff --git a/patch/u-boot/u-boot-rockpis/0001-fixing-dtc-error.patch b/patch/u-boot/legacy/board_rockpi-s/0001-fixing-dtc-error.patch similarity index 100% rename from patch/u-boot/u-boot-rockpis/0001-fixing-dtc-error.patch rename to patch/u-boot/legacy/board_rockpi-s/0001-fixing-dtc-error.patch diff --git a/patch/u-boot/u-boot-rockpis/add-trust-ini.patch b/patch/u-boot/legacy/board_rockpi-s/add-trust-ini.patch similarity index 100% rename from patch/u-boot/u-boot-rockpis/add-trust-ini.patch rename to patch/u-boot/legacy/board_rockpi-s/add-trust-ini.patch diff --git a/patch/u-boot/u-boot-rockpis/compiler_adjustements.patch b/patch/u-boot/legacy/board_rockpi-s/compiler_adjustements.patch similarity index 100% rename from patch/u-boot/u-boot-rockpis/compiler_adjustements.patch rename to patch/u-boot/legacy/board_rockpi-s/compiler_adjustements.patch diff --git a/patch/u-boot/u-boot-clearfog/0001-fixing-dtc-error.patch b/patch/u-boot/legacy/u-boot-clearfog/0001-fixing-dtc-error.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/0001-fixing-dtc-error.patch rename to patch/u-boot/legacy/u-boot-clearfog/0001-fixing-dtc-error.patch diff --git a/patch/u-boot/u-boot-clearfog/README.md b/patch/u-boot/legacy/u-boot-clearfog/README.md similarity index 100% rename from patch/u-boot/u-boot-clearfog/README.md rename to patch/u-boot/legacy/u-boot-clearfog/README.md diff --git a/patch/u-boot/u-boot-clearfog/add-boot-marvell.cmd-backward-compatibility.patch b/patch/u-boot/legacy/u-boot-clearfog/add-boot-marvell.cmd-backward-compatibility.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/add-boot-marvell.cmd-backward-compatibility.patch rename to patch/u-boot/legacy/u-boot-clearfog/add-boot-marvell.cmd-backward-compatibility.patch diff --git a/patch/u-boot/u-boot-clearfog/add_2GB_SOM_support.patch.disabled b/patch/u-boot/legacy/u-boot-clearfog/add_2GB_SOM_support.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-clearfog/add_2GB_SOM_support.patch.disabled rename to patch/u-boot/legacy/u-boot-clearfog/add_2GB_SOM_support.patch.disabled diff --git a/patch/u-boot/u-boot-clearfog/arm-mvebu-add-rev-id-a38x-b0.patch b/patch/u-boot/legacy/u-boot-clearfog/arm-mvebu-add-rev-id-a38x-b0.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/arm-mvebu-add-rev-id-a38x-b0.patch rename to patch/u-boot/legacy/u-boot-clearfog/arm-mvebu-add-rev-id-a38x-b0.patch diff --git a/patch/u-boot/u-boot-clearfog/board_clearfogbase/do_pcie_reset_during_init.patch b/patch/u-boot/legacy/u-boot-clearfog/board_clearfogbase/do_pcie_reset_during_init.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/board_clearfogbase/do_pcie_reset_during_init.patch rename to patch/u-boot/legacy/u-boot-clearfog/board_clearfogbase/do_pcie_reset_during_init.patch diff --git a/patch/u-boot/u-boot-clearfog/board_clearfogbase/enable_base_model.patch b/patch/u-boot/legacy/u-boot-clearfog/board_clearfogbase/enable_base_model.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/board_clearfogbase/enable_base_model.patch rename to patch/u-boot/legacy/u-boot-clearfog/board_clearfogbase/enable_base_model.patch diff --git a/patch/u-boot/u-boot-clearfog/board_clearfogpro/do_pcie_reset_during_init.patch b/patch/u-boot/legacy/u-boot-clearfog/board_clearfogpro/do_pcie_reset_during_init.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/board_clearfogpro/do_pcie_reset_during_init.patch rename to patch/u-boot/legacy/u-boot-clearfog/board_clearfogpro/do_pcie_reset_during_init.patch diff --git a/patch/u-boot/u-boot-clearfog/clearfog-pci0=msata.patch.disabled b/patch/u-boot/legacy/u-boot-clearfog/clearfog-pci0=msata.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-clearfog/clearfog-pci0=msata.patch.disabled rename to patch/u-boot/legacy/u-boot-clearfog/clearfog-pci0=msata.patch.disabled diff --git a/patch/u-boot/u-boot-clearfog/clearfog-pci1=msata.patch.disabled b/patch/u-boot/legacy/u-boot-clearfog/clearfog-pci1=msata.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-clearfog/clearfog-pci1=msata.patch.disabled rename to patch/u-boot/legacy/u-boot-clearfog/clearfog-pci1=msata.patch.disabled diff --git a/patch/u-boot/u-boot-clearfog/enable-pcie-support.patch b/patch/u-boot/legacy/u-boot-clearfog/enable-pcie-support.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/enable-pcie-support.patch rename to patch/u-boot/legacy/u-boot-clearfog/enable-pcie-support.patch diff --git a/patch/u-boot/u-boot-imx6/libfdt_fix.patch b/patch/u-boot/legacy/u-boot-clearfog/libfdt_fix.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/libfdt_fix.patch rename to patch/u-boot/legacy/u-boot-clearfog/libfdt_fix.patch diff --git a/patch/u-boot/u-boot-clearfog/swap-sata-serdes-rx.patch b/patch/u-boot/legacy/u-boot-clearfog/swap-sata-serdes-rx.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/swap-sata-serdes-rx.patch rename to patch/u-boot/legacy/u-boot-clearfog/swap-sata-serdes-rx.patch diff --git a/patch/u-boot/u-boot-clearfog/target_mmc/set_default_boot_target_to_mmc.patch b/patch/u-boot/legacy/u-boot-clearfog/target_mmc/set_default_boot_target_to_mmc.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/target_mmc/set_default_boot_target_to_mmc.patch rename to patch/u-boot/legacy/u-boot-clearfog/target_mmc/set_default_boot_target_to_mmc.patch diff --git a/patch/u-boot/u-boot-clearfog/target_sata/set_default_boot_target_to_sata.patch b/patch/u-boot/legacy/u-boot-clearfog/target_sata/set_default_boot_target_to_sata.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/target_sata/set_default_boot_target_to_sata.patch rename to patch/u-boot/legacy/u-boot-clearfog/target_sata/set_default_boot_target_to_sata.patch diff --git a/patch/u-boot/u-boot-clearfog/target_sdhc/set_default_boot_target_to_sdhc.patch b/patch/u-boot/legacy/u-boot-clearfog/target_sdhc/set_default_boot_target_to_sdhc.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/target_sdhc/set_default_boot_target_to_sdhc.patch rename to patch/u-boot/legacy/u-boot-clearfog/target_sdhc/set_default_boot_target_to_sdhc.patch diff --git a/patch/u-boot/u-boot-clearfog/target_spi/set_default_boot_target_to_spi.patch b/patch/u-boot/legacy/u-boot-clearfog/target_spi/set_default_boot_target_to_spi.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/target_spi/set_default_boot_target_to_spi.patch rename to patch/u-boot/legacy/u-boot-clearfog/target_spi/set_default_boot_target_to_spi.patch diff --git a/patch/u-boot/u-boot-clearfog/target_uart/set_default_boot_target_to_uart.patch b/patch/u-boot/legacy/u-boot-clearfog/target_uart/set_default_boot_target_to_uart.patch similarity index 100% rename from patch/u-boot/u-boot-clearfog/target_uart/set_default_boot_target_to_uart.patch rename to patch/u-boot/legacy/u-boot-clearfog/target_uart/set_default_boot_target_to_uart.patch diff --git a/patch/u-boot/u-boot-helios4/0001-fixing-dtc-error.patch b/patch/u-boot/legacy/u-boot-helios4/0001-fixing-dtc-error.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/0001-fixing-dtc-error.patch rename to patch/u-boot/legacy/u-boot-helios4/0001-fixing-dtc-error.patch diff --git a/patch/u-boot/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch b/patch/u-boot/legacy/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch rename to patch/u-boot/legacy/u-boot-helios4/ARMADA-A388-SOM-U-Boot-ODT-Update.patch diff --git a/patch/u-boot/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch b/patch/u-boot/legacy/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch rename to patch/u-boot/legacy/u-boot-helios4/Add-DM-driver-for-mvebu-rtc.patch diff --git a/patch/u-boot/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch b/patch/u-boot/legacy/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch rename to patch/u-boot/legacy/u-boot-helios4/add-boot-marvell.cmd-backward-compatibility.patch diff --git a/patch/u-boot/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch b/patch/u-boot/legacy/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch rename to patch/u-boot/legacy/u-boot-helios4/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/Add-RTC-to-clearfog.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/add-clearfog-base-DT.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/adjust-fdtfile-env-clearfog-base.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/board-name-to-clearfog-base.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogpro/Add-RTC-to-clearfog.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch diff --git a/patch/u-boot/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch b/patch/u-boot/legacy/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch rename to patch/u-boot/legacy/u-boot-helios4/board_clearfogpro/board-name-to-clearfog-pro.patch diff --git a/patch/u-boot/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch b/patch/u-boot/legacy/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch rename to patch/u-boot/legacy/u-boot-helios4/board_helios4/Add-RTC-to-helios4.patch diff --git a/patch/u-boot/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch b/patch/u-boot/legacy/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch rename to patch/u-boot/legacy/u-boot-helios4/board_helios4/arm-mvebu-helios4-Update-Load-address.patch diff --git a/patch/u-boot/u-boot-helios4/enable-DT-overlays-support.patch b/patch/u-boot/legacy/u-boot-helios4/enable-DT-overlays-support.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/enable-DT-overlays-support.patch rename to patch/u-boot/legacy/u-boot-helios4/enable-DT-overlays-support.patch diff --git a/patch/u-boot/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch b/patch/u-boot/legacy/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch rename to patch/u-boot/legacy/u-boot-helios4/target_spi/clearfog-add-spi-support-in-spl.patch diff --git a/patch/u-boot/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch b/patch/u-boot/legacy/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch rename to patch/u-boot/legacy/u-boot-helios4/target_spi/clearfog-set-default-boot-target-to-spi.patch diff --git a/patch/u-boot/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch b/patch/u-boot/legacy/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch rename to patch/u-boot/legacy/u-boot-helios4/target_spi/helios4-config-set-boot-device-spinor.patch diff --git a/patch/u-boot/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch b/patch/u-boot/legacy/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch rename to patch/u-boot/legacy/u-boot-helios4/target_spi/helios4-reorder-boot-device.patch diff --git a/patch/u-boot/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch b/patch/u-boot/legacy/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch rename to patch/u-boot/legacy/u-boot-helios4/target_uart/clearfog-disable-autoboot-and-env-storage.patch diff --git a/patch/u-boot/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch b/patch/u-boot/legacy/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch similarity index 100% rename from patch/u-boot/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch rename to patch/u-boot/legacy/u-boot-helios4/target_uart/helios4-prepare-for-uart-image.patch diff --git a/patch/u-boot/u-boot-imx6/board_cubox-i/change_logo_to_armbian.patch b/patch/u-boot/legacy/u-boot-imx6/board_cubox-i/change_logo_to_armbian.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/board_cubox-i/change_logo_to_armbian.patch rename to patch/u-boot/legacy/u-boot-imx6/board_cubox-i/change_logo_to_armbian.patch diff --git a/patch/u-boot/u-boot-imx6/board_udoo/udoo-adjust-env.patch b/patch/u-boot/legacy/u-boot-imx6/board_udoo/udoo-adjust-env.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/board_udoo/udoo-adjust-env.patch rename to patch/u-boot/legacy/u-boot-imx6/board_udoo/udoo-adjust-env.patch diff --git a/patch/u-boot/u-boot-imx6/board_wandboard/0001-wandboard-uEnv.txt-bootz-n-fixes.patch b/patch/u-boot/legacy/u-boot-imx6/board_wandboard/0001-wandboard-uEnv.txt-bootz-n-fixes.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/board_wandboard/0001-wandboard-uEnv.txt-bootz-n-fixes.patch rename to patch/u-boot/legacy/u-boot-imx6/board_wandboard/0001-wandboard-uEnv.txt-bootz-n-fixes.patch diff --git a/patch/u-boot/u-boot-imx7d-legacy/libfdt_fix.patch b/patch/u-boot/legacy/u-boot-imx6/libfdt_fix.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-legacy/libfdt_fix.patch rename to patch/u-boot/legacy/u-boot-imx6/libfdt_fix.patch diff --git a/patch/u-boot/u-boot-imx6/target_sata/enable_sata.patch b/patch/u-boot/legacy/u-boot-imx6/target_sata/enable_sata.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/target_sata/enable_sata.patch rename to patch/u-boot/legacy/u-boot-imx6/target_sata/enable_sata.patch diff --git a/patch/u-boot/u-boot-imx6/target_sdhc/enable_sdhc.patch b/patch/u-boot/legacy/u-boot-imx6/target_sdhc/enable_sdhc.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/target_sdhc/enable_sdhc.patch rename to patch/u-boot/legacy/u-boot-imx6/target_sdhc/enable_sdhc.patch diff --git a/patch/u-boot/u-boot-imx6/target_spi/enable_spi.patch b/patch/u-boot/legacy/u-boot-imx6/target_spi/enable_spi.patch similarity index 100% rename from patch/u-boot/u-boot-imx6/target_spi/enable_spi.patch rename to patch/u-boot/legacy/u-boot-imx6/target_spi/enable_spi.patch diff --git a/patch/u-boot/u-boot-s5p6818/board_nanopct3plus/add-support-for-2G.patch b/patch/u-boot/legacy/u-boot-s5p6818/add-support-for-2G.patch similarity index 100% rename from patch/u-boot/u-boot-s5p6818/board_nanopct3plus/add-support-for-2G.patch rename to patch/u-boot/legacy/u-boot-s5p6818/add-support-for-2G.patch diff --git a/patch/u-boot/u-boot-s5p6818/script-loading.patch b/patch/u-boot/legacy/u-boot-s5p6818/script-loading.patch similarity index 100% rename from patch/u-boot/u-boot-s5p6818/script-loading.patch rename to patch/u-boot/legacy/u-boot-s5p6818/script-loading.patch diff --git a/patch/u-boot/u-boot-s5p6818/update-nanopi-fire3-support.patch b/patch/u-boot/legacy/u-boot-s5p6818/update-nanopi-fire3-support.patch similarity index 100% rename from patch/u-boot/u-boot-s5p6818/update-nanopi-fire3-support.patch rename to patch/u-boot/legacy/u-boot-s5p6818/update-nanopi-fire3-support.patch diff --git a/patch/u-boot/u-boot-mvebu-edge/ARMADA-A388-SOM-U-Boot-ODT-Update.patch b/patch/u-boot/u-boot-mvebu-edge/ARMADA-A388-SOM-U-Boot-ODT-Update.patch deleted file mode 100644 index 5cae2546f..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/ARMADA-A388-SOM-U-Boot-ODT-Update.patch +++ /dev/null @@ -1,60 +0,0 @@ -From befbb65412d22f698703207d8d29b7707fcb62b3 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Aditya Prayoga -Date: Tue, 19 Mar 2019 19:28:44 +0800 -Subject: [PATCH] ARMADA A388 SOM U-Boot ODT Update - -Old versions of U-Boot did not configure correctly the ODT on data -signals of DDR RAM on ARMADA A388 SOMs.[1] - -The changes on [2] adapted into current source. - -[1] -https://developer.solid-run.com/knowledge-base/armada-38x-som-u-boot-odt-update/ - -[2]https://github.com/SolidRun/u-boot/commit/ab15b2d5b6ee50c106628dc0aa5943747a5dd772 - -Signed-off-by: Aditya Prayoga ---- - drivers/ddr/marvell/a38x/ddr3_training.c | 4 ++-- - drivers/ddr/marvell/a38x/mv_ddr_plat.h | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/ddr/marvell/a38x/ddr3_training.c b/drivers/ddr/marvell/a38x/ddr3_training.c -index 799c5ba089..33d4255bba 100644 ---- a/drivers/ddr/marvell/a38x/ddr3_training.c -+++ b/drivers/ddr/marvell/a38x/ddr3_training.c -@@ -1606,7 +1606,7 @@ int ddr3_tip_freq_set(u32 dev_num, enum hws_access_type access_type, - CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, - if_id, DDR_ODT_TIMING_LOW_REG, - val, 0xffff0)); -- val = 0x91 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12); -+ val = 0x71 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12); - CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, - if_id, DDR_ODT_TIMING_HIGH_REG, - val, 0xffff)); -@@ -1661,7 +1661,7 @@ static int ddr3_tip_write_odt(u32 dev_num, enum hws_access_type access_type, - - CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, if_id, - DDR_ODT_TIMING_LOW_REG, val, 0xffff0)); -- val = 0x91 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12); -+ val = 0x71 | ((cwl_value - 1) << 8) | ((cwl_value + 5) << 12); - CHECK_STATUS(ddr3_tip_if_write(dev_num, access_type, if_id, - DDR_ODT_TIMING_HIGH_REG, val, 0xffff)); - if (odt_additional == 1) { -diff --git a/drivers/ddr/marvell/a38x/mv_ddr_plat.h b/drivers/ddr/marvell/a38x/mv_ddr_plat.h -index 9c5fdecd93..e01e89ca05 100644 ---- a/drivers/ddr/marvell/a38x/mv_ddr_plat.h -+++ b/drivers/ddr/marvell/a38x/mv_ddr_plat.h -@@ -33,7 +33,7 @@ - #define TUNE_TRAINING_PARAMS_N_ODT_CTRL 45 - #define TUNE_TRAINING_PARAMS_DIC 0x2 - #define TUNE_TRAINING_PARAMS_ODT_CONFIG_2CS 0x120012 --#define TUNE_TRAINING_PARAMS_ODT_CONFIG_1CS 0x10000 -+#define TUNE_TRAINING_PARAMS_ODT_CONFIG_1CS 0x30000 - #define TUNE_TRAINING_PARAMS_RTT_NOM 0x44 - - #define TUNE_TRAINING_PARAMS_RTT_WR_1CS 0x0 /*off*/ --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/Add-DM-driver-for-mvebu-rtc.patch b/patch/u-boot/u-boot-mvebu-edge/Add-DM-driver-for-mvebu-rtc.patch deleted file mode 100644 index f4adb95ef..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/Add-DM-driver-for-mvebu-rtc.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 187573405d9fd1d070f035806769cfee52224ac9 Mon Sep 17 00:00:00 2001 -Message-Id: <187573405d9fd1d070f035806769cfee52224ac9.1540752056.git.aditya@kobol.io> -In-Reply-To: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io> -References: <3eb15c0c6a0f26e418074cf3be9490a36f9161fd.1540752056.git.aditya@kobol.io> -From: Jon Nettleton -Date: Thu, 24 Aug 2017 22:28:06 +0200 -Subject: [PATCH 03/11] mvebu: rtc: Add DM driver for mvebu rtc - -This is heavily based on the linux kernel driver. Please note the -long timeout I have added. I have found that adding this additional -time fixes a lot of the other timing problems that were worked around -with various delays and repeated commands. - -Signed-off-by: Jon Nettleton ---- - drivers/rtc/Kconfig | 7 +++ - drivers/rtc/Makefile | 1 + - drivers/rtc/mvebu_rtc.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 159 insertions(+) - -diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig -index bcc01b1..59b3d2c 100644 ---- a/drivers/rtc/Kconfig -+++ b/drivers/rtc/Kconfig -@@ -31,6 +31,13 @@ config TPL_DM_RTC - drivers to perform the actual functions. See rtc.h for a - description of the API. - -+config RTC_MVEBU -+ bool "Armada 38x Marvell SoC RTC" -+ depends on DM_RTC -+ help -+ If you say yes here you will get support for the in-chip RTC -+ that can be found in the Armada 38x Marvell's SoC device -+ - config RTC_PCF2127 - bool "Enable PCF2127 driver" - depends on DM_RTC -diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile -index 1724602..0e23190 100644 ---- a/drivers/rtc/Makefile -+++ b/drivers/rtc/Makefile -@@ -38,6 +38,7 @@ obj-$(CONFIG_RTC_MCP79411) += ds1307.o - obj-$(CONFIG_MCFRTC) += mcfrtc.o - obj-$(CONFIG_RTC_MK48T59) += mk48t59.o - obj-$(CONFIG_RTC_MV) += mvrtc.o -+obj-$(CONFIG_RTC_MVEBU) += mvebu_rtc.o - obj-$(CONFIG_RTC_MX27) += mx27rtc.o - obj-$(CONFIG_RTC_MXS) += mxsrtc.o - obj-$(CONFIG_RTC_PCF8563) += pcf8563.o -diff --git a/drivers/rtc/mvebu_rtc.c b/drivers/rtc/mvebu_rtc.c -new file mode 100644 -index 0000000..b04d8e6 ---- /dev/null -+++ b/drivers/rtc/mvebu_rtc.c -@@ -0,0 +1,151 @@ -+/* -+ * (C) Copyright 2015 Solid Run Ltd. -+ * Author: Jon Nettleton -+ * -+ * Based on Linux Kernel driver rtc-armada38x.c -+ * Copyright (C) 2015 Marvell -+ * Gregory Clement -+ * -+ * SPDX-License-Identifier: GPL-2.0+ -+ */ -+ -+#include -+#include -+#include -+#include -+ -+DECLARE_GLOBAL_DATA_PTR; -+ -+#define RTC_NOMINAL_TIMING 0x2000 -+ -+#define RTC_STATUS 0x0 -+#define RTC_STATUS_ALARM1 BIT(0) -+#define RTC_STATUS_ALARM2 BIT(1) -+#define RTC_TIME 0xC -+#define RTC_ALARM1 0x10 -+#define RTC_CLOCK_CORR 0x18 -+#define RTC_TEST_CONF 0x1C -+ -+/* armada38x SoC registers */ -+#define RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS 0x0 -+#define RTC_38X_WRCLK_PERIOD_OFFS 0 -+#define RTC_38X_WRCLK_PERIOD_MASK (0x3FF << RTC_38X_WRCLK_PERIOD_OFFS) -+#define RTC_38X_READ_OUTPUT_DELAY_OFFS 26 -+#define RTC_38X_READ_OUTPUT_DELAY_MASK (0x1F << RTC_38X_READ_OUTPUT_DELAY_OFFS) -+ -+struct mvebu_rtc_platdata { -+ fdt_addr_t base; -+ fdt_addr_t soc_base; -+}; -+ -+/* -+ * According to the datasheet, the OS should wait 5us after every -+ * register write to the RTC hard macro so that the required update -+ * can occur without holding off the system bus -+ * According to errata FE-3124064, Write to any RTC register -+ * may fail. As a workaround, before writing to RTC -+ * register, issue a dummy write of 0x0 twice to RTC Status -+ * register. -+ */ -+ -+static void rtc_delayed_write(u32 val, struct mvebu_rtc_platdata *rtc, int offset) -+{ -+ writel(0, rtc->base + RTC_STATUS); -+ writel(0, rtc->base + RTC_STATUS); -+ writel(val, rtc->base + offset); -+ mdelay(10); -+} -+ -+static unsigned long read_rtc_reg(struct mvebu_rtc_platdata *rtc, uint8_t rtc_reg) -+{ -+ unsigned long value = readl(rtc->base + rtc_reg); -+ -+ return value; -+} -+ -+static void rtc_update_38x_mbus_timing_params(struct mvebu_rtc_platdata *rtc) -+{ -+ uint32_t reg; -+ -+ reg = readl(rtc->soc_base + RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS); -+ reg &= ~RTC_38X_WRCLK_PERIOD_MASK; -+ reg |= 0x3FF << RTC_38X_WRCLK_PERIOD_OFFS; /*Maximum value*/ -+ reg &= ~RTC_38X_READ_OUTPUT_DELAY_MASK; -+ reg |= 0x1F << RTC_38X_READ_OUTPUT_DELAY_OFFS; /*Maximum value*/ -+ writel(reg, rtc->soc_base + RTC_38X_BRIDGE_TIMING_CTRL_REG_OFFS); -+} -+ -+static int mvebu_rtc_get(struct udevice *dev, struct rtc_time *tm) -+{ -+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev); -+ -+ rtc_to_tm(read_rtc_reg(rtc, RTC_TIME), tm); -+ -+ return 0; -+} -+ -+static int mvebu_rtc_set(struct udevice *dev, const struct rtc_time *tm) -+{ -+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev); -+ unsigned long time; -+ -+ time = rtc_mktime(tm); -+ rtc_delayed_write(time, rtc, RTC_TIME); -+ -+ return 0; -+} -+ -+static int mvebu_rtc_reset(struct udevice *dev) -+{ -+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev); -+ -+ rtc_delayed_write(0, rtc, RTC_TEST_CONF); -+ rtc_delayed_write(0, rtc, RTC_TIME); -+ rtc_delayed_write((RTC_STATUS_ALARM1 | RTC_STATUS_ALARM2), rtc, RTC_STATUS); -+ rtc_delayed_write(RTC_NOMINAL_TIMING, rtc, RTC_CLOCK_CORR); -+ -+ return 0; -+} -+ -+static int mvebu_rtc_read8(struct udevice *dev, unsigned int reg) -+{ -+ return -ENOSYS; -+} -+ -+static int mvebu_rtc_write8(struct udevice *dev, unsigned int reg, int val) -+{ -+ return -ENOSYS; -+} -+ -+static int mvebu_rtc_probe(struct udevice *dev) -+{ -+ struct mvebu_rtc_platdata *rtc = dev_get_platdata(dev); -+ -+ rtc->base = devfdt_get_addr(dev); -+ rtc->soc_base = devfdt_get_addr_name(dev, "rtc-soc"); -+ -+ rtc_update_38x_mbus_timing_params(rtc); -+ -+ return 0; -+} -+ -+static const struct rtc_ops mvebu_rtc_ops = { -+ .get = mvebu_rtc_get, -+ .set = mvebu_rtc_set, -+ .reset = mvebu_rtc_reset, -+ .read8 = mvebu_rtc_read8, -+ .write8 = mvebu_rtc_write8, -+}; -+ -+static const struct udevice_id mvebu_rtc_ids[] = { -+ { .compatible = "marvell,armada-380-rtc" }, -+ { } -+}; -+ -+U_BOOT_DRIVER(rtc_mvebu) = { -+ .name = "rtc-mvebu", -+ .id = UCLASS_RTC, -+ .of_match = mvebu_rtc_ids, -+ .probe = mvebu_rtc_probe, -+ .ops = &mvebu_rtc_ops, -+}; --- -2.7.4 - diff --git a/patch/u-boot/u-boot-mvebu-edge/add-boot-marvell.cmd-backward-compatibility.patch b/patch/u-boot/u-boot-mvebu-edge/add-boot-marvell.cmd-backward-compatibility.patch deleted file mode 100644 index fe98aa003..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/add-boot-marvell.cmd-backward-compatibility.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 68876ccdd2fdb5bf450d9d546e18286b4508cf33 Mon Sep 17 00:00:00 2001 -Message-Id: <68876ccdd2fdb5bf450d9d546e18286b4508cf33.1561531622.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 14:42:30 +0800 -Subject: [PATCH] mvebu: configs: add boot-marvell.cmd backward compatibility - -On system that still use boot.scr derived from boot-marvell.cmd, new -u-boot 2018 will failed to load dtb and script due to missing some -variables. This will render the system unbootable. - -These changes added the missing variables. - -Signed-off-by: Aditya Prayoga ---- - include/config_distro_bootcmd.h | 1 + - include/configs/clearfog.h | 2 ++ - include/configs/helios4.h | 2 ++ - 3 files changed, 5 insertions(+) - -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index 4993303f..97af842e 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -411,6 +411,7 @@ - "boot_a_script=" \ - "load ${devtype} ${devnum}:${distro_bootpart} " \ - "${scriptaddr} ${prefix}${script}; " \ -+ "setenv boot_interface ${devtype};" \ - "source ${scriptaddr}\0" \ - \ - "scan_dev_for_scripts=" \ -diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h -index c51cf284..bbbfff71 100644 ---- a/include/configs/clearfog.h -+++ b/include/configs/clearfog.h -@@ -148,6 +148,8 @@ - LOAD_ADDRESS_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "console=ttyS0,115200\0" \ -+ "loadaddr=0x02000000\0" \ -+ "fdt_addr=" FDT_ADDR_R "\0" \ - BOOTENV - - #endif /* CONFIG_SPL_BUILD */ -diff --git a/include/configs/helios4.h b/include/configs/helios4.h -index df4d8bcb..ef6c4ed6 100644 ---- a/include/configs/helios4.h -+++ b/include/configs/helios4.h -@@ -174,6 +174,8 @@ - LOAD_ADDRESS_ENV_SETTINGS \ - "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "console=ttyS0,115200\0" \ -+ "loadaddr=0x02000000\0" \ -+ "fdt_addr=" FDT_ADDR_R "\0" \ - BOOTENV - - #endif /* CONFIG_SPL_BUILD */ --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/add-clearfogbase-configuration.patch b/patch/u-boot/u-boot-mvebu-edge/add-clearfogbase-configuration.patch deleted file mode 100644 index 5d3d7c5d2..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/add-clearfogbase-configuration.patch +++ /dev/null @@ -1,117 +0,0 @@ -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 0e2ffdb87..e3ce81137 100644 ---- a/arch/arm/dts/Makefile -+++ b/arch/arm/dts/Makefile -@@ -136,6 +136,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ - armada-3720-uDPU.dtb \ - armada-375-db.dtb \ - armada-388-clearfog.dtb \ -+ armada-388-clearfog-base.dtb \ - armada-388-gp.dtb \ - armada-388-helios4.dtb \ - armada-385-amc.dtb \ -diff --git a/arch/arm/dts/armada-388-clearfog-base-u-boot.dtsi b/arch/arm/dts/armada-388-clearfog-base-u-boot.dtsi -new file mode 100644 -index 000000000..f31691ee9 ---- /dev/null -+++ b/arch/arm/dts/armada-388-clearfog-base-u-boot.dtsi -@@ -0,0 +1,9 @@ -+// SPDX-License-Identifier: GPL-2.0+ -+ -+&spi1 { -+ u-boot,dm-spl; -+ -+ spi-flash@0 { -+ u-boot,dm-spl; -+ }; -+}; -diff --git a/arch/arm/dts/armada-388-clearfog-base.dts b/arch/arm/dts/armada-388-clearfog-base.dts -new file mode 100644 -index 000000000..d20ec739c ---- /dev/null -+++ b/arch/arm/dts/armada-388-clearfog-base.dts -@@ -0,0 +1,9 @@ -+#include "armada-388-clearfog.dts" -+ -+/ { -+ model = "SolidRun Clearfog Base"; -+ compatible = "solidrun,clearfog-base", "marvell,armada388", -+ "marvell,armada385", "marvell,armada380"; -+ -+ /delete-node/ dsa@0; -+}; -diff --git a/configs/clearfogbase_defconfig b/configs/clearfogbase_defconfig -new file mode 100644 -index 000000000..65bc784a4 ---- /dev/null -+++ b/configs/clearfogbase_defconfig -@@ -0,0 +1,66 @@ -+CONFIG_ARM=y -+CONFIG_SYS_THUMB_BUILD=y -+CONFIG_ARCH_MVEBU=y -+CONFIG_SYS_TEXT_BASE=0x00800000 -+CONFIG_SPL_GPIO_SUPPORT=y -+CONFIG_SPL_LIBCOMMON_SUPPORT=y -+CONFIG_SPL_LIBGENERIC_SUPPORT=y -+CONFIG_SYS_MALLOC_F_LEN=0x2000 -+CONFIG_TARGET_CLEARFOG=y -+CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -+CONFIG_SPL_MMC_SUPPORT=y -+CONFIG_SPL_SERIAL_SUPPORT=y -+CONFIG_SPL=y -+CONFIG_DEBUG_UART_BASE=0xd0012000 -+CONFIG_DEBUG_UART_CLOCK=250000000 -+CONFIG_DEBUG_UART=y -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_NR_DRAM_BANKS=2 -+CONFIG_BOOTDELAY=3 -+CONFIG_SYS_CONSOLE_INFO_QUIET=y -+# CONFIG_DISPLAY_BOARDINFO is not set -+CONFIG_DISPLAY_BOARDINFO_LATE=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x141 -+CONFIG_SPL_I2C_SUPPORT=y -+# CONFIG_CMD_FLASH is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_I2C=y -+CONFIG_CMD_MMC=y -+CONFIG_CMD_PCI=y -+CONFIG_CMD_SF=y -+CONFIG_CMD_SPI=y -+CONFIG_CMD_USB=y -+# CONFIG_CMD_SETEXPR is not set -+CONFIG_CMD_TFTPPUT=y -+CONFIG_CMD_CACHE=y -+CONFIG_CMD_TIME=y -+# CONFIG_SPL_PARTITION_UUIDS is not set -+CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog-base" -+CONFIG_ENV_IS_IN_MMC=y -+CONFIG_NET_RANDOM_ETHADDR=y -+CONFIG_SPL_OF_TRANSLATE=y -+CONFIG_SCSI_AHCI=y -+CONFIG_DM_GPIO=y -+CONFIG_DM_PCA953X=y -+CONFIG_DM_I2C=y -+CONFIG_SYS_I2C_MVTWSI=y -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_SDMA=y -+CONFIG_MMC_SDHCI_MV=y -+CONFIG_SPI_FLASH=y -+CONFIG_SF_DEFAULT_BUS=1 -+CONFIG_SPI_FLASH_WINBOND=y -+CONFIG_SPI_FLASH_MTD=y -+CONFIG_PHY_MARVELL=y -+CONFIG_PHY_GIGE=y -+CONFIG_MVNETA=y -+CONFIG_MII=y -+CONFIG_PCI=y -+CONFIG_PCI_MVEBU=y -+CONFIG_SCSI=y -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_SYS_NS16550=y -+CONFIG_KIRKWOOD_SPI=y -+CONFIG_USB=y -+CONFIG_DM_USB=y -+CONFIG_USB_XHCI_HCD=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch b/patch/u-boot/u-boot-mvebu-edge/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch deleted file mode 100644 index d374a7b46..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/arm-dts-armada-38x-Fix-broken-SPI-support-after-dts-sync.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 5e830c7c547daf781a93b69140bdded5609b6f08 Mon Sep 17 00:00:00 2001 -Message-Id: <5e830c7c547daf781a93b69140bdded5609b6f08.1561706494.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Fri, 28 Jun 2019 15:21:18 +0800 -Subject: [PATCH] arm: dts: armada-38x: Fix broken SPI support after dts sync - -SPI support on mainline u-boot is broken since -commit 30c4383 (ARM: mvebu: sync Armada-38x dts with Linux 4.20) - -revert the changes on SPI node only. - -Signed-off-by: Aditya Prayoga ---- - arch/arm/dts/armada-38x.dtsi | 48 ++++++++++++++++++------------------ - 1 file changed, 24 insertions(+), 24 deletions(-) - -diff --git a/arch/arm/dts/armada-38x.dtsi b/arch/arm/dts/armada-38x.dtsi -index 72c49beb71..f21a817444 100644 ---- a/arch/arm/dts/armada-38x.dtsi -+++ b/arch/arm/dts/armada-38x.dtsi -@@ -133,6 +133,30 @@ - clocks = <&coreclk 2>; - }; - -+ spi0: spi@10600 { -+ compatible = "marvell,armada-380-spi", -+ "marvell,orion-spi"; -+ reg = <0x10600 0x50>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ cell-index = <0>; -+ interrupts = ; -+ clocks = <&coreclk 0>; -+ status = "disabled"; -+ }; -+ -+ spi1: spi@10680 { -+ compatible = "marvell,armada-380-spi", -+ "marvell,orion-spi"; -+ reg = <0x10680 0x50>; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ cell-index = <1>; -+ interrupts = ; -+ clocks = <&coreclk 0>; -+ status = "disabled"; -+ }; -+ - gic: interrupt-controller@d000 { - compatible = "arm,cortex-a9-gic"; - #interrupt-cells = <3>; -@@ -620,30 +644,6 @@ - no-memory-wc; - status = "disabled"; - }; -- -- spi0: spi@10600 { -- compatible = "marvell,armada-380-spi", -- "marvell,orion-spi"; -- reg = ; -- #address-cells = <1>; -- #size-cells = <0>; -- cell-index = <0>; -- interrupts = ; -- clocks = <&coreclk 0>; -- status = "disabled"; -- }; -- -- spi1: spi@10680 { -- compatible = "marvell,armada-380-spi", -- "marvell,orion-spi"; -- reg = ; -- #address-cells = <1>; -- #size-cells = <0>; -- cell-index = <1>; -- interrupts = ; -- clocks = <&coreclk 0>; -- status = "disabled"; -- }; - }; - - clocks { --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/Add-RTC-to-clearfog.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/Add-RTC-to-clearfog.patch deleted file mode 100644 index 26ff892fd..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/Add-RTC-to-clearfog.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 351f4566aeaff51d999554a2be40ab6a40fb617d Mon Sep 17 00:00:00 2001 -Message-Id: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 10:07:05 +0800 -Subject: [PATCH 1/2] configs: Enable U-Boot RTC support on Clearfog - ---- - configs/clearfog_defconfig | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configs/clearfogbase_defconfig b/configs/clearfogbase_defconfig -index 0429071..8cc34f3 100644 ---- a/configs/clearfog_defconfig -+++ b/configs/clearfog_defconfig -@@ -30,6 +30,7 @@ CONFIG_CMD_PCI=y - CONFIG_CMD_SF=y - CONFIG_CMD_SPI=y - CONFIG_CMD_USB=y -+CONFIG_CMD_DATE=y - # CONFIG_CMD_SETEXPR is not set - CONFIG_CMD_TFTPPUT=y - CONFIG_CMD_CACHE=y -@@ -58,6 +59,8 @@ CONFIG_MII=y - CONFIG_PCI=y - CONFIG_PCI_MVEBU=y - CONFIG_SCSI=y -+CONFIG_DM_RTC=y -+CONFIG_RTC_MVEBU=y - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550=y - CONFIG_KIRKWOOD_SPI=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch deleted file mode 100644 index 6936ec822..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/arm-mvebu-clearfog-Update-Load-address.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1e9b721fe025578f00b7150665909e74f4f9fe9d Mon Sep 17 00:00:00 2001 -Message-Id: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 14:46:02 +0800 -Subject: [PATCH 1/2] arm: mvebu: clearfog: Update Load address - -Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16 - -Signed-off-by: Aditya Prayoga ---- - include/configs/clearfog.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h -index bbbfff71..5707ea24 100644 ---- a/include/configs/clearfog.h -+++ b/include/configs/clearfog.h -@@ -128,11 +128,11 @@ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - --#define KERNEL_ADDR_R __stringify(0x800000) --#define FDT_ADDR_R __stringify(0x100000) --#define RAMDISK_ADDR_R __stringify(0x1800000) --#define SCRIPT_ADDR_R __stringify(0x200000) --#define PXEFILE_ADDR_R __stringify(0x300000) -+#define KERNEL_ADDR_R __stringify(0x2080000) -+#define FDT_ADDR_R __stringify(0x2040000) -+#define RAMDISK_ADDR_R __stringify(0x2880000) -+#define SCRIPT_ADDR_R __stringify(0x3000000) -+#define PXEFILE_ADDR_R __stringify(0x3100000) - - #define LOAD_ADDRESS_ENV_SETTINGS \ - "kernel_addr_r=" KERNEL_ADDR_R "\0" \ --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/board-name-to-clearfog-base.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/board-name-to-clearfog-base.patch deleted file mode 100644 index 0f5c3f6d7..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/board-name-to-clearfog-base.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts -index 4ddeaa02f1..2792209b64 100644 ---- a/arch/arm/dts/armada-388-clearfog.dts -+++ b/arch/arm/dts/armada-388-clearfog.dts -@@ -53,7 +53,7 @@ - #include "armada-38x-solidrun-microsom.dtsi" - - / { -- model = "SolidRun Clearfog A1"; -+ model = "SolidRun Clearfog"; - compatible = "solidrun,clearfog-a1", "marvell,armada388", - "marvell,armada385", "marvell,armada380"; - -diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c -index 03724fee10..4650d754c2 100644 ---- a/board/solidrun/clearfog/clearfog.c -+++ b/board/solidrun/clearfog/clearfog.c -@@ -125,7 +125,7 @@ int board_init(void) - - int checkboard(void) - { -- puts("Board: SolidRun ClearFog\n"); -+ puts("Board: SolidRun ClearFog Base\n"); - - return 0; - } --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/do_pcie_reset_during_init.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/do_pcie_reset_during_init.patch deleted file mode 100644 index c4681695d..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/do_pcie_reset_during_init.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c -index f644547..f6e8ad5 100644 ---- a/board/solidrun/clearfog/clearfog.c -+++ b/board/solidrun/clearfog/clearfog.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include "../drivers/ddr/marvell/a38x/ddr3_init.h" - #include <../serdes/a38x/high_speed_env_spec.h> -@@ -120,6 +121,36 @@ int board_init(void) - setbits_le32(MVEBU_GPIO0_BASE + 0x0, BIT(19)); - mdelay(10); - -+#ifdef CONFIG_DM_GPIO -+ struct gpio_desc pcie0_reset, -+ pcie1_reset; -+ int res; -+ -+ /* Toogle PERST# on miniPCIe1 (CON2) and miniPCIe0 (CON3) */ -+ res = dm_gpio_lookup_name("gpio@20_1", &pcie0_reset); -+ if (!res) { -+ res = dm_gpio_request(&pcie0_reset, "pcie0-reset"); -+ if (!res) -+ dm_gpio_set_dir_flags(&pcie0_reset,GPIOD_IS_OUT | -+ GPIOD_ACTIVE_LOW); -+ } -+ -+ res = dm_gpio_lookup_name("gpio@20_2", &pcie1_reset); -+ if (!res) { -+ res = dm_gpio_request(&pcie1_reset, "pcie1-reset"); -+ if (!res) -+ dm_gpio_set_dir_flags(&pcie1_reset,GPIOD_IS_OUT | -+ GPIOD_ACTIVE_LOW); -+ } -+ -+ dm_gpio_set_value(&pcie0_reset, 1); -+ dm_gpio_set_value(&pcie1_reset, 1); -+ mdelay(100); -+ dm_gpio_set_value(&pcie0_reset, 0); -+ dm_gpio_set_value(&pcie1_reset, 0); -+ mdelay(100); -+#endif -+ - return 0; - } - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch deleted file mode 100644 index fbed24ee2..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogbase/set-serdes-lane-4-as-usb-3-host.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c -index 4650d754c2..53922793ad 100644 ---- a/board/solidrun/clearfog/clearfog.c -+++ b/board/solidrun/clearfog/clearfog.c -@@ -33,7 +33,7 @@ static struct serdes_map board_serdes_map[] = { - {SGMII1, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {PEX1, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0}, - {USB3_HOST1, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0}, -- {PEX2, SERDES_SPEED_5_GBPS, PEX_ROOT_COMPLEX_X1, 0, 0}, -+ {USB3_HOST0, SERDES_SPEED_5_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - {SGMII2, SERDES_SPEED_1_25_GBPS, SERDES_DEFAULT_MODE, 0, 0}, - }; - --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/Add-RTC-to-clearfog.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/Add-RTC-to-clearfog.patch deleted file mode 100644 index dcd3df15d..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/Add-RTC-to-clearfog.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 351f4566aeaff51d999554a2be40ab6a40fb617d Mon Sep 17 00:00:00 2001 -Message-Id: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 10:07:05 +0800 -Subject: [PATCH 1/2] configs: Enable U-Boot RTC support on Clearfog - ---- - configs/clearfog_defconfig | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig -index 0429071..8cc34f3 100644 ---- a/configs/clearfog_defconfig -+++ b/configs/clearfog_defconfig -@@ -30,6 +30,7 @@ CONFIG_CMD_PCI=y - CONFIG_CMD_SF=y - CONFIG_CMD_SPI=y - CONFIG_CMD_USB=y -+CONFIG_CMD_DATE=y - # CONFIG_CMD_SETEXPR is not set - CONFIG_CMD_TFTPPUT=y - CONFIG_CMD_CACHE=y -@@ -58,6 +59,8 @@ CONFIG_MII=y - CONFIG_PCI=y - CONFIG_PCI_MVEBU=y - CONFIG_SCSI=y -+CONFIG_DM_RTC=y -+CONFIG_RTC_MVEBU=y - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550=y - CONFIG_KIRKWOOD_SPI=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch deleted file mode 100644 index 6936ec822..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/arm-mvebu-clearfog-Update-Load-address.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1e9b721fe025578f00b7150665909e74f4f9fe9d Mon Sep 17 00:00:00 2001 -Message-Id: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 14:46:02 +0800 -Subject: [PATCH 1/2] arm: mvebu: clearfog: Update Load address - -Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16 - -Signed-off-by: Aditya Prayoga ---- - include/configs/clearfog.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h -index bbbfff71..5707ea24 100644 ---- a/include/configs/clearfog.h -+++ b/include/configs/clearfog.h -@@ -128,11 +128,11 @@ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - --#define KERNEL_ADDR_R __stringify(0x800000) --#define FDT_ADDR_R __stringify(0x100000) --#define RAMDISK_ADDR_R __stringify(0x1800000) --#define SCRIPT_ADDR_R __stringify(0x200000) --#define PXEFILE_ADDR_R __stringify(0x300000) -+#define KERNEL_ADDR_R __stringify(0x2080000) -+#define FDT_ADDR_R __stringify(0x2040000) -+#define RAMDISK_ADDR_R __stringify(0x2880000) -+#define SCRIPT_ADDR_R __stringify(0x3000000) -+#define PXEFILE_ADDR_R __stringify(0x3100000) - - #define LOAD_ADDRESS_ENV_SETTINGS \ - "kernel_addr_r=" KERNEL_ADDR_R "\0" \ --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/board-name-to-clearfog-pro.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/board-name-to-clearfog-pro.patch deleted file mode 100644 index 70e5c8651..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/board-name-to-clearfog-pro.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/arch/arm/dts/armada-388-clearfog.dts b/arch/arm/dts/armada-388-clearfog.dts -index 4ddeaa02f1..2792209b64 100644 ---- a/arch/arm/dts/armada-388-clearfog.dts -+++ b/arch/arm/dts/armada-388-clearfog.dts -@@ -53,7 +53,7 @@ - #include "armada-38x-solidrun-microsom.dtsi" - - / { -- model = "SolidRun Clearfog A1"; -+ model = "SolidRun Clearfog"; - compatible = "solidrun,clearfog-a1", "marvell,armada388", - "marvell,armada385", "marvell,armada380"; - -diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c -index 03724fee10..f644547c12 100644 ---- a/board/solidrun/clearfog/clearfog.c -+++ b/board/solidrun/clearfog/clearfog.c -@@ -125,7 +125,7 @@ int board_init(void) - - int checkboard(void) - { -- puts("Board: SolidRun ClearFog\n"); -+ puts("Board: SolidRun ClearFog Pro\n"); - - return 0; - } --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/do_pcie_reset_during_init.patch b/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/do_pcie_reset_during_init.patch deleted file mode 100644 index c4681695d..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_clearfogpro/do_pcie_reset_during_init.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/board/solidrun/clearfog/clearfog.c b/board/solidrun/clearfog/clearfog.c -index f644547..f6e8ad5 100644 ---- a/board/solidrun/clearfog/clearfog.c -+++ b/board/solidrun/clearfog/clearfog.c -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include "../drivers/ddr/marvell/a38x/ddr3_init.h" - #include <../serdes/a38x/high_speed_env_spec.h> -@@ -120,6 +121,36 @@ int board_init(void) - setbits_le32(MVEBU_GPIO0_BASE + 0x0, BIT(19)); - mdelay(10); - -+#ifdef CONFIG_DM_GPIO -+ struct gpio_desc pcie0_reset, -+ pcie1_reset; -+ int res; -+ -+ /* Toogle PERST# on miniPCIe1 (CON2) and miniPCIe0 (CON3) */ -+ res = dm_gpio_lookup_name("gpio@20_1", &pcie0_reset); -+ if (!res) { -+ res = dm_gpio_request(&pcie0_reset, "pcie0-reset"); -+ if (!res) -+ dm_gpio_set_dir_flags(&pcie0_reset,GPIOD_IS_OUT | -+ GPIOD_ACTIVE_LOW); -+ } -+ -+ res = dm_gpio_lookup_name("gpio@20_2", &pcie1_reset); -+ if (!res) { -+ res = dm_gpio_request(&pcie1_reset, "pcie1-reset"); -+ if (!res) -+ dm_gpio_set_dir_flags(&pcie1_reset,GPIOD_IS_OUT | -+ GPIOD_ACTIVE_LOW); -+ } -+ -+ dm_gpio_set_value(&pcie0_reset, 1); -+ dm_gpio_set_value(&pcie1_reset, 1); -+ mdelay(100); -+ dm_gpio_set_value(&pcie0_reset, 0); -+ dm_gpio_set_value(&pcie1_reset, 0); -+ mdelay(100); -+#endif -+ - return 0; - } - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_helios4/Add-RTC-to-helios4.patch b/patch/u-boot/u-boot-mvebu-edge/board_helios4/Add-RTC-to-helios4.patch deleted file mode 100644 index d88cc541d..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_helios4/Add-RTC-to-helios4.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6eecc75c169fd9b1a3c26a3c8043f63d4a689d9e Mon Sep 17 00:00:00 2001 -Message-Id: <6eecc75c169fd9b1a3c26a3c8043f63d4a689d9e.1561517341.git.aditya@kobol.io> -In-Reply-To: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io> -References: <351f4566aeaff51d999554a2be40ab6a40fb617d.1561517341.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 10:48:38 +0800 -Subject: [PATCH 2/2] configs: Enable U-Boot RTC support on Helios4 - ---- - configs/helios4_defconfig | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig -index 699ce06..0a1bb8e 100644 ---- a/configs/helios4_defconfig -+++ b/configs/helios4_defconfig -@@ -27,6 +27,7 @@ CONFIG_CMD_MMC=y - CONFIG_CMD_SF=y - CONFIG_CMD_SPI=y - CONFIG_CMD_USB=y -+CONFIG_CMD_DATE=y - # CONFIG_CMD_SETEXPR is not set - CONFIG_CMD_TFTPPUT=y - CONFIG_CMD_CACHE=y -@@ -54,6 +55,8 @@ CONFIG_PHY_GIGE=y - CONFIG_MVNETA=y - CONFIG_MII=y - CONFIG_SCSI=y -+CONFIG_DM_RTC=y -+CONFIG_RTC_MVEBU=y - CONFIG_DEBUG_UART_SHIFT=2 - CONFIG_SYS_NS16550=y - CONFIG_KIRKWOOD_SPI=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/board_helios4/arm-mvebu-helios4-Update-Load-address.patch b/patch/u-boot/u-boot-mvebu-edge/board_helios4/arm-mvebu-helios4-Update-Load-address.patch deleted file mode 100644 index f379a9eb8..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/board_helios4/arm-mvebu-helios4-Update-Load-address.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 86c6ccfc00e36152348dc74f98915d12a4adcb47 Mon Sep 17 00:00:00 2001 -Message-Id: <86c6ccfc00e36152348dc74f98915d12a4adcb47.1561531622.git.aditya@kobol.io> -In-Reply-To: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io> -References: <1e9b721fe025578f00b7150665909e74f4f9fe9d.1561531622.git.aditya@kobol.io> -From: Aditya Prayoga -Date: Wed, 26 Jun 2019 14:46:30 +0800 -Subject: [PATCH 2/2] arm: mvebu: helios4: Update Load address - -Use the values from U-Boot 2013.01 Marvell version: 2015_T1.0p16 - -Signed-off-by: Aditya Prayoga ---- - include/configs/helios4.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/configs/helios4.h b/include/configs/helios4.h -index ef6c4ed6..c523f6a7 100644 ---- a/include/configs/helios4.h -+++ b/include/configs/helios4.h -@@ -154,11 +154,11 @@ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - --#define KERNEL_ADDR_R __stringify(0x800000) --#define FDT_ADDR_R __stringify(0x100000) --#define RAMDISK_ADDR_R __stringify(0x1800000) --#define SCRIPT_ADDR_R __stringify(0x200000) --#define PXEFILE_ADDR_R __stringify(0x300000) -+#define KERNEL_ADDR_R __stringify(0x2080000) -+#define FDT_ADDR_R __stringify(0x2040000) -+#define RAMDISK_ADDR_R __stringify(0x2880000) -+#define SCRIPT_ADDR_R __stringify(0x3000000) -+#define PXEFILE_ADDR_R __stringify(0x3100000) - - #define LOAD_ADDRESS_ENV_SETTINGS \ - "kernel_addr_r=" KERNEL_ADDR_R "\0" \ --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/enable-DT-overlays-support.patch b/patch/u-boot/u-boot-mvebu-edge/enable-DT-overlays-support.patch deleted file mode 100644 index 9925b3723..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/enable-DT-overlays-support.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 4a23e32..121f336 100644 ---- a/arch/arm/Kconfig -+++ b/arch/arm/Kconfig -@@ -440,6 +440,8 @@ config ARCH_MVEBU - select DM_SPI_FLASH - select OF_CONTROL - select OF_SEPARATE -+ select OF_LIBFDT -+ select OF_LIBFDT_OVERLAY - select SPI - imply CMD_DM - diff --git a/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfog-add-spi-support-in-spl.patch b/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfog-add-spi-support-in-spl.patch deleted file mode 100644 index 1a2e15b92..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfog-add-spi-support-in-spl.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig -index 04290710a7..15ea602bc3 100644 ---- a/configs/clearfog_defconfig -+++ b/configs/clearfog_defconfig -@@ -8,7 +8,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_SYS_MALLOC_F_LEN=0x2000 - CONFIG_TARGET_CLEARFOG=y - CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y --CONFIG_SPL_MMC_SUPPORT=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_SPL=y - CONFIG_DEBUG_UART_BASE=0xd0012000 -@@ -50,7 +49,6 @@ CONFIG_MMC_SDHCI_MV=y - CONFIG_SPI_FLASH=y - CONFIG_SF_DEFAULT_BUS=1 - CONFIG_SPI_FLASH_WINBOND=y --CONFIG_SPI_FLASH_MTD=y - CONFIG_PHY_MARVELL=y - CONFIG_PHY_GIGE=y - CONFIG_MVNETA=y -diff --git a/configs/clearfogbase_defconfig b/configs/clearfogbase_defconfig -index 65bc784a4..415f8f784 100644 ---- a/configs/clearfogbase_defconfig -+++ b/configs/clearfogbase_defconfig -@@ -8,7 +8,6 @@ CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_SYS_MALLOC_F_LEN=0x2000 - CONFIG_TARGET_CLEARFOG=y - CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y --CONFIG_SPL_MMC_SUPPORT=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_SPL=y - CONFIG_DEBUG_UART_BASE=0xd0012000 -@@ -50,7 +49,6 @@ CONFIG_MMC_SDHCI_MV=y - CONFIG_SPI_FLASH=y - CONFIG_SF_DEFAULT_BUS=1 - CONFIG_SPI_FLASH_WINBOND=y --CONFIG_SPI_FLASH_MTD=y - CONFIG_PHY_MARVELL=y - CONFIG_PHY_GIGE=y - CONFIG_MVNETA=y -diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h -index c51cf28450..d0e023ae44 100644 ---- a/include/configs/clearfog.h -+++ b/include/configs/clearfog.h -@@ -6,6 +6,8 @@ - #ifndef _CONFIG_CLEARFOG_H - #define _CONFIG_CLEARFOG_H - -+#include -+ - /* - * High Level Configuration Options (easy to change) - */ -@@ -21,7 +23,19 @@ - * Commands configuration - */ - --/* SPI NOR flash default params, used by sf commands */ -+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI -+/* -+ * SPI Flash configuration for the environment access -+ */ -+#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS -+#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS -+#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED -+ -+/* Environment in SPI NOR flash */ -+#define CONFIG_ENV_SECT_SIZE SZ_64K -+#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -+#define CONFIG_ENV_OFFSET SZ_1M -+#endif - - /* - * SDIO/MMC Card Configuration -@@ -37,6 +51,7 @@ - - #define CONFIG_ENV_MIN_ENTRIES 128 - -+#ifdef CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC - /* Environment in MMC */ - #define CONFIG_SYS_MMC_ENV_DEV 0 - #define CONFIG_ENV_SECT_SIZE 0x200 -@@ -49,6 +64,7 @@ - */ - #define CONFIG_ENV_OFFSET 0xf0000 - #define CONFIG_ENV_ADDR CONFIG_ENV_OFFSET -+#endif - - #define PHY_ANEG_TIMEOUT 8000 /* PHY needs a longer aneg time */ - -@@ -90,10 +106,14 @@ - - #if defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI) - /* SPL related SPI defines */ -+#define CONFIG_SPL_SPI_FLASH_SUPPORT -+#define CONFIG_SPL_SPI_LOAD -+#define CONFIG_SPL_SPI_SUPPORT - #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 - #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS - #elif defined(CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC) - /* SPL related MMC defines */ -+#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_SYS_MMC_U_BOOT_OFFS (160 << 10) - #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_MMC_U_BOOT_OFFS - #ifdef CONFIG_SPL_BUILD --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfog-set-default-boot-target-to-spi.patch b/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfog-set-default-boot-target-to-spi.patch deleted file mode 100644 index 2bb7ab84e..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfog-set-default-boot-target-to-spi.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig -index 15ea602bc3..919fe93b28 100644 ---- a/configs/clearfog_defconfig -+++ b/configs/clearfog_defconfig -@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y - CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_SYS_MALLOC_F_LEN=0x2000 - CONFIG_TARGET_CLEARFOG=y --CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -+CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_SPL=y - CONFIG_DEBUG_UART_BASE=0xd0012000 -@@ -33,9 +33,11 @@ CONFIG_CMD_USB=y - CONFIG_CMD_TFTPPUT=y - CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y -+CONFIG_CMD_MVEBU_BUBT=y -+CONFIG_MVEBU_UBOOT_DFLT_NAME="u-boot-spl-spi.kwb" - # CONFIG_SPL_PARTITION_UUIDS is not set - CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" --CONFIG_ENV_IS_IN_MMC=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_SPL_OF_TRANSLATE=y - CONFIG_SCSI_AHCI=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfogbase-set-default-boot-target-to-spi.patch b/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfogbase-set-default-boot-target-to-spi.patch deleted file mode 100644 index b7d0fb3a0..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_spi/clearfogbase-set-default-boot-target-to-spi.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/configs/clearfogbase_defconfig b/configs/clearfogbase_defconfig -index 415f8f784..124e509eb 100644 ---- a/configs/clearfogbase_defconfig -+++ b/configs/clearfogbase_defconfig -@@ -7,7 +7,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y - CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_SYS_MALLOC_F_LEN=0x2000 - CONFIG_TARGET_CLEARFOG=y --CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -+CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_SPL=y - CONFIG_DEBUG_UART_BASE=0xd0012000 -@@ -33,9 +33,11 @@ CONFIG_CMD_USB=y - CONFIG_CMD_TFTPPUT=y - CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y -+CONFIG_CMD_MVEBU_BUBT=y -+CONFIG_MVEBU_UBOOT_DFLT_NAME="u-boot-spl-spi.kwb" - # CONFIG_SPL_PARTITION_UUIDS is not set - CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog-base" --CONFIG_ENV_IS_IN_MMC=y -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_SPL_OF_TRANSLATE=y - CONFIG_SCSI_AHCI=y diff --git a/patch/u-boot/u-boot-mvebu-edge/target_spi/helios4-config-set-boot-device-spinor.patch b/patch/u-boot/u-boot-mvebu-edge/target_spi/helios4-config-set-boot-device-spinor.patch deleted file mode 100644 index e1f07997c..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_spi/helios4-config-set-boot-device-spinor.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig -index ddd075e..50bdc7e 100644 ---- a/configs/helios4_defconfig -+++ b/configs/helios4_defconfig -@@ -5,7 +5,7 @@ CONFIG_SPL_LIBCOMMON_SUPPORT=y - CONFIG_SPL_LIBGENERIC_SUPPORT=y - CONFIG_SYS_MALLOC_F_LEN=0x2000 - CONFIG_TARGET_HELIOS4=y --CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y -+CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y - CONFIG_SPL_SERIAL_SUPPORT=y - CONFIG_SPL_SYS_MALLOC_SIMPLE=y - CONFIG_SPL=y -@@ -34,7 +34,8 @@ CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y - # CONFIG_SPL_PARTITION_UUIDS is not set - CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4" --CONFIG_ENV_IS_IN_MMC=y -+# CONFIG_ENV_IS_IN_MMC is not set -+CONFIG_ENV_IS_IN_SPI_FLASH=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_SPL_OF_TRANSLATE=y - CONFIG_SCSI_AHCI=y diff --git a/patch/u-boot/u-boot-mvebu-edge/target_spi/helios4-reorder-boot-device.patch b/patch/u-boot/u-boot-mvebu-edge/target_spi/helios4-reorder-boot-device.patch deleted file mode 100644 index 1cedbc64c..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_spi/helios4-reorder-boot-device.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/include/configs/helios4.h b/include/configs/helios4.h -index 299c58d..7ccb9e0 100644 ---- a/include/configs/helios4.h -+++ b/include/configs/helios4.h -@@ -159,9 +159,9 @@ - #endif - - #define BOOT_TARGET_DEVICES(func) \ -- BOOT_TARGET_DEVICES_MMC(func) \ - BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_DEVICES_SATA(func) \ -+ BOOT_TARGET_DEVICES_MMC(func) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - diff --git a/patch/u-boot/u-boot-mvebu-edge/target_uart/clearfog-disable-autoboot-and-env-storage.patch b/patch/u-boot/u-boot-mvebu-edge/target_uart/clearfog-disable-autoboot-and-env-storage.patch deleted file mode 100644 index 124e46288..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_uart/clearfog-disable-autoboot-and-env-storage.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/configs/clearfog_defconfig b/configs/clearfog_defconfig -index 04290710a7..f48f5e15cd 100644 ---- a/configs/clearfog_defconfig -+++ b/configs/clearfog_defconfig -@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=250000000 - CONFIG_DEBUG_UART=y - CONFIG_DISTRO_DEFAULTS=y - CONFIG_NR_DRAM_BANKS=2 --CONFIG_BOOTDELAY=3 -+CONFIG_BOOTDELAY=-1 - CONFIG_SYS_CONSOLE_INFO_QUIET=y - # CONFIG_DISPLAY_BOARDINFO is not set - CONFIG_DISPLAY_BOARDINFO_LATE=y -@@ -36,7 +36,6 @@ CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y - # CONFIG_SPL_PARTITION_UUIDS is not set - CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog" --CONFIG_ENV_IS_IN_MMC=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_SPL_OF_TRANSLATE=y - CONFIG_SCSI_AHCI=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-mvebu-edge/target_uart/clearfogbase-disable-autoboot-and-env-storage.patch b/patch/u-boot/u-boot-mvebu-edge/target_uart/clearfogbase-disable-autoboot-and-env-storage.patch deleted file mode 100644 index 83a032ec1..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_uart/clearfogbase-disable-autoboot-and-env-storage.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/configs/clearfogbase_defconfig b/configs/clearfogbase_defconfig -index 65bc784a4..badb6ee5d 100644 ---- a/configs/clearfogbase_defconfig -+++ b/configs/clearfogbase_defconfig -@@ -16,7 +16,7 @@ CONFIG_DEBUG_UART_CLOCK=250000000 - CONFIG_DEBUG_UART=y - CONFIG_DISTRO_DEFAULTS=y - CONFIG_NR_DRAM_BANKS=2 --CONFIG_BOOTDELAY=3 -+CONFIG_BOOTDELAY=-1 - CONFIG_SYS_CONSOLE_INFO_QUIET=y - # CONFIG_DISPLAY_BOARDINFO is not set - CONFIG_DISPLAY_BOARDINFO_LATE=y -@@ -36,7 +36,6 @@ CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y - # CONFIG_SPL_PARTITION_UUIDS is not set - CONFIG_DEFAULT_DEVICE_TREE="armada-388-clearfog-base" --CONFIG_ENV_IS_IN_MMC=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_SPL_OF_TRANSLATE=y - CONFIG_SCSI_AHCI=y diff --git a/patch/u-boot/u-boot-mvebu-edge/target_uart/helios4-prepare-for-uart-image.patch b/patch/u-boot/u-boot-mvebu-edge/target_uart/helios4-prepare-for-uart-image.patch deleted file mode 100644 index f481c521b..000000000 --- a/patch/u-boot/u-boot-mvebu-edge/target_uart/helios4-prepare-for-uart-image.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bf63030982e9b2c555dab11b3f53bfd27a48f567 Mon Sep 17 00:00:00 2001 -Message-Id: -From: Aditya Prayoga -Date: Fri, 5 Jul 2019 18:45:05 +0800 -Subject: [PATCH] mvebu: helios4: Prepare for UART image - -SPL failed to continue the booting process if ECC is enabled. -So disable the ECC and while at it also disable env storage and -autoboot. - -Signed-off-by: Aditya Prayoga ---- - board/kobol/helios4/helios4.c | 2 +- - configs/helios4_defconfig | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/board/kobol/helios4/helios4.c b/board/kobol/helios4/helios4.c -index 3c3592ecf5..780bef12a9 100644 ---- a/board/kobol/helios4/helios4.c -+++ b/board/kobol/helios4/helios4.c -@@ -66,7 +66,7 @@ static struct mv_ddr_topology_map board_topology_map = { - 0, 0, /* cas_wl cas_l */ - MV_DDR_TEMP_LOW, /* temperature */ - MV_DDR_TIM_DEFAULT} }, /* timing */ -- BUS_MASK_32BIT_ECC, /* Busses mask */ -+ BUS_MASK_32BIT, /* Busses mask */ - MV_DDR_CFG_DEFAULT, /* ddr configuration data source */ - { {0} }, /* raw spd data */ - {0} /* timing parameters */ -diff --git a/configs/helios4_defconfig b/configs/helios4_defconfig -index 699ce0609f..3ccb613b8d 100644 ---- a/configs/helios4_defconfig -+++ b/configs/helios4_defconfig -@@ -14,7 +14,7 @@ CONFIG_DEBUG_UART=y - CONFIG_AHCI=y - CONFIG_DISTRO_DEFAULTS=y - CONFIG_NR_DRAM_BANKS=2 --CONFIG_BOOTDELAY=3 -+CONFIG_BOOTDELAY=-1 - CONFIG_SYS_CONSOLE_INFO_QUIET=y - # CONFIG_DISPLAY_BOARDINFO is not set - CONFIG_DISPLAY_BOARDINFO_LATE=y -@@ -33,7 +33,6 @@ CONFIG_CMD_CACHE=y - CONFIG_CMD_TIME=y - # CONFIG_SPL_PARTITION_UUIDS is not set - CONFIG_DEFAULT_DEVICE_TREE="armada-388-helios4" --CONFIG_ENV_IS_IN_MMC=y - CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_SPL_OF_TRANSLATE=y - CONFIG_SCSI_AHCI=y --- -2.17.1 - diff --git a/patch/u-boot/u-boot-odroid/fix-boot-scripts-path.patch b/patch/u-boot/u-boot-odroid/fix-boot-scripts-path.patch deleted file mode 100644 index b42258a9e..000000000 --- a/patch/u-boot/u-boot-odroid/fix-boot-scripts-path.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h -index 1539e68..3828642 100644 ---- a/include/configs/odroid-g12-common.h -+++ b/include/configs/odroid-g12-common.h -@@ -96,7 +96,7 @@ - - #define ENV_BOOT_ORDER_DEFAULT "boot_order=mmc rawimage usb pxe spi\0" - --#define ENV_BOOTSCRIPTS_DEFAULT "boot_scripts=boot.ini boot.scr\0" -+#define ENV_BOOTSCRIPTS_DEFAULT "boot_scripts=boot.ini boot.scr /boot/boot.ini /boot/boot.scr\0" - - #define ENV_BOOT_ATTEMPT_DEFAULT \ - "boot_attempt=" \ diff --git a/patch/u-boot/u-boot-odroid/load-from-ext4.patch b/patch/u-boot/u-boot-odroid/load-from-ext4.patch deleted file mode 100644 index ff76bb6e3..000000000 --- a/patch/u-boot/u-boot-odroid/load-from-ext4.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff --git a/common/cmd_cfgload.c b/common/cmd_cfgload.c -index 7dd4ec3..c7089a4 100644 ---- a/common/cmd_cfgload.c -+++ b/common/cmd_cfgload.c -@@ -23,7 +23,7 @@ static int do_load_cfgload(cmd_tbl_t *cmdtp, int flag, int argc, - debug ("* cfgload: cmdline image address = 0x%08lx\n", addr); - } - -- snprintf(cmd, sizeof(cmd), "load mmc %d:1 0x%08lx boot.ini; source 0x%08lx", -+ snprintf(cmd, sizeof(cmd), "ext4load mmc %d:1 0x%08lx boot/boot.ini; source 0x%08lx", - devno, addr, addr); - return run_command(cmd, 0); - } -@@ -32,7 +32,7 @@ U_BOOT_CMD( - cfgload, 2, 0, do_load_cfgload, - "read 'boot.ini' from FAT partiton", - "\n" -- " - read boot.ini from the first partiton treated as FAT partiton" -+ " - read boot.ini from the first partiton" - ); - - /* vim: set ts=4 sw=4 tw=80: */ -diff --git a/common/edid-decode.c b/common/edid-decode.c -index a4c1a0c..ae11a02 100644 ---- a/common/edid-decode.c -+++ b/common/edid-decode.c -@@ -1735,10 +1735,10 @@ void save_edid_bin(unsigned char *edid, unsigned int blk_len) - return; - } - -- ret = file_exists("mmc", part, "edid.bin", FS_TYPE_ANY); -+ ret = file_exists("mmc", part, "/boot/edid.bin", FS_TYPE_ANY); - if (!ret) { - printf("NOT EXIST, now build edid.bin\n"); -- sprintf(str, "fatwrite mmc %s 0x%lx edid.bin 0x%x", -+ sprintf(str, "ext4write mmc %s 0x%lx /boot/edid.bin 0x%x", - part, (unsigned long)edid, (128 * blk_len)); - run_command(str, 0); - } -@@ -1756,18 +1756,18 @@ void save_display_bin(bool config, char *modeline) - return; - } - -- ret = file_exists("mmc", part, "display.bin", FS_TYPE_ANY); -+ ret = file_exists("mmc", part, "/boot/display.bin", FS_TYPE_ANY); - if(!ret) { - printf("NOT EXIST, now build display.bin\n"); - - if (config == true) { - sprintf(result, "Auto Detect OK:%s,%s(%s)", bestmode, getenv("voutmode"), modeline); -- sprintf(str, "fatwrite mmc %s 0x%lx display.bin 0x78", -+ sprintf(str, "ext4write mmc %s 0x%lx /boot/display.bin 0x78", - part, (unsigned long)result); - run_command(str, 0); - } else { - sprintf(result, "Auto Detect FAIL:%s,%s", bestmode, getenv("voutmode")); -- sprintf(str, "fatwrite mmc %s 0x%lx display.bin 0x78", -+ sprintf(str, "ext4write mmc %s 0x%lx /boot/display.bin 0x78", - part, (unsigned long)result); - run_command(str, 0); - } -diff --git a/include/configs/odroid-g12-common.h b/include/configs/odroid-g12-common.h -index 663b0f0..71e73c2 100644 ---- a/include/configs/odroid-g12-common.h -+++ b/include/configs/odroid-g12-common.h -@@ -450,6 +450,7 @@ - #define CONFIG_CMD_FAT 1 - #define CONFIG_CMD_EXT2 1 - #define CONFIG_CMD_EXT4 1 -+#define CONFIG_CMD_EXT4_WRITE 1 - #define CONFIG_CMD_GPIO 1 - #define CONFIG_CMD_RUN 1 - #define CONFIG_CMD_REBOOT 1 diff --git a/patch/u-boot/u-boot-odroidm1/add_defconfig_without_SPI_and_sector_in_addition_to_partition.patch b/patch/u-boot/u-boot-odroidm1/add_defconfig_without_SPI_and_sector_in_addition_to_partition.patch deleted file mode 100644 index 591693b3e..000000000 --- a/patch/u-boot/u-boot-odroidm1/add_defconfig_without_SPI_and_sector_in_addition_to_partition.patch +++ /dev/null @@ -1,1567 +0,0 @@ -Index: configs/odroid_rk3568_nomtd_defconfig -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/configs/odroid_rk3568_nomtd_defconfig b/configs/odroid_rk3568_nomtd_defconfig -new file mode 100644 ---- /dev/null (revision 891005518ba61a6abcbd8d43cbf75fb93d177ab4) -+++ b/configs/odroid_rk3568_nomtd_defconfig (revision 891005518ba61a6abcbd8d43cbf75fb93d177ab4) -@@ -0,0 +1,1557 @@ -+# -+# Automatically generated file; DO NOT EDIT. -+# U-Boot 2017.09 Configuration -+# -+CONFIG_CREATE_ARCH_SYMLINK=y -+# CONFIG_ARC is not set -+CONFIG_ARM=y -+# CONFIG_M68K is not set -+# CONFIG_MICROBLAZE is not set -+# CONFIG_MIPS is not set -+# CONFIG_NDS32 is not set -+# CONFIG_NIOS2 is not set -+# CONFIG_PPC is not set -+# CONFIG_RISCV is not set -+# CONFIG_SANDBOX is not set -+# CONFIG_SH is not set -+# CONFIG_X86 is not set -+# CONFIG_XTENSA is not set -+CONFIG_SYS_ARCH="arm" -+CONFIG_SYS_CPU="armv8" -+CONFIG_SYS_SOC="rockchip" -+CONFIG_SYS_VENDOR="hardkernel" -+CONFIG_SYS_BOARD="odroid-m1" -+CONFIG_SYS_CONFIG_NAME="odroid-m1" -+ -+# -+# ARM architecture -+# -+CONFIG_ARM64=y -+# CONFIG_POSITION_INDEPENDENT is not set -+CONFIG_STATIC_RELA=y -+CONFIG_DMA_ADDR_T_64BIT=y -+CONFIG_ARM_ASM_UNIFIED=y -+CONFIG_SYS_ARM_ARCH=8 -+CONFIG_SYS_CACHE_SHIFT_6=y -+CONFIG_SYS_CACHELINE_SIZE=64 -+CONFIG_ARM_SMCCC=y -+CONFIG_ARM_CPU_SUSPEND=y -+# CONFIG_SEMIHOSTING is not set -+# CONFIG_SYS_L2CACHE_OFF is not set -+CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y -+# CONFIG_ARM_CORTEX_CPU_IS_UP is not set -+CONFIG_ARM64_SUPPORT_AARCH32=y -+# CONFIG_ARCH_AT91 is not set -+# CONFIG_TARGET_EDB93XX is not set -+# CONFIG_TARGET_ASPENITE is not set -+# CONFIG_TARGET_GPLUGD is not set -+# CONFIG_ARCH_DAVINCI is not set -+# CONFIG_KIRKWOOD is not set -+# CONFIG_ARCH_MVEBU is not set -+# CONFIG_TARGET_DEVKIT3250 is not set -+# CONFIG_TARGET_WORK_92105 is not set -+# CONFIG_TARGET_MX25PDK is not set -+# CONFIG_TARGET_ZMX25 is not set -+# CONFIG_TARGET_APF27 is not set -+# CONFIG_TARGET_APX4DEVKIT is not set -+# CONFIG_TARGET_XFI3 is not set -+# CONFIG_TARGET_M28EVK is not set -+# CONFIG_TARGET_MX23EVK is not set -+# CONFIG_TARGET_MX28EVK is not set -+# CONFIG_TARGET_MX23_OLINUXINO is not set -+# CONFIG_TARGET_BG0900 is not set -+# CONFIG_TARGET_SANSA_FUZE_PLUS is not set -+# CONFIG_TARGET_SC_SPS_1 is not set -+# CONFIG_ORION5X is not set -+# CONFIG_TARGET_SPEAR300 is not set -+# CONFIG_TARGET_SPEAR310 is not set -+# CONFIG_TARGET_SPEAR320 is not set -+# CONFIG_TARGET_SPEAR600 is not set -+# CONFIG_TARGET_STV0991 is not set -+# CONFIG_TARGET_X600 is not set -+# CONFIG_TARGET_IMX31_PHYCORE is not set -+# CONFIG_TARGET_IMX31_PHYCORE_EET is not set -+# CONFIG_TARGET_MX31ADS is not set -+# CONFIG_TARGET_MX31PDK is not set -+# CONFIG_TARGET_WOODBURN is not set -+# CONFIG_TARGET_WOODBURN_SD is not set -+# CONFIG_TARGET_FLEA3 is not set -+# CONFIG_TARGET_MX35PDK is not set -+# CONFIG_ARCH_BCM283X is not set -+# CONFIG_TARGET_VEXPRESS_CA15_TC2 is not set -+# CONFIG_ARCH_BCMSTB is not set -+# CONFIG_TARGET_VEXPRESS_CA5X2 is not set -+# CONFIG_TARGET_VEXPRESS_CA9X4 is not set -+# CONFIG_TARGET_BCM23550_W1D is not set -+# CONFIG_TARGET_BCM28155_AP is not set -+# CONFIG_TARGET_BCMCYGNUS is not set -+# CONFIG_TARGET_BCMNSP is not set -+# CONFIG_TARGET_BCMNS2 is not set -+# CONFIG_ARCH_EXYNOS is not set -+# CONFIG_ARCH_S5PC1XX is not set -+# CONFIG_ARCH_HIGHBANK is not set -+# CONFIG_ARCH_INTEGRATOR is not set -+# CONFIG_ARCH_KEYSTONE is not set -+# CONFIG_ARCH_OMAP2PLUS is not set -+# CONFIG_ARCH_MESON is not set -+# CONFIG_ARCH_MX7ULP is not set -+# CONFIG_ARCH_MX7 is not set -+# CONFIG_ARCH_MX6 is not set -+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/armv8/u-boot-spl.lds" -+# CONFIG_ARCH_MX5 is not set -+# CONFIG_ARCH_RMOBILE is not set -+# CONFIG_TARGET_S32V234EVB is not set -+# CONFIG_ARCH_SNAPDRAGON is not set -+# CONFIG_ARCH_SOCFPGA is not set -+# CONFIG_ARCH_SUNXI is not set -+# CONFIG_TARGET_TS4600 is not set -+# CONFIG_ARCH_VF610 is not set -+# CONFIG_ARCH_ZYNQ is not set -+# CONFIG_ARCH_ZYNQMP is not set -+# CONFIG_TEGRA is not set -+# CONFIG_TARGET_VEXPRESS64_AEMV8A is not set -+# CONFIG_TARGET_VEXPRESS64_BASE_FVP is not set -+# CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM is not set -+# CONFIG_TARGET_VEXPRESS64_JUNO is not set -+# CONFIG_TARGET_LS2080A_EMU is not set -+# CONFIG_TARGET_LS2080A_SIMU is not set -+# CONFIG_TARGET_LS2080AQDS is not set -+# CONFIG_TARGET_LS2080ARDB is not set -+# CONFIG_TARGET_LS2081ARDB is not set -+# CONFIG_TARGET_HIKEY is not set -+# CONFIG_TARGET_POPLAR is not set -+# CONFIG_TARGET_LS1012AQDS is not set -+# CONFIG_TARGET_LS1012ARDB is not set -+# CONFIG_TARGET_LS1012AFRDM is not set -+# CONFIG_TARGET_LS1021AQDS is not set -+# CONFIG_TARGET_LS1021ATWR is not set -+# CONFIG_TARGET_LS1021AIOT is not set -+# CONFIG_TARGET_LS1043AQDS is not set -+# CONFIG_TARGET_LS1043ARDB is not set -+# CONFIG_TARGET_LS1046AQDS is not set -+# CONFIG_TARGET_LS1046ARDB is not set -+# CONFIG_TARGET_H2200 is not set -+# CONFIG_TARGET_ZIPITZ2 is not set -+# CONFIG_TARGET_COLIBRI_PXA270 is not set -+# CONFIG_ARCH_UNIPHIER is not set -+# CONFIG_STM32 is not set -+# CONFIG_ARCH_STI is not set -+CONFIG_ARCH_ROCKCHIP=y -+# CONFIG_TARGET_THUNDERX_88XX is not set -+# CONFIG_ARCH_ASPEED is not set -+CONFIG_SPL_GPIO_SUPPORT=y -+CONFIG_SPL_LIBCOMMON_SUPPORT=y -+CONFIG_SPL_LIBGENERIC_SUPPORT=y -+CONFIG_SYS_MALLOC_F_LEN=0x80000 -+# CONFIG_ROCKCHIP_PX30 is not set -+CONFIG_TPL_LDSCRIPT="arch/arm/mach-rockchip/u-boot-tpl-v8.lds" -+CONFIG_TPL_TEXT_BASE=0xfdcc1000 -+CONFIG_TPL_MAX_SIZE=61440 -+# CONFIG_ROCKCHIP_RK3036 is not set -+# CONFIG_ROCKCHIP_RK3128 is not set -+# CONFIG_ROCKCHIP_RK3066 is not set -+# CONFIG_ROCKCHIP_RK3188 is not set -+# CONFIG_ROCKCHIP_RK322X is not set -+# CONFIG_ROCKCHIP_RK3288 is not set -+CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/make_fit_atf.sh" -+# CONFIG_ROCKCHIP_RK3308 is not set -+# CONFIG_ROCKCHIP_RK3328 is not set -+# CONFIG_ROCKCHIP_RK3368 is not set -+# CONFIG_ROCKCHIP_RK3399 is not set -+CONFIG_ROCKCHIP_RK3568=y -+# CONFIG_ROCKCHIP_RK1808 is not set -+# CONFIG_ROCKCHIP_RV1108 is not set -+# CONFIG_ROCKCHIP_RV1126 is not set -+# CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set -+CONFIG_TPL_ROCKCHIP_BACK_TO_BROM=y -+# CONFIG_ARM64_BOOT_AARCH32 is not set -+# CONFIG_ARM64_SWITCH_TO_AARCH32 is not set -+CONFIG_ROCKCHIP_BOOT_MODE_REG=0xfdc20200 -+CONFIG_ROCKCHIP_STIMER_BASE=0xfdd1c020 -+CONFIG_ROCKCHIP_IRAM_START_ADDR=0xfdcc0000 -+CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0 -+CONFIG_ROCKCHIP_BROM_HELPER=y -+# CONFIG_SPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set -+# CONFIG_TPL_ROCKCHIP_EARLYRETURN_TO_BROM is not set -+CONFIG_SPL_MMC_SUPPORT=y -+CONFIG_RKIMG_BOOTLOADER=y -+# CONFIG_RKIMG_ANDROID_BOOTMODE_LEGACY is not set -+CONFIG_ROCKCHIP_RESOURCE_IMAGE=y -+CONFIG_ROCKCHIP_DTB_VERIFY=y -+# CONFIG_ROCKCHIP_USB_BOOT is not set -+CONFIG_ROCKCHIP_FIT_IMAGE=y -+# CONFIG_ROCKCHIP_UIMAGE is not set -+# CONFIG_ROCKCHIP_EARLY_DISTRO_DTB is not set -+# CONFIG_ROCKCHIP_HWID_DTB is not set -+# CONFIG_ROCKCHIP_VENDOR_PARTITION is not set -+CONFIG_USING_KERNEL_DTB=y -+CONFIG_EMBED_KERNEL_DTB_PATH="rk3568-odroid-m1.dtb" -+# CONFIG_EMBED_KERNEL_DTB_ALWAYS is not set -+# CONFIG_ROCKCHIP_CRC is not set -+CONFIG_ROCKCHIP_SMCCC=y -+# CONFIG_ROCKCHIP_CRASH_DUMP is not set -+CONFIG_ROCKCHIP_PRELOADER_ATAGS=y -+CONFIG_ROCKCHIP_PRELOADER_SERIAL=y -+CONFIG_ROCKCHIP_FIT_IMAGE_PACK=y -+CONFIG_ROCKCHIP_UART_MUX_SEL_M=0 -+# CONFIG_ROCKCHIP_REBOOT_TEST is not set -+# CONFIG_ROCKCHIP_NEW_IDB is not set -+# CONFIG_GICV2 is not set -+CONFIG_GICV3=y -+CONFIG_ROCKCHIP_EMMC_IOMUX=y -+# CONFIG_ROCKCHIP_NAND_IOMUX is not set -+CONFIG_ROCKCHIP_SFC_IOMUX=y -+CONFIG_BASE_DEFCONFIG="" -+CONFIG_CHIP_NAME="" -+CONFIG_LOADER_INI="" -+CONFIG_TRUST_INI="" -+CONFIG_SPL_SERIAL_SUPPORT=y -+CONFIG_BOARD_SPECIFIC_OPTIONS=y -+# CONFIG_TPL_LIBCOMMON_SUPPORT is not set -+# CONFIG_TPL_LIBGENERIC_SUPPORT is not set -+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y -+CONFIG_ENV_SIZE=0x20000 -+CONFIG_ENV_OFFSET=0xe0000 -+# CONFIG_TARGET_EVB_RK3568 is not set -+CONFIG_TARGET_ODROID_M1=y -+CONFIG_SPL_LIBDISK_SUPPORT=y -+# CONFIG_SPL_NAND_SUPPORT is not set -+CONFIG_SPL_SPI_FLASH_SUPPORT=y -+CONFIG_SPL_SPI_SUPPORT=y -+# CONFIG_SPL_WATCHDOG_SUPPORT is not set -+# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE is not set -+CONFIG_IDENT_STRING="" -+# CONFIG_SPL_FAT_SUPPORT is not set -+# CONFIG_ARMV8_MULTIENTRY is not set -+# CONFIG_ARMV8_SET_SMPEN is not set -+ -+# -+# ARMv8 secure monitor firmware -+# -+# CONFIG_ARMV8_SEC_FIRMWARE_SUPPORT is not set -+# CONFIG_SPL_ARMV8_SEC_FIRMWARE_SUPPORT is not set -+CONFIG_PSCI_RESET=y -+# CONFIG_ARMV8_PSCI is not set -+# CONFIG_CMD_DEKBLOB is not set -+# CONFIG_CMD_HDMIDETECT is not set -+ -+# -+# ARM debug -+# -+CONFIG_DEFAULT_DEVICE_TREE="rk3568-odroid-m1" -+CONFIG_SMBIOS_PRODUCT_NAME="" -+CONFIG_DEBUG_UART=y -+# CONFIG_AHCI is not set -+ -+# -+# General setup -+# -+CONFIG_LOCALVERSION="-armbian-nomtd" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_CC_OPTIMIZE_FOR_SIZE=y -+CONFIG_DISTRO_DEFAULTS=y -+CONFIG_SYS_MALLOC_F=y -+CONFIG_SPL_SYS_MALLOC_F_LEN=0x80000 -+CONFIG_TPL_SYS_MALLOC_F_LEN=0x80000 -+CONFIG_EXPERT=y -+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -+# CONFIG_TOOLS_DEBUG is not set -+CONFIG_PHYS_64BIT=y -+ -+# -+# Boot images -+# -+CONFIG_ANDROID_BOOT_IMAGE=y -+CONFIG_FIT=y -+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y -+# CONFIG_FIT_SIGNATURE is not set -+# CONFIG_FIT_VERBOSE is not set -+# CONFIG_FIT_BEST_MATCH is not set -+CONFIG_FIT_IMAGE_POST_PROCESS=y -+CONFIG_FIT_HW_CRYPTO=y -+CONFIG_SPL_FIT=y -+# CONFIG_SPL_FIT_SIGNATURE is not set -+CONFIG_SPL_LOAD_FIT=y -+CONFIG_SPL_FIT_IMAGE_POST_PROCESS=y -+CONFIG_SPL_FIT_HW_CRYPTO=y -+# CONFIG_SPL_SYS_DCACHE_OFF is not set -+CONFIG_SPL_FIT_SOURCE="" -+CONFIG_SPL_FIT_IMAGE_KB=2048 -+CONFIG_SPL_FIT_IMAGE_MULTIPLE=1 -+# CONFIG_OF_BOARD_SETUP is not set -+# CONFIG_OF_SYSTEM_SETUP is not set -+# CONFIG_OF_STDOUT_VIA_ALIAS is not set -+CONFIG_SYS_EXTRA_OPTIONS="" -+CONFIG_ARCH_FIXUP_FDT_MEMORY=y -+ -+# -+# API -+# -+# CONFIG_API is not set -+ -+# -+# Boot timing -+# -+# CONFIG_BOOTSTAGE is not set -+CONFIG_BOOTSTAGE_USER_COUNT=20 -+CONFIG_BOOTSTAGE_RECORD_COUNT=30 -+CONFIG_BOOTSTAGE_STASH_ADDR=0 -+CONFIG_BOOTSTAGE_STASH_SIZE=0x1000 -+# CONFIG_BOOTSTAGE_PRINTF_TIMESTAMP is not set -+ -+# -+# Boot media -+# -+# CONFIG_NAND_BOOT is not set -+# CONFIG_ONENAND_BOOT is not set -+# CONFIG_QSPI_BOOT is not set -+# CONFIG_SATA_BOOT is not set -+# CONFIG_SD_BOOT is not set -+# CONFIG_SPI_BOOT is not set -+CONFIG_PASS_DEVICE_SERIAL_BY_FDT=y -+CONFIG_BOOTDELAY=0 -+CONFIG_USE_BOOTARGS=y -+CONFIG_BOOTARGS="" -+# CONFIG_IO_TRACE is not set -+ -+# -+# Console -+# -+CONFIG_MENU=y -+# CONFIG_CONSOLE_RECORD is not set -+# CONFIG_CONSOLE_DISABLE_CLI is not set -+# CONFIG_DISABLE_CONSOLE is not set -+CONFIG_LOGLEVEL=4 -+CONFIG_SPL_LOGLEVEL=4 -+# CONFIG_SILENT_CONSOLE is not set -+# CONFIG_PRE_CONSOLE_BUFFER is not set -+CONFIG_CONSOLE_MUX=y -+CONFIG_SYS_CONSOLE_IS_IN_ENV=y -+# CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE is not set -+# CONFIG_SYS_CONSOLE_ENV_OVERWRITE is not set -+CONFIG_SYS_CONSOLE_INFO_QUIET=y -+# CONFIG_SYS_STDIO_DEREGISTER is not set -+ -+# -+# Logging -+# -+# CONFIG_LOG is not set -+# CONFIG_SPL_LOG is not set -+CONFIG_DEFAULT_FDT_FILE="" -+# CONFIG_VERSION_VARIABLE is not set -+CONFIG_BOARD_LATE_INIT=y -+# CONFIG_DISPLAY_CPUINFO is not set -+CONFIG_DISPLAY_BOARDINFO=y -+ -+# -+# Start-up hooks -+# -+# CONFIG_ARCH_EARLY_INIT_R is not set -+# CONFIG_ARCH_MISC_INIT is not set -+# CONFIG_BOARD_EARLY_INIT_F is not set -+CONFIG_BOARD_EARLY_INIT_R=y -+ -+# -+# Android features support -+# -+CONFIG_ANDROID_BOOTLOADER=y -+# CONFIG_ANDROID_AB is not set -+# CONFIG_ANDROID_WRITE_KEYBOX is not set -+CONFIG_ANDROID_AVB=y -+# CONFIG_ANDROID_KEYMASTER_CA is not set -+CONFIG_ANDROID_BOOT_IMAGE_HASH=y -+# CONFIG_SKIP_RELOCATE_UBOOT is not set -+ -+# -+# Security support -+# -+CONFIG_HASH=y -+ -+# -+# SPL / TPL -+# -+CONFIG_SUPPORT_SPL=y -+CONFIG_SUPPORT_TPL=y -+CONFIG_SPL=y -+# CONFIG_SPL_ADC_SUPPORT is not set -+CONFIG_SPL_BOARD_INIT=y -+# CONFIG_SPL_BOOTROM_SUPPORT is not set -+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set -+# CONFIG_SPL_LEGACY_IMAGE_SUPPORT is not set -+CONFIG_SPL_SYS_MALLOC_SIMPLE=y -+# CONFIG_TPL_SYS_MALLOC_SIMPLE is not set -+# CONFIG_SPL_STACK_R is not set -+CONFIG_SPL_SEPARATE_BSS=y -+# CONFIG_SPL_DISPLAY_PRINT is not set -+CONFIG_SPL_SKIP_RELOCATE=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x4000 -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=1 -+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_NAME="uboot" -+# CONFIG_SPL_CRC32_SUPPORT is not set -+# CONFIG_SPL_MD5_SUPPORT is not set -+# CONFIG_SPL_SHA1_SUPPORT is not set -+CONFIG_SPL_SHA256_SUPPORT=y -+# CONFIG_SPL_FIT_IMAGE_TINY is not set -+# CONFIG_SPL_CPU_SUPPORT is not set -+CONFIG_SPL_CRYPTO_SUPPORT=y -+CONFIG_SPL_HASH_SUPPORT=y -+# CONFIG_SPL_DMA_SUPPORT is not set -+# CONFIG_SPL_ENV_SUPPORT is not set -+# CONFIG_SPL_EXT_SUPPORT is not set -+# CONFIG_SPL_FPGA_SUPPORT is not set -+# CONFIG_SPL_I2C_SUPPORT is not set -+CONFIG_SPL_MMC_WRITE=y -+# CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT is not set -+# CONFIG_SPL_MTD_SUPPORT is not set -+# CONFIG_SPL_MUSB_NEW_SUPPORT is not set -+# CONFIG_SPL_NET_SUPPORT is not set -+# CONFIG_SPL_NO_CPU_SUPPORT is not set -+# CONFIG_SPL_NOR_SUPPORT is not set -+# CONFIG_SPL_XIP_SUPPORT is not set -+# CONFIG_SPL_ONENAND_SUPPORT is not set -+# CONFIG_SPL_OS_BOOT is not set -+# CONFIG_SPL_PCI_SUPPORT is not set -+# CONFIG_SPL_PCH_SUPPORT is not set -+# CONFIG_SPL_POST_MEM_SUPPORT is not set -+# CONFIG_SPL_POWER_SUPPORT is not set -+# CONFIG_SPL_PWM_SUPPORT is not set -+# CONFIG_SPL_RAM_SUPPORT is not set -+# CONFIG_SPL_RTC_SUPPORT is not set -+# CONFIG_SPL_SATA_SUPPORT is not set -+# CONFIG_SPL_RKNAND_SUPPORT is not set -+# CONFIG_SPL_SPI_FLASH_TINY is not set -+# CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT is not set -+# CONFIG_SPL_SPI_LOAD is not set -+# CONFIG_SPL_USB_HOST_SUPPORT is not set -+# CONFIG_SPL_USB_GADGET is not set -+# CONFIG_SPL_YMODEM_SUPPORT is not set -+CONFIG_SPL_ATF=y -+# CONFIG_SPL_OPTEE_SUPPORT is not set -+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y -+# CONFIG_SPL_OPTEE is not set -+CONFIG_SPL_AB=y -+# CONFIG_SPL_LOAD_RKFW is not set -+# CONFIG_SPL_KERNEL_BOOT is not set -+CONFIG_TPL=y -+# CONFIG_TPL_BOARD_INIT is not set -+# CONFIG_TPL_NEEDS_SEPARATE_TEXT_BASE is not set -+# CONFIG_TPL_NEEDS_SEPARATE_STACK is not set -+# CONFIG_TPL_BOOTROM_SUPPORT is not set -+# CONFIG_TPL_DRIVERS_MISC_SUPPORT is not set -+# CONFIG_TPL_ENV_SUPPORT is not set -+# CONFIG_TPL_I2C_SUPPORT is not set -+CONFIG_TPL_TINY_FRAMEWORK=y -+# CONFIG_TPL_MPC8XXX_INIT_DDR_SUPPORT is not set -+# CONFIG_TPL_MMC_SUPPORT is not set -+# CONFIG_TPL_NAND_SUPPORT is not set -+CONFIG_TPL_SERIAL_SUPPORT=y -+# CONFIG_TPL_SPI_FLASH_SUPPORT is not set -+# CONFIG_TPL_SPI_SUPPORT is not set -+ -+# -+# USBPLUG -+# -+# CONFIG_SUPPORT_USBPLUG is not set -+ -+# -+# Command line interface -+# -+CONFIG_CMDLINE=y -+CONFIG_HUSH_PARSER=y -+CONFIG_SYS_PROMPT="=> " -+ -+# -+# Autoboot options -+# -+CONFIG_AUTOBOOT=y -+# CONFIG_AUTOBOOT_KEYED is not set -+ -+# -+# FASTBOOT -+# -+CONFIG_FASTBOOT=y -+CONFIG_USB_FUNCTION_FASTBOOT=y -+# CONFIG_UDP_FUNCTION_FASTBOOT is not set -+CONFIG_CMD_FASTBOOT=y -+CONFIG_FASTBOOT_BUF_ADDR=0xc00800 -+CONFIG_FASTBOOT_BUF_SIZE=0x04000000 -+CONFIG_FASTBOOT_USB_DEV=0 -+CONFIG_FASTBOOT_FLASH=y -+CONFIG_FASTBOOT_FLASH_MMC_DEV=0 -+# CONFIG_RK_AVB_LIBAVB_ENABLE_ATH_UNLOCK is not set -+ -+# -+# Commands -+# -+ -+# -+# Info commands -+# -+CONFIG_CMD_BDI=y -+# CONFIG_CMD_CONFIG is not set -+CONFIG_CMD_CONSOLE=y -+# CONFIG_CMD_CPU is not set -+# CONFIG_CMD_LICENSE is not set -+ -+# -+# Boot commands -+# -+CONFIG_CMD_BOOTD=y -+CONFIG_CMD_BOOTM=y -+CONFIG_CMD_BOOTZ=y -+CONFIG_CMD_BOOTI=y -+CONFIG_CMD_BOOTEFI=y -+# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set -+# CONFIG_CMD_BOOTMENU is not set -+CONFIG_CMD_DTIMG=y -+# CONFIG_CMD_ELF is not set -+CONFIG_CMD_FDT=y -+CONFIG_CMD_GO=y -+CONFIG_CMD_RUN=y -+# CONFIG_CMD_IMI is not set -+# CONFIG_CMD_IMLS is not set -+# CONFIG_CMD_XIMG is not set -+# CONFIG_CMD_POWEROFF is not set -+# CONFIG_CMD_SPL is not set -+# CONFIG_CMD_THOR_DOWNLOAD is not set -+# CONFIG_CMD_ZBOOT is not set -+ -+# -+# Environment commands -+# -+# CONFIG_CMD_ASKENV is not set -+CONFIG_CMD_EXPORTENV=y -+CONFIG_CMD_IMPORTENV=y -+CONFIG_CMD_EDITENV=y -+# CONFIG_CMD_GREPENV is not set -+CONFIG_CMD_SAVEENV=y -+CONFIG_CMD_ENV_EXISTS=y -+# CONFIG_CMD_ENV_CALLBACK is not set -+# CONFIG_CMD_ENV_FLAGS is not set -+ -+# -+# Memory commands -+# -+CONFIG_CMD_CRC32=y -+# CONFIG_CRC32_VERIFY is not set -+# CONFIG_CMD_EEPROM is not set -+# CONFIG_LOOPW is not set -+# CONFIG_CMD_MD5SUM is not set -+# CONFIG_CMD_MEMINFO is not set -+CONFIG_CMD_MEMORY=y -+# CONFIG_CMD_MEMTEST is not set -+# CONFIG_CMD_MX_CYCLIC is not set -+# CONFIG_CMD_SHA1SUM is not set -+# CONFIG_CMD_STRINGS is not set -+# CONFIG_CMD_CRYPTO is not set -+CONFIG_CMD_CRYPTO_SUM=y -+ -+# -+# Compression commands -+# -+# CONFIG_CMD_LZMADEC is not set -+CONFIG_CMD_UNZIP=y -+# CONFIG_CMD_ZIP is not set -+ -+# -+# Device access commands -+# -+# CONFIG_CMD_ARMFLASH is not set -+CONFIG_CMD_BCB=y -+# CONFIG_CMD_CLK is not set -+# CONFIG_CMD_DEMO is not set -+# CONFIG_CMD_DFU is not set -+CONFIG_CMD_DM=y -+# CONFIG_CMD_FDC is not set -+# CONFIG_CMD_FLASH is not set -+# CONFIG_CMD_FPGA is not set -+# CONFIG_CMD_FPGAD is not set -+# CONFIG_CMD_FUSE is not set -+CONFIG_CMD_GPIO=y -+CONFIG_CMD_GPT=y -+CONFIG_RANDOM_UUID=y -+# CONFIG_CMD_GPT_RENAME is not set -+# CONFIG_CMD_IDE is not set -+CONFIG_CMD_INI=y -+# CONFIG_CMD_IO is not set -+# CONFIG_CMD_IOTRACE is not set -+CONFIG_CMD_I2C=y -+# CONFIG_CMD_LOADB is not set -+# CONFIG_CMD_LOADS is not set -+# CONFIG_CMD_LOAD_ANDROID is not set -+CONFIG_CMD_BOOT_ANDROID=y -+CONFIG_CMD_BOOT_FIT=y -+CONFIG_CMD_BOOT_ROCKCHIP=y -+CONFIG_CMD_MMC=y -+# CONFIG_CMD_MTD is not set -+# CONFIG_CMD_NAND is not set -+# CONFIG_CMD_MMC_SPI is not set -+# CONFIG_CMD_ONENAND is not set -+CONFIG_CMD_PART=y -+# CONFIG_CMD_PCI is not set -+# CONFIG_CMD_PCMCIA is not set -+# CONFIG_CMD_READ is not set -+CONFIG_CMD_ROCKUSB=y -+# CONFIG_CMD_RK_SECURE_STORAGE is not set -+# CONFIG_CMD_SATA is not set -+# CONFIG_CMD_SAVES is not set -+# CONFIG_CMD_SDRAM is not set -+CONFIG_CMD_SF=y -+# CONFIG_CMD_SF_TEST is not set -+# CONFIG_CMD_SPI is not set -+# CONFIG_CMD_TSI148 is not set -+# CONFIG_CMD_UNIVERSE is not set -+CONFIG_CMD_USB=y -+# CONFIG_CMD_USB_SDP is not set -+CONFIG_CMD_USB_MASS_STORAGE=y -+ -+# -+# Shell scripting commands -+# -+CONFIG_CMD_ECHO=y -+# CONFIG_CMD_ITEST is not set -+CONFIG_CMD_SOURCE=y -+# CONFIG_CMD_SETEXPR is not set -+ -+# -+# Network commands -+# -+CONFIG_CMD_NET=y -+CONFIG_CMD_TFTPPUT=y -+CONFIG_CMD_TFTP_BOOTM=y -+CONFIG_CMD_TFTP_FLASH=y -+# CONFIG_CMD_TFTP_UPDATE is not set -+# CONFIG_CMD_TFTPSRV is not set -+# CONFIG_CMD_RARP is not set -+CONFIG_CMD_DHCP=y -+CONFIG_CMD_PXE=y -+CONFIG_CMD_NFS=y -+CONFIG_CMD_MII=y -+CONFIG_CMD_PING=y -+# CONFIG_CMD_CDP is not set -+# CONFIG_CMD_SNTP is not set -+# CONFIG_CMD_DNS is not set -+# CONFIG_CMD_LINK_LOCAL is not set -+# CONFIG_CMD_ETHSW is not set -+# CONFIG_CMD_MEMTESTER is not set -+# CONFIG_CMD_DDR_TEST_TOOL is not set -+ -+# -+# Misc commands -+# -+CONFIG_CMD_BMP=y -+# CONFIG_CMD_BSP is not set -+# CONFIG_CMD_BKOPS_ENABLE is not set -+# CONFIG_CMD_CACHE is not set -+# CONFIG_CMD_DISPLAY is not set -+# CONFIG_CMD_LED is not set -+# CONFIG_CMD_DATE is not set -+# CONFIG_CMD_TIME is not set -+# CONFIG_CMD_GETTIME is not set -+# CONFIG_CMD_RNG is not set -+# CONFIG_CMD_MISC is not set -+# CONFIG_CMD_TIMER is not set -+# CONFIG_CMD_QFW is not set -+# CONFIG_CMD_TERMINAL is not set -+# CONFIG_CMD_UUID is not set -+ -+# -+# Power commands -+# -+CONFIG_CMD_PMIC=y -+CONFIG_CMD_REGULATOR=y -+ -+# -+# Security commands -+# -+# CONFIG_CMD_AES is not set -+# CONFIG_CMD_BLOB is not set -+# CONFIG_CMD_HASH is not set -+ -+# -+# Firmware commands -+# -+ -+# -+# Filesystem commands -+# -+CONFIG_CMD_CRAMFS=y -+CONFIG_CMD_EXT2=y -+CONFIG_CMD_EXT4=y -+# CONFIG_CMD_EXT4_WRITE is not set -+CONFIG_CMD_FAT=y -+CONFIG_CMD_FS_GENERIC=y -+# CONFIG_CMD_FS_UUID is not set -+# CONFIG_CMD_JFFS2 is not set -+# CONFIG_CMD_MTDPARTS is not set -+# CONFIG_CMD_MTD_BLK is not set -+# CONFIG_CMD_REISER is not set -+# CONFIG_CMD_SCSI is not set -+# CONFIG_CMD_ZFS is not set -+ -+# -+# Debug commands -+# -+CONFIG_CMD_ATAGS=y -+# CONFIG_CMD_BEDBUG is not set -+# CONFIG_CMD_DIAG is not set -+# CONFIG_CMD_KGDB is not set -+# CONFIG_CMD_LOG is not set -+# CONFIG_CMD_TRACE is not set -+# CONFIG_CMD_UBI is not set -+ -+# -+# Partition Types -+# -+CONFIG_PARTITIONS=y -+# CONFIG_MAC_PARTITION is not set -+# CONFIG_SPL_MAC_PARTITION is not set -+CONFIG_DOS_PARTITION=y -+# CONFIG_SPL_DOS_PARTITION is not set -+# CONFIG_ISO_PARTITION is not set -+# CONFIG_SPL_ISO_PARTITION is not set -+# CONFIG_AMIGA_PARTITION is not set -+# CONFIG_SPL_AMIGA_PARTITION is not set -+CONFIG_EFI_PARTITION=y -+CONFIG_EFI_PARTITION_ENTRIES_NUMBERS=64 -+CONFIG_EFI_PARTITION_ENTRIES_OFF=0 -+CONFIG_SPL_EFI_PARTITION=y -+CONFIG_PARTITION_UUIDS=y -+CONFIG_SPL_PARTITION_UUIDS=y -+CONFIG_PARTITION_TYPE_GUID=y -+# CONFIG_RKPARM_PARTITION is not set -+# CONFIG_SPL_ROCKCHIP_PARTITION is not set -+CONFIG_SUPPORT_OF_CONTROL=y -+CONFIG_DTC=y -+ -+# -+# Device Tree Control -+# -+CONFIG_OF_CONTROL=y -+# CONFIG_OF_BOARD_FIXUP is not set -+CONFIG_SPL_OF_CONTROL=y -+# CONFIG_SPL_DTB_MINIMUM is not set -+# CONFIG_TPL_OF_CONTROL is not set -+CONFIG_OF_LIVE=y -+CONFIG_OF_SEPARATE=y -+# CONFIG_OF_EMBED is not set -+# CONFIG_OF_BOARD is not set -+# CONFIG_OF_PRIOR_STAGE is not set -+CONFIG_OF_LIST="rk3568-odroid-m1" -+# CONFIG_MULTI_DTB_FIT is not set -+# CONFIG_SPL_MULTI_DTB_FIT is not set -+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" -+CONFIG_OF_U_BOOT_REMOVE_PROPS="" -+# CONFIG_SPL_OF_PLATDATA is not set -+CONFIG_MKIMAGE_DTC_PATH="dtc" -+ -+# -+# Environment -+# -+# CONFIG_ENV_IS_NOWHERE is not set -+# CONFIG_ENV_IS_IN_EEPROM is not set -+# CONFIG_ENV_IS_IN_FAT is not set -+# CONFIG_ENV_IS_IN_FLASH is not set -+# CONFIG_ENV_IS_IN_MMC is not set -+# CONFIG_ENV_IS_IN_NAND is not set -+# CONFIG_ENV_IS_IN_NVRAM is not set -+# CONFIG_ENV_IS_IN_ONENAND is not set -+# CONFIG_ENV_IS_IN_REMOTE is not set -+CONFIG_ENV_IS_IN_SPI_FLASH=y -+# CONFIG_ENV_IS_IN_UBI is not set -+# CONFIG_ENV_IS_IN_BLK_DEV is not set -+# CONFIG_ENV_AES is not set -+CONFIG_NET=y -+# CONFIG_NET_RANDOM_ETHADDR is not set -+# CONFIG_NETCONSOLE is not set -+# CONFIG_NET_TFTP_VARS is not set -+CONFIG_BOOTP_PXE_CLIENTARCH=0x16 -+CONFIG_BOOTP_VCI_STRING="U-Boot.armv8" -+ -+# -+# Device Drivers -+# -+ -+# -+# Generic Driver Options -+# -+CONFIG_DM=y -+CONFIG_SPL_DM=y -+# CONFIG_TPL_DM is not set -+CONFIG_DM_WARN=y -+# CONFIG_DM_DEBUG is not set -+CONFIG_DM_DEVICE_REMOVE=y -+CONFIG_DM_STDIO=y -+CONFIG_DM_SEQ_ALIAS=y -+# CONFIG_SPL_DM_SEQ_ALIAS is not set -+CONFIG_REGMAP=y -+CONFIG_SPL_REGMAP=y -+CONFIG_SYSCON=y -+CONFIG_SPL_SYSCON=y -+# CONFIG_DEVRES is not set -+CONFIG_SIMPLE_BUS=y -+CONFIG_SPL_SIMPLE_BUS=y -+CONFIG_OF_TRANSLATE=y -+# CONFIG_SPL_OF_TRANSLATE is not set -+CONFIG_ADC=y -+# CONFIG_ADC_REQ_REGULATOR is not set -+# CONFIG_ADC_EXYNOS is not set -+# CONFIG_ADC_SANDBOX is not set -+CONFIG_SARADC_ROCKCHIP=y -+# CONFIG_SATA is not set -+# CONFIG_SCSI_AHCI is not set -+ -+# -+# SATA/SCSI device support -+# -+CONFIG_BLK=y -+CONFIG_SPL_BLK=y -+# CONFIG_SPL_BLK_READ_PREPARE is not set -+# CONFIG_BLOCK_CACHE is not set -+# CONFIG_IDE is not set -+ -+# -+# Boot count support -+# -+# CONFIG_BOOTCOUNT is not set -+ -+# -+# Clock -+# -+CONFIG_CLK=y -+CONFIG_SPL_CLK=y -+# CONFIG_CLK_AT91 is not set -+# CONFIG_CPU is not set -+# CONFIG_AMP is not set -+ -+# -+# Hardware crypto devices -+# -+CONFIG_DM_CRYPTO=y -+CONFIG_SPL_DM_CRYPTO=y -+# CONFIG_FSL_CAAM is not set -+# CONFIG_SYS_FSL_SEC_BE is not set -+# CONFIG_SYS_FSL_SEC_LE is not set -+CONFIG_ROCKCHIP_RSA=y -+CONFIG_SPL_ROCKCHIP_RSA=y -+# CONFIG_ROCKCHIP_CIPHER is not set -+# CONFIG_SPL_ROCKCHIP_CIPHER is not set -+# CONFIG_ROCKCHIP_HMAC is not set -+# CONFIG_SPL_ROCKCHIP_HMAC is not set -+# CONFIG_ROCKCHIP_CRYPTO_V1 is not set -+# CONFIG_SPL_ROCKCHIP_CRYPTO_V1 is not set -+CONFIG_ROCKCHIP_CRYPTO_V2=y -+CONFIG_SPL_ROCKCHIP_CRYPTO_V2=y -+CONFIG_DM_RNG=y -+CONFIG_RNG_ROCKCHIP=y -+ -+# -+# Demo for driver model -+# -+# CONFIG_DM_DEMO is not set -+ -+# -+# DFU support -+# -+ -+# -+# DMA Support -+# -+# CONFIG_DMA is not set -+# CONFIG_TI_EDMA3 is not set -+CONFIG_FIRMWARE=y -+CONFIG_ARM_PSCI_FW=y -+# CONFIG_SCMI_FIRMWARE is not set -+ -+# -+# FPGA support -+# -+# CONFIG_FPGA_ALTERA is not set -+# CONFIG_FPGA_SOCFPGA is not set -+# CONFIG_FPGA_XILINX is not set -+# CONFIG_FPGA_ROCKCHIP is not set -+ -+# -+# GPIO Support -+# -+CONFIG_DM_GPIO=y -+# CONFIG_ALTERA_PIO is not set -+# CONFIG_DWAPB_GPIO is not set -+# CONFIG_AT91_GPIO is not set -+# CONFIG_ATMEL_PIO4 is not set -+# CONFIG_INTEL_BROADWELL_GPIO is not set -+# CONFIG_INTEL_ICH6_GPIO is not set -+# CONFIG_IMX_RGPIO2P is not set -+# CONFIG_LPC32XX_GPIO is not set -+# CONFIG_MSM_GPIO is not set -+# CONFIG_CMD_PCA953X is not set -+# CONFIG_PCF8575_GPIO is not set -+CONFIG_ROCKCHIP_GPIO=y -+CONFIG_ROCKCHIP_GPIO_V2=y -+# CONFIG_CMD_TCA642X is not set -+# CONFIG_TEGRA_GPIO is not set -+# CONFIG_TEGRA186_GPIO is not set -+# CONFIG_VYBRID_GPIO is not set -+# CONFIG_DM_74X164 is not set -+# CONFIG_DM_PCA953X is not set -+# CONFIG_MPC85XX_GPIO is not set -+ -+# -+# I2C support -+# -+CONFIG_DM_I2C=y -+# CONFIG_DM_I2C_COMPAT is not set -+# CONFIG_I2C_SET_DEFAULT_BUS_NUM is not set -+# CONFIG_DM_I2C_GPIO is not set -+# CONFIG_SYS_I2C_FSL is not set -+# CONFIG_SYS_I2C_CADENCE is not set -+# CONFIG_SYS_I2C_DW is not set -+# CONFIG_SYS_I2C_INTEL is not set -+# CONFIG_SYS_I2C_IMX_LPI2C is not set -+CONFIG_SYS_I2C_ROCKCHIP=y -+# CONFIG_SYS_I2C_MVTWSI is not set -+# CONFIG_I2C_MUX is not set -+CONFIG_INPUT=y -+# CONFIG_SPL_INPUT is not set -+# CONFIG_DM_KEYBOARD is not set -+# CONFIG_DM_KEY is not set -+# CONFIG_DM_RC is not set -+# CONFIG_SPL_DM_KEYBOARD is not set -+# CONFIG_CROS_EC_KEYB is not set -+ -+# -+# LED Support -+# -+CONFIG_LED=y -+CONFIG_LED_BLINK=y -+CONFIG_SPL_LED=y -+CONFIG_LED_GPIO=y -+CONFIG_SPL_LED_GPIO=y -+CONFIG_LED_STATUS=y -+CONFIG_LED_STATUS_OFF=0 -+CONFIG_LED_STATUS_BLINKING=1 -+CONFIG_LED_STATUS_ON=2 -+CONFIG_LED_STATUS_GPIO=y -+CONFIG_LED_STATUS_BOARD_SPECIFIC=y -+ -+# -+# LEDs parameters -+# -+CONFIG_LED_STATUS0=y -+CONFIG_LED_STATUS_BIT=22 -+CONFIG_LED_STATUS_STATE=2 -+CONFIG_LED_STATUS_FREQ=2 -+CONFIG_LED_STATUS1=y -+CONFIG_LED_STATUS_BIT1=15 -+CONFIG_LED_STATUS_STATE1=2 -+CONFIG_LED_STATUS_FREQ1=2 -+# CONFIG_LED_STATUS2 is not set -+# CONFIG_LED_STATUS3 is not set -+# CONFIG_LED_STATUS4 is not set -+# CONFIG_LED_STATUS5 is not set -+CONFIG_LED_STATUS_BOOT_ENABLE=y -+CONFIG_LED_STATUS_BOOT=0 -+# CONFIG_LED_STATUS_RED_ENABLE is not set -+# CONFIG_LED_STATUS_YELLOW_ENABLE is not set -+# CONFIG_LED_STATUS_BLUE_ENABLE is not set -+# CONFIG_LED_STATUS_GREEN_ENABLE is not set -+# CONFIG_LED_STATUS_CMD is not set -+ -+# -+# Mailbox Controller Support -+# -+# CONFIG_DM_MAILBOX is not set -+ -+# -+# Memory Controller drivers -+# -+ -+# -+# Multifunction device drivers -+# -+CONFIG_MISC=y -+CONFIG_SPL_MISC=y -+# CONFIG_MISC_DECOMPRESS is not set -+# CONFIG_SPL_MISC_DECOMPRESS is not set -+# CONFIG_ALTERA_SYSID is not set -+# CONFIG_ATSHA204A is not set -+# CONFIG_ROCKCHIP_EFUSE is not set -+CONFIG_ROCKCHIP_OTP=y -+CONFIG_SPL_ROCKCHIP_SECURE_OTP_V1=y -+# CONFIG_SPL_ROCKCHIP_SECURE_OTP_V2 is not set -+# CONFIG_CROS_EC is not set -+# CONFIG_DS4510 is not set -+# CONFIG_FSL_SEC_MON is not set -+# CONFIG_MXC_OCOTP is not set -+# CONFIG_NUVOTON_NCT6102D is not set -+# CONFIG_PWRSEQ is not set -+# CONFIG_PCA9551_LED is not set -+# CONFIG_WINBOND_W83627 is not set -+# CONFIG_I2C_EEPROM is not set -+ -+# -+# MMC Host controller Support -+# -+CONFIG_MMC=y -+CONFIG_MMC_WRITE=y -+CONFIG_DM_MMC=y -+CONFIG_SPL_DM_MMC=y -+# CONFIG_SPL_MMC_TINY is not set -+CONFIG_SUPPORT_EMMC_RPMB=y -+CONFIG_MMC_DW=y -+# CONFIG_MMC_DW_K3 is not set -+CONFIG_MMC_DW_ROCKCHIP=y -+# CONFIG_MMC_MXC is not set -+# CONFIG_MMC_PCI is not set -+# CONFIG_MMC_OMAP_HS is not set -+CONFIG_MMC_SDHCI=y -+CONFIG_MMC_SDHCI_SDMA=y -+# CONFIG_MMC_SDHCI_BCMSTB is not set -+# CONFIG_MMC_SDHCI_CADENCE is not set -+# CONFIG_MMC_SDHCI_KONA is not set -+# CONFIG_MMC_SDHCI_MSM is not set -+CONFIG_MMC_SDHCI_ROCKCHIP=y -+# CONFIG_MMC_SDHCI_S5P is not set -+# CONFIG_MMC_SDHCI_SPEAR is not set -+# CONFIG_MMC_SDHCI_STI is not set -+# CONFIG_MMC_SDHCI_XENON is not set -+# CONFIG_MMC_SDHCI_TANGIER is not set -+# CONFIG_MMC_USE_PRE_CONFIG is not set -+ -+# -+# MTD Support -+# -+# CONFIG_MTD is not set -+# CONFIG_MTD_NOR_FLASH is not set -+# CONFIG_MTD_DEVICE is not set -+# CONFIG_FLASH_CFI_DRIVER is not set -+# CONFIG_MTD_NAND_BBT_USING_FLASH is not set -+# CONFIG_NAND is not set -+ -+# -+# SPI Flash Support -+# -+CONFIG_DM_SPI_FLASH=y -+# CONFIG_SPI_FLASH is not set -+CONFIG_SF_DEFAULT_BUS=0 -+CONFIG_SF_DEFAULT_CS=0 -+CONFIG_SF_DEFAULT_MODE=3 -+CONFIG_SF_DEFAULT_SPEED=20000000 -+ -+# -+# UBI support -+# -+# CONFIG_CONFIG_UBI_SILENCE_MSG is not set -+# CONFIG_MTD_UBI is not set -+# CONFIG_BITBANGMII is not set -+# CONFIG_MV88E6352_SWITCH is not set -+CONFIG_PHYLIB=y -+# CONFIG_MV88E61XX_SWITCH is not set -+# CONFIG_PHYLIB_10G is not set -+# CONFIG_PHY_AQUANTIA is not set -+# CONFIG_PHY_ATHEROS is not set -+# CONFIG_PHY_BROADCOM is not set -+# CONFIG_PHY_CORTINA is not set -+# CONFIG_PHY_DAVICOM is not set -+# CONFIG_PHY_ET1011C is not set -+# CONFIG_PHY_LXT is not set -+# CONFIG_PHY_MARVELL is not set -+# CONFIG_PHY_MICREL is not set -+# CONFIG_PHY_MSCC is not set -+# CONFIG_PHY_NATSEMI is not set -+CONFIG_PHY_REALTEK=y -+CONFIG_RTL8211X_PHY_FORCE_MASTER=y -+# CONFIG_PHY_SMSC is not set -+# CONFIG_PHY_TERANETICS is not set -+# CONFIG_PHY_TI is not set -+# CONFIG_PHY_VITESSE is not set -+# CONFIG_PHY_XILINX is not set -+# CONFIG_PHY_FIXED is not set -+CONFIG_DM_ETH=y -+CONFIG_DM_MDIO=y -+CONFIG_DM_ETH_PHY=y -+CONFIG_NETDEVICES=y -+# CONFIG_PHY_GIGE is not set -+# CONFIG_ALTERA_TSE is not set -+# CONFIG_BCM_SF2_ETH is not set -+# CONFIG_DWC_ETH_QOS is not set -+# CONFIG_E1000 is not set -+# CONFIG_ETH_DESIGNWARE is not set -+# CONFIG_ETHOC is not set -+# CONFIG_FTMAC100 is not set -+# CONFIG_MACB is not set -+# CONFIG_RGMII is not set -+# CONFIG_RTL8139 is not set -+# CONFIG_RTL8169 is not set -+# CONFIG_SUN7I_GMAC is not set -+# CONFIG_SUN4I_EMAC is not set -+# CONFIG_SUN8I_EMAC is not set -+# CONFIG_PCI is not set -+ -+# -+# PHY Subsystem -+# -+CONFIG_PHY=y -+# CONFIG_SPL_PHY is not set -+# CONFIG_NOP_PHY is not set -+CONFIG_PHY_ROCKCHIP_INNO_USB2=y -+CONFIG_PHY_ROCKCHIP_NANENG_COMBOPHY=y -+# CONFIG_PHY_ROCKCHIP_NANENG_USB2 is not set -+# CONFIG_PHY_ROCKCHIP_INNO_USB3 is not set -+CONFIG_PHY_ROCKCHIP_NANENG_EDP=y -+# CONFIG_PHY_ROCKCHIP_SNPS_PCIE3 is not set -+# CONFIG_PHY_ROCKCHIP_TYPEC is not set -+# CONFIG_MVEBU_COMPHY_SUPPORT is not set -+ -+# -+# Pin controllers -+# -+CONFIG_PINCTRL=y -+CONFIG_PINCTRL_FULL=y -+CONFIG_PINCTRL_GENERIC=y -+CONFIG_PINMUX=y -+# CONFIG_PINCONF is not set -+CONFIG_SPL_PINCTRL=y -+CONFIG_SPL_PINCTRL_FULL=y -+CONFIG_SPL_PINCTRL_GENERIC=y -+CONFIG_SPL_PINMUX=y -+# CONFIG_SPL_PINCONF is not set -+# CONFIG_PINCTRL_AT91 is not set -+# CONFIG_PINCTRL_AT91PIO4 is not set -+CONFIG_PINCTRL_ROCKCHIP=y -+CONFIG_SPL_PINCTRL_ROCKCHIP=y -+# CONFIG_PINCTRL_SINGLE is not set -+# CONFIG_PINCTRL_STM32 is not set -+ -+# -+# Power -+# -+ -+# -+# Power Domain Support -+# -+# CONFIG_POWER_DOMAIN is not set -+CONFIG_DM_FUEL_GAUGE=y -+# CONFIG_SPL_DM_FUEL_GAUGE is not set -+# CONFIG_POWER_FG_CW201X is not set -+# CONFIG_POWER_FG_RK818 is not set -+CONFIG_POWER_FG_RK817=y -+# CONFIG_POWER_FG_RK816 is not set -+# CONFIG_SPL_POWER_FG_RK816 is not set -+ -+# -+# IO Domain Support -+# -+CONFIG_IO_DOMAIN=y -+CONFIG_ROCKCHIP_IO_DOMAIN=y -+CONFIG_DM_PMIC=y -+# CONFIG_SPL_DM_PMIC is not set -+CONFIG_PMIC_CHILDREN=y -+CONFIG_SPL_PMIC_CHILDREN=y -+# CONFIG_PMIC_ACT8846 is not set -+# CONFIG_PMIC_AS3722 is not set -+# CONFIG_DM_PMIC_PFUZE100 is not set -+# CONFIG_DM_PMIC_MAX77686 is not set -+# CONFIG_DM_PMIC_MAX8998 is not set -+# CONFIG_PMIC_MAX8997 is not set -+# CONFIG_PMIC_PM8916 is not set -+CONFIG_PMIC_RK8XX=y -+# CONFIG_PMIC_S2MPS11 is not set -+# CONFIG_DM_PMIC_SANDBOX is not set -+# CONFIG_PMIC_S5M8767 is not set -+# CONFIG_PMIC_RN5T567 is not set -+# CONFIG_PMIC_TPS65090 is not set -+# CONFIG_PMIC_PALMAS is not set -+# CONFIG_PMIC_LP873X is not set -+# CONFIG_PMIC_LP87565 is not set -+# CONFIG_POWER_MC34VR500 is not set -+CONFIG_DM_REGULATOR=y -+# CONFIG_SPL_DM_REGULATOR is not set -+# CONFIG_REGULATOR_FAN53555 is not set -+# CONFIG_REGULATOR_PWM is not set -+CONFIG_DM_REGULATOR_FIXED=y -+# CONFIG_SPL_DM_REGULATOR_FIXED is not set -+# CONFIG_DM_REGULATOR_GPIO is not set -+# CONFIG_REGULATOR_RK860X is not set -+CONFIG_REGULATOR_RK8XX=y -+# CONFIG_DM_DVFS is not set -+# CONFIG_CHARGER_BQ25700 is not set -+# CONFIG_DM_CHARGE_DISPLAY is not set -+CONFIG_DM_PWM=y -+# CONFIG_PWM_EXYNOS is not set -+CONFIG_PWM_ROCKCHIP=y -+# CONFIG_PWM_SANDBOX is not set -+# CONFIG_PWM_TEGRA is not set -+CONFIG_RAM=y -+CONFIG_SPL_RAM=y -+CONFIG_TPL_RAM=y -+# CONFIG_STM32_SDRAM is not set -+# CONFIG_DM_RAMDISK is not set -+# CONFIG_ROCKCHIP_DMC is not set -+CONFIG_ROCKCHIP_SDRAM_COMMON=y -+# CONFIG_ROCKCHIP_DRAM_EXTENDED_TEMP_SUPPORT is not set -+CONFIG_ROCKCHIP_TPL_INIT_DRAM_TYPE=0 -+ -+# -+# Remote Processor drivers -+# -+ -+# -+# Reset Controller Support -+# -+CONFIG_DM_RESET=y -+CONFIG_SPL_DM_RESET=y -+CONFIG_RESET_ROCKCHIP=y -+CONFIG_SPL_RESET_ROCKCHIP=y -+# CONFIG_RESET_SCMI is not set -+# CONFIG_RKNAND is not set -+# CONFIG_RKFLASH is not set -+ -+# -+# Real Time Clock -+# -+# CONFIG_DM_RTC is not set -+# CONFIG_SCSI is not set -+# CONFIG_DM_SCSI is not set -+ -+# -+# Serial drivers -+# -+CONFIG_BAUDRATE=1500000 -+CONFIG_REQUIRE_SERIAL_CONSOLE=y -+CONFIG_SERIAL_PRESENT=y -+CONFIG_SPL_SERIAL_PRESENT=y -+CONFIG_DM_SERIAL=y -+# CONFIG_SERIAL_RX_BUFFER is not set -+CONFIG_SPL_DM_SERIAL=y -+CONFIG_TPL_DM_SERIAL=y -+# CONFIG_DEBUG_UART_ALTERA_JTAGUART is not set -+# CONFIG_DEBUG_UART_ALTERA_UART is not set -+# CONFIG_DEBUG_UART_ATMEL is not set -+CONFIG_DEBUG_UART_NS16550=y -+# CONFIG_DEBUG_UART_S5P is not set -+# CONFIG_DEBUG_UART_UARTLITE is not set -+# CONFIG_DEBUG_UART_ARM_DCC is not set -+# CONFIG_DEBUG_MVEBU_A3700_UART is not set -+# CONFIG_DEBUG_UART_ZYNQ is not set -+# CONFIG_DEBUG_UART_PL010 is not set -+# CONFIG_DEBUG_UART_PL011 is not set -+# CONFIG_DEBUG_UART_OMAP is not set -+CONFIG_DEBUG_UART_BASE=0xFE660000 -+CONFIG_DEBUG_UART_CLOCK=24000000 -+CONFIG_DEBUG_UART_SHIFT=2 -+CONFIG_DEBUG_UART_BOARD_INIT=y -+# CONFIG_DEBUG_UART_ANNOUNCE is not set -+# CONFIG_DEBUG_UART_SKIP_INIT is not set -+CONFIG_DEBUG_UART_ALWAYS=y -+# CONFIG_ALTERA_JTAG_UART is not set -+# CONFIG_ALTERA_UART is not set -+# CONFIG_ATMEL_USART is not set -+# CONFIG_FSL_LPUART is not set -+# CONFIG_MVEBU_A3700_UART is not set -+CONFIG_SYS_NS16550=y -+# CONFIG_MSM_SERIAL is not set -+# CONFIG_PXA_SERIAL is not set -+ -+# -+# Sound support -+# -+# CONFIG_SOUND is not set -+CONFIG_SPI=y -+CONFIG_DM_SPI=y -+# CONFIG_SPI_MEM is not set -+# CONFIG_ALTERA_SPI is not set -+# CONFIG_ATCSPI200_SPI is not set -+# CONFIG_ATMEL_SPI is not set -+# CONFIG_BCMSTB_SPI is not set -+# CONFIG_CADENCE_QSPI is not set -+# CONFIG_DESIGNWARE_SPI is not set -+# CONFIG_EXYNOS_SPI is not set -+# CONFIG_FSL_DSPI is not set -+# CONFIG_ICH_SPI is not set -+# CONFIG_MVEBU_A3700_SPI is not set -+# CONFIG_ROCKCHIP_SPI is not set -+# CONFIG_ROCKCHIP_SFC is not set -+# CONFIG_TEGRA114_SPI is not set -+# CONFIG_TEGRA20_SFLASH is not set -+# CONFIG_TEGRA20_SLINK is not set -+# CONFIG_TEGRA210_QSPI is not set -+# CONFIG_XILINX_SPI is not set -+# CONFIG_SOFT_SPI is not set -+# CONFIG_CF_SPI is not set -+# CONFIG_FSL_ESPI is not set -+# CONFIG_FSL_QSPI is not set -+# CONFIG_SH_SPI is not set -+# CONFIG_SH_QSPI is not set -+# CONFIG_TI_QSPI is not set -+# CONFIG_KIRKWOOD_SPI is not set -+# CONFIG_LPC32XX_SSP is not set -+# CONFIG_MPC8XXX_SPI is not set -+# CONFIG_MXC_SPI is not set -+# CONFIG_MXS_SPI is not set -+# CONFIG_OMAP3_SPI is not set -+ -+# -+# SPMI support -+# -+# CONFIG_SPMI is not set -+ -+# -+# System reset device drivers -+# -+CONFIG_SYSRESET=y -+CONFIG_SPL_SYSRESET=y -+CONFIG_SYSRESET_PSCI=y -+# CONFIG_SYSRESET_SYSCON is not set -+CONFIG_SYSRESET_SYSCON_REBOOT=y -+# CONFIG_SYSRESET_WATCHDOG is not set -+# CONFIG_DM_THERMAL is not set -+ -+# -+# Timer Support -+# -+# CONFIG_TIMER is not set -+ -+# -+# TPM support -+# -+CONFIG_USB=y -+CONFIG_DM_USB=y -+CONFIG_SPL_DM_USB=y -+# CONFIG_DM_USB_GADGET is not set -+# CONFIG_SPL_DM_USB_GADGET is not set -+ -+# -+# USB Host Controller Drivers -+# -+CONFIG_USB_HOST=y -+CONFIG_USB_XHCI_HCD=y -+CONFIG_USB_XHCI_DWC3=y -+# CONFIG_USB_XHCI_DWC3_OF_SIMPLE is not set -+# CONFIG_USB_XHCI_PCI is not set -+CONFIG_USB_EHCI_HCD=y -+# CONFIG_USB_EHCI_MSM is not set -+# CONFIG_USB_EHCI_PCI is not set -+CONFIG_USB_EHCI_GENERIC=y -+CONFIG_USB_OHCI_HCD=y -+# CONFIG_USB_OHCI_PCI is not set -+CONFIG_USB_OHCI_GENERIC=y -+# CONFIG_USB_OHCI_DA8XX is not set -+# CONFIG_USB_UHCI_HCD is not set -+# CONFIG_USB_DWC2 is not set -+# CONFIG_USB_R8A66597_HCD is not set -+# CONFIG_USB_CDNS3 is not set -+CONFIG_USB_DWC3=y -+# CONFIG_USB_DWC3_HOST is not set -+CONFIG_USB_DWC3_GADGET=y -+ -+# -+# Platform Glue Driver Support -+# -+# CONFIG_USB_DWC3_OMAP is not set -+CONFIG_USB_DWC3_GENERIC=y -+ -+# -+# PHY Subsystem -+# -+# CONFIG_USB_DWC3_PHY_OMAP is not set -+# CONFIG_USB_DWC3_PHY_SAMSUNG is not set -+ -+# -+# MUSB Controller Driver -+# -+# CONFIG_USB_MUSB_HOST is not set -+# CONFIG_USB_MUSB_GADGET is not set -+# CONFIG_USB_MUSB_DA8XX is not set -+# CONFIG_USB_MUSB_TI is not set -+ -+# -+# ULPI drivers -+# -+ -+# -+# USB peripherals -+# -+CONFIG_USB_STORAGE=y -+# CONFIG_USB_KEYBOARD is not set -+CONFIG_USB_GADGET=y -+CONFIG_USB_GADGET_MANUFACTURER="Rockchip" -+CONFIG_USB_GADGET_VENDOR_NUM=0x2207 -+CONFIG_USB_GADGET_PRODUCT_NUM=0x350a -+# CONFIG_USB_GADGET_ATMEL_USBA is not set -+# CONFIG_USB_GADGET_BCM_UDC_OTG_PHY is not set -+# CONFIG_USB_GADGET_DWC2_OTG is not set -+# CONFIG_CI_UDC is not set -+CONFIG_USB_GADGET_VBUS_DRAW=2 -+CONFIG_USB_GADGET_DUALSPEED=y -+CONFIG_USB_GADGET_DOWNLOAD=y -+# CONFIG_USB_FUNCTION_SDP is not set -+# CONFIG_USB_ETHER is not set -+# CONFIG_USB_HOST_ETHER is not set -+ -+# -+# Graphics support -+# -+CONFIG_DM_VIDEO=y -+CONFIG_BACKLIGHT_PWM=y -+# CONFIG_BACKLIGHT_GPIO is not set -+CONFIG_VIDEO_BPP8=y -+CONFIG_VIDEO_BPP16=y -+CONFIG_VIDEO_BPP32=y -+CONFIG_CONSOLE_NORMAL=y -+# CONFIG_CONSOLE_ROTATION is not set -+# CONFIG_CONSOLE_TRUETYPE is not set -+CONFIG_SYS_WHITE_ON_BLACK=y -+ -+# -+# TrueType Fonts -+# -+# CONFIG_VIDCONSOLE_AS_LCD is not set -+# CONFIG_VIDEO_VESA is not set -+# CONFIG_VIDEO_LCD_ANX9804 is not set -+# CONFIG_VIDEO_LCD_SSD2828 is not set -+# CONFIG_VIDEO_MVEBU is not set -+CONFIG_I2C_EDID=y -+CONFIG_DISPLAY=y -+# CONFIG_ATMEL_HLCD is not set -+# CONFIG_VIDEO_ROCKCHIP is not set -+CONFIG_DRM_ROCKCHIP=y -+CONFIG_DRM_MEM_RESERVED_SIZE_MBYTES=32 -+CONFIG_DRM_DP_HELPER=y -+CONFIG_DRM_ROCKCHIP_PANEL=y -+CONFIG_DRM_ROCKCHIP_DW_HDMI=y -+# CONFIG_DRM_ROCKCHIP_INNO_HDMI is not set -+# CONFIG_ROCKCHIP_INNO_HDMI_PHY is not set -+CONFIG_DRM_ROCKCHIP_INNO_MIPI_PHY=y -+# CONFIG_DRM_ROCKCHIP_INNO_VIDEO_PHY is not set -+CONFIG_DRM_ROCKCHIP_INNO_VIDEO_COMBO_PHY=y -+CONFIG_DRM_MIPI_DSI=y -+CONFIG_DRM_ROCKCHIP_DW_MIPI_DSI=y -+CONFIG_DRM_ROCKCHIP_ANALOGIX_DP=y -+CONFIG_DRM_ROCKCHIP_LVDS=y -+# CONFIG_DRM_ROCKCHIP_RGB is not set -+# CONFIG_DRM_ROCKCHIP_RK618 is not set -+# CONFIG_DRM_ROCKCHIP_RK1000 is not set -+# CONFIG_ROCKCHIP_DRM_TVE is not set -+CONFIG_ROCKCHIP_CUBIC_LUT_SIZE=0 -+# CONFIG_VIDEO_TEGRA20 is not set -+# CONFIG_VIDEO_TEGRA124 is not set -+CONFIG_VIDEO_BRIDGE=y -+# CONFIG_VIDEO_BRIDGE_PARADE_PS862X is not set -+# CONFIG_VIDEO_BRIDGE_NXP_PTN3460 is not set -+# CONFIG_VIDEO_BRIDGE_ANALOGIX_ANX6345 is not set -+CONFIG_CONSOLE_SCROLL_LINES=1 -+CONFIG_LCD=y -+# CONFIG_ROCKCHIP_EINK is not set -+ -+# -+# Watchdog Timer Support -+# -+# CONFIG_BCM2835_WDT is not set -+# CONFIG_ULP_WATCHDOG is not set -+# CONFIG_WDT is not set -+# CONFIG_IRQ is not set -+# CONFIG_PHYS_TO_BUS is not set -+ -+# -+# File systems -+# -+# CONFIG_FS_CBFS is not set -+CONFIG_FS_FAT=y -+CONFIG_FAT_WRITE=y -+CONFIG_FS_FAT_MAX_CLUSTSIZE=65536 -+# CONFIG_FS_JFFS2 is not set -+CONFIG_FS_CRAMFS=y -+# CONFIG_YAFFS2 is not set -+ -+# -+# Library routines -+# -+# CONFIG_BCH is not set -+# CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set -+CONFIG_SYS_HZ=1000 -+CONFIG_SYS_STACK_SIZE=0x200000 -+CONFIG_USE_TINY_PRINTF=y -+CONFIG_PANIC_HANG=y -+CONFIG_REGEX=y -+# CONFIG_LIB_RAND is not set -+CONFIG_SPL_TINY_MEMSET=y -+# CONFIG_TPL_TINY_MEMSET is not set -+CONFIG_SYSMEM=y -+CONFIG_BIDRAM=y -+# CONFIG_CMD_DHRYSTONE is not set -+ -+# -+# Security support -+# -+# CONFIG_AES is not set -+CONFIG_RSA=y -+CONFIG_SPL_RSA=y -+CONFIG_RSA_SOFTWARE_EXP=y -+CONFIG_RSA_N_SIZE=0x200 -+CONFIG_RSA_E_SIZE=0x10 -+CONFIG_RSA_C_SIZE=0x20 -+# CONFIG_TPM is not set -+ -+# -+# Boot Configuration -+# -+# CONFIG_XBC is not set -+ -+# -+# Hashing Support -+# -+CONFIG_SHA1=y -+CONFIG_SHA256=y -+CONFIG_SHA512=y -+# CONFIG_SHA_HW_ACCEL is not set -+ -+# -+# Compression Support -+# -+CONFIG_LZ4=y -+# CONFIG_LZMA is not set -+# CONFIG_LZO is not set -+# CONFIG_SPL_LZO is not set -+CONFIG_SPL_GZIP=y -+CONFIG_SPL_ZLIB=y -+CONFIG_ERRNO_STR=y -+# CONFIG_HEXDUMP is not set -+CONFIG_OF_LIBFDT=y -+CONFIG_OF_LIBFDT_OVERLAY=y -+CONFIG_SPL_OF_LIBFDT=y -+# CONFIG_TPL_OF_LIBFDT is not set -+# CONFIG_FDT_FIXUP_PARTITIONS is not set -+ -+# -+# System tables -+# -+CONFIG_GENERATE_SMBIOS_TABLE=y -+CONFIG_SMBIOS_MANUFACTURER="rockchip" -+CONFIG_EFI_LOADER=y -+# CONFIG_EFI_LOADER_BOUNCE_BUFFER is not set -+CONFIG_AVB_LIBAVB=y -+# CONFIG_SPL_AVB_LIBAVB is not set -+# CONFIG_TPL_AVB_LIBAVB is not set -+CONFIG_AVB_LIBAVB_AB=y -+# CONFIG_SPL_AVB_LIBAVB_AB is not set -+# CONFIG_TPL_AVB_LIBAVB_AB is not set -+CONFIG_AVB_LIBAVB_ATX=y -+# CONFIG_SPL_AVB_LIBAVB_ATX is not set -+# CONFIG_TPL_AVB_LIBAVB_ATX is not set -+CONFIG_AVB_LIBAVB_USER=y -+# CONFIG_AVB_VBMETA_PUBLIC_KEY_VALIDATE is not set -+# CONFIG_SPL_AVB_LIBAVB_USER is not set -+# CONFIG_TPL_AVB_LIBAVB_USER is not set -+CONFIG_RK_AVB_LIBAVB_USER=y -+# CONFIG_SPL_RK_AVB_LIBAVB_USER is not set -+# CONFIG_TPL_RK_AVB_LIBAVB_USER is not set -+# CONFIG_ROCKCHIP_PRELOADER_PUB_KEY is not set -+CONFIG_OPTEE_CLIENT=y -+# CONFIG_OPTEE_V1 is not set -+CONFIG_OPTEE_V2=y -+# CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION is not set -+# CONFIG_UNIT_TEST is not set -+# CONFIG_TEST_ROCKCHIP is not set diff --git a/patch/u-boot/u-boot-odroidxu4/fix_build_for_recent_host-side_libfdt.patch b/patch/u-boot/u-boot-odroidxu4/fix_build_for_recent_host-side_libfdt.patch deleted file mode 100644 index b015611c3..000000000 --- a/patch/u-boot/u-boot-odroidxu4/fix_build_for_recent_host-side_libfdt.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 001bcba84e1f3ad0f605e5a9bb2fb5cb0e9c605d Mon Sep 17 00:00:00 2001 -From: Hugo Grostabussiat -Date: Fri, 11 Jan 2019 21:33:19 +0100 -Subject: [PATCH] tools: fix build for recent host-side libfdt - -Recent versions of libfdt removed the _ prefix in the header guards, -causing clashes with the libfdt version embedded in U-boot source tree. ---- - include/fdt.h | 3 ++- - include/libfdt.h | 3 ++- - include/libfdt_env.h | 3 ++- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/include/fdt.h b/include/fdt.h -index 526aedb515..3dd42971eb 100644 ---- a/include/fdt.h -+++ b/include/fdt.h -@@ -1,5 +1,6 @@ --#ifndef _FDT_H -+#if !defined(_FDT_H) && !defined(FDT_H) - #define _FDT_H -+#define FDT_H - /* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. -diff --git a/include/libfdt.h b/include/libfdt.h -index e2bc2e00c1..9d0d4b98ea 100644 ---- a/include/libfdt.h -+++ b/include/libfdt.h -@@ -1,5 +1,6 @@ --#ifndef _LIBFDT_H -+#if !defined(_LIBFDT_H) && !defined(LIBFDT_H) - #define _LIBFDT_H -+#define LIBFDT_H - /* - * libfdt - Flat Device Tree manipulation - * Copyright (C) 2006 David Gibson, IBM Corporation. -diff --git a/include/libfdt_env.h b/include/libfdt_env.h -index 6c6845f76c..216e5c6fa1 100644 ---- a/include/libfdt_env.h -+++ b/include/libfdt_env.h -@@ -6,8 +6,9 @@ - * SPDX-License-Identifier: LGPL-2.1+ - */ - --#ifndef _LIBFDT_ENV_H -+#if !defined(_LIBFDT_ENV_H) && !defined(LIBFDT_ENV_H) - #define _LIBFDT_ENV_H -+#define LIBFDT_ENV_H - - #include "compiler.h" - #include "linux/types.h" --- -GitLab - diff --git a/patch/u-boot/u-boot-rockchip/board_miqi/libfdt_fix.patch b/patch/u-boot/u-boot-rockchip/board_miqi/libfdt_fix.patch deleted file mode 100644 index 762f4f0a1..000000000 --- a/patch/u-boot/u-boot-rockchip/board_miqi/libfdt_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e0d20dc1521e74b82dbd69be53a048847798a90a Mon Sep 17 00:00:00 2001 -From: Paul Kocialkowski -Date: Fri, 2 Mar 2018 23:13:42 +0100 -Subject: [PATCH] tools: Include U-Boot libfdt headers from their actual path - -There are no headers for libfdt in lib/libfdt, as they are instead -located in scripts/dtc/libfdt. Specifying lib/libfdt for headers -inclusion in host tools results in using the system libfdt headers, -which is not what we want. Change this to the proper path. - -Signed-off-by: Paul Kocialkowski ---- - tools/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile b/tools/Makefile -index d3387fad69..f38f68ee47 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -244,7 +244,7 @@ endif # !LOGO_BMP - # - HOST_EXTRACFLAGS += -include $(srctree)/include/compiler.h \ - $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -- -I$(srctree)/lib/libfdt \ -+ -I$(srctree)/scripts/dtc/libfdt \ - -I$(srctree)/tools \ - -DUSE_HOSTCC \ - -D__KERNEL_STRICT_NAMES \ --- -GitLab - diff --git a/patch/u-boot/u-boot-imx7d-legacy/u-boot-enable-CMD_IMPORTENV.patch b/patch/u-boot/v2020.04/u-boot-enable-CMD_IMPORTENV.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-legacy/u-boot-enable-CMD_IMPORTENV.patch rename to patch/u-boot/v2020.04/u-boot-enable-CMD_IMPORTENV.patch diff --git a/patch/u-boot/u-boot-imx7d-legacy/u-boot-remove-predefined-mmcroot.patch b/patch/u-boot/v2020.04/u-boot-remove-predefined-mmcroot.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-legacy/u-boot-remove-predefined-mmcroot.patch rename to patch/u-boot/v2020.04/u-boot-remove-predefined-mmcroot.patch diff --git a/patch/u-boot/u-boot-imx7d-current/u-boot-update-boot-scripts.patch b/patch/u-boot/v2020.04/u-boot-update-boot-scripts.patch similarity index 100% rename from patch/u-boot/u-boot-imx7d-current/u-boot-update-boot-scripts.patch rename to patch/u-boot/v2020.04/u-boot-update-boot-scripts.patch diff --git a/patch/u-boot/u-boot-meson64/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch b/patch/u-boot/v2022.07/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch rename to patch/u-boot/v2022.07/0001-HACK-configs-meson64-prevent-stdout-stderr-on-videoconsole.patch diff --git a/patch/u-boot/u-boot-meson64/0003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch b/patch/u-boot/v2022.07/0003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/0003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch rename to patch/u-boot/v2022.07/0003-mmc-meson-gx-change-clock-phase-value-on-axg-SoCs.patch diff --git a/patch/u-boot/u-boot-meson64/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch b/patch/u-boot/v2022.07/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch rename to patch/u-boot/v2022.07/board_bananapim5/bananapi-m5-fix-wrong-GPIO-pin-labeling-for-CON1.patch diff --git a/patch/u-boot/u-boot-meson64/board_bananapim5/u-boot-meson64-current.patch b/patch/u-boot/v2022.07/board_bananapim5/u-boot-meson64-current.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_bananapim5/u-boot-meson64-current.patch rename to patch/u-boot/v2022.07/board_bananapim5/u-boot-meson64-current.patch diff --git a/patch/u-boot/u-boot-mvebu64/0001-espressobin-u-boot-fit-images.patch b/patch/u-boot/v2022.07/board_espressobin/0001-espressobin-u-boot-fit-images.patch similarity index 100% rename from patch/u-boot/u-boot-mvebu64/0001-espressobin-u-boot-fit-images.patch rename to patch/u-boot/v2022.07/board_espressobin/0001-espressobin-u-boot-fit-images.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj100/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2022.07/board_jethubj100/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj100/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch rename to patch/u-boot/v2022.07/board_jethubj100/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj100/0002-board-amlogic-jethub-j100-enable-saradc-in-config.patch b/patch/u-boot/v2022.07/board_jethubj100/0002-board-amlogic-jethub-j100-enable-saradc-in-config.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj100/0002-board-amlogic-jethub-j100-enable-saradc-in-config.patch rename to patch/u-boot/v2022.07/board_jethubj100/0002-board-amlogic-jethub-j100-enable-saradc-in-config.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj100/0003-Copy-and-update-amlogic-2019-aml-partition-keyman-co.patch b/patch/u-boot/v2022.07/board_jethubj100/0003-Copy-and-update-amlogic-2019-aml-partition-keyman-co.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj100/0003-Copy-and-update-amlogic-2019-aml-partition-keyman-co.patch rename to patch/u-boot/v2022.07/board_jethubj100/0003-Copy-and-update-amlogic-2019-aml-partition-keyman-co.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj100/0004-cmd-fix-do_adc_single.patch b/patch/u-boot/v2022.07/board_jethubj100/0004-cmd-fix-do_adc_single.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj100/0004-cmd-fix-do_adc_single.patch rename to patch/u-boot/v2022.07/board_jethubj100/0004-cmd-fix-do_adc_single.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj100/0005-Add-usid-serial-mac-read-from-emmc.patch b/patch/u-boot/v2022.07/board_jethubj100/0005-Add-usid-serial-mac-read-from-emmc.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj100/0005-Add-usid-serial-mac-read-from-emmc.patch rename to patch/u-boot/v2022.07/board_jethubj100/0005-Add-usid-serial-mac-read-from-emmc.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj100/0006-Disable-efi-options-for-JetHub-D1.patch b/patch/u-boot/v2022.07/board_jethubj100/0006-Disable-efi-options-for-JetHub-D1.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj100/0006-Disable-efi-options-for-JetHub-D1.patch rename to patch/u-boot/v2022.07/board_jethubj100/0006-Disable-efi-options-for-JetHub-D1.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj80/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2022.07/board_jethubj80/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj80/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch rename to patch/u-boot/v2022.07/board_jethubj80/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj80/0002-cmd-fix-do_adc_single.patch b/patch/u-boot/v2022.07/board_jethubj80/0002-cmd-fix-do_adc_single.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj80/0002-cmd-fix-do_adc_single.patch rename to patch/u-boot/v2022.07/board_jethubj80/0002-cmd-fix-do_adc_single.patch diff --git a/patch/u-boot/u-boot-meson64/board_jethubj80/0003-Disable-EFI-for-J80.patch b/patch/u-boot/v2022.07/board_jethubj80/0003-Disable-EFI-for-J80.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_jethubj80/0003-Disable-EFI-for-J80.patch rename to patch/u-boot/v2022.07/board_jethubj80/0003-Disable-EFI-for-J80.patch diff --git a/patch/u-boot/u-boot-meson64/le-potato-general-vendor.patch b/patch/u-boot/v2022.07/board_lepotato/le-potato-general-vendor.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/le-potato-general-vendor.patch rename to patch/u-boot/v2022.07/board_lepotato/le-potato-general-vendor.patch diff --git a/patch/u-boot/u-boot-mvebu64/board_macchiatobin-doubleshot/0001-env_and_10g.patch b/patch/u-boot/v2022.07/board_macchiatobin-doubleshot/0001-env_and_10g.patch similarity index 100% rename from patch/u-boot/u-boot-mvebu64/board_macchiatobin-doubleshot/0001-env_and_10g.patch rename to patch/u-boot/v2022.07/board_macchiatobin-doubleshot/0001-env_and_10g.patch diff --git a/patch/u-boot/u-boot-mvebu64/board_macchiatobin-doubleshot/boot-from-script.patch.disabled b/patch/u-boot/v2022.07/board_macchiatobin-doubleshot/boot-from-script.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-mvebu64/board_macchiatobin-doubleshot/boot-from-script.patch.disabled rename to patch/u-boot/v2022.07/board_macchiatobin-doubleshot/boot-from-script.patch.disabled diff --git a/patch/u-boot/u-boot-meson64/add-emmc-support-for-nanopi-k2.patch b/patch/u-boot/v2022.07/board_nanopik2-s905/add-emmc-support-for-nanopi-k2.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/add-emmc-support-for-nanopi-k2.patch rename to patch/u-boot/v2022.07/board_nanopik2-s905/add-emmc-support-for-nanopi-k2.patch diff --git a/patch/u-boot/u-boot-meson64/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch b/patch/u-boot/v2022.07/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch rename to patch/u-boot/v2022.07/board_radxa-zero/0001-HACK-mmc-meson-gx-limit-to-24MHz.patch diff --git a/patch/u-boot/u-boot-meson64/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch b/patch/u-boot/v2022.07/board_radxa-zero2/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch rename to patch/u-boot/v2022.07/board_radxa-zero2/0001-ARM-dts-add-support-for-Radxa-Zero-2.patch diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch b/patch/u-boot/v2022.07/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch rename to patch/u-boot/v2022.07/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0002-tinkerboard-add-emmc.patch b/patch/u-boot/v2022.07/board_tinkerboard/0002-tinkerboard-add-emmc.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0002-tinkerboard-add-emmc.patch rename to patch/u-boot/v2022.07/board_tinkerboard/0002-tinkerboard-add-emmc.patch diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0003-UMS-mode-on-otg-port.patch b/patch/u-boot/v2022.07/board_tinkerboard/0003-UMS-mode-on-otg-port.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0003-UMS-mode-on-otg-port.patch rename to patch/u-boot/v2022.07/board_tinkerboard/0003-UMS-mode-on-otg-port.patch diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0004-make-emmc-bootable.patch b/patch/u-boot/v2022.07/board_tinkerboard/0004-make-emmc-bootable.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0004-make-emmc-bootable.patch rename to patch/u-boot/v2022.07/board_tinkerboard/0004-make-emmc-bootable.patch diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0017-Fix-HDMI-some-issues.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/0017-Fix-HDMI-some-issues.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0017-Fix-HDMI-some-issues.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/0017-Fix-HDMI-some-issues.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/0036-auto-enable-ums-mode-when-TinkerBoard-is-connected-t.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0039-fixed-enter-ums-mode-fail-sometimes.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/0039-fixed-enter-ums-mode-fail-sometimes.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0039-fixed-enter-ums-mode-fail-sometimes.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/0039-fixed-enter-ums-mode-fail-sometimes.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0045-modify-UMS-name-of-uboot.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/0045-modify-UMS-name-of-uboot.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0045-modify-UMS-name-of-uboot.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/0045-modify-UMS-name-of-uboot.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0049-added-timeout-when-force-entering-UMS-mode.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/0049-added-timeout-when-force-entering-UMS-mode.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0049-added-timeout-when-force-entering-UMS-mode.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/0049-added-timeout-when-force-entering-UMS-mode.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/0050-USB-VID-PID.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/0050-USB-VID-PID.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/0050-USB-VID-PID.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/0050-USB-VID-PID.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/101-u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch.disabled b/patch/u-boot/v2022.07/board_tinkerboard/101-u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch.disabled similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/101-u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch.disabled rename to patch/u-boot/v2022.07/board_tinkerboard/101-u-boot-0002-rockchip-tinker-enable-rockchip-video-driver.patch.disabled diff --git a/patch/u-boot/u-boot-rockchip/board_tinkerboard/add-overlay-support.patch b/patch/u-boot/v2022.07/board_tinkerboard/add-overlay-support.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_tinkerboard/add-overlay-support.patch rename to patch/u-boot/v2022.07/board_tinkerboard/add-overlay-support.patch diff --git a/patch/u-boot/u-boot-rockchip/zzz-usb-otg-fix.patch b/patch/u-boot/v2022.07/board_tinkerboard/zzz-usb-otg-fix.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/zzz-usb-otg-fix.patch rename to patch/u-boot/v2022.07/board_tinkerboard/zzz-usb-otg-fix.patch diff --git a/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/u-boot-1000-enable-rockchip-efuse-for-rk322x-rk3288-and-rk3328.patch b/patch/u-boot/v2022.07/board_xt-q8l-v10/u-boot-1000-enable-rockchip-efuse-for-rk322x-rk3288-and-rk3328.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/u-boot-1000-enable-rockchip-efuse-for-rk322x-rk3288-and-rk3328.patch rename to patch/u-boot/v2022.07/board_xt-q8l-v10/u-boot-1000-enable-rockchip-efuse-for-rk322x-rk3288-and-rk3328.patch diff --git a/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch b/patch/u-boot/v2022.07/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch rename to patch/u-boot/v2022.07/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch diff --git a/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch b/patch/u-boot/v2022.07/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch rename to patch/u-boot/v2022.07/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch diff --git a/patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch b/patch/u-boot/v2022.07/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch similarity index 100% rename from patch/u-boot/u-boot-rockchip/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch rename to patch/u-boot/v2022.07/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch diff --git a/patch/u-boot/v2022.07/board_xt-q8l-v10/zzz-usb-otg-fix.patch b/patch/u-boot/v2022.07/board_xt-q8l-v10/zzz-usb-otg-fix.patch new file mode 100644 index 000000000..dcfbaea5a --- /dev/null +++ b/patch/u-boot/v2022.07/board_xt-q8l-v10/zzz-usb-otg-fix.patch @@ -0,0 +1,13 @@ +diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c +index cefe9d83..f7288203 100644 +--- a/drivers/usb/host/dwc2.c ++++ b/drivers/usb/host/dwc2.c +@@ -440,6 +440,8 @@ static void dwc_otg_core_init(struct dwc2_priv *priv) + + writel(usbcfg, ®s->gusbcfg); + ++ mdelay(10); ++ + /* Program the GAHBCFG Register. */ + switch (readl(®s->ghwcfg2) & DWC2_HWCFG2_ARCHITECTURE_MASK) { + case DWC2_HWCFG2_ARCHITECTURE_SLAVE_ONLY: diff --git a/patch/u-boot/u-boot-meson64/enable-DT-overlays-support.patch b/patch/u-boot/v2022.07/enable-DT-overlays-support.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/enable-DT-overlays-support.patch rename to patch/u-boot/v2022.07/enable-DT-overlays-support.patch diff --git a/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch b/patch/u-boot/v2022.07/u-boot-meson64-support-old-bootscripts.patch similarity index 100% rename from patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch rename to patch/u-boot/v2022.07/u-boot-meson64-support-old-bootscripts.patch