[PATCH] board: amlogic: odroid-n2: fix fdtfile suffix for n2-plus

[PATCH] board: amlogic: odroid-n2: fix fdtfile suffix for n2-plus

[Christian Hewitt]

The N2+ dtb is meson-g12b-odroid-n2-plus.dtb, not n2_plus, so
correct the suffix provided in the board file. Also align the
board ident string shown during boot to match.

Fixes: 8bc780106c13 ("board: amlogic: odroid: add runtime detection of the N2/N2+/C4/HC4 variants")
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
---
 board/amlogic/odroid-n2/odroid-n2.c | 2 +-
 configs/odroid-n2_defconfig         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
index 88a60f34fe..acfd107fc5 100644
--- a/board/amlogic/odroid-n2/odroid-n2.c
+++ b/board/amlogic/odroid-n2/odroid-n2.c
@@ -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 */
diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig
index bac44b61ab..1f718a3154 100644
--- a/configs/odroid-n2_defconfig
+++ b/configs/odroid-n2_defconfig
@@ -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
-- 
2.17.1


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

Re: [PATCH] board: amlogic: odroid-n2: fix fdtfile suffix for n2-plus

[Neil Armstrong]

On 04/08/2021 13:01, Christian Hewitt wrote:
> The N2+ dtb is meson-g12b-odroid-n2-plus.dtb, not n2_plus, so
> correct the suffix provided in the board file. Also align the
> board ident string shown during boot to match.
> 
> Fixes: 8bc780106c13 ("board: amlogic: odroid: add runtime detection of the N2/N2+/C4/HC4 variants")
> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
> ---
>  board/amlogic/odroid-n2/odroid-n2.c | 2 +-
>  configs/odroid-n2_defconfig         | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/board/amlogic/odroid-n2/odroid-n2.c b/board/amlogic/odroid-n2/odroid-n2.c
> index 88a60f34fe..acfd107fc5 100644
> --- a/board/amlogic/odroid-n2/odroid-n2.c
> +++ b/board/amlogic/odroid-n2/odroid-n2.c
> @@ -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 */
> diff --git a/configs/odroid-n2_defconfig b/configs/odroid-n2_defconfig
> index bac44b61ab..1f718a3154 100644
> --- a/configs/odroid-n2_defconfig
> +++ b/configs/odroid-n2_defconfig
> @@ -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
> 

Indeed, thx for the fix

Acked-by: Neil Armstrong <narmstrong@baylibre.com>

If nobody complains I'll push it at the end of the week !

Neil

_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic