From 784e893ac51fc75dbd6121929621072d4863a8f5 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 21 Sep 2015 14:32:37 +0200 Subject: [PATCH 1/6] change filesystem from ext3 to ext4 ext3 filesystem is getting deprecated in favor of ext4 and openembedded will default to ext4 in the next release, so switch to ext4 as well. Signed-off-by: Jens Lucius --- classes/sdcard_image-sunxi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/sdcard_image-sunxi.bbclass b/classes/sdcard_image-sunxi.bbclass index dc8abe9..f96abc8 100644 --- a/classes/sdcard_image-sunxi.bbclass +++ b/classes/sdcard_image-sunxi.bbclass @@ -26,7 +26,7 @@ BOOT_SPACE ?= "20480" IMAGE_ROOTFS_ALIGNMENT = "2048" # Use an uncompressed ext3 by default as rootfs -SDIMG_ROOTFS_TYPE ?= "ext3" +SDIMG_ROOTFS_TYPE ?= "ext4" SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${SDIMG_ROOTFS_TYPE}" IMAGE_DEPENDS_sunxi-sdimg += " \ From 5127517a14aad1bb58aeaa52c98d83dbd2fcbbf1 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 21 Sep 2015 14:34:31 +0200 Subject: [PATCH 2/6] update to latest sunxi-board-fex Signed-off-by: Jens Lucius --- recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb index 2dc2e14..5505978 100644 --- a/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb +++ b/recipes-bsp/sunxi-board-fex/sunxi-board-fex.bb @@ -11,7 +11,7 @@ COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)" SRC_URI = "git://github.com/linux-sunxi/sunxi-boards.git;protocol=git" # Increase PV with SRCREV change -SRCREV = "bf02cb81d1fe5996758322dc74e66808c1c7ad38" +SRCREV = "496ef0fbd166cc2395daa76dd3c359357420963d" S = "${WORKDIR}/git" From 4e261ffb96d8fd76803aa17bc21ded0d4d2157ca Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 21 Sep 2015 15:51:56 +0200 Subject: [PATCH 3/6] update kernel versions - Update kernel from 4.1.3 to 4.1.7 - Update git kernel from 4.2rc4 to 4.3rc2 - Sync defconfig with latest version Signed-off-by: Jens Lucius --- recipes-kernel/linux/linux/defconfig | 8 ++++++++ recipes-kernel/linux/{linux_4.1.3.bb => linux_4.1.7.bb} | 4 ++-- recipes-kernel/linux/linux_git.bb | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) rename recipes-kernel/linux/{linux_4.1.3.bb => linux_4.1.7.bb} (79%) diff --git a/recipes-kernel/linux/linux/defconfig b/recipes-kernel/linux/linux/defconfig index b5527e7..d16d39f 100644 --- a/recipes-kernel/linux/linux/defconfig +++ b/recipes-kernel/linux/linux/defconfig @@ -3,6 +3,7 @@ CONFIG_POSIX_MQUEUE=y CONFIG_FHANDLE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_CGROUPS=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y CONFIG_TASKSTATS=y @@ -500,6 +501,7 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_MV64XXX=y +CONFIG_I2C_SUN6I_P2WI=y CONFIG_SPI=y CONFIG_SPI_SUN4I=y CONFIG_SPI_SUN6I=y @@ -716,7 +718,12 @@ CONFIG_RTC_CLASS=y # CONFIG_RTC_INTF_PROC is not set CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUNXI=y +CONFIG_DMADEVICES=y +CONFIG_DMA_SUN6I=y # CONFIG_IOMMU_SUPPORT is not set +CONFIG_EXTCON=y +CONFIG_PWM=y +CONFIG_PWM_SUN4I=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN9I_USB=y CONFIG_EXT4_FS=y @@ -732,6 +739,7 @@ CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y CONFIG_PRINTK_TIME=y +CONFIG_CRYPTO_DEV_SUN4I_SS=y CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM_NEON=y CONFIG_CRYPTO_SHA256_ARM=y diff --git a/recipes-kernel/linux/linux_4.1.3.bb b/recipes-kernel/linux/linux_4.1.7.bb similarity index 79% rename from recipes-kernel/linux/linux_4.1.3.bb rename to recipes-kernel/linux/linux_4.1.7.bb index e8a0a5f..8a5e4a0 100644 --- a/recipes-kernel/linux/linux_4.1.3.bb +++ b/recipes-kernel/linux/linux_4.1.7.bb @@ -16,8 +16,8 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/linux-${PV}" -SRC_URI[md5sum] = "96c2c77b1c54ba01cfd8fc2d13fbf828" -SRC_URI[sha256sum] = "96dd2c30984408a8a2211463618c3564514239f1e4335f6bc461c4b9a9bae30b" +SRC_URI[md5sum] = "e94aaf24b20aa8d148a271398cdafa40" +SRC_URI[sha256sum] = "76719c1c9326b7ab7f4305a82478389813c3571120f858491ba05d30d5b62d3c" SRC_URI += "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ file://defconfig \ diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb index 4c3386c..a9ce67f 100644 --- a/recipes-kernel/linux/linux_git.bb +++ b/recipes-kernel/linux/linux_git.bb @@ -18,9 +18,9 @@ DEFAULT_PREFERENCE = "-1" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" -# 4.2 rc4 -PV = "4.1+4.2rc4.git${SRCPV}" -SRCREV_pn-${PN} = "cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f" +# 4.3 rc2 +PV = "4.1+4.3rc2.git${SRCPV}" +SRCREV_pn-${PN} = "1f93e4a96c9109378204c147b3eec0d0e8100fde" SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \ file://defconfig \ From b66da9c3bb7ca896833ae25c47b4ea6341bb01d1 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 21 Sep 2015 15:53:57 +0200 Subject: [PATCH 4/6] update sunxi-tools The complete fel boot has been reworked, making it possible to boot mainline u-boot via fel mode, also supports Allwinner H3, A80 and A88. Signed-off-by: Jens Lucius --- recipes-support/sunxi-tools/sunxi-tools_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-support/sunxi-tools/sunxi-tools_git.bb b/recipes-support/sunxi-tools/sunxi-tools_git.bb index 4770121..777e827 100644 --- a/recipes-support/sunxi-tools/sunxi-tools_git.bb +++ b/recipes-support/sunxi-tools/sunxi-tools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PV = "1.0+git${SRCPV}" PKGV = "1.0+git${GITPKGV}" PR = "r3" -SRCREV = "ed6f7969d80b91048b0ed95ccb61cc98f46fead7" +SRCREV = "568c7a0e81fc5d52189710c6d832677aa8770b16" DEPENDS += "libusb" @@ -31,5 +31,4 @@ do_install() { install -m 755 ${S}/fexc ${D}/${bindir} install -m 755 ${S}/nand-part ${D}/${bindir} install -m 755 ${S}/pio ${D}/${bindir} - install -m 755 ${S}/usb-boot ${D}/${bindir} } From 0693369edc9544302c9a511f81729622c10dc3f9 Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 21 Sep 2015 15:55:42 +0200 Subject: [PATCH 5/6] update fbturbo to latest version Signed-off-by: Jens Lucius --- recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb index 77e8e1e..4385684 100644 --- a/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb +++ b/recipes-graphics/xorg-xserver/xf86-video-fbturbo_git.bb @@ -9,7 +9,7 @@ DEPENDS += "sunxi-mali" PE = "3" PV = "0.3.1+git${SRCPV}" -SRCREV_pn-${PN} = "eed17d5586c3b4dfcf0b5976e8b947b171d4897c" +SRCREV_pn-${PN} = "e094e3c8f9004ca3347694bd05b99d136e8621b9" SRC_URI = "git://github.com/ssvb/xf86-video-fbturbo.git;protocol=http;branch=master \ file://20-fbturbo.conf" From 82672a440b2803b5c0c9f24c5e1c9556583549dc Mon Sep 17 00:00:00 2001 From: Jens Lucius Date: Mon, 21 Sep 2015 16:59:07 +0200 Subject: [PATCH 6/6] adjust git kernel version --- recipes-kernel/linux/linux_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-kernel/linux/linux_git.bb b/recipes-kernel/linux/linux_git.bb index a9ce67f..f494173 100644 --- a/recipes-kernel/linux/linux_git.bb +++ b/recipes-kernel/linux/linux_git.bb @@ -19,7 +19,7 @@ DEFAULT_PREFERENCE = "-1" KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" # 4.3 rc2 -PV = "4.1+4.3rc2.git${SRCPV}" +PV = "4.2+4.3rc2.git${SRCPV}" SRCREV_pn-${PN} = "1f93e4a96c9109378204c147b3eec0d0e8100fde" SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \