update upstream to scarthgap
This commit is contained in:
parent
2c1613208a
commit
e7bd7e95c6
@ -15,4 +15,4 @@ LAYERVERSION_pinecube-bsp = "2"
|
||||
|
||||
|
||||
LAYERDEPENDS_pinecube-bsp = "core sunxi-bsp"
|
||||
LAYERSERIES_COMPAT_pinecube-bsp = "mickledore"
|
||||
LAYERSERIES_COMPAT_pinecube-bsp = "scarthgap"
|
||||
|
||||
@ -22,8 +22,8 @@ MACHINE_FEATURES = "ext2 rtc serial usbhost vfat wifi"
|
||||
|
||||
# Kernel and device tree
|
||||
PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
|
||||
PREFERRED_VERSION_virtual/kernel = "6.1%"
|
||||
KERNEL_DEVICETREE = "sun8i-s3-pinecube.dtb"
|
||||
PREFERRED_VERSION_virtual/kernel = "6.6%"
|
||||
KERNEL_DEVICETREE = "allwinner/sun8i-s3-pinecube.dtb"
|
||||
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
|
||||
|
||||
# Serial console
|
||||
|
||||
@ -23,11 +23,11 @@ addtask mkimage after do_compile before do_install
|
||||
do_compile[noexec] = "1"
|
||||
|
||||
do_install () {
|
||||
install -D -m 644 ${B}/boot.scr ${D}boot/boot.scr
|
||||
install -D -m 644 ${B}/boot.scr ${D}/boot/boot.scr
|
||||
}
|
||||
|
||||
do_deploy () {
|
||||
install -D -m 644 ${D}boot/boot.scr ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
|
||||
install -D -m 644 ${D}/boot/boot.scr ${DEPLOYDIR}/boot.scr-${MACHINE}-${PV}-${PR}
|
||||
|
||||
cd ${DEPLOYDIR}
|
||||
rm -f boot.scr
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -25,12 +25,12 @@ leds {
|
||||
|
||||
led1 {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -162,6 +162,10 @@ &ac_power_supply {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -207,7 +207,7 @@ &spi0 {
|
||||
flash@0 {
|
||||
#address-cells = <1>;
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -75,6 +75,18 @@ csi1_ep: endpoint {
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -64,6 +64,8 @@ &csi1 {
|
||||
status = "okay";
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -226,3 +226,16 @@ &usbphy {
|
||||
usb0_vbus-supply = <®_vcc5v0>;
|
||||
status = "okay";
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -purN a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts
|
||||
diff -purN a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
--- a/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
+++ b/arch/arm/boot/dts/allwinner/sun8i-s3-pinecube.dts
|
||||
@@ -99,9 +99,13 @@ &i2c0 {
|
||||
status = "okay";
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user