dany/meta-sunxi
1
0
Fork 0
mirror of https://github.com/linux-sunxi/meta-sunxi.git synced 2024-12-27 05:28:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #98 from Noxenious/master

Browse Source 
Update kernel and u-boot
This commit is contained in:
Aguirre 2015-07-18 16:43:49 +02:00
commit d8934807c6
5 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/olinuxino-a10s.conf
View File

@ -6,5 +6,5 @@
require conf/machine/include/sun5i.inc require conf/machine/include/sun5i.inc
KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb" KERNEL_DEVICETREE = "sun5i-a10s-olinuxino-micro.dtb"
UBOOT_MACHINE = "A10s-OLinuXino-Micro_config" UBOOT_MACHINE = "A10s-OLinuXino-M_config"
SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex" SUNXI_FEX_FILE = "sys_config/a10s/a10s-olinuxino-m.fex"

2
conf/machine/olinuxino-a20.conf
View File

@ -6,5 +6,5 @@
require conf/machine/include/sun7i.inc require conf/machine/include/sun7i.inc
KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb" KERNEL_DEVICETREE = "sun7i-a20-olinuxino-lime.dtb"
UBOOT_MACHINE = "A20-OLinuXino-Micro_config" UBOOT_MACHINE = "A20-OLinuXino_MICRO_config"
SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex" SUNXI_FEX_FILE = "sys_config/a20/a20-olinuxino_micro.fex"

4
recipes-bsp/u-boot/u-boot-sunxi.bb
View File

@ -13,6 +13,10 @@ DEFAULT_PREFERENCE_sun4i="1"
DEFAULT_PREFERENCE_sun5i="1" DEFAULT_PREFERENCE_sun5i="1"
DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun7i="1"
# Sunxi U-Boot uses different names for some boards
UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino-Micro_config"
UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-Micro_config"
SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi" SRC_URI = "git://github.com/linux-sunxi/u-boot-sunxi.git;protocol=git;branch=sunxi"
PE = "1" PE = "1"

8
recipes-bsp/u-boot/u-boot_2015.07rc2.bb → recipes-bsp/u-boot/u-boot_2015.07.bb
View File

@ -25,15 +25,11 @@ DEFAULT_PREFERENCE_sun4i="1"
DEFAULT_PREFERENCE_sun5i="1" DEFAULT_PREFERENCE_sun5i="1"
DEFAULT_PREFERENCE_sun7i="1" DEFAULT_PREFERENCE_sun7i="1"
# Mainline U-Boot uses different names for some boards
UBOOT_MACHINE_olinuxino-a20 = "A20-OLinuXino_MICRO_config"
UBOOT_MACHINE_olinuxino-a10s = "A10s-OLinuXino-M_config"
SRC_URI += "file://boot.cmd" SRC_URI += "file://boot.cmd"
SRCREV = "dfc8bb1f16f7d7c20b7446da95c23f247a02e583" SRCREV = "33711bdd4a4dce942fb5ae85a68899a8357bdd94"
PV = "v2015.07-rc2${SRCPV}" PV = "v2015.07${SRCPV}"
PE = "1" PE = "1"

22
recipes-kernel/linux/linux_4.1.bb Normal file
View File

@ -0,0 +1,22 @@
SECTION = "kernel"
DESCRIPTION = "Mainline Linux kernel"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
COMPATIBLE_MACHINE = "(sun4i|sun5i|sun7i)"
inherit kernel
require recipes-kernel/linux/linux-dtb.inc
require linux.inc
# Pull in the devicetree files into the rootfs
RDEPENDS_kernel-base += "kernel-devicetree"
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
PV = "4.1.2"
SRCREV_pn-${PN} = "5cf9896dc5c72a6c68c36140568b755f697f7760"
SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;protocol=git;branch=linux-4.1.y \
file://defconfig \
"
S = "${WORKDIR}/git"