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>

diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig
index 7f40ba93190b4ce0e49a01d8e492c065ccc28d7f..2791b3dbda2b543346910eff2def9cfd9cddd144 100644 (file)
--- 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/mt8516/Kconfig b/board/mediatek/mt8516/Kconfig
new file mode 100644 (file)
index 0000000..a87d387
--- /dev/null
+++ b/board/mediatek/mt8516/Kconfig
@@ -0,0 +1,13 @@
+if TARGET_MT8516
+
+config SYS_BOARD
+       default "mt8516"
+
+config SYS_CONFIG_NAME
+       default "mt8516"
+
+config MTK_BROM_HEADER_INFO
+       string
+       default "media=emmc"
+
+endif

diff --git a/board/mediatek/mt8516/MAINTAINERS b/board/mediatek/mt8516/MAINTAINERS
new file mode 100644 (file)
index 0000000..2f0d8f6
--- /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/mt8516/Makefile b/board/mediatek/mt8516/Makefile
new file mode 100644 (file)
index 0000000..1d4815d
--- /dev/null
+++ b/board/mediatek/mt8516/Makefile
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier:     GPL-2.0
+
+obj-y += mt8516_pumpkin.o

diff --git a/board/mediatek/mt8516/mt8516_pumpkin.c b/board/mediatek/mt8516/mt8516_pumpkin.c
new file mode 100644 (file)
index 0000000..37daf1c
--- /dev/null
+++ b/board/mediatek/mt8516/mt8516_pumpkin.c
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2019 BayLibre SAS
+ */
+
+#include <common.h>
+#include <dm.h>
+
+int board_init(void)
+{
+       return 0;
+}
+
+int board_late_init(void)
+{
+       struct udevice *dev;
+       int ret;
+
+       if (CONFIG_IS_ENABLED(USB_GADGET)) {
+               ret = uclass_get_device(UCLASS_USB_GADGET_GENERIC, 0, &dev);
+               if (ret) {
+                       pr_err("%s: Cannot find USB device\n", __func__);
+                       return ret;
+               }
+       }
+
+       return 0;
+}

diff --git a/board/mediatek/pumpkin/Kconfig b/board/mediatek/pumpkin/Kconfig
deleted file mode 100644 (file)
index 34b1c0b..0000000
--- a/board/mediatek/pumpkin/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-if TARGET_MT8516
-
-config SYS_BOARD
-       default "pumpkin"
-
-config SYS_CONFIG_NAME
-       default "pumpkin"
-
-config MTK_BROM_HEADER_INFO
-       string
-       default "media=emmc"
-
-endif

diff --git a/board/mediatek/pumpkin/MAINTAINERS b/board/mediatek/pumpkin/MAINTAINERS
deleted file mode 100644 (file)
index 16beadc..0000000
--- 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/board/mediatek/pumpkin/Makefile b/board/mediatek/pumpkin/Makefile
deleted file mode 100644 (file)
index 75fce4a..0000000
--- a/board/mediatek/pumpkin/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-# SPDX-License-Identifier:     GPL-2.0
-
-obj-y += pumpkin.o

diff --git a/board/mediatek/pumpkin/pumpkin.c b/board/mediatek/pumpkin/pumpkin.c
deleted file mode 100644 (file)
index 37daf1c..0000000
--- a/board/mediatek/pumpkin/pumpkin.c
+++ /dev/null
@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (C) 2019 BayLibre SAS
- */
-
-#include <common.h>
-#include <dm.h>
-
-int board_init(void)
-{
-       return 0;
-}
-
-int board_late_init(void)
-{
-       struct udevice *dev;
-       int ret;
-
-       if (CONFIG_IS_ENABLED(USB_GADGET)) {
-               ret = uclass_get_device(UCLASS_USB_GADGET_GENERIC, 0, &dev);
-               if (ret) {
-                       pr_err("%s: Cannot find USB device\n", __func__);
-                       return ret;
-               }
-       }
-
-       return 0;
-}

diff --git a/configs/mt8516_pumpkin_defconfig b/configs/mt8516_pumpkin_defconfig
new file mode 100644 (file)
index 0000000..5270ec2
--- /dev/null
+++ b/configs/mt8516_pumpkin_defconfig
@@ -0,0 +1,78 @@
+CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y
+CONFIG_SYS_TEXT_BASE=0x4C000000
+CONFIG_SYS_MALLOC_F_LEN=0x4000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_ENV_SIZE=0x1000
+CONFIG_DM_GPIO=y
+CONFIG_TARGET_MT8516=y
+CONFIG_DEBUG_UART_BASE=0x11005000
+CONFIG_DEBUG_UART_CLOCK=26000000
+# CONFIG_PSCI_RESET is not set
+CONFIG_DEFAULT_DEVICE_TREE="mt8516-pumpkin"
+CONFIG_DEBUG_UART=y
+CONFIG_FIT=y
+# CONFIG_FIT_ENABLE_SHA256_SUPPORT is not set
+# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
+CONFIG_DEFAULT_FDT_FILE="mt8516-pumpkin"
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_BOARD_LATE_INIT=y
+CONFIG_HUSH_PARSER=y
+# CONFIG_CMD_BDI is not set
+# CONFIG_CMD_CONSOLE is not set
+# CONFIG_CMD_BOOTD is not set
+# CONFIG_CMD_BOOTI is not set
+# CONFIG_CMD_ELF is not set
+# CONFIG_CMD_GO is not set
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_XIMG is not set
+# CONFIG_CMD_EXPORTENV is not set
+# CONFIG_CMD_IMPORTENV is not set
+# CONFIG_CMD_EDITENV is not set
+# CONFIG_CMD_ENV_EXISTS is not set
+# CONFIG_CMD_CRC32 is not set
+# CONFIG_CMD_MEMORY is not set
+CONFIG_CMD_GPT=y
+# CONFIG_RANDOM_UUID is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_PART=y
+# CONFIG_CMD_ITEST is not set
+# CONFIG_CMD_SOURCE is not set
+# CONFIG_CMD_SETEXPR is not set
+# CONFIG_CMD_BLOCK_CACHE is not set
+# CONFIG_CMD_SLEEP is not set
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_CLK=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x4d000000
+CONFIG_FASTBOOT_BUF_SIZE=0x4000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
+CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
+# CONFIG_INPUT is not set
+CONFIG_DM_MMC=y
+# CONFIG_MMC_QUIRKS is not set
+CONFIG_MMC_MTK=y
+CONFIG_PINCTRL=y
+CONFIG_PINCONF=y
+CONFIG_PINCTRL_MT8516=y
+CONFIG_RAM=y
+CONFIG_BAUDRATE=921600
+CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_MTK_SERIAL=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_MT85XX=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_VENDOR_NUM=0x0e8d
+CONFIG_USB_GADGET_PRODUCT_NUM=0x201c
+CONFIG_WDT=y
+CONFIG_WDT_MTK=y
+# CONFIG_EFI_LOADER is not set

diff --git a/configs/pumpkin_defconfig b/configs/pumpkin_defconfig
deleted file mode 100644 (file)
index 5270ec2..0000000
--- a/configs/pumpkin_defconfig
+++ /dev/null
@@ -1,78 +0,0 @@
-CONFIG_ARM=y
-CONFIG_POSITION_INDEPENDENT=y
-CONFIG_ARCH_MEDIATEK=y
-CONFIG_SYS_TEXT_BASE=0x4C000000
-CONFIG_SYS_MALLOC_F_LEN=0x4000
-CONFIG_NR_DRAM_BANKS=1
-CONFIG_ENV_SIZE=0x1000
-CONFIG_DM_GPIO=y
-CONFIG_TARGET_MT8516=y
-CONFIG_DEBUG_UART_BASE=0x11005000
-CONFIG_DEBUG_UART_CLOCK=26000000
-# CONFIG_PSCI_RESET is not set
-CONFIG_DEFAULT_DEVICE_TREE="mt8516-pumpkin"
-CONFIG_DEBUG_UART=y
-CONFIG_FIT=y
-# CONFIG_FIT_ENABLE_SHA256_SUPPORT is not set
-# CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
-CONFIG_DEFAULT_FDT_FILE="mt8516-pumpkin"
-# CONFIG_DISPLAY_BOARDINFO is not set
-CONFIG_BOARD_LATE_INIT=y
-CONFIG_HUSH_PARSER=y
-# CONFIG_CMD_BDI is not set
-# CONFIG_CMD_CONSOLE is not set
-# CONFIG_CMD_BOOTD is not set
-# CONFIG_CMD_BOOTI is not set
-# CONFIG_CMD_ELF is not set
-# CONFIG_CMD_GO is not set
-# CONFIG_CMD_IMI is not set
-# CONFIG_CMD_XIMG is not set
-# CONFIG_CMD_EXPORTENV is not set
-# CONFIG_CMD_IMPORTENV is not set
-# CONFIG_CMD_EDITENV is not set
-# CONFIG_CMD_ENV_EXISTS is not set
-# CONFIG_CMD_CRC32 is not set
-# CONFIG_CMD_MEMORY is not set
-CONFIG_CMD_GPT=y
-# CONFIG_RANDOM_UUID is not set
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
-CONFIG_CMD_MMC=y
-CONFIG_CMD_PART=y
-# CONFIG_CMD_ITEST is not set
-# CONFIG_CMD_SOURCE is not set
-# CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_BLOCK_CACHE is not set
-# CONFIG_CMD_SLEEP is not set
-CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
-CONFIG_CLK=y
-CONFIG_USB_FUNCTION_FASTBOOT=y
-CONFIG_FASTBOOT_BUF_ADDR=0x4d000000
-CONFIG_FASTBOOT_BUF_SIZE=0x4000000
-CONFIG_FASTBOOT_FLASH=y
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
-CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y
-CONFIG_FASTBOOT_MMC_USER_SUPPORT=y
-# CONFIG_INPUT is not set
-CONFIG_DM_MMC=y
-# CONFIG_MMC_QUIRKS is not set
-CONFIG_MMC_MTK=y
-CONFIG_PINCTRL=y
-CONFIG_PINCONF=y
-CONFIG_PINCTRL_MT8516=y
-CONFIG_RAM=y
-CONFIG_BAUDRATE=921600
-CONFIG_DM_SERIAL=y
-CONFIG_DEBUG_UART_ANNOUNCE=y
-CONFIG_MTK_SERIAL=y
-CONFIG_USB=y
-CONFIG_DM_USB=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_MT85XX=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_VENDOR_NUM=0x0e8d
-CONFIG_USB_GADGET_PRODUCT_NUM=0x201c
-CONFIG_WDT=y
-CONFIG_WDT_MTK=y
-# CONFIG_EFI_LOADER is not set

diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h
new file mode 100644 (file)
index 0000000..e809a9c
--- /dev/null
+++ b/include/configs/mt8516.h
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Configuration for Pumpkin board
+ *
+ * Copyright (C) 2019 BayLibre, SAS
+ * Author: Fabien Parent <fparent@baylibre.com
+ */
+
+#ifndef __MT8516_H
+#define __MT8516_H
+
+#include <linux/sizes.h>
+
+#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_MALLOC_LEN          SZ_4M
+
+#define CONFIG_CPU_ARMV8
+#define COUNTER_FREQUENCY              13000000
+
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    -4
+#define CONFIG_SYS_NS16550_MEM32
+#define CONFIG_SYS_NS16550_COM1                0x11005000
+#define CONFIG_SYS_NS16550_CLK         26000000
+
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + SZ_2M - \
+                                                GENERATED_GBL_DATA_SIZE)
+
+#define CONFIG_SYS_BOOTM_LEN           SZ_64M
+
+/* Environment settings */
+#include <config_distro_bootcmd.h>
+
+#define MMCBOOT \
+       "mmcdev=0\0" \
+       "kernel_partition=2\0" \
+       "rootfs_partition=3\0" \
+       "mmc_discover_partition=" \
+               "part start mmc ${mmcdev} ${kernel_partition} kernel_part_addr;" \
+               "part size mmc ${mmcdev} ${kernel_partition} kernel_part_size;\0" \
+       "mmcboot=" \
+               "mmc dev ${mmcdev};" \
+               "run mmc_discover_partition;" \
+               "mmc read ${kerneladdr} ${kernel_part_addr} ${kernel_part_size};" \
+               "setenv bootargs ${bootargs} root=/dev/mmcblk${mmcdev}p${rootfs_partition} rootwait; " \
+               "bootm ${kerneladdr}; \0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       "kerneladdr=0x4A000000\0" \
+       MMCBOOT \
+       "bootcmd=run mmcboot;\0"
+
+#endif

diff --git a/include/configs/pumpkin.h b/include/configs/pumpkin.h
deleted file mode 100644 (file)
index 9c52cae..0000000
--- a/include/configs/pumpkin.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * Configuration for Pumpkin board
- *
- * Copyright (C) 2019 BayLibre, SAS
- * Author: Fabien Parent <fparent@baylibre.com
- */
-
-#ifndef __PUMPKIN_H
-#define __PUMPKIN_H
-
-#include <linux/sizes.h>
-
-#define CONFIG_SYS_LOAD_ADDR           CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_MALLOC_LEN          SZ_4M
-
-#define CONFIG_CPU_ARMV8
-#define COUNTER_FREQUENCY              13000000
-
-#define CONFIG_SYS_NS16550_SERIAL
-#define CONFIG_SYS_NS16550_REG_SIZE    -4
-#define CONFIG_SYS_NS16550_MEM32
-#define CONFIG_SYS_NS16550_COM1                0x11005000
-#define CONFIG_SYS_NS16550_CLK         26000000
-
-#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_TEXT_BASE + SZ_2M - \
-                                                GENERATED_GBL_DATA_SIZE)
-
-#define CONFIG_SYS_BOOTM_LEN           SZ_64M
-
-/* Environment settings */
-#include <config_distro_bootcmd.h>
-
-#define MMCBOOT \
-       "mmcdev=0\0" \
-       "kernel_partition=2\0" \
-       "rootfs_partition=3\0" \
-       "mmc_discover_partition=" \
-               "part start mmc ${mmcdev} ${kernel_partition} kernel_part_addr;" \
-               "part size mmc ${mmcdev} ${kernel_partition} kernel_part_size;\0" \
-       "mmcboot=" \
-               "mmc dev ${mmcdev};" \
-               "run mmc_discover_partition;" \
-               "mmc read ${kerneladdr} ${kernel_part_addr} ${kernel_part_size};" \
-               "setenv bootargs ${bootargs} root=/dev/mmcblk${mmcdev}p${rootfs_partition} rootwait; " \
-               "bootm ${kerneladdr}; \0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "kerneladdr=0x4A000000\0" \
-       MMCBOOT \
-       "bootcmd=run mmcboot;\0"
-
-#endif