GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-28 17:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: Add soc_rev to environment

Browse source 
Add SoC revision to environment. This can be useful to select the
correct device tree at runtime (N2/N2+).

Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
Signed-off-by: Stefan Agner <stefan@agner.ch>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Pascal Vizeli 2020-11-27 17:28:21 +01:00 • committed by Neil Armstrong
parent cf47c0e23a
commit d42e7964d9
3 changed files with 21 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/include/asm/arch-meson/boot.h
View file

@ -7,6 +7,8 @@
#ifndef __MESON_BOOT_H__ #ifndef __MESON_BOOT_H__
#define __MESON_BOOT_H__ #define __MESON_BOOT_H__
#include <linux/types.h>
/* Boot device */ /* Boot device */
#define BOOT_DEVICE_RESERVED 0 #define BOOT_DEVICE_RESERVED 0
#define BOOT_DEVICE_EMMC 1 #define BOOT_DEVICE_EMMC 1
@ -17,4 +19,6 @@
int meson_get_boot_device(void); int meson_get_boot_device(void);
int meson_get_soc_rev(char *buff, size_t buff_len);
#endif /* __MESON_BOOT_H__ */ #endif /* __MESON_BOOT_H__ */

12
arch/arm/mach-meson/board-info.c
View file

@ -187,3 +187,15 @@ int show_board_info(void)
return 0; return 0;
} }
int meson_get_soc_rev(char *buff, size_t buff_len)
{
unsigned int socinfo;
socinfo = get_socinfo();
if (!socinfo)
return -1;
/* Write SoC info */
return snprintf(buff, buff_len, "%x", socinfo_to_minor(socinfo));
}

5
board/amlogic/odroid-n2/odroid-n2.c
View file

@ -12,6 +12,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/sm.h> #include <asm/arch/sm.h>
#include <asm/arch/eth.h> #include <asm/arch/eth.h>
#include <asm/arch/boot.h>
#define EFUSE_MAC_OFFSET 20 #define EFUSE_MAC_OFFSET 20
#define EFUSE_MAC_SIZE 12 #define EFUSE_MAC_SIZE 12
@ -23,6 +24,10 @@ int misc_init_r(void)
char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3]; char efuse_mac_addr[EFUSE_MAC_SIZE], tmp[3];
ssize_t len; ssize_t len;
if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) &&
meson_get_soc_rev(tmp, sizeof(tmp)) > 0)
env_set("soc_rev", tmp);
meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0); meson_eth_init(PHY_INTERFACE_MODE_RGMII, 0);
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) { if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {