diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-29 10:39:18 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-29 10:39:18 -0400 |
| commit | 6864fc8704661878294d1f0f981f47e864ef470f (patch) | |
| tree | 4b1f116a26cfdded81f80b665a2d92375af6f74e /board | |
| parent | 5bec37eb72bdb43d683593148f4911f1e1f34980 (diff) | |
| parent | 836f1ce6c772ef5d1c545edec62bb177708fc150 (diff) | |
| download | u-boot-6864fc8704661878294d1f0f981f47e864ef470f.tar.gz | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-shWIP/29Apr2020
- rmobile gen2/gen3 DTS sync and defconfig consolidation
Diffstat (limited to 'board')
| -rw-r--r-- | board/renesas/salvator-x/MAINTAINERS | 4 | ||||
| -rw-r--r-- | board/renesas/salvator-x/salvator-x.c | 4 | ||||
| -rw-r--r-- | board/renesas/ulcb/MAINTAINERS | 4 | ||||
| -rw-r--r-- | board/renesas/ulcb/ulcb.c | 6 |
4 files changed, 7 insertions, 11 deletions
diff --git a/board/renesas/salvator-x/MAINTAINERS b/board/renesas/salvator-x/MAINTAINERS index 542f7cc893..7335bc3cd8 100644 --- a/board/renesas/salvator-x/MAINTAINERS +++ b/board/renesas/salvator-x/MAINTAINERS @@ -3,6 +3,4 @@ M: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> S: Maintained F: board/renesas/salvator-x/ F: include/configs/salvator-x.h -F: configs/r8a7795_salvator-x_defconfig -F: configs/r8a7796_salvator-x_defconfig -F: configs/r8a77965_salvator-x_defconfig +F: configs/rcar3_salvator-x_defconfig diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index 058fa6fbb6..91c3728571 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -93,11 +93,11 @@ int board_fit_config_name_match(const char *name) u32 cpu_type = rmobile_get_cpu_type(); if ((cpu_type == RMOBILE_CPU_TYPE_R8A7795) && - !strcmp(name, "r8a7795-salvator-x-u-boot")) + !strcmp(name, "r8a77950-salvator-x-u-boot")) return 0; if ((cpu_type == RMOBILE_CPU_TYPE_R8A7796) && - !strcmp(name, "r8a7796-salvator-x-u-boot")) + !strcmp(name, "r8a77960-salvator-x-u-boot")) return 0; if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) && diff --git a/board/renesas/ulcb/MAINTAINERS b/board/renesas/ulcb/MAINTAINERS index 8549f543f4..564eb561b1 100644 --- a/board/renesas/ulcb/MAINTAINERS +++ b/board/renesas/ulcb/MAINTAINERS @@ -3,6 +3,4 @@ M: Marek Vasut <marek.vasut+renesas@gmail.com> S: Maintained F: board/renesas/ulcb/ F: include/configs/ulcb.h -F: configs/r8a7795_ulcb_defconfig -F: configs/r8a7796_ulcb_defconfig -F: configs/r8a77965_ulcb_defconfig +F: configs/rcar3_ulcb_defconfig diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index bcae6ff67c..b91f940b48 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -75,15 +75,15 @@ int board_fit_config_name_match(const char *name) u32 cpu_type = rmobile_get_cpu_type(); if ((cpu_type == RMOBILE_CPU_TYPE_R8A7795) && - !strcmp(name, "r8a7795-h3ulcb-u-boot")) + !strcmp(name, "r8a77950-ulcb-u-boot")) return 0; if ((cpu_type == RMOBILE_CPU_TYPE_R8A7796) && - !strcmp(name, "r8a7796-m3ulcb-u-boot")) + !strcmp(name, "r8a77960-ulcb-u-boot")) return 0; if ((cpu_type == RMOBILE_CPU_TYPE_R8A77965) && - !strcmp(name, "r8a77965-m3nulcb-u-boot")) + !strcmp(name, "r8a77965-ulcb-u-boot")) return 0; return -1; |