From b293d016eb28b081f53e051ac75089902b0f87b2 Mon Sep 17 00:00:00 2001 From: YuzukiTsuru Date: Wed, 30 Mar 2022 15:57:52 +0800 Subject: [PATCH] add support for yuzukick1n --- .../sun8i-v3s/script/genimage.cfg | 46 +++++++++++++++++++ .../sun8i-v3x/script/genimage.cfg | 46 +++++++++++++++++++ .../lichee-zero/script}/genimage.cfg | 0 .../config/uboot/uboot_yuzukick1n_defconfig | 4 +- .../dts/sun8i-v3x-yuzukick1n-linux.dts | 6 +-- .../board/yuzukihd/yuzukick1n/script/bootcmd | 2 +- .../yuzukihd/yuzukick1n/script/genimage.cfg | 46 +++++++++++++++++++ .../configs/yuzukihd_yuzukick1n_defconfig | 4 +- 8 files changed, 145 insertions(+), 9 deletions(-) create mode 100644 buildroot/board/allwinner-generic/sun8i-v3s/script/genimage.cfg create mode 100644 buildroot/board/allwinner-generic/sun8i-v3x/script/genimage.cfg rename buildroot/board/{allwinner-generic/sun8i-generic => sipeed/lichee-zero/script}/genimage.cfg (100%) create mode 100644 buildroot/board/yuzukihd/yuzukick1n/script/genimage.cfg diff --git a/buildroot/board/allwinner-generic/sun8i-v3s/script/genimage.cfg b/buildroot/board/allwinner-generic/sun8i-v3s/script/genimage.cfg new file mode 100644 index 00000000..31b4a915 --- /dev/null +++ b/buildroot/board/allwinner-generic/sun8i-v3s/script/genimage.cfg @@ -0,0 +1,46 @@ +# boot partition +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-v3s-common-linux.dtb", + "boot.scr" + } + } + size = 8M +} + +# micro data-transfer partition +image data.vfat { + vfat {} + empty = true + size = 8M +} + +image sdcard.img { + hdimage {} + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 516096 # 512KB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 0 + } + + partition data { + partition-type = 0xC + image = "data.vfat" + } +} \ No newline at end of file diff --git a/buildroot/board/allwinner-generic/sun8i-v3x/script/genimage.cfg b/buildroot/board/allwinner-generic/sun8i-v3x/script/genimage.cfg new file mode 100644 index 00000000..8d7833f9 --- /dev/null +++ b/buildroot/board/allwinner-generic/sun8i-v3x/script/genimage.cfg @@ -0,0 +1,46 @@ +# boot partition +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-v3x-common-linux.dtb", + "boot.scr" + } + } + size = 8M +} + +# micro data-transfer partition +image data.vfat { + vfat {} + empty = true + size = 8M +} + +image sdcard.img { + hdimage {} + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 516096 # 512KB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 0 + } + + partition data { + partition-type = 0xC + image = "data.vfat" + } +} \ No newline at end of file diff --git a/buildroot/board/allwinner-generic/sun8i-generic/genimage.cfg b/buildroot/board/sipeed/lichee-zero/script/genimage.cfg similarity index 100% rename from buildroot/board/allwinner-generic/sun8i-generic/genimage.cfg rename to buildroot/board/sipeed/lichee-zero/script/genimage.cfg diff --git a/buildroot/board/yuzukihd/yuzukick1n/config/uboot/uboot_yuzukick1n_defconfig b/buildroot/board/yuzukihd/yuzukick1n/config/uboot/uboot_yuzukick1n_defconfig index eaa2d384..6be205e0 100644 --- a/buildroot/board/yuzukihd/yuzukick1n/config/uboot/uboot_yuzukick1n_defconfig +++ b/buildroot/board/yuzukihd/yuzukick1n/config/uboot/uboot_yuzukick1n_defconfig @@ -4,12 +4,10 @@ CONFIG_DEFAULT_DEVICE_TREE="sun8i-v3x-yuzukick1n-uboot" CONFIG_SPL=y CONFIG_MACH_SUN8I_V3S=y CONFIG_SUNXI_DRAM_DDR3_1333=y -CONFIG_DRAM_CLK=166 +CONFIG_DRAM_CLK=400 CONFIG_SYS_CLK_FREQ=800000000 CONFIG_BOOTDELAY=0 # CONFIG_ENV_IS_IN_FAT is not set -CONFIG_USE_DEFAULT_ENV_FILE=y -CONFIG_DEFAULT_ENV_FILE="../../../board/allwinner-generic/sun8i-v3x/script/uboot.env" CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_ATMEL=y diff --git a/buildroot/board/yuzukihd/yuzukick1n/dts/sun8i-v3x-yuzukick1n-linux.dts b/buildroot/board/yuzukihd/yuzukick1n/dts/sun8i-v3x-yuzukick1n-linux.dts index 8f5dd005..a01b5d35 100644 --- a/buildroot/board/yuzukihd/yuzukick1n/dts/sun8i-v3x-yuzukick1n-linux.dts +++ b/buildroot/board/yuzukihd/yuzukick1n/dts/sun8i-v3x-yuzukick1n-linux.dts @@ -1,10 +1,10 @@ /dts-v1/; -#include "sun8i-v3s-linux.dtsi" +#include "sun8i-v3x-linux.dtsi" #include "sunxi-common-regulators.dtsi" / { - model = "Lichee Pi Zero"; - compatible = "licheepi,licheepi-zero", "allwinner,sun8i-v3s"; + model = "YuzukiCK1N"; + compatible = "yuzukihd,yuzukick1n", "allwinner,sun8i-v3s"; aliases { serial0 = &uart0; diff --git a/buildroot/board/yuzukihd/yuzukick1n/script/bootcmd b/buildroot/board/yuzukihd/yuzukick1n/script/bootcmd index 89f396de..3c710687 100644 --- a/buildroot/board/yuzukihd/yuzukick1n/script/bootcmd +++ b/buildroot/board/yuzukihd/yuzukick1n/script/bootcmd @@ -1,4 +1,4 @@ setenv bootargs console=ttyS0,115200 panic=5 console=tty0 rootwait root=/dev/mmcblk0p2 earlyprintk rw load mmc 0:1 0x41000000 zImage -load mmc 0:1 0x41800000 sun8i-v3s-licheepi-zero-linux.dtb +load mmc 0:1 0x41800000 sun8i-v3x-yuzukick1n-linux.dtb bootz 0x41000000 - 0x41800000 \ No newline at end of file diff --git a/buildroot/board/yuzukihd/yuzukick1n/script/genimage.cfg b/buildroot/board/yuzukihd/yuzukick1n/script/genimage.cfg new file mode 100644 index 00000000..1841704a --- /dev/null +++ b/buildroot/board/yuzukihd/yuzukick1n/script/genimage.cfg @@ -0,0 +1,46 @@ +# boot partition +image boot.vfat { + vfat { + files = { + "zImage", + "sun8i-v3x-yuzukick1n-linux.dtb", + "boot.scr" + } + } + size = 8M +} + +# micro data-transfer partition +image data.vfat { + vfat {} + empty = true + size = 8M +} + +image sdcard.img { + hdimage {} + + partition u-boot { + in-partition-table = "no" + image = "u-boot-sunxi-with-spl.bin" + offset = 8192 + size = 516096 # 512KB - 8192 + } + + partition boot { + partition-type = 0xC + bootable = "true" + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext4" + size = 0 + } + + partition data { + partition-type = 0xC + image = "data.vfat" + } +} \ No newline at end of file diff --git a/buildroot/configs/yuzukihd_yuzukick1n_defconfig b/buildroot/configs/yuzukihd_yuzukick1n_defconfig index f505b980..1fa83334 100644 --- a/buildroot/configs/yuzukihd_yuzukick1n_defconfig +++ b/buildroot/configs/yuzukihd_yuzukick1n_defconfig @@ -9,7 +9,7 @@ BR2_TARGET_GENERIC_ISSUE="Welcome to YuzukiCK1N" BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_GENERIC_GETTY_BAUDRATE_115200=y BR2_ROOTFS_POST_IMAGE_SCRIPT="board/allwinner-generic/sun8i-generic/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/allwinner-generic/sun8i-generic/genimage.cfg" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/yuzukihd/yuzukick1n/script/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.180" @@ -38,4 +38,4 @@ BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/sipeed/lichee-zero/script/bootcmd" +BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/yuzukihd/yuzukick1n/script/bootcmd"