From da77b9f7d1bea10c8dcd4626306d374f9269f190 Mon Sep 17 00:00:00 2001 From: Mohammad Rasim Date: Sat, 23 Mar 2019 14:52:22 +0300 Subject: [PATCH] ARM: board: meson: rename odroid-c2 to p200 This renames the odroid-c2 to p200 and set it as the default GXBB board Other boards (odroid-c2 and nanopi-k2) will inherit from p200 Signed-off-by: Mohammad Rasim Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/Kconfig | 2 +- board/amlogic/{odroid-c2 => p200}/MAINTAINERS | 5 ++--- board/amlogic/{odroid-c2 => p200}/Makefile | 2 +- board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 | 0 board/amlogic/{odroid-c2 => p200}/README.odroid-c2 | 0 board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} | 0 6 files changed, 4 insertions(+), 5 deletions(-) rename board/amlogic/{odroid-c2 => p200}/MAINTAINERS (70%) rename board/amlogic/{odroid-c2 => p200}/Makefile (82%) rename board/amlogic/{odroid-c2 => p200}/README.nanopi-k2 (100%) rename board/amlogic/{odroid-c2 => p200}/README.odroid-c2 (100%) rename board/amlogic/{odroid-c2/odroid-c2.c => p200/p200.c} (100%) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 11077bc6cc..1b1d0aef0d 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -61,7 +61,7 @@ config SYS_VENDOR config SYS_BOARD string "Board name" - default "odroid-c2" if MESON_GXBB + default "p200" if MESON_GXBB default "p212" if MESON_GXL default "q200" if MESON_GXM default "s400" if MESON_AXG diff --git a/board/amlogic/odroid-c2/MAINTAINERS b/board/amlogic/p200/MAINTAINERS similarity index 70% rename from board/amlogic/odroid-c2/MAINTAINERS rename to board/amlogic/p200/MAINTAINERS index 6a853066d7..77a055b681 100644 --- a/board/amlogic/odroid-c2/MAINTAINERS +++ b/board/amlogic/p200/MAINTAINERS @@ -1,8 +1,7 @@ -ODROID-C2 +P200 M: Beniamino Galvani M: Neil Armstrong S: Maintained -F: board/amlogic/odroid-c2/ -F: include/configs/odroid-c2.h +F: board/amlogic/p200/ F: configs/nanopi-k2_defconfig F: configs/odroid-c2_defconfig diff --git a/board/amlogic/odroid-c2/Makefile b/board/amlogic/p200/Makefile similarity index 82% rename from board/amlogic/odroid-c2/Makefile rename to board/amlogic/p200/Makefile index a6a3db755f..f82a7ea9ca 100644 --- a/board/amlogic/odroid-c2/Makefile +++ b/board/amlogic/p200/Makefile @@ -2,4 +2,4 @@ # # (C) Copyright 2016 Beniamino Galvani -obj-y := odroid-c2.o +obj-y := p200.o diff --git a/board/amlogic/odroid-c2/README.nanopi-k2 b/board/amlogic/p200/README.nanopi-k2 similarity index 100% rename from board/amlogic/odroid-c2/README.nanopi-k2 rename to board/amlogic/p200/README.nanopi-k2 diff --git a/board/amlogic/odroid-c2/README.odroid-c2 b/board/amlogic/p200/README.odroid-c2 similarity index 100% rename from board/amlogic/odroid-c2/README.odroid-c2 rename to board/amlogic/p200/README.odroid-c2 diff --git a/board/amlogic/odroid-c2/odroid-c2.c b/board/amlogic/p200/p200.c similarity index 100% rename from board/amlogic/odroid-c2/odroid-c2.c rename to board/amlogic/p200/p200.c -- 2.39.5