From 0102ab2bf16e1f8e8d2b46295d7acdc7f98eeaa7 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Sat, 7 Aug 2021 01:37:23 +0200 Subject: fixed u-boot --- recipes-bsp/u-boot/rvphone/cl-imx8.inc | 3 ++- .../rvphone/cl-imx8/0000-add-board-support.patch | 23 ---------------------- .../rvphone/cl-imx8/0000-board-support.patch | 23 ++++++++++++++++++++++ .../rvphone/cl-imx8/board/rvphone/cl-imx8/Kconfig | 17 ++-------------- .../cl-imx8/configs/cl-imx8_android_defconfig | 8 ++++---- .../rvphone/cl-imx8/configs/cl-imx8_d1_defconfig | 8 ++++---- .../rvphone/cl-imx8/configs/cl-imx8_d2_defconfig | 8 ++++---- .../rvphone/cl-imx8/configs/cl-imx8_defconfig | 8 ++++---- .../rvphone/cl-imx8/include/configs/cl-imx8.h | 4 ++-- 9 files changed, 45 insertions(+), 57 deletions(-) delete mode 100644 recipes-bsp/u-boot/rvphone/cl-imx8/0000-add-board-support.patch create mode 100644 recipes-bsp/u-boot/rvphone/cl-imx8/0000-board-support.patch diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8.inc b/recipes-bsp/u-boot/rvphone/cl-imx8.inc index 9989f37..629dc99 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8.inc +++ b/recipes-bsp/u-boot/rvphone/cl-imx8.inc @@ -1,5 +1,6 @@ SRC_URI_append_cl-imx8 = " \ - file://0000-add-board-support.patch \ + file://0000-board-support.patch \ + file://0001-board-dts.patch \ file://dts/ \ file://board/ \ file://configs/ \ diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/0000-add-board-support.patch b/recipes-bsp/u-boot/rvphone/cl-imx8/0000-add-board-support.patch deleted file mode 100644 index 6be287c..0000000 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/0000-add-board-support.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig -index 09779cda64..cb2fa337fc 100644 ---- a/arch/arm/mach-imx/imx8m/Kconfig -+++ b/arch/arm/mach-imx/imx8m/Kconfig -@@ -66,6 +66,11 @@ config TARGET_IMX8MM_DDR4_EVK - select SUPPORT_SPL - select IMX8M_DDR4 - -+config TARGET_RVPHONE_CL_IMX8 -+ bool "rvPhone cl-imx8 board" -+ select IMX8MQ -+ select SUPPORT_SPL -+ - endchoice - - config SYS_SOC -@@ -77,5 +82,6 @@ source "board/freescale/imx8mq_phanbell/Kconfig" - source "board/freescale/imx8mq_aiy/Kconfig" - source "board/freescale/imx8mm_evk/Kconfig" - source "board/freescale/imx8mm_val/Kconfig" -+source "board/rvphone/cl-imx8/Kconfig" - - endif diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/0000-board-support.patch b/recipes-bsp/u-boot/rvphone/cl-imx8/0000-board-support.patch new file mode 100644 index 0000000..6be287c --- /dev/null +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/0000-board-support.patch @@ -0,0 +1,23 @@ +diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig +index 09779cda64..cb2fa337fc 100644 +--- a/arch/arm/mach-imx/imx8m/Kconfig ++++ b/arch/arm/mach-imx/imx8m/Kconfig +@@ -66,6 +66,11 @@ config TARGET_IMX8MM_DDR4_EVK + select SUPPORT_SPL + select IMX8M_DDR4 + ++config TARGET_RVPHONE_CL_IMX8 ++ bool "rvPhone cl-imx8 board" ++ select IMX8MQ ++ select SUPPORT_SPL ++ + endchoice + + config SYS_SOC +@@ -77,5 +82,6 @@ source "board/freescale/imx8mq_phanbell/Kconfig" + source "board/freescale/imx8mq_aiy/Kconfig" + source "board/freescale/imx8mm_evk/Kconfig" + source "board/freescale/imx8mm_val/Kconfig" ++source "board/rvphone/cl-imx8/Kconfig" + + endif diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/board/rvphone/cl-imx8/Kconfig b/recipes-bsp/u-boot/rvphone/cl-imx8/board/rvphone/cl-imx8/Kconfig index 56058c4..4daaf23 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/board/rvphone/cl-imx8/Kconfig +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/board/rvphone/cl-imx8/Kconfig @@ -1,23 +1,10 @@ -if TARGET_COMPULAB_IMX8 - -choice - prompt "rvPhone board select" - -config TARGET_CL_IMX8 - bool "cl-imx8" - -endchoice - -config DEFAULT_DTB - string "U-Boot Default Device Tree File" - depends on TARGET_RVPHONE_CL_IMX8 - default "cl-som.dtb" +if TARGET_RVPHONE_CL_IMX8 config SYS_BOARD default "cl-imx8" config SYS_VENDOR - default "compulab" + default "rvphone" config SYS_CONFIG_NAME default "cl-imx8" diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_android_defconfig b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_android_defconfig index 17a98e3..17df68f 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_android_defconfig +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_android_defconfig @@ -2,14 +2,14 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_COMPULAB_IMX8=y +CONFIG_TARGET_RVPHONE_CL_IMX8=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y -CONFIG_DEFAULT_DEVICE_TREE="cl-som-imx8" -CONFIG_LOCALVERSION="-cl-som-imx8-1.1" +CONFIG_DEFAULT_DEVICE_TREE="cl-imx8" +CONFIG_LOCALVERSION="-rvphone-cl-imx8" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,ANDROID_SUPPORT" -CONFIG_DEFAULT_FDT_FILE="sbc-imx8.dtb" +CONFIG_DEFAULT_FDT_FILE="cl-imx8.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d1_defconfig b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d1_defconfig index 6b3cc36..c9f08e4 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d1_defconfig +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d1_defconfig @@ -2,15 +2,15 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_COMPULAB_IMX8=y +CONFIG_TARGET_RVPHONE_CL_IMX8=y CONFIG_RAM_1G=y CONFIG_IMX_OPTEE=y -CONFIG_DEFAULT_DEVICE_TREE="cl-som-imx8" -CONFIG_LOCALVERSION="-cl-som-imx8-rev1.1-1.0-D1" +CONFIG_DEFAULT_DEVICE_TREE="cl-imx8" +CONFIG_LOCALVERSION="-rvphone-cl-imx8-D1" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" -CONFIG_DEFAULT_FDT_FILE="sbc-imx8.dtb" +CONFIG_DEFAULT_FDT_FILE="cl-imx8.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d2_defconfig b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d2_defconfig index 8f6cf9b..202315a 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d2_defconfig +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_d2_defconfig @@ -2,15 +2,15 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_COMPULAB_IMX8=y +CONFIG_TARGET_RVPHONE_CL_IMX8=y CONFIG_RAM_2G=y CONFIG_IMX_OPTEE=y -CONFIG_DEFAULT_DEVICE_TREE="cl-som-imx8" -CONFIG_LOCALVERSION="-cl-som-imx8-rev1.1-1.0-D2" +CONFIG_DEFAULT_DEVICE_TREE="cl-imx8" +CONFIG_LOCALVERSION="-rvphone-cl-imx8-D2" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" -CONFIG_DEFAULT_FDT_FILE="sbc-imx8.dtb" +CONFIG_DEFAULT_FDT_FILE="cl-imx8.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_defconfig b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_defconfig index 4f48094..ed49417 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_defconfig +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/configs/cl-imx8_defconfig @@ -2,14 +2,14 @@ CONFIG_ARM=y CONFIG_ARCH_IMX8M=y CONFIG_SYS_TEXT_BASE=0x40200000 CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_COMPULAB_IMX8=y +CONFIG_TARGET_RVPHONE_CL_IMX8=y CONFIG_IMX_OPTEE=y -CONFIG_DEFAULT_DEVICE_TREE="cl-som-imx8" -CONFIG_LOCALVERSION="-cl-som-imx8-rev1.1-1.0-CFG" +CONFIG_DEFAULT_DEVICE_TREE="cl-imx8" +CONFIG_LOCALVERSION="-rvphone-cl-imx8-CFG" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" -CONFIG_DEFAULT_FDT_FILE="sbc-imx8.dtb" +CONFIG_DEFAULT_FDT_FILE="cl-imx8.dtb" CONFIG_ARCH_MISC_INIT=y CONFIG_SPL=y CONFIG_SPL_BOARD_INIT=y diff --git a/recipes-bsp/u-boot/rvphone/cl-imx8/include/configs/cl-imx8.h b/recipes-bsp/u-boot/rvphone/cl-imx8/include/configs/cl-imx8.h index 049d09a..a2cb9a6 100644 --- a/recipes-bsp/u-boot/rvphone/cl-imx8/include/configs/cl-imx8.h +++ b/recipes-bsp/u-boot/rvphone/cl-imx8/include/configs/cl-imx8.h @@ -119,11 +119,11 @@ "fdt_addr=0x43000000\0" \ "fdt_high=0xffffffffffffffff\0" \ "boot_fdt=try\0" \ - "fdt_file="CONFIG_DEFAULT_DTB"\0" \ + "fdt_file="CONFIG_DEFAULT_FDT_FILE"\0" \ "initrd_addr=0x43800000\0" \ "initrd_high=0xffffffffffffffff\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ - "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ + "mmcpart="__stringify(CONFIG_SYS_MMC_IMG_LOAD_PART)"\0" \ "mmcautodetect=yes\0" \ "mmcargs=setenv bootargs console=${console} root=/dev/mmcblk${mmcdev}p2 rootwait rw\0 " \ "loadbootscript=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ -- cgit v1.2.3