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:
Enrico Butera 2017-04-10 22:12:50 +02:00 committed by GitHub
commit f2db7fb88e
7 changed files with 25 additions and 11 deletions

View File

@ -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"

View File

@ -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"

View 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"

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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 \