mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge tag 'v2025.10-rc4' into next
Prepare v2025.10-rc4
This commit is contained in:
Tom Rini
@@ -11,30 +11,13 @@
|
||||
#ifndef __CONFIG_AM57XX_EVM_H
|
||||
#define __CONFIG_AM57XX_EVM_H
|
||||
|
||||
#include <env/ti/dfu.h>
|
||||
#include <linux/sizes.h>
|
||||
|
||||
#define CFG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
|
||||
#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
|
||||
#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
|
||||
|
||||
#ifndef CONFIG_XPL_BUILD
|
||||
#define DFUARGS \
|
||||
"dfu_bufsiz=0x10000\0" \
|
||||
DFU_ALT_INFO_MMC \
|
||||
DFU_ALT_INFO_EMMC \
|
||||
DFU_ALT_INFO_RAM \
|
||||
DFU_ALT_INFO_QSPI
|
||||
#else
|
||||
#ifdef CONFIG_SPL_DFU
|
||||
#define DFUARGS \
|
||||
"dfu_bufsiz=0x10000\0" \
|
||||
DFU_ALT_INFO_RAM
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <configs/ti_omap5_common.h>
|
||||
|
||||
/* CPSW Ethernet */
|
||||
|
||||
#include <configs/ti_omap5_common.h>
|
||||
#endif /* __CONFIG_AM57XX_EVM_H */
|
||||
|
||||
@@ -11,40 +11,16 @@
|
||||
#ifndef __CONFIG_DRA7XX_EVM_H
|
||||
#define __CONFIG_DRA7XX_EVM_H
|
||||
|
||||
#include <env/ti/dfu.h>
|
||||
|
||||
#define CFG_MAX_MEM_MAPPED 0x80000000
|
||||
|
||||
#ifndef CONFIG_QSPI_BOOT
|
||||
/* MMC ENV related defines */
|
||||
#endif
|
||||
|
||||
#if (CONFIG_CONS_INDEX == 1)
|
||||
#define CONSOLEDEV "ttyS0"
|
||||
#elif (CONFIG_CONS_INDEX == 3)
|
||||
#define CONSOLEDEV "ttyS2"
|
||||
#endif
|
||||
#define CFG_SYS_NS16550_COM1 UART1_BASE /* Base EVM has UART0 */
|
||||
#define CFG_SYS_NS16550_COM2 UART2_BASE /* UART2 */
|
||||
#define CFG_SYS_NS16550_COM3 UART3_BASE /* UART3 */
|
||||
|
||||
#ifndef CONFIG_XPL_BUILD
|
||||
#define DFUARGS \
|
||||
"dfu_bufsiz=0x10000\0" \
|
||||
DFU_ALT_INFO_MMC \
|
||||
DFU_ALT_INFO_EMMC \
|
||||
DFU_ALT_INFO_RAM \
|
||||
DFU_ALT_INFO_QSPI
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_XPL_BUILD
|
||||
#ifdef CONFIG_SPL_DFU
|
||||
#define DFUARGS \
|
||||
"dfu_bufsiz=0x10000\0" \
|
||||
DFU_ALT_INFO_RAM
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#include <configs/ti_omap5_common.h>
|
||||
|
||||
/* NAND support */
|
||||
|
||||
@@ -18,7 +18,8 @@
|
||||
#define ENV_MEM_LAYOUT_SETTINGS \
|
||||
"scriptaddr=0x00000000\0" \
|
||||
"pxefile_addr_r=0x00100000\0" \
|
||||
"fdt_addr_r=0x01f00000\0" \
|
||||
"fdt_addr_r=0x01e00000\0" \
|
||||
"fdtoverlay_addr_r=0x01f00000\0" \
|
||||
"kernel_addr_r=0x02000000\0" \
|
||||
"ramdisk_addr_r=0x04000000\0"
|
||||
|
||||
|
||||
@@ -39,216 +39,6 @@
|
||||
#define DFUARGS
|
||||
#endif
|
||||
|
||||
#include <env/ti/mmc.h>
|
||||
#include <env/ti/nand.h>
|
||||
|
||||
#ifndef CONSOLEDEV
|
||||
#define CONSOLEDEV "ttyS2"
|
||||
#endif
|
||||
|
||||
#ifndef PARTS_DEFAULT
|
||||
/*
|
||||
* Default GPT tables for eMMC (Linux and Android). Notes:
|
||||
* 1. Keep partitions aligned to erase group size (512 KiB) when possible
|
||||
* 2. Keep partitions in sync with DFU_ALT_INFO_EMMC (see dfu.h)
|
||||
* 3. Keep 'bootloader' partition (U-Boot proper) start address in sync with
|
||||
* CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR (see common/spl/Kconfig)
|
||||
*/
|
||||
#define PARTS_DEFAULT \
|
||||
/* Linux partitions */ \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=bootloader,start=384K,size=1792K,uuid=${uuid_gpt_bootloader};" \
|
||||
"name=rootfs,start=2688K,size=-,uuid=${uuid_gpt_rootfs}\0" \
|
||||
/* Android partitions */ \
|
||||
"partitions_android=" \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=xloader,start=128K,size=256K,uuid=${uuid_gpt_xloader};" \
|
||||
"name=bootloader,size=2048K,uuid=${uuid_gpt_bootloader};" \
|
||||
"name=uboot-env,start=2432K,size=256K,uuid=${uuid_gpt_reserved};" \
|
||||
"name=misc,size=128K,uuid=${uuid_gpt_misc};" \
|
||||
"name=boot_a,size=20M,uuid=${uuid_gpt_boot_a};" \
|
||||
"name=boot_b,size=20M,uuid=${uuid_gpt_boot_b};" \
|
||||
"name=dtbo_a,size=8M,uuid=${uuid_gpt_dtbo_a};" \
|
||||
"name=dtbo_b,size=8M,uuid=${uuid_gpt_dtbo_b};" \
|
||||
"name=vbmeta_a,size=64K,uuid=${uuid_gpt_vbmeta_a};" \
|
||||
"name=vbmeta_b,size=64K,uuid=${uuid_gpt_vbmeta_b};" \
|
||||
"name=recovery,size=64M,uuid=${uuid_gpt_recovery};" \
|
||||
"name=super,size=2560M,uuid=${uuid_gpt_super};" \
|
||||
"name=metadata,size=16M,uuid=${uuid_gpt_metadata};" \
|
||||
"name=userdata,size=-,uuid=${uuid_gpt_userdata}"
|
||||
#endif /* PARTS_DEFAULT */
|
||||
|
||||
#if defined(CONFIG_CMD_AVB)
|
||||
#define AVB_VERIFY_CHECK "if run avb_verify; then " \
|
||||
"echo AVB verification OK.;" \
|
||||
"set bootargs $bootargs $avb_bootargs;" \
|
||||
"else " \
|
||||
"echo AVB verification failed.;" \
|
||||
"exit; fi;"
|
||||
#define AVB_VERIFY_CMD "avb_verify=avb init 1; avb verify $slot_suffix;\0"
|
||||
#else
|
||||
#define AVB_VERIFY_CHECK ""
|
||||
#define AVB_VERIFY_CMD ""
|
||||
#endif
|
||||
|
||||
#define CONTROL_PARTITION "misc"
|
||||
|
||||
#if defined(CONFIG_CMD_BCB) && defined(CONFIG_ANDROID_AB)
|
||||
#define AB_SELECT_SLOT \
|
||||
"if part number mmc 1 " CONTROL_PARTITION " control_part_number; " \
|
||||
"then " \
|
||||
"echo " CONTROL_PARTITION \
|
||||
" partition number:${control_part_number};" \
|
||||
"bcb ab_select slot_name mmc ${mmcdev}:${control_part_number};" \
|
||||
"else " \
|
||||
"echo " CONTROL_PARTITION " partition not found;" \
|
||||
"exit;" \
|
||||
"fi;" \
|
||||
"setenv slot_suffix _${slot_name};"
|
||||
#define AB_SELECT_ARGS \
|
||||
"setenv bootargs_ab androidboot.slot_suffix=${slot_suffix}; " \
|
||||
"echo A/B cmdline addition: ${bootargs_ab};" \
|
||||
"setenv bootargs ${bootargs} ${bootargs_ab};"
|
||||
#else
|
||||
#define AB_SELECT_SLOT ""
|
||||
#define AB_SELECT_ARGS ""
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Prepares complete device tree blob for current board (for Android boot).
|
||||
*
|
||||
* Boot image or recovery image should be loaded into $loadaddr prior to running
|
||||
* these commands. The logic of these commnads is next:
|
||||
*
|
||||
* 1. Read correct DTB for current SoC/board from boot image in $loadaddr
|
||||
* to $fdtaddr
|
||||
* 2. Merge all needed DTBO for current board from 'dtbo' partition into read
|
||||
* DTB
|
||||
* 3. User should provide $fdtaddr as 3rd argument to 'bootm'
|
||||
*/
|
||||
#define PREPARE_FDT \
|
||||
"echo Preparing FDT...; " \
|
||||
"if test $board_name = am57xx_evm_reva3; then " \
|
||||
"echo \" Reading DTBO partition...\"; " \
|
||||
"part start mmc ${mmcdev} dtbo${slot_suffix} p_dtbo_start; " \
|
||||
"part size mmc ${mmcdev} dtbo${slot_suffix} p_dtbo_size; " \
|
||||
"mmc read ${dtboaddr} ${p_dtbo_start} ${p_dtbo_size}; " \
|
||||
"echo \" Reading DTB for AM57x EVM RevA3...\"; " \
|
||||
"abootimg get dtb --index=0 dtb_start dtb_size; " \
|
||||
"cp.b $dtb_start $fdtaddr $dtb_size; " \
|
||||
"fdt addr $fdtaddr 0x80000; " \
|
||||
"echo \" Applying DTBOs for AM57x EVM RevA3...\"; " \
|
||||
"adtimg addr $dtboaddr; " \
|
||||
"adtimg get dt --index=0 dtbo0_addr dtbo0_size; " \
|
||||
"fdt apply $dtbo0_addr; " \
|
||||
"adtimg get dt --index=1 dtbo1_addr dtbo1_size; " \
|
||||
"fdt apply $dtbo1_addr; " \
|
||||
"elif test $board_name = beagle_x15_revc; then " \
|
||||
"echo \" Reading DTB for Beagle X15 RevC...\"; " \
|
||||
"abootimg get dtb --index=0 dtb_start dtb_size; " \
|
||||
"cp.b $dtb_start $fdtaddr $dtb_size; " \
|
||||
"fdt addr $fdtaddr 0x80000; " \
|
||||
"else " \
|
||||
"echo Error: Android boot is not supported for $board_name; " \
|
||||
"exit; " \
|
||||
"fi; " \
|
||||
|
||||
#define DEFAULT_COMMON_BOOT_TI_ARGS \
|
||||
"console=" CONSOLEDEV ",115200n8\0" \
|
||||
"fdtfile=undefined\0" \
|
||||
"finduuid=part uuid mmc 0:2 uuid\0" \
|
||||
"usbtty=cdc_acm\0" \
|
||||
"vram=16M\0" \
|
||||
AVB_VERIFY_CMD \
|
||||
"partitions=" PARTS_DEFAULT "\0" \
|
||||
"optargs=\0" \
|
||||
"dofastboot=0\0" \
|
||||
"emmc_android_boot=" \
|
||||
"setenv mmcdev 1; " \
|
||||
"mmc dev $mmcdev; " \
|
||||
"mmc rescan; " \
|
||||
AB_SELECT_SLOT \
|
||||
"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
|
||||
CONTROL_PARTITION "; then " \
|
||||
"setenv ardaddr -; " \
|
||||
"if bcb test command = bootonce-bootloader; then " \
|
||||
"echo Android: Bootloader boot...; " \
|
||||
"bcb clear command; bcb store; " \
|
||||
"fastboot 1; " \
|
||||
"exit; " \
|
||||
"elif bcb test command = boot-recovery; then " \
|
||||
"echo Android: Recovery boot...; " \
|
||||
"setenv ardaddr $loadaddr;" \
|
||||
"setenv apart recovery; " \
|
||||
"else " \
|
||||
"echo Android: Normal boot...; " \
|
||||
"setenv ardaddr $loadaddr; " \
|
||||
"setenv apart boot${slot_suffix}; " \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"echo Warning: BCB is corrupted or does not exist; " \
|
||||
"echo Android: Normal boot...; " \
|
||||
"fi; " \
|
||||
"setenv eval_bootargs setenv bootargs $bootargs; " \
|
||||
"run eval_bootargs; " \
|
||||
"setenv machid fe6; " \
|
||||
AVB_VERIFY_CHECK \
|
||||
AB_SELECT_ARGS \
|
||||
"if part start mmc $mmcdev $apart boot_start; then " \
|
||||
"part size mmc $mmcdev $apart boot_size; " \
|
||||
"mmc read $loadaddr $boot_start $boot_size; " \
|
||||
PREPARE_FDT \
|
||||
"bootm $loadaddr $ardaddr $fdtaddr; " \
|
||||
"else " \
|
||||
"echo $apart partition not found; " \
|
||||
"exit; " \
|
||||
"fi;\0"
|
||||
|
||||
#define DEFAULT_FDT_TI_ARGS \
|
||||
"findfdt="\
|
||||
"if test $board_name = omap5_uevm; then " \
|
||||
"setenv fdtfile omap5-uevm.dtb; fi; " \
|
||||
"if test $board_name = dra7xx; then " \
|
||||
"setenv fdtfile dra7-evm.dtb; fi;" \
|
||||
"if test $board_name = dra72x-revc; then " \
|
||||
"setenv fdtfile dra72-evm-revc.dtb; fi;" \
|
||||
"if test $board_name = dra72x; then " \
|
||||
"setenv fdtfile dra72-evm.dtb; fi;" \
|
||||
"if test $board_name = dra71x; then " \
|
||||
"setenv fdtfile dra71-evm.dtb; fi;" \
|
||||
"if test $board_name = dra76x_acd; then " \
|
||||
"setenv fdtfile dra76-evm.dtb; fi;" \
|
||||
"if test $board_name = beagle_x15; then " \
|
||||
"setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
|
||||
"if test $board_name = beagle_x15_revb1; then " \
|
||||
"setenv fdtfile am57xx-beagle-x15-revb1.dtb; fi;" \
|
||||
"if test $board_name = beagle_x15_revc; then " \
|
||||
"setenv fdtfile am57xx-beagle-x15-revc.dtb; fi;" \
|
||||
"if test $board_name = am5729_beagleboneai; then " \
|
||||
"setenv fdtfile am5729-beagleboneai.dtb; fi;" \
|
||||
"if test $board_name = am572x_idk; then " \
|
||||
"setenv fdtfile am572x-idk.dtb; fi;" \
|
||||
"if test $board_name = am574x_idk; then " \
|
||||
"setenv fdtfile am574x-idk.dtb; fi;" \
|
||||
"if test $board_name = am57xx_evm; then " \
|
||||
"setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
|
||||
"if test $board_name = am57xx_evm_reva3; then " \
|
||||
"setenv fdtfile am57xx-beagle-x15.dtb; fi;" \
|
||||
"if test $board_name = am571x_idk; then " \
|
||||
"setenv fdtfile am571x-idk.dtb; fi;" \
|
||||
"if test $fdtfile = undefined; then " \
|
||||
"echo WARNING: Could not determine device tree to use; fi; \0"
|
||||
|
||||
#define GET_OVERLAY_MMC_TI_ARGS \
|
||||
"get_overlay_mmc=" \
|
||||
"fdt address ${fdtaddr};" \
|
||||
"fdt resize 0x100000;" \
|
||||
"for overlay in $name_overlays;" \
|
||||
"do;" \
|
||||
"load mmc ${bootpart} ${dtboaddr} ${bootdir}/dtb/${overlay} &&" \
|
||||
"fdt apply ${dtboaddr};" \
|
||||
"done;\0" \
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(TI_MMC, ti_mmc, na) \
|
||||
func(MMC, mmc, 0) \
|
||||
@@ -265,24 +55,6 @@
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
#define CFG_EXTRA_ENV_SETTINGS \
|
||||
DEFAULT_LINUX_BOOT_ENV \
|
||||
DEFAULT_MMC_TI_ARGS \
|
||||
"bootpart=0:2\0" \
|
||||
"bootdir=/boot\0" \
|
||||
"get_name_kern=" \
|
||||
"if test $boot_fit -eq 1; then " \
|
||||
"setenv bootfile fitImage; " \
|
||||
"else " \
|
||||
"setenv bootfile zImage; " \
|
||||
"fi\0" \
|
||||
DEFAULT_FIT_TI_ARGS \
|
||||
"get_fit_config=setenv name_fit_config ${fdtfile}\0" \
|
||||
DEFAULT_COMMON_BOOT_TI_ARGS \
|
||||
DEFAULT_FDT_TI_ARGS \
|
||||
GET_OVERLAY_MMC_TI_ARGS \
|
||||
DFUARGS \
|
||||
NETARGS \
|
||||
NANDARGS \
|
||||
BOOTENV
|
||||
|
||||
/*
|
||||
|
||||
53
include/env/ti/dfu.env
vendored
Normal file
53
include/env/ti/dfu.env
vendored
Normal file
@@ -0,0 +1,53 @@
|
||||
dfu_alt_info_mmc=
|
||||
boot part 0 1;
|
||||
rootfs part 0 2;
|
||||
MLO fat 0 1;
|
||||
MLO.raw raw 0x100 0x200;
|
||||
u-boot.img.raw raw 0x300 0x1000;
|
||||
u-env.raw raw 0x1300 0x200;
|
||||
spl-os-args.raw raw 0x1500 0x200;
|
||||
spl-os-image.raw raw 0x1700 0x6900;
|
||||
spl-os-args fat 0 1;
|
||||
spl-os-image fat 0 1;
|
||||
u-boot.img fat 0 1;
|
||||
uEnv.txt fat 0 1
|
||||
|
||||
dfu_alt_info_emmc=
|
||||
rawemmc raw 0 3751936;
|
||||
boot part 1 1;
|
||||
rootfs part 1 2;
|
||||
MLO fat 1 1;
|
||||
MLO.raw raw 0x100 0x200;
|
||||
u-boot.img.raw raw 0x300 0x1000;
|
||||
u-env.raw raw 0x1300 0x200;
|
||||
spl-os-args.raw raw 0x1500 0x200;
|
||||
spl-os-image.raw raw 0x1700 0x6900;
|
||||
spl-os-args fat 1 1;
|
||||
spl-os-image fat 1 1;
|
||||
u-boot.img fat 1 1;
|
||||
uEnv.txt fat 1 1
|
||||
|
||||
#if CONFIG_MTD_RAW_NAND
|
||||
dfu_alt_info_nand=
|
||||
SPL part 0 1;
|
||||
SPL.backup1 part 0 2;
|
||||
SPL.backup2 part 0 3;
|
||||
SPL.backup3 part 0 4;
|
||||
u-boot part 0 5;
|
||||
u-boot-spl-os part 0 6;
|
||||
kernel part 0 8;
|
||||
rootfs part 0 9
|
||||
#endif
|
||||
|
||||
dfu_alt_info_ram=
|
||||
kernel ram 0x80200000 0x4000000;
|
||||
fdt ram 0x80f80000 0x80000;
|
||||
ramdisk ram 0x81000000 0x4000000
|
||||
|
||||
dfu_alt_info_qspi=
|
||||
MLO raw 0x0 0x040000;
|
||||
u-boot.img raw 0x040000 0x0100000;
|
||||
u-boot-spl-os raw 0x140000 0x080000;
|
||||
u-boot-env raw 0x1C0000 0x010000;
|
||||
u-boot-env.backup raw 0x1D0000 0x010000;
|
||||
kernel raw 0x1E0000 0x800000
|
||||
@@ -212,6 +212,8 @@ enum {
|
||||
#define RK817_POWER_EN_SAVE0 0x99
|
||||
#define RK817_POWER_EN_SAVE1 0xa4
|
||||
|
||||
#define RK806_RST_FUN_MSK GENMASK(7, 6)
|
||||
|
||||
#define RK806_POWER_EN(x) (0x00 + (x))
|
||||
/* POWER_ENx register lower 4 bits are write-protected unless the associated top bit is set */
|
||||
#define RK806_POWER_EN_CLRSETBITS(bit, val) (((val) << (bit)) | (1 << ((bit) + 4)))
|
||||
|
||||
Reference in New Issue
Block a user