Bump mainline kernel version, fixed #5,#4

This commit is contained in:
imi415 2021-07-08 01:44:57 +08:00
parent 75c0d3832c
commit 464ab98686
Signed by: imi415
GPG Key ID: 17F01E106F9F5E0A
9 changed files with 51 additions and 6 deletions

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
/output
/external_tree/customizations/users.table
/external_tree/customizations/overlay/
/external_tree/customizations/overlay

View File

@ -2,10 +2,14 @@ setenv bootargs console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rootwait
fatload mmc 0 $kernel_addr_r Image
fatload mmc 0 $fdt_addr_r sun50i-a64-pine64-plus.dtb
fatload mmc 0 0x4F000000 overlays/spidev.dtbo
fdt addr ${fdt_addr_r}
fdt resize 8192
fatload mmc 0 0x4F000000 overlays/spidev.dtbo
fdt apply 0x4F000000
fatload mmc 0 0x4F000000 overlays/i2c-pcf8574a.dtbo
fdt apply 0x4F000000
bootefi $kernel_addr_r $fdt_addr_r

View File

@ -0,0 +1,37 @@
/dts-v1/;
/plugin/;
/ {
compatible = "allwinner,sun50i-a64";
fragment@0 {
target = <&pio>;
__overlay__ {
pcf8574a_irq_pins: pcf8574a_irq_pins {
pins = "PC12";
function = "irq";
bias-pull-up;
};
};
};
fragment@1 {
target = <&i2c1>;
__overlay__ {
pcf8574a: pcf8574a@38 {
status = "okay";
compatible = "nxp,pcf8574a";
reg = <0x38>;
#gpio-cells = <2>;
gpio-controller;
pinctrl-names = "default";
pinctrl-0 = <&pcf8574a_irq_pins>;
interrupt-parent = <&pio>;
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <2 12 2>; // PC12, falling edge triggered.
irq-gpios = <&pio 2 12 1>; // GPIO 22, on 40p header.
};
};
};
};

View File

@ -314,6 +314,7 @@ CONFIG_GPIO_XGENE=y
CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_PCA953X_IRQ=y
CONFIG_GPIO_PCF857X=y
CONFIG_GPIO_BD9571MWV=m
CONFIG_GPIO_MAX77620=y
CONFIG_POWER_RESET_BRCMSTB=y

View File

@ -43,6 +43,7 @@ rm -rf "${GENIMAGE_TMP}"
mkdir -p "${BINARIES_DIR}/overlays"
cp "${BINARIES_DIR}/spidev.dtb" "${BINARIES_DIR}/overlays/spidev.dtbo"
cp "${BINARIES_DIR}/i2c-pcf8574a.dtb" "${BINARIES_DIR}/overlays/i2c-pcf8574a.dtbo"
genimage \
--rootpath "${ROOTPATH_TMP}" \

View File

@ -10,5 +10,5 @@ dtoverlay=i2c-pcf8574a,addr=0x38,interrupt=22
dtoverlay=i2c-rtc,ds3231
# Add BME280 sensor
dtoverlay=i2c-bme280,addr=0x76
# dtoverlay=i2c-bme280,addr=0x76

View File

@ -0,0 +1,2 @@
CONFIG_RTC_HCTOSYS=y
CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

View File

@ -27,7 +27,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_system_agent_PATH)/board/iminc/orangepi-pc-system-agent/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.13"
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/orangepi-pc-system-agent/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y

View File

@ -26,13 +26,13 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine
BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine64-a64-plus-system-agent/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.10"
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.12.13"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine64-a64-plus-system-agent/pine64_a64_plus_defconfig"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine64-a64-plus-system-agent/linux.fragment"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64-plus"
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine64-a64-plus-system-agent/overlays/spidev.dts"
BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="$(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine64-a64-plus-system-agent/overlays/spidev.dts $(BR2_EXTERNAL_system_agent_PATH)/board/iminc/pine64-a64-plus-system-agent/overlays/i2c-pcf8574a.dts"
BR2_LINUX_KERNEL_DTB_OVERLAY_SUPPORT=y
BR2_PACKAGE_LINUX_TOOLS_CPUPOWER=y
BR2_PACKAGE_LINUX_TOOLS_GPIO=y