aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Parent2021-02-15 19:07:44 +0100
committerTom Rini2021-03-20 16:24:26 -0400
commit86e07d59ee53cdd209c114bdabef599d3b3d2036 (patch)
treecd58f07ad4dd82df096b43b7d53072797bc49058
parentf879f2621b42529cf5f88912a07d2866cfc8fd45 (diff)
board: mediatek: rename pumpkin board into mt8516
More than one pumpkin board has been made with different MediaTek SoCs. Rename the pumpkin board to follow the naming convention of all other MediaTek boards and also to not be confusing when other pumpkin boards will be added in follow-up commits. Signed-off-by: Fabien Parent <fparent@baylibre.com>
-rw-r--r--arch/arm/mach-mediatek/Kconfig2
-rw-r--r--board/mediatek/mt8516/Kconfig (renamed from board/mediatek/pumpkin/Kconfig)4
-rw-r--r--board/mediatek/mt8516/MAINTAINERS6
-rw-r--r--board/mediatek/mt8516/Makefile (renamed from board/mediatek/pumpkin/Makefile)2
-rw-r--r--board/mediatek/mt8516/mt8516_pumpkin.c (renamed from board/mediatek/pumpkin/pumpkin.c)0
-rw-r--r--board/mediatek/pumpkin/MAINTAINERS6
-rw-r--r--configs/mt8516_pumpkin_defconfig (renamed from configs/pumpkin_defconfig)0
-rw-r--r--include/configs/mt8516.h (renamed from include/configs/pumpkin.h)4
8 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
index 7f40ba93190..2791b3dbda2 100644
--- a/arch/arm/mach-mediatek/Kconfig
+++ b/arch/arm/mach-mediatek/Kconfig
@@ -76,7 +76,7 @@ source "board/mediatek/mt7622/Kconfig"
source "board/mediatek/mt7623/Kconfig"
source "board/mediatek/mt7629/Kconfig"
source "board/mediatek/mt8512/Kconfig"
+source "board/mediatek/mt8516/Kconfig"
source "board/mediatek/mt8518/Kconfig"
-source "board/mediatek/pumpkin/Kconfig"
endif
diff --git a/board/mediatek/pumpkin/Kconfig b/board/mediatek/mt8516/Kconfig
index 34b1c0b09d4..a87d3872fe6 100644
--- a/board/mediatek/pumpkin/Kconfig
+++ b/board/mediatek/mt8516/Kconfig
@@ -1,10 +1,10 @@
if TARGET_MT8516
config SYS_BOARD
- default "pumpkin"
+ default "mt8516"
config SYS_CONFIG_NAME
- default "pumpkin"
+ default "mt8516"
config MTK_BROM_HEADER_INFO
string
diff --git a/board/mediatek/mt8516/MAINTAINERS b/board/mediatek/mt8516/MAINTAINERS
new file mode 100644
index 00000000000..2f0d8f64649
--- /dev/null
+++ b/board/mediatek/mt8516/MAINTAINERS
@@ -0,0 +1,6 @@
+MT8516 Pumpkin
+M: Fabien Parent <fparent@baylibre.com>
+S: Maintained
+F: board/mediatek/mt8516
+F: include/configs/mt8516.h
+F: configs/mt8516_pumpkin_defconfig
diff --git a/board/mediatek/pumpkin/Makefile b/board/mediatek/mt8516/Makefile
index 75fce4a393a..1d4815d1370 100644
--- a/board/mediatek/pumpkin/Makefile
+++ b/board/mediatek/mt8516/Makefile
@@ -1,3 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
-obj-y += pumpkin.o
+obj-y += mt8516_pumpkin.o
diff --git a/board/mediatek/pumpkin/pumpkin.c b/board/mediatek/mt8516/mt8516_pumpkin.c
index 37daf1c51b9..37daf1c51b9 100644
--- a/board/mediatek/pumpkin/pumpkin.c
+++ b/board/mediatek/mt8516/mt8516_pumpkin.c
diff --git a/board/mediatek/pumpkin/MAINTAINERS b/board/mediatek/pumpkin/MAINTAINERS
deleted file mode 100644
index 16beadc027a..00000000000
--- a/board/mediatek/pumpkin/MAINTAINERS
+++ /dev/null
@@ -1,6 +0,0 @@
-Pumpkin
-M: Fabien Parent <fparent@baylibre.com>
-S: Maintained
-F: board/mediatek/pumpkin
-F: include/configs/pumpkin.h
-F: configs/pumpkin_defconfig
diff --git a/configs/pumpkin_defconfig b/configs/mt8516_pumpkin_defconfig
index 5270ec28cbd..5270ec28cbd 100644
--- a/configs/pumpkin_defconfig
+++ b/configs/mt8516_pumpkin_defconfig
diff --git a/include/configs/pumpkin.h b/include/configs/mt8516.h
index 9c52cae41d7..e809a9c7e30 100644
--- a/include/configs/pumpkin.h
+++ b/include/configs/mt8516.h
@@ -6,8 +6,8 @@
* Author: Fabien Parent <fparent@baylibre.com
*/
-#ifndef __PUMPKIN_H
-#define __PUMPKIN_H
+#ifndef __MT8516_H
+#define __MT8516_H
#include <linux/sizes.h>