diff options
| author | Tom Rini | 2021-10-31 12:47:35 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-10-31 12:47:35 -0400 |
| commit | e63a3130e99faf0cf4dc67c4bbb92d028ffd69ee (patch) | |
| tree | eb8c87397dc7a731c8c9b69f2bdf0bf100945fec /board | |
| parent | 50bff6a6f86669a8652e2bf271eeb04f77911274 (diff) | |
| parent | 16f1f0058974abd480a2c01d99a98179c667e828 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-sh
- rzg2_beacon updates
Diffstat (limited to 'board')
| -rw-r--r-- | board/beacon/beacon-rzg2m/Kconfig | 2 | ||||
| -rw-r--r-- | board/beacon/beacon-rzg2m/MAINTAINERS | 4 | ||||
| -rw-r--r-- | board/beacon/beacon-rzg2m/beacon-rzg2m.c | 26 |
3 files changed, 18 insertions, 14 deletions
diff --git a/board/beacon/beacon-rzg2m/Kconfig b/board/beacon/beacon-rzg2m/Kconfig index 99c23a3d148..c03857cf2fe 100644 --- a/board/beacon/beacon-rzg2m/Kconfig +++ b/board/beacon/beacon-rzg2m/Kconfig @@ -1,4 +1,4 @@ -if TARGET_BEACON_RZG2H || TARGET_BEACON_RZG2M || TARGET_BEACON_RZG2N +if TARGET_BEACON_RZG2M config SYS_SOC default "rmobile" diff --git a/board/beacon/beacon-rzg2m/MAINTAINERS b/board/beacon/beacon-rzg2m/MAINTAINERS index 45c269da723..77c4057ab05 100644 --- a/board/beacon/beacon-rzg2m/MAINTAINERS +++ b/board/beacon/beacon-rzg2m/MAINTAINERS @@ -3,6 +3,4 @@ M: Adam Ford <aford173@gmail.com> S: Maintained F: board/beacon/beacon-rzg2m/ F: include/configs/beacon-rzg2m.h -F: configs/r8a774a1_beacon_defconfig -F: configs/r8a774b1_beacon_defconfig -F: configs/r8a774e1_beacon_defconfig +F: configs/rzg2_beacon_defconfig diff --git a/board/beacon/beacon-rzg2m/beacon-rzg2m.c b/board/beacon/beacon-rzg2m/beacon-rzg2m.c index c12ff77fb24..df6044a4297 100644 --- a/board/beacon/beacon-rzg2m/beacon-rzg2m.c +++ b/board/beacon/beacon-rzg2m/beacon-rzg2m.c @@ -10,16 +10,6 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) -{ -} - -/* Kconfig forces this on, so just return 0 */ -int board_early_init_f(void) -{ - return 0; -} - int board_init(void) { /* address of boot parameters */ @@ -36,3 +26,19 @@ void reset_cpu(void) { writel(RST_CODE, RST_CA57RESCNT); } + +#if IS_ENABLED(CONFIG_MULTI_DTB_FIT) +int board_fit_config_name_match(const char *name) +{ + if (!strcmp(rzg_get_cpu_name(), "R8A774A1") && !strcmp(name, "r8a774a1-beacon-rzg2m-kit")) + return 0; + + if (!strcmp(rzg_get_cpu_name(), "R8A774B1") && !strcmp(name, "r8a774b1-beacon-rzg2n-kit")) + return 0; + + if (!strcmp(rzg_get_cpu_name(), "R8A774E1") && !strcmp(name, "r8a774e1-beacon-rzg2h-kit")) + return 0; + + return -1; +} +#endif |