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

Merge pull request #215 from XevoInc/nanopi-neo-plus2

Browse Source 
Add the nanopi neo 2 and plus2
This commit is contained in:
Enrico Butera 2018-06-10 23:40:08 +02:00 committed by GitHub
commit df468d72d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/machine/nanopi-neo-air.conf
View File

@ -5,7 +5,7 @@
require conf/machine/include/sun8i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo-air.dtb"
UBOOT_MACHINE = "nanopi_neo_air_defconfig"

11
conf/machine/nanopi-neo-plus2.conf Normal file
View File

@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: nanopi-neo-plus2
#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo Plus2, based
# on the Allwinner H5 SoC.
require conf/machine/include/sun50i.inc
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo-plus2.dtb"
UBOOT_MACHINE = "nanopi_neo_plus2_defconfig"

2
conf/machine/nanopi-neo.conf
View File

@ -4,7 +4,7 @@
require conf/machine/include/sun8i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "sun8i-h3-nanopi-neo.dtb"
UBOOT_MACHINE = "nanopi_neo_defconfig"

11
conf/machine/nanopi-neo2.conf Normal file
View File

@ -0,0 +1,11 @@
#@TYPE: Machine
#@NAME: nanopi-neo2
#@DESCRIPTION: Machine configuration for the FriendlyARM NanoPi Neo 2, based on
# the Allwinner H5 SoC.
require conf/machine/include/sun50i.inc
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "allwinner/sun50i-h5-nanopi-neo2.dtb"
UBOOT_MACHINE = "nanopi_neo2_defconfig"

2
conf/machine/orange-pi-one.conf
View File

@ -4,7 +4,7 @@
require conf/machine/include/sun8i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "sun8i-h3-orangepi-one.dtb"
UBOOT_MACHINE = "orangepi_one_defconfig"

2
conf/machine/orange-pi-pc.conf
View File

@ -4,7 +4,7 @@
require conf/machine/include/sun8i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "sun8i-h3-orangepi-pc.dtb"
UBOOT_MACHINE = "orangepi_pc_defconfig"

2
conf/machine/orange-pi-zero-plus2.conf
View File

@ -5,7 +5,7 @@
require conf/machine/include/sun50i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "allwinner/sun50i-h5-orangepi-zero-plus2.dtb"
UBOOT_MACHINE = "orangepi_zero_plus2_defconfig"

2
conf/machine/orange-pi-zero.conf
View File

@ -4,7 +4,7 @@
require conf/machine/include/sun8i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "sun8i-h2-plus-orangepi-zero.dtb"
UBOOT_MACHINE = "orangepi_zero_defconfig"

2
conf/machine/pcduino.conf
View File

@ -4,7 +4,7 @@
require conf/machine/include/sun4i.inc
PREFERRED_VERSION_u-boot = "v2017.11%"
PREFERRED_VERSION_u-boot = "v2018.03%"
KERNEL_DEVICETREE = "sun4i-a10-pcduino.dtb"
UBOOT_MACHINE = "Linksprite_pcDuino_defconfig"

28
recipes-bsp/u-boot/files/u-boot-pylibfdt-native-build.patch
View File

@ -1,12 +1,16 @@
diff --git a/tools/Makefile b/tools/Makefile
index 5db2a54..54bd224 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -134,6 +134,7 @@ tools/_libfdt.so: $(LIBFDT_SRCS) $(LIBFDT_SWIG)
$(Q)unset CC; \
unset CROSS_COMPILE; \
LDFLAGS="$(HOSTLDFLAGS)" CFLAGS= VERSION="u-boot-$(UBOOTVERSION)" \
+ CC="$(HOSTCC)" LDSHARED="$(HOSTLDSHARED)" \
CPPFLAGS="$(_hostc_flags)" OBJDIR=tools \
SOURCES="$(LIBFDT_SRCS) tools/libfdt.i" \
SWIG_OPTS="-I$(srctree)/lib/libfdt -I$(srctree)/lib" \
diff --git a/scripts/dtc/pylibfdt/Makefile b/scripts/dtc/pylibfdt/Makefile
index 01d5e0ffe3..2b2dfe0bd9 100644
--- a/scripts/dtc/pylibfdt/Makefile
+++ b/scripts/dtc/pylibfdt/Makefile
@@ -15,6 +15,8 @@ PYLIBFDT_srcs = $(addprefix $(LIBFDT_srcdir)/,$(LIBFDT_SRCS)) \
quiet_cmd_pymod = PYMOD $@
cmd_pymod = unset CC; unset CROSS_COMPILE; unset CFLAGS;\
+ CC="$(HOSTCC)" \
+ LDSHARED="$(HOSTLDSHARED)" \
LDFLAGS="$(HOSTLDFLAGS)" \
VERSION="u-boot-$(UBOOTVERSION)" \
CPPFLAGS="$(HOSTCFLAGS) -I$(LIBFDT_srcdir)" OBJDIR=$(obj) \
--
2.11.0

4
recipes-bsp/u-boot/u-boot_2017.11.bb → recipes-bsp/u-boot/u-boot_2018.03.bb
View File

@ -21,9 +21,9 @@ SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
file://boot.cmd \
"
SRCREV = "c253573f3e269fd9a24ee6684d87dd91106018a5"
SRCREV = "f95ab1fb6e37f0601f397091bb011edf7a98b890"
PV = "v2017.11+git${SRCPV}"
PV = "v2018.03+git${SRCPV}"
PE = "2"
S = "${WORKDIR}/git"

5
recipes-kernel/linux/linux-mainline/aarch64/defconfig
View File

@ -431,6 +431,11 @@ CONFIG_USB_QCOM_8X16_PHY=y
CONFIG_USB_ULPI=y
CONFIG_USB_GADGET=y
CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_MUSB_HDRC=y
# Restrict to host mode, as it is hard-coded that way in the device tree
# (dr_mode = "host" in the &usb_otg node)
CONFIG_USB_MUSB_HOST=y
CONFIG_USB_MUSB_SUNXI=y
CONFIG_MMC=y
CONFIG_MMC_BLOCK_MINORS=32
CONFIG_MMC_ARMMMCI=y