| Message ID | 20191218193033.32388-1-avraham.shukron@gmail.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | pine64_defconfig: switch ATF to mainline and bump to latest | expand |
Please ignore this patch. I'll rework the commit message and submit a new series with some other bumps. On Wed, Dec 18, 2019 at 9:31 PM Avi Shukron <avraham.shukron@gmail.com> wrote: > For a while now that sun50i_a64 is supported in the mainline ATF > repo. > > Signed-off-by: Avi Shukron <avraham.shukron@gmail.com> > --- > configs/pine64_defconfig | 43 ++++++++++++++-------------------------- > 1 file changed, 15 insertions(+), 28 deletions(-) > > diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig > index d2e3a360fa..05084b347d 100644 > --- a/configs/pine64_defconfig > +++ b/configs/pine64_defconfig > @@ -1,19 +1,22 @@ > BR2_aarch64=y > -BR2_cortex_a53=y > BR2_ARM_FPU_VFPV4=y > - > -# Linux headers same as kernel, a 5.0 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y > - > -# Firmware > +BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" > +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg" > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION=y > +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" > +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > +BR2_LINUX_KERNEL_DTS_SUPPORT=y > +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" > +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_ROOTFS_EXT2_4=y > BR2_TARGET_ARM_TRUSTED_FIRMWARE=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL=" > https://github.com/apritzel/arm-trusted-firmware.git" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" > > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" > -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y > - > -# Bootloader > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" > +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" > BR2_TARGET_UBOOT=y > BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y > BR2_TARGET_UBOOT_CUSTOM_VERSION=y > @@ -28,22 +31,6 @@ BR2_TARGET_UBOOT_SPL=y > BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" > BR2_TARGET_UBOOT_BOOT_SCRIPT=y > BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" > - > -# Kernel > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" > -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" > -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y > - > -# Filesystem > -BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_ROOTFS_EXT2_4=y > BR2_PACKAGE_HOST_DOSFSTOOLS=y > BR2_PACKAGE_HOST_GENIMAGE=y > BR2_PACKAGE_HOST_MTOOLS=y > -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" > -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg" > -- > 2.20.1 > >
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index d2e3a360fa..05084b347d 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -1,19 +1,22 @@ BR2_aarch64=y -BR2_cortex_a53=y BR2_ARM_FPU_VFPV4=y - -# Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Firmware +BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" +BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" +BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ARM_TRUSTED_FIRMWARE=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f" -BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y - -# Bootloader +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y @@ -28,22 +31,6 @@ BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin" BR2_TARGET_UBOOT_BOOT_SCRIPT=y BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd" - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64" -BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y - -# Filesystem -BR2_TARGET_GENERIC_ISSUE="Welcome to PINE64" -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y BR2_PACKAGE_HOST_DOSFSTOOLS=y BR2_PACKAGE_HOST_GENIMAGE=y BR2_PACKAGE_HOST_MTOOLS=y -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/pine64/genimage.cfg"
For a while now that sun50i_a64 is supported in the mainline ATF repo. Signed-off-by: Avi Shukron <avraham.shukron@gmail.com> --- configs/pine64_defconfig | 43 ++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 28 deletions(-)