mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-06-23 23:22:02 +00:00
- odroid-n2: fix fdtfile suffix for n2-plus
- sei610 & meson64_android cleanups to prepare android 11 boot support - use Android BCB mechanism for reboot reason instead of HW reboot flag - Switch meson64_android boot flow to use abootimg for A/B, AVB and DTBO support -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAmESPjcACgkQd9zb2sjI SdFabg/+K/5kH01N6etPpPgNH3DTns3Z7Uv16rawGaFJVj4V2O/Ak2vmhvjJA4df KvLJL3AVolMOfD4xTABRDyLKt3maCgIYkamdBWBV/xKCTKL7fvvqj8V1U5iUsGKm Wl2KbbDj+dGNF+IYO9V4T1D/JaRjAUk4YeztFEDaNdP3P1N+01v2FyfkadBL5un3 dqwHb3DMNS2SyjnE3glTAs3g/+3nmrHhAHiVVZQlJHsijuup6f93e8huKQ4v1oFX xsNzeI9j6jGBvVI6hRsHNLOZzhj8/ZcSntdlL+b4FbY++KzrKidMgVECc486cc8t IEq/iJHggYhwRtw3EAYblmMVFiQeo07hgSbbSP8mIJWARtqh439tLUyKxW3y/5UT UlGLHcsSSwv/5NhY8ugGAYeaGGXNpMMc5ISbssnn5FB6VHSox4nRZai5U9jKoyc2 iBNNdyLiLi/Fz9YMWj8SAibajT8bchWu1qW2n85nFb3xWQpXcbjzlglnLY6bX3TQ 1d5ehInNK8deptHNh2eGBsPKOUJ/gDTvEey+6J517hbJ59My96v+dvmbtG7kH9Z8 157KQzjvHH4X9MDW8wYb381TV8kcNi3b16QPP2RKxuK1Zrve0RLPhOAz/YeSkTDN mavHlaY7JvUXjAct0K5VXHvA9U6DBrvc3eb7KoXL4b4+SHr/4UQ= =RZ8+ -----END PGP SIGNATURE----- Merge tag 'u-boot-amlogic-20210810' of https://source.denx.de/u-boot/custodians/u-boot-amlogic - odroid-n2: fix fdtfile suffix for n2-plus - sei610 & meson64_android cleanups to prepare android 11 boot support - use Android BCB mechanism for reboot reason instead of HW reboot flag - Switch meson64_android boot flow to use abootimg for A/B, AVB and DTBO support
This commit is contained in:
Tom Rini
commit
aba3fa1d3f
9 changed files with 220 additions and 95 deletions
|
|
@ -22,10 +22,7 @@
|
|||
#include <efi_loader.h>
|
||||
#include <u-boot/crc.h>
|
||||
|
||||
#if CONFIG_IS_ENABLED(FASTBOOT)
|
||||
#include <asm/psci.h>
|
||||
#include <fastboot.h>
|
||||
#endif
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
|
|
@ -152,38 +149,7 @@ int board_late_init(void)
|
|||
return meson_board_late_init();
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(FASTBOOT)
|
||||
static unsigned int reboot_reason = REBOOT_REASON_NORMAL;
|
||||
|
||||
int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
|
||||
{
|
||||
if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER)
|
||||
return -ENOTSUPP;
|
||||
|
||||
reboot_reason = REBOOT_REASON_BOOTLOADER;
|
||||
|
||||
printf("Using reboot reason: 0x%x\n", reboot_reason);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void reset_cpu(void)
|
||||
{
|
||||
struct pt_regs regs;
|
||||
|
||||
regs.regs[0] = ARM_PSCI_0_2_FN_SYSTEM_RESET;
|
||||
regs.regs[1] = reboot_reason;
|
||||
|
||||
printf("Rebooting with reason: 0x%lx\n", regs.regs[1]);
|
||||
|
||||
smc_call(®s);
|
||||
|
||||
while (1)
|
||||
;
|
||||
}
|
||||
#else
|
||||
void reset_cpu(void)
|
||||
{
|
||||
psci_system_reset();
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ static struct meson_odroid_boards {
|
|||
/* OdroidN2 rev 2019,2,7 */
|
||||
{ MESON_SOC_ID_G12B, 330 * 4, 350 * 4, "n2" },
|
||||
/* OdroidN2plus rev 2019,11,20 */
|
||||
{ MESON_SOC_ID_G12B, 410 * 4, 430 * 4, "n2_plus" },
|
||||
{ MESON_SOC_ID_G12B, 410 * 4, 430 * 4, "n2-plus" },
|
||||
/* OdroidC4 rev 2020,01,29 */
|
||||
{ MESON_SOC_ID_SM1, 80 * 4, 100 * 4, "c4" },
|
||||
/* OdroidHC4 rev 2019,12,10 */
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="meson-g12b-odroid-n2"
|
|||
CONFIG_MESON_G12A=y
|
||||
CONFIG_DEBUG_UART_BASE=0xff803000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_IDENT_STRING=" odroid-n2/n2_plus"
|
||||
CONFIG_IDENT_STRING=" odroid-n2/n2-plus"
|
||||
CONFIG_DEBUG_UART=y
|
||||
CONFIG_OF_BOARD_SETUP=y
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
|
|
|
|||
|
|
@ -20,8 +20,12 @@ CONFIG_PREBOOT="run load_logo"
|
|||
# CONFIG_CONSOLE_MUX is not set
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
CONFIG_MISC_INIT_R=y
|
||||
CONFIG_AVB_VERIFY=y
|
||||
# CONFIG_CMD_BDI is not set
|
||||
CONFIG_CMD_ADTIMG=y
|
||||
CONFIG_CMD_ABOOTIMG=y
|
||||
# CONFIG_CMD_IMI is not set
|
||||
CONFIG_CMD_BCB=y
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_GPT=y
|
||||
# CONFIG_CMD_LOADS is not set
|
||||
|
|
@ -31,6 +35,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
|
|||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_BMP=y
|
||||
CONFIG_CMD_REGULATOR=y
|
||||
CONFIG_CMD_AVB=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_ENV_IS_IN_MMC=y
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
|
|
@ -83,4 +88,5 @@ CONFIG_VIDEO_BMP_RLE8=y
|
|||
CONFIG_BMP_16BPP=y
|
||||
CONFIG_BMP_24BPP=y
|
||||
CONFIG_BMP_32BPP=y
|
||||
CONFIG_LIBAVB=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
|
|
|
|||
|
|
@ -20,8 +20,12 @@ CONFIG_PREBOOT="run load_logo"
|
|||
# CONFIG_CONSOLE_MUX is not set
|
||||
# CONFIG_DISPLAY_CPUINFO is not set
|
||||
CONFIG_MISC_INIT_R=y
|
||||
CONFIG_AVB_VERIFY=y
|
||||
# CONFIG_CMD_BDI is not set
|
||||
CONFIG_CMD_ADTIMG=y
|
||||
CONFIG_CMD_ABOOTIMG=y
|
||||
# CONFIG_CMD_IMI is not set
|
||||
CONFIG_CMD_BCB=y
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_GPT=y
|
||||
# CONFIG_CMD_LOADS is not set
|
||||
|
|
@ -31,6 +35,7 @@ CONFIG_CMD_USB_MASS_STORAGE=y
|
|||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_BMP=y
|
||||
CONFIG_CMD_REGULATOR=y
|
||||
CONFIG_CMD_AVB=y
|
||||
CONFIG_OF_CONTROL=y
|
||||
CONFIG_ENV_IS_IN_MMC=y
|
||||
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
|
|
@ -83,4 +88,5 @@ CONFIG_VIDEO_BMP_RLE8=y
|
|||
CONFIG_BMP_16BPP=y
|
||||
CONFIG_BMP_24BPP=y
|
||||
CONFIG_BMP_32BPP=y
|
||||
CONFIG_LIBAVB=y
|
||||
CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
|
|
|
|||
|
|
@ -32,7 +32,9 @@
|
|||
#define CONFIG_CPU_ARMV8
|
||||
#define CONFIG_REMAKE_ELF
|
||||
#define CONFIG_SYS_MAXARGS 32
|
||||
#ifndef CONFIG_SYS_MALLOC_LEN
|
||||
#define CONFIG_SYS_MALLOC_LEN (32 << 20)
|
||||
#endif
|
||||
#define CONFIG_SYS_CBSIZE 1024
|
||||
|
||||
#define CONFIG_SYS_SDRAM_BASE 0
|
||||
|
|
|
|||
|
|
@ -9,10 +9,134 @@
|
|||
#ifndef __MESON64_ANDROID_CONFIG_H
|
||||
#define __MESON64_ANDROID_CONFIG_H
|
||||
|
||||
#include <linux/sizes.h>
|
||||
|
||||
#define CONFIG_SYS_MALLOC_LEN SZ_128M
|
||||
|
||||
#ifndef BOOT_PARTITION
|
||||
#define BOOT_PARTITION "boot"
|
||||
#endif
|
||||
|
||||
#ifndef LOGO_PARTITION
|
||||
#define LOGO_PARTITION "logo"
|
||||
#endif
|
||||
|
||||
#ifndef CONTROL_PARTITION
|
||||
#define CONTROL_PARTITION "misc"
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_AVB)
|
||||
#define AVB_VERIFY_CHECK \
|
||||
"if test \"${force_avb}\" -eq 1; then " \
|
||||
"if run avb_verify; then " \
|
||||
"echo AVB verification OK.;" \
|
||||
"setenv bootargs \"$bootargs $avb_bootargs\";" \
|
||||
"else " \
|
||||
"echo AVB verification failed.;" \
|
||||
"exit; fi;" \
|
||||
"else " \
|
||||
"setenv bootargs \"$bootargs androidboot.verifiedbootstate=orange\";" \
|
||||
"echo Running without AVB...; "\
|
||||
"fi;"
|
||||
|
||||
#define AVB_VERIFY_CMD "avb_verify=avb init ${mmcdev}; avb verify $slot_suffix;\0"
|
||||
#else
|
||||
#define AVB_VERIFY_CHECK ""
|
||||
#define AVB_VERIFY_CMD ""
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_AB_SELECT)
|
||||
#define ANDROIDBOOT_GET_CURRENT_SLOT_CMD "get_current_slot=" \
|
||||
"if part number mmc ${mmcdev} " CONTROL_PARTITION " control_part_number; " \
|
||||
"then " \
|
||||
"echo " CONTROL_PARTITION \
|
||||
" partition number:${control_part_number};" \
|
||||
"ab_select current_slot mmc ${mmcdev}:${control_part_number};" \
|
||||
"else " \
|
||||
"echo " CONTROL_PARTITION " partition not found;" \
|
||||
"fi;\0"
|
||||
|
||||
#define AB_SELECT_SLOT \
|
||||
"run get_current_slot; " \
|
||||
"if test -e \"${current_slot}\"; " \
|
||||
"then " \
|
||||
"setenv slot_suffix _${current_slot}; " \
|
||||
"else " \
|
||||
"echo current_slot not found;" \
|
||||
"exit;" \
|
||||
"fi;"
|
||||
|
||||
#define AB_SELECT_ARGS \
|
||||
"setenv bootargs_ab androidboot.slot_suffix=${slot_suffix}; " \
|
||||
"echo A/B cmdline addition: ${bootargs_ab};" \
|
||||
"setenv bootargs ${bootargs} ${bootargs_ab};"
|
||||
|
||||
#define AB_BOOTARGS " androidboot.force_normal_boot=1"
|
||||
#define RECOVERY_PARTITION "boot"
|
||||
#else
|
||||
#define AB_SELECT_SLOT ""
|
||||
#define AB_SELECT_ARGS " "
|
||||
#define ANDROIDBOOT_GET_CURRENT_SLOT_CMD ""
|
||||
#define AB_BOOTARGS " "
|
||||
#define RECOVERY_PARTITION "recovery"
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_ABOOTIMG)
|
||||
/*
|
||||
* 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 = sei510; then " \
|
||||
"echo \" Reading DTB for sei510...\"; " \
|
||||
"setenv dtb_index 0;" \
|
||||
"elif test $board_name = sei610; then " \
|
||||
"echo \" Reading DTB for sei610...\"; " \
|
||||
"setenv dtb_index 1;" \
|
||||
"else " \
|
||||
"echo Error: Android boot is not supported for $board_name; " \
|
||||
"exit; " \
|
||||
"fi; " \
|
||||
"abootimg get dtb --index=$dtb_index dtb_start dtb_size; " \
|
||||
"cp.b $dtb_start $fdt_addr_r $dtb_size; " \
|
||||
"fdt addr $fdt_addr_r 0x80000; " \
|
||||
"if test $board_name = sei510; then " \
|
||||
"echo \" Reading DTBO for sei510...\"; " \
|
||||
"setenv dtbo_index 0;" \
|
||||
"elif test $board_name = sei610; then " \
|
||||
"echo \" Reading DTBO for sei610...\"; " \
|
||||
"setenv dtbo_index 1;" \
|
||||
"else " \
|
||||
"echo Error: Android boot is not supported for $board_name; " \
|
||||
"exit; " \
|
||||
"fi; " \
|
||||
"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 \" Applying DTBOs...\"; " \
|
||||
"adtimg addr $dtboaddr; " \
|
||||
"adtimg get dt --index=$dtbo_index dtbo0_addr; " \
|
||||
"fdt apply $dtbo0_addr;" \
|
||||
"setenv bootargs \"$bootargs androidboot.dtbo_idx=$dtbo_index \";"\
|
||||
|
||||
#define BOOT_CMD "bootm ${loadaddr} ${loadaddr} ${fdt_addr_r};"
|
||||
|
||||
#else
|
||||
#define PREPARE_FDT " "
|
||||
#define BOOT_CMD "bootm ${loadaddr};"
|
||||
#endif
|
||||
|
||||
#define BOOTENV_DEV_FASTBOOT(devtypeu, devtypel, instance) \
|
||||
"bootcmd_fastboot=" \
|
||||
"sm reboot_reason reason;" \
|
||||
"setenv run_fastboot 0;" \
|
||||
"if test \"${boot_source}\" = \"usb\"; then " \
|
||||
"echo Fastboot forced by usb rom boot;" \
|
||||
|
|
@ -23,41 +147,45 @@
|
|||
"echo Broken MMC partition scheme;" \
|
||||
"setenv run_fastboot 1;" \
|
||||
"fi;" \
|
||||
"if test \"${reason}\" = \"bootloader\" -o " \
|
||||
"\"${reason}\" = \"fastboot\"; then " \
|
||||
"echo Fastboot asked by reboot reason;" \
|
||||
"setenv run_fastboot 1;" \
|
||||
"fi;" \
|
||||
"if test \"${skip_fastboot}\" -eq 1; then " \
|
||||
"echo Fastboot skipped by environment;" \
|
||||
"setenv run_fastboot 0;" \
|
||||
"fi;" \
|
||||
"if test \"${force_fastboot}\" -eq 1; then " \
|
||||
"echo Fastboot forced by environment;" \
|
||||
"setenv run_fastboot 1;" \
|
||||
"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
|
||||
CONTROL_PARTITION "; then " \
|
||||
"if bcb test command = bootonce-bootloader; then " \
|
||||
"echo BCB: Bootloader boot...; " \
|
||||
"bcb clear command; bcb store; " \
|
||||
"setenv run_fastboot 1;" \
|
||||
"fi; " \
|
||||
"if bcb test command = boot-fastboot; then " \
|
||||
"echo BCB: fastboot userspace boot...; " \
|
||||
"setenv force_recovery 1;" \
|
||||
"fi; " \
|
||||
"else " \
|
||||
"echo Warning: BCB is corrupted or does not exist; " \
|
||||
"fi;" \
|
||||
"if test \"${run_fastboot}\" -eq 1; then " \
|
||||
"echo Running Fastboot...;" \
|
||||
"fastboot 0;" \
|
||||
"fastboot " __stringify(CONFIG_FASTBOOT_USB_DEV) "; " \
|
||||
"fi\0"
|
||||
|
||||
#define BOOTENV_DEV_NAME_FASTBOOT(devtypeu, devtypel, instance) \
|
||||
"fastboot "
|
||||
|
||||
/* TOFIX: Run actual recovery instead of fastboot */
|
||||
#define BOOTENV_DEV_RECOVERY(devtypeu, devtypel, instance) \
|
||||
"bootcmd_recovery=" \
|
||||
"pinmux dev pinctrl@14;" \
|
||||
"pinmux dev pinctrl@40;" \
|
||||
"sm reboot_reason reason;" \
|
||||
"setenv run_recovery 0;" \
|
||||
"if run check_button; then " \
|
||||
"echo Recovery button is pressed;" \
|
||||
"setenv run_recovery 1;" \
|
||||
"elif test \"${reason}\" = \"recovery\" -o " \
|
||||
"\"${reason}\" = \"update\"; then " \
|
||||
"echo Recovery asked by reboot reason;" \
|
||||
"setenv run_recovery 1;" \
|
||||
"fi; " \
|
||||
"if bcb load " __stringify(CONFIG_FASTBOOT_FLASH_MMC_DEV) " " \
|
||||
CONTROL_PARTITION "; then " \
|
||||
"if bcb test command = boot-recovery; then " \
|
||||
"echo BCB: Recovery boot...; " \
|
||||
"setenv run_recovery 1;" \
|
||||
"fi;" \
|
||||
"else " \
|
||||
"echo Warning: BCB is corrupted or does not exist; " \
|
||||
"fi;" \
|
||||
"if test \"${skip_recovery}\" -eq 1; then " \
|
||||
"echo Recovery skipped by environment;" \
|
||||
|
|
@ -69,7 +197,20 @@
|
|||
"fi;" \
|
||||
"if test \"${run_recovery}\" -eq 1; then " \
|
||||
"echo Running Recovery...;" \
|
||||
"fastboot 0;" \
|
||||
"mmc dev ${mmcdev};" \
|
||||
"setenv bootargs \"${bootargs} androidboot.serialno=${serial#}\";" \
|
||||
AB_SELECT_SLOT \
|
||||
AB_SELECT_ARGS \
|
||||
AVB_VERIFY_CHECK \
|
||||
"part start mmc ${mmcdev} " RECOVERY_PARTITION "${slot_suffix} boot_start;" \
|
||||
"part size mmc ${mmcdev} " RECOVERY_PARTITION "${slot_suffix} boot_size;" \
|
||||
"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
|
||||
PREPARE_FDT \
|
||||
"echo Running Android Recovery...;" \
|
||||
BOOT_CMD \
|
||||
"fi;" \
|
||||
"echo Failed to boot Android...;" \
|
||||
"reset;" \
|
||||
"fi\0"
|
||||
|
||||
#define BOOTENV_DEV_NAME_RECOVERY(devtypeu, devtypel, instance) \
|
||||
|
|
@ -77,14 +218,19 @@
|
|||
|
||||
#define BOOTENV_DEV_SYSTEM(devtypeu, devtypel, instance) \
|
||||
"bootcmd_system=" \
|
||||
"echo Loading Android boot partition...;" \
|
||||
"echo Loading Android " BOOT_PARTITION " partition...;" \
|
||||
"mmc dev ${mmcdev};" \
|
||||
"setenv bootargs ${bootargs} console=${console} androidboot.serialno=${serial#};" \
|
||||
"part start mmc ${mmcdev} ${bootpart} boot_start;" \
|
||||
"part size mmc ${mmcdev} ${bootpart} boot_size;" \
|
||||
"setenv bootargs ${bootargs} androidboot.serialno=${serial#};" \
|
||||
AB_SELECT_SLOT \
|
||||
AB_SELECT_ARGS \
|
||||
AVB_VERIFY_CHECK \
|
||||
"part start mmc ${mmcdev} " BOOT_PARTITION "${slot_suffix} boot_start;" \
|
||||
"part size mmc ${mmcdev} " BOOT_PARTITION "${slot_suffix} boot_size;" \
|
||||
"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
|
||||
PREPARE_FDT \
|
||||
"setenv bootargs \"${bootargs} " AB_BOOTARGS "\" ; " \
|
||||
"echo Running Android...;" \
|
||||
"bootm ${loadaddr};" \
|
||||
BOOT_CMD \
|
||||
"fi;" \
|
||||
"echo Failed to boot Android...;" \
|
||||
"reset\0"
|
||||
|
|
@ -101,8 +247,8 @@
|
|||
"if test \"${boot_source}\" != \"usb\" && " \
|
||||
"gpt verify mmc ${mmcdev} ${partitions}; then; " \
|
||||
"mmc dev ${mmcdev};" \
|
||||
"part start mmc ${mmcdev} ${logopart} boot_start;" \
|
||||
"part size mmc ${mmcdev} ${logopart} boot_size;" \
|
||||
"part start mmc ${mmcdev} " LOGO_PARTITION " boot_start;" \
|
||||
"part size mmc ${mmcdev} " LOGO_PARTITION " boot_size;" \
|
||||
"if mmc read ${loadaddr} ${boot_start} ${boot_size}; then " \
|
||||
"bmp display ${loadaddr} m m;" \
|
||||
"fi;" \
|
||||
|
|
@ -111,23 +257,24 @@
|
|||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"partitions=" PARTS_DEFAULT "\0" \
|
||||
"mmcdev=2\0" \
|
||||
"bootpart=1\0" \
|
||||
"logopart=2\0" \
|
||||
ANDROIDBOOT_GET_CURRENT_SLOT_CMD \
|
||||
AVB_VERIFY_CMD \
|
||||
"force_avb=0\0" \
|
||||
"gpio_recovery=88\0" \
|
||||
"check_button=gpio input ${gpio_recovery};test $? -eq 0;\0" \
|
||||
"load_logo=" PREBOOT_LOAD_LOGO "\0" \
|
||||
"console=/dev/ttyAML0\0" \
|
||||
"bootargs=no_console_suspend\0" \
|
||||
"stdin=" STDIN_CFG "\0" \
|
||||
"stdout=" STDOUT_CFG "\0" \
|
||||
"stderr=" STDOUT_CFG "\0" \
|
||||
"loadaddr=0x01000000\0" \
|
||||
"dtboaddr=0x08200000\0" \
|
||||
"loadaddr=0x01080000\0" \
|
||||
"fdt_addr_r=0x01000000\0" \
|
||||
"scriptaddr=0x08000000\0" \
|
||||
"kernel_addr_r=0x01080000\0" \
|
||||
"pxefile_addr_r=0x01080000\0" \
|
||||
"ramdisk_addr_r=0x13000000\0" \
|
||||
"fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" BOOTENV
|
||||
"fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
|
||||
BOOTENV
|
||||
|
||||
#include <configs/meson64.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -10,20 +10,19 @@
|
|||
#define __CONFIG_H
|
||||
|
||||
#define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;"
|
||||
#define CACHE_UUID "99207ae6-5207-11e9-999e-6f77a3612069;"
|
||||
#define SYSTEM_UUID "99f9b7ac-5207-11e9-8507-c3c037e393f3;"
|
||||
#define VENDOR_UUID "9d082802-5207-11e9-954c-cbbce08ba108;"
|
||||
#define USERDATA_UUID "9b976e42-5207-11e9-8f16-ff47ac594b22;"
|
||||
#define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;"
|
||||
|
||||
#define PARTS_DEFAULT \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=boot,size=64M,bootable,uuid=${uuid_gpt_boot};" \
|
||||
"name=logo,size=2M,uuid=" LOGO_UUID \
|
||||
"name=cache,size=256M,uuid=" CACHE_UUID \
|
||||
"name=system,size=1536M,uuid=" SYSTEM_UUID \
|
||||
"name=vendor,size=256M,uuid=" VENDOR_UUID \
|
||||
"name=userdata,size=5341M,uuid=" USERDATA_UUID \
|
||||
#define PARTS_DEFAULT \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=logo,size=2M,uuid=" LOGO_UUID \
|
||||
"name=misc,size=128K,uuid=${uuid_gpt_misc};" \
|
||||
"name=dtbo,size=8M,uuid=${uuid_gpt_dtbo};" \
|
||||
"name=vbmeta,size=64K,uuid=${uuid_gpt_vbmeta};" \
|
||||
"name=boot,size=32M,bootable,uuid=${uuid_gpt_boot};" \
|
||||
"name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \
|
||||
"name=cache,size=256M,uuid=${uuid_gpt_cache};" \
|
||||
"name=super,size=2304M,uuid=${uuid_gpt_super};" \
|
||||
"name=userdata,size=4820M,uuid=${uuid_gpt_userdata};" \
|
||||
"name=rootfs,size=-,uuid=" ROOT_UUID
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0+ */
|
||||
/*
|
||||
* Configuration for the SEI510
|
||||
* Configuration for the SEI610
|
||||
*
|
||||
* Copyright (C) 2019 Baylibre, SAS
|
||||
* Author: Jerome Brunet <jbrunet@baylibre.com>
|
||||
|
|
@ -10,20 +10,19 @@
|
|||
#define __CONFIG_H
|
||||
|
||||
#define LOGO_UUID "43a3305d-150f-4cc9-bd3b-38fca8693846;"
|
||||
#define CACHE_UUID "99207ae6-5207-11e9-999e-6f77a3612069;"
|
||||
#define SYSTEM_UUID "99f9b7ac-5207-11e9-8507-c3c037e393f3;"
|
||||
#define VENDOR_UUID "9d082802-5207-11e9-954c-cbbce08ba108;"
|
||||
#define USERDATA_UUID "9b976e42-5207-11e9-8f16-ff47ac594b22;"
|
||||
#define ROOT_UUID "ddb8c3f6-d94d-4394-b633-3134139cc2e0;"
|
||||
|
||||
#define PARTS_DEFAULT \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=boot,size=64M,bootable,uuid=${uuid_gpt_boot};" \
|
||||
"name=logo,size=2M,uuid=" LOGO_UUID \
|
||||
"name=cache,size=256M,uuid=" CACHE_UUID \
|
||||
"name=system,size=1536M,uuid=" SYSTEM_UUID \
|
||||
"name=vendor,size=256M,uuid=" VENDOR_UUID \
|
||||
"name=userdata,size=12795M,uuid=" USERDATA_UUID \
|
||||
#define PARTS_DEFAULT \
|
||||
"uuid_disk=${uuid_gpt_disk};" \
|
||||
"name=logo,start=512K,size=2M,uuid=" LOGO_UUID \
|
||||
"name=misc,size=512K,uuid=${uuid_gpt_misc};" \
|
||||
"name=dtbo,size=8M,uuid=${uuid_gpt_dtbo};" \
|
||||
"name=vbmeta,size=512K,uuid=${uuid_gpt_vbmeta};" \
|
||||
"name=boot,size=32M,bootable,uuid=${uuid_gpt_boot};" \
|
||||
"name=recovery,size=32M,uuid=${uuid_gpt_recovery};" \
|
||||
"name=cache,size=256M,uuid=${uuid_gpt_cache};" \
|
||||
"name=super,size=2304M,uuid=${uuid_gpt_super};" \
|
||||
"name=userdata,size=12274M,uuid=${uuid_gpt_userdata};" \
|
||||
"name=rootfs,size=-,uuid=" ROOT_UUID
|
||||
|
||||
#include <configs/meson64_android.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue