Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ipq40xx: add support for OpenMesh A62 #884

Closed
wants to merge 7 commits into from
Closed

ipq40xx: add support for OpenMesh A62 #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6c9cf97
firmware: ath10k-firmware: update to 2018-04-19
ecsv Apr 19, 2018
bb98dcb
ipq40xx: Remove unused reserved-memory nodes
ecsv Apr 17, 2018
f4a9e7b
ipq40xx: Move reserved-memory DT to qcom-ipq4019.dtsi
ecsv Apr 18, 2018
302a1ed
ipq40xx: fix gpio-hog related boot issues
ecsv Apr 16, 2018
aa8dcea
scripts/om-fwupgradecfg-gen.sh: add support for the A62
ecsv Aug 9, 2017
6a378e8
uboot-envtools: add OpenMesh A62 support
ecsv Aug 9, 2017
40bb14b
ipq40xx: add support for OpenMesh A62
ecsv Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion package/boot/uboot-envtools/files/ipq40xx
View file
Open in desktop
Expand Up @@ -31,7 +31,8 @@ ubootenv_mtdinfo () {
}

case "$board" in
openmesh,a42)
openmesh,a42 |\
openmesh,a62)
ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x10000" "0x10000"
;;
esac
Expand Down
6 changes: 3 additions & 3 deletions package/firmware/ath10k-firmware/Makefile
View file
Open in desktop
Expand Up @@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=ath10k-firmware
PKG_SOURCE_DATE:=2018-02-09
PKG_SOURCE_VERSION:=8f4bafdd400d21a65966004d0ce6e0686ef4d9bc
PKG_MIRROR_HASH:=4f4f0678b9d07c0282f18c69bd63a5e2a2ae015b9ce7298cedb88a60be87ed3a
PKG_SOURCE_DATE:=2018-04-19
PKG_SOURCE_VERSION:=71e50312b54cc972657a7b08c470088447cb9676
PKG_MIRROR_HASH:=726e7bce9917532e3b39ced6a17ca2d4c39fdf4c9bec4a3f8f2ea3e5defa6a54
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
Expand Down
10 changes: 9 additions & 1 deletion scripts/om-fwupgradecfg-gen.sh
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
#

usage() {
echo "Usage: $0 <OM2P|OM5P|OM5PAC|MR600|MR900|MR1750|A60|A42> <out file path> <kernel path> <rootfs path>"
echo "Usage: $0 <OM2P|OM5P|OM5PAC|MR600|MR900|MR1750|A60|A42|A62> <out file path> <kernel path> <rootfs path>"
rm -f $CFG_OUT
exit 1
}
Expand Down Expand Up @@ -44,6 +44,14 @@ case $CE_TYPE in
SIZE_FACTOR=1024
SIZE_FORMAT="0x%08x"
;;
A62)
MAX_PART_SIZE=15552
KERNEL_FLASH_ADDR=0x1a0000
FLASH_BS=65536
MD5_SKIP_BLOCKS=4
SIZE_FACTOR=1024
SIZE_FORMAT="0x%08x"
;;
*)
echo "Error - unsupported ce type: $CE_TYPE"
exit 1
Expand Down
3 changes: 2 additions & 1 deletion target/linux/ipq40xx/base-files/etc/board.d/02_network
View file
Open in desktop
Expand Up @@ -38,7 +38,8 @@ glinet,gl-b1300)
ucidef_add_switch "switch0" \
"0u@eth0" "3:lan" "4:lan"
;;
openmesh,a42)
openmesh,a42 |\
openmesh,a62)
ucidef_set_interfaces_lan_wan "eth1" "eth0"
;;
meraki,mr33 |\
Expand Down
13 changes: 11 additions & 2 deletions target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
View file
Open in desktop
Expand Up @@ -110,6 +110,13 @@ case "$FIRMWARE" in
;;
esac
;;
"ath10k/pre-cal-pci-0000:01:00.0.bin")
case "$board" in
openmesh,a62)
ath10kcal_extract "0:ART" 36864 12064
;;
esac
;;
"ath10k/pre-cal-ahb-a000000.wifi.bin")
case "$board" in
8dev,jalapeno |\
Expand All @@ -135,7 +142,8 @@ case "$FIRMWARE" in
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 0)
;;
compex,wpj428 |\
openmesh,a42)
openmesh,a42 |\
openmesh,a62)
ath10kcal_extract "0:ART" 4096 12064
;;
esac
Expand Down Expand Up @@ -165,7 +173,8 @@ case "$FIRMWARE" in
ath10kcal_patch_mac_crc $(mtd_get_mac_binary dnidata 12)
;;
compex,wpj428 |\
openmesh,a42)
openmesh,a42 |\
openmesh,a62)
ath10kcal_extract "0:ART" 20480 12064
;;
esac
Expand Down
3 changes: 3 additions & 0 deletions target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
View file
Open in desktop
Expand Up @@ -47,6 +47,9 @@ platform_do_upgrade_openmesh() {
openmesh,a42)
primary_kernel_mtd=8
;;
openmesh,a62)
primary_kernel_mtd=10
;;
*)
echo "failed to detect primary kernel mtd partition for board"
return 1
Expand Down
3 changes: 2 additions & 1 deletion target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
View file
Open in desktop
Expand Up @@ -39,7 +39,8 @@ platform_do_upgrade() {
CI_KERNPART="linux"
nand_do_upgrade "$1"
;;
openmesh,a42)
openmesh,a42 |\
openmesh,a62)
PART_NAME="inactive"
platform_do_upgrade_openmesh "$ARGV"
;;
Expand Down
21 changes: 0 additions & 21 deletions target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-a42.dts
View file
Open in desktop
Expand Up @@ -25,27 +25,6 @@
model = "OpenMesh A42";
compatible = "openmesh,a42", "qcom,ipq4019";

reserved-memory {
#address-cells = <0x1>;
#size-cells = <0x1>;
ranges;

tz_apps@87b80000 {
reg = <0x87b80000 0x280000>;
no-map;
};

smem@87e00000 {
reg = <0x87e00000 0x080000>;
no-map;
};

tz@87e80000 {
reg = <0x87e80000 0x180000>;
no-map;
};
};

soc {
mdio@90000 {
status = "okay";
Expand Down
16 changes: 0 additions & 16 deletions target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-ex61x0v2.dtsi
View file
Open in desktop
Expand Up @@ -25,22 +25,6 @@
model = "Netgear EX61X0v2";
compatible = "netgear,ex61x0v2", "qcom,ipq4019";

reserved-memory {
#address-cells = <0x1>;
#size-cells = <0x1>;
ranges;

smem@87e00000 {
reg = <0x87e00000 0x080000>;
no-map;
};

tz@87e80000 {
reg = <0x87e80000 0x180000>;
no-map;
};
};

soc {
mdio@90000 {
status = "okay";
Expand Down
21 changes: 0 additions & 21 deletions target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-fritz4040.dts
View file
Open in desktop
Expand Up @@ -31,27 +31,6 @@
led-upgrade = &flash;
};

reserved-memory {
#address-cells = <0x1>;
#size-cells = <0x1>;
ranges;

tz_apps@87b80000 {
reg = <0x87b80000 0x280000>;
reusable;
};

smem@87e00000 {
reg = <0x87e00000 0x080000>;
no-map;
};

tz@87e80000 {
reg = <0x87e80000 0x180000>;
no-map;
};
};

soc {
mdio@90000 {
status = "okay";
Expand Down
21 changes: 0 additions & 21 deletions target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dts
View file
Open in desktop
Expand Up @@ -25,27 +25,6 @@
model = "8devices Jalapeno";
compatible = "8dev,jalapeno", "qcom,ipq4019";

reserved-memory {
#address-cells = <0x1>;
#size-cells = <0x1>;
ranges;

tz_apps@87b80000 {
reg = <0x87b80000 0x280000>;
no-map;
};

smem@87e00000 {
reg = <0x87e00000 0x080000>;
no-map;
};

tz@87e80000 {
reg = <0x87e80000 0x180000>;
no-map;
};
};

soc {
mdio@90000 {
status = "okay";
Expand Down
16 changes: 0 additions & 16 deletions target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4018-rt-ac58u.dts
View file
Open in desktop
Expand Up @@ -36,22 +36,6 @@
led-upgrade = &power;
};

reserved-memory {
#address-cells = <0x1>;
#size-cells = <0x1>;
ranges;

smem@87e00000 {
reg = <0x87e00000 0x080000>;
no-map;
};

tz@87e80000 {
reg = <0x87e80000 0x180000>;
no-map;
};
};

soc {
mdio@90000 {
status = "okay";
Expand Down