[PATCH 1/3] 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 --- arch/arm/mach-mediatek/Kconfig | 2 +- board/mediatek/{pumpkin => mt8516}/Kconfig | 4 ++-- board/mediatek/mt8516/MAINTAINERS | 6 ++++++ board/mediatek/{pumpkin => mt8516}/Makefile | 2 +- .../mediatek/{pumpkin/pumpkin.c => mt8516/mt8516_pumpkin.c} | 0 board/mediatek/pumpkin/MAINTAINERS | 6 ------ configs/{pumpkin_defconfig => mt8516_pumpkin_defconfig} | 0 include/configs/{pumpkin.h => mt8516.h} | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename board/mediatek/{pumpkin => mt8516}/Kconfig (76%) create mode 100644 board/mediatek/mt8516/MAINTAINERS rename board/mediatek/{pumpkin => mt8516}/Makefile (58%) rename board/mediatek/{pumpkin/pumpkin.c => mt8516/mt8516_pumpkin.c} (100%) delete mode 100644 board/mediatek/pumpkin/MAINTAINERS rename configs/{pumpkin_defconfig => mt8516_pumpkin_defconfig} (100%) rename include/configs/{pumpkin.h => mt8516.h} (97%)
diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 7f40ba93190b..2791b3dbda2b 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 similarity index 76% rename from board/mediatek/pumpkin/Kconfig rename to board/mediatek/mt8516/Kconfig index 34b1c0b09d47..a87d3872fe6e 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 000000000000..2f0d8f646498 --- /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 similarity index 58% rename from board/mediatek/pumpkin/Makefile rename to board/mediatek/mt8516/Makefile index 75fce4a393ab..1d4815d1370f 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 similarity index 100% rename from board/mediatek/pumpkin/pumpkin.c rename to board/mediatek/mt8516/mt8516_pumpkin.c diff --git a/board/mediatek/pumpkin/MAINTAINERS b/board/mediatek/pumpkin/MAINTAINERS deleted file mode 100644 index 16beadc027a1..000000000000 --- 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 similarity index 100% rename from configs/pumpkin_defconfig rename to configs/mt8516_pumpkin_defconfig diff --git a/include/configs/pumpkin.h b/include/configs/mt8516.h similarity index 97% rename from include/configs/pumpkin.h rename to include/configs/mt8516.h index 9c52cae41d71..e809a9c7e304 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>
Init USB Ether if CONFIG_USB_ETHER is enabled.
Signed-off-by: Fabien Parent fparent@baylibre.com --- board/mediatek/mt8516/mt8516_pumpkin.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/board/mediatek/mt8516/mt8516_pumpkin.c b/board/mediatek/mt8516/mt8516_pumpkin.c index 37daf1c51b92..42f3863b92c3 100644 --- a/board/mediatek/mt8516/mt8516_pumpkin.c +++ b/board/mediatek/mt8516/mt8516_pumpkin.c @@ -5,6 +5,7 @@
#include <common.h> #include <dm.h> +#include <net.h>
int board_init(void) { @@ -24,5 +25,8 @@ int board_late_init(void) } }
+ if (CONFIG_IS_ENABLED(USB_ETHER)) + usb_ether_init(); + return 0; }
On Mon, Feb 15, 2021 at 07:07:45PM +0100, Fabien Parent wrote:
Init USB Ether if CONFIG_USB_ETHER is enabled.
Signed-off-by: Fabien Parent fparent@baylibre.com
Applied to u-boot/next, thanks!
Instead of redefining our own way to boot, let's just use config_distro_bootcmd.h.
Signed-off-by: Fabien Parent fparent@baylibre.com --- include/configs/mt8516.h | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-)
diff --git a/include/configs/mt8516.h b/include/configs/mt8516.h index e809a9c7e304..a1c5d8174be7 100644 --- a/include/configs/mt8516.h +++ b/include/configs/mt8516.h @@ -31,23 +31,11 @@ /* 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 BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0)
#define CONFIG_EXTRA_ENV_SETTINGS \ - "kerneladdr=0x4A000000\0" \ - MMCBOOT \ - "bootcmd=run mmcboot;\0" + "scriptaddr=0x40000000\0" \ + BOOTENV
#endif
On Mon, Feb 15, 2021 at 07:07:46PM +0100, Fabien Parent wrote:
Instead of redefining our own way to boot, let's just use config_distro_bootcmd.h.
Signed-off-by: Fabien Parent fparent@baylibre.com
Applied to u-boot/next, thanks!
On Mon, Feb 15, 2021 at 07:07:44PM +0100, Fabien Parent wrote:
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
Applied to u-boot/next, thanks!
participants (2)
-
Fabien Parent -
Tom Rini