mirror of
https://github.com/linux-sunxi/meta-sunxi.git
synced 2024-12-27 05:28:22 +01:00
Merge pull request #171 from geomatsi/orange-pi-zero-and-misc-updates
bump u-boot, kernel, enable CONFIG_THERMAL_OF, add new orange-pi-zero board
This commit is contained in:
commit
f2db7fb88e
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
require conf/machine/include/sun8i.inc
|
require conf/machine/include/sun8i.inc
|
||||||
|
|
||||||
PREFERRED_VERSION_linux = "4.9.0+git%"
|
PREFERRED_VERSION_linux = "4.11.0+git%"
|
||||||
PREFERRED_VERSION_u-boot = "v2016.11%"
|
PREFERRED_VERSION_u-boot = "v2017.03%"
|
||||||
|
|
||||||
KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
|
KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
|
||||||
UBOOT_MACHINE = "nanopi_neo_defconfig"
|
UBOOT_MACHINE = "nanopi_neo_defconfig"
|
||||||
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
require conf/machine/include/sun8i.inc
|
require conf/machine/include/sun8i.inc
|
||||||
|
|
||||||
PREFERRED_VERSION_linux = "4.9.0+git%"
|
PREFERRED_VERSION_linux = "4.11.0+git%"
|
||||||
PREFERRED_VERSION_u-boot = "v2016.11%"
|
PREFERRED_VERSION_u-boot = "v2017.03%"
|
||||||
|
|
||||||
KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
|
KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
|
||||||
UBOOT_MACHINE = "orangepi_one_defconfig"
|
UBOOT_MACHINE = "orangepi_one_defconfig"
|
||||||
|
13
conf/machine/orange-pi-zero.conf
Normal file
13
conf/machine/orange-pi-zero.conf
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
#@TYPE: Machine
|
||||||
|
#@NAME: orange-pi-one
|
||||||
|
#@DESCRIPTION: Machine configuration for the orange-pi-one, base on allwinner H3 CPU
|
||||||
|
|
||||||
|
require conf/machine/include/sun8i.inc
|
||||||
|
|
||||||
|
PREFERRED_VERSION_linux = "4.11.0+git%"
|
||||||
|
PREFERRED_VERSION_u-boot = "v2017.03%"
|
||||||
|
|
||||||
|
KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
|
||||||
|
UBOOT_MACHINE = "orangepi_zero_defconfig"
|
||||||
|
|
||||||
|
DEFAULTTUNE = "cortexa7hf-neon-vfpv4"
|
@ -4,8 +4,8 @@
|
|||||||
|
|
||||||
require conf/machine/include/sun4i.inc
|
require conf/machine/include/sun4i.inc
|
||||||
|
|
||||||
PREFERRED_VERSION_linux = "4.9.0+git%"
|
PREFERRED_VERSION_linux = "4.11.0+git%"
|
||||||
PREFERRED_VERSION_u-boot = "v2016.11%"
|
PREFERRED_VERSION_u-boot = "v2017.03%"
|
||||||
|
|
||||||
KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
|
KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
|
||||||
UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
|
UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"
|
||||||
|
@ -29,9 +29,9 @@ DEFAULT_PREFERENCE_sun8i="1"
|
|||||||
SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
|
SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
|
||||||
file://boot.cmd"
|
file://boot.cmd"
|
||||||
|
|
||||||
SRCREV = "29e0cfb4f77f7aa369136302cee14a91e22dca71"
|
SRCREV = "8537ddd769f460d7fb7a62a3dcc9669049702e51"
|
||||||
|
|
||||||
PV = "v2016.11+git${SRCPV}"
|
PV = "v2017.03+git${SRCPV}"
|
||||||
|
|
||||||
PE = "2"
|
PE = "2"
|
||||||
|
|
@ -511,6 +511,7 @@ CONFIG_GPIO_SYSFS=y
|
|||||||
CONFIG_POWER_SUPPLY=y
|
CONFIG_POWER_SUPPLY=y
|
||||||
CONFIG_POWER_RESET=y
|
CONFIG_POWER_RESET=y
|
||||||
CONFIG_THERMAL=y
|
CONFIG_THERMAL=y
|
||||||
|
CONFIG_THERMAL_OF=y
|
||||||
CONFIG_CPU_THERMAL=y
|
CONFIG_CPU_THERMAL=y
|
||||||
CONFIG_WATCHDOG=y
|
CONFIG_WATCHDOG=y
|
||||||
CONFIG_SUNXI_WATCHDOG=y
|
CONFIG_SUNXI_WATCHDOG=y
|
||||||
|
@ -18,9 +18,9 @@ DEFAULT_PREFERENCE = "-1"
|
|||||||
|
|
||||||
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
|
KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
|
||||||
|
|
||||||
# 4.9.0
|
# 4.11.0-rc5
|
||||||
PV = "4.9.0+git${SRCPV}"
|
PV = "4.11.0+git${SRCPV}"
|
||||||
SRCREV_pn-${PN} = "69973b830859bc6529a7a0468ba0d80ee5117826"
|
SRCREV_pn-${PN} = "81d4bab4ce87228c37ab14a885438544af5c9ce6"
|
||||||
|
|
||||||
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
|
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;branch=master \
|
||||||
file://defconfig \
|
file://defconfig \
|
||||||
|
Loading…
Reference in New Issue
Block a user