eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'u-boot-amlogic-20220120' of https://source.denx.de/u-boot/custodians/u-boot-amlogic

Browse Source 
- Disable CONFIG_NET_RANDOM_ETHADDR for android configs
- meson64_android: define raw parts for bootloader to permit flashing with fastboot
- vim3: configure serial# from ethaddr to permit using fastboot like sei510/610
This commit is contained in:
Tom Rini
2022-01-20 09:40:04 -05:00
parent 280db76f15 09c2debab7
commit 3918376e91
6 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
board/amlogic/vim3/vim3.c
View File

@@ -153,6 +153,7 @@ int misc_init_r(void)
{
u8 mac_addr[MAC_ADDR_LEN];
char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
char serial_string[EFUSE_MAC_SIZE + 1];
ssize_t len;
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
@@ -177,5 +178,13 @@ int misc_init_r(void)
eth_env_get_enetaddr("ethaddr", mac_addr);
}
if (!env_get("serial#")) {
eth_env_get_enetaddr("ethaddr", mac_addr);
sprintf(serial_string, "%02X%02X%02X%02X%02X%02X",
mac_addr[0], mac_addr[1], mac_addr[2],
mac_addr[3], mac_addr[4], mac_addr[5]);
env_set("serial#", serial_string);
}
return 0;
}

1
configs/khadas-vim3_android_ab_defconfig
View File

@@ -39,7 +39,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AVB=y
CONFIG_OF_CONTROL=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_ADC=y
CONFIG_SARADC_MESON=y
CONFIG_BUTTON=y

1
configs/khadas-vim3_android_defconfig
View File

@@ -37,7 +37,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AVB=y
CONFIG_OF_CONTROL=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_ADC=y
CONFIG_SARADC_MESON=y
CONFIG_BUTTON=y

1
configs/khadas-vim3l_android_ab_defconfig
View File

@@ -39,7 +39,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AVB=y
CONFIG_OF_CONTROL=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_ADC=y
CONFIG_SARADC_MESON=y
CONFIG_BUTTON=y

1
configs/khadas-vim3l_android_defconfig
View File

@@ -37,7 +37,6 @@ CONFIG_CMD_REGULATOR=y
CONFIG_CMD_AVB=y
CONFIG_OF_CONTROL=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_ADC=y
CONFIG_SARADC_MESON=y
CONFIG_BUTTON=y

2
include/configs/meson64_android.h
View File

@@ -283,6 +283,8 @@
EXTRA_ANDROID_ENV_SETTINGS \
"partitions=" PARTS_DEFAULT "\0" \
"mmcdev=2\0" \
"fastboot_raw_partition_bootloader=0x1 0xfff mmcpart 1\0" \
"fastboot_raw_partition_bootenv=0x0 0xfff mmcpart 2\0" \
ANDROIDBOOT_GET_CURRENT_SLOT_CMD \
AVB_VERIFY_CMD \
"force_avb=0\0" \