mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2024-11-07 22:08:22 +01:00
Merge pull request #112 from Noxenious/master
Update kernel, sunxi-board-fex, sunxi-tools, fbturbo, switch from ext3 to ext4
This commit is contained in:
commit
9d864e2510
@ -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 += " \
|
||||
|
@ -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"
|
||||
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
|
@ -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 \
|
@ -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.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 \
|
||||
file://defconfig \
|
||||
|
@ -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}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user