board=$(board_name)
case "$board" in
+asrock,g10 |\
+nec,wg2600hp)
+ ucidef_add_switch "switch0" \
+ "2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "1:wan" "0@eth0"
+ ;;
buffalo,wxr-2533dhp |\
compex,wpq864 |\
netgear,d7800 |\
ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
;;
-nec,wg2600hp)
- ucidef_add_switch "switch0" \
- "2:lan" "3:lan" "4:lan" "5:lan" "6@eth1" "1:wan" "0@eth0"
- ;;
netgear,r7800 |\
tplink,c2600)
ucidef_add_switch "switch0" \
case "$FIRMWARE" in
"ath10k/pre-cal-pci-0000:01:00.0.bin")
case $board in
+ asrock,g10)
+ caldata_extract "0:ART" 0x1000 0x2f20
+ ;;
buffalo,wxr-2533dhp)
caldata_extract "ART" 0x1000 0x2f20
ath10k_patch_mac $(mtd_get_mac_binary ART 0x1e)
;;
"ath10k/pre-cal-pci-0001:01:00.0.bin")
case $board in
+ asrock,g10)
+ caldata_extract "0:ART" 0x5000 0x2f20
+ ;;
buffalo,wxr-2533dhp)
caldata_extract "ART" 0x5000 0x2f20
ath10k_patch_mac $(mtd_get_mac_binary ART 0x18)
START=99
+. /lib/upgrade/asrock.sh
+
boot() {
case $(board_name) in
+ asrock,g10)
+ asrock_bootconfig_mangle "bootcheck"
+ if [ $? -eq 0 ]; then
+ reboot
+ fi
+ ;;
edgecore,ecw5410)
fw_setenv bootcount 0
;;
--- /dev/null
+. /lib/functions.sh
+
+preinit_set_mac_address() {
+ case $(board_name) in
+ asrock,g10)
+ lan_mac=$(mtd_get_mac_ascii hwconfig HW.LAN.MAC.Address)
+ wan_mac=$(mtd_get_mac_ascii hwconfig HW.WAN.MAC.Address)
+ ip link set dev eth0 address "${lan_mac}"
+ ip link set dev eth1 address "${wan_mac}"
+ ;;
+ esac
+}
+
+boot_hook_add preinit_main preinit_set_mac_address
--- /dev/null
+. /lib/functions.sh
+
+
+asrock_bootconfig_mangle() {
+ local mtdnum="$( find_mtd_index 0:BOOTCONFIG )"
+
+ if [ -z "$mtdnum" ]; then
+ echo "cannot find bootconfig mtd partition"
+ return 1
+ fi
+ dd if=/dev/mtd$mtdnum of=/tmp/mtd$mtdnum bs=1k
+
+ local partition_byte="$(dd if=/tmp/mtd$mtdnum bs=1 skip=52 count=1)"
+ local upgrade_byte="$(dd if=/tmp/mtd$mtdnum bs=1 skip=4 count=1)"
+
+ if [ $1 = "bootcheck" ]; then
+ if [ ! -s $upgrade_byte ]; then
+ dd if=/dev/mtd$mtdnum of=/tmp/mtd$mtdnum bs=1k
+ printf '\x00' | dd of=/tmp/mtd$mtdnum conv=notrunc bs=1 seek=4
+ printf '\x00' | dd of=/tmp/mtd$mtdnum conv=notrunc bs=1 seek=56
+ else
+ return 1
+ fi
+ elif [ $1 = "sysupgrade" ]; then
+ printf '\x01' | dd of=/tmp/mtd$mtdnum conv=notrunc bs=1 seek=4
+ printf '\x01' | dd of=/tmp/mtd$mtdnum conv=notrunc bs=1 seek=56
+ fi
+
+ if [ -s $partition_byte ]; then
+ printf '\x01' | dd of=/tmp/mtd$mtdnum conv=notrunc bs=1 seek=52
+ else
+ printf '\x00' | dd of=/tmp/mtd$mtdnum conv=notrunc bs=1 seek=52
+ fi
+
+ mtd write /tmp/mtd$mtdnum /dev/mtd$mtdnum
+ return 0
+}
+
+asrock_upgrade_prepare() {
+ local ubidev="$( nand_find_ubi ubi )"
+
+ #Set upgrade flag. If something goes wrong, router will boot with
+ #factory firmware.
+ asrock_bootconfig_mangle 'sysupgrade'
+
+ if [ $? -ne 0 ]; then
+ echo "cannot find bootconfig mtd partition"
+ exit 1
+ fi
+
+ # Just delete these partitions if present and use
+ # OpenWrt's standard names for those.
+ ubirmvol /dev/$ubidev -N ubi_rootfs &> /dev/null || true
+ ubirmvol /dev/$ubidev -N ubi_rootfs_data &> /dev/null || true
+}
platform_do_upgrade() {
case "$(board_name)" in
+ asrock,g10)
+ asrock_upgrade_prepare
+ nand_do_upgrade "$1"
+ ;;
buffalo,wxr-2533dhp)
buffalo_upgrade_prepare_ubi
CI_ROOTPART="ubi_rootfs"
--- /dev/null
+#!/bin/sh
+
+. /lib/upgrade/asrock.sh
+
+case $(board_name) in
+asrock,g10)
+ asrock_bootconfig_mangle "factory"
+ if [ $? -eq 0 ]; then
+ reboot
+ fi
+ ;;
+*)
+ echo "Unsupported hardware."
+ ;;
+esac
+
CONFIG_CLKDEV_LOOKUP=y
CONFIG_CLKSRC_QCOM=y
CONFIG_CLONE_BACKWARDS=y
+CONFIG_CMDLINE_OVERRIDE=y
CONFIG_COMMON_CLK=y
CONFIG_COMMON_CLK_QCOM=y
CONFIG_COMPAT_32BIT_TIME=y
--- /dev/null
+// SPDX-License-Identifier: GPL-2.0
+#include "qcom-ipq8064-v2.0.dtsi"
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+ compatible = "asrock,g10", "qcom,ipq8064";
+ model = "ASRock G10";
+
+ aliases {
+ ethernet0 = &gmac1;
+ ethernet1 = &gmac0;
+
+ led-boot = &led_status_blue;
+ led-failsafe = &led_status_amber;
+ led-running = &led_status_blue;
+ led-upgrade = &led_status_amber;
+ };
+
+ chosen {
+ bootargs-override = "console=ttyMSM0,115200n8";
+ };
+
+ leds {
+ compatible = "gpio-leds";
+
+ pinctrl-0 = <&led_pins>;
+ pinctrl-names = "default";
+
+ /*
+ * this is a bit misleading. Because there are about seven
+ * multicolor LEDs connected all wired together in parallel.
+ */
+
+ status_yellow {
+ label = "yellow:status";
+ gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
+ };
+
+ led_status_amber: status_amber {
+ label = "amber:status";
+ gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
+ };
+
+ led_status_blue: status_blue {
+ label = "blue:status";
+ gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
+ };
+
+ /*
+ * LED is declared in vendors boardfile but it's not
+ * working and the manual doesn't mention anything
+ * about the LED being white.
+
+ status_white {
+ label = "white:status";
+ gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
+ };
+ */
+ };
+
+ i2c-gpio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ compatible = "i2c-gpio";
+ gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>, /* sda */
+ <&qcom_pinmux 54 GPIO_ACTIVE_HIGH>; /* scl */
+ i2c-gpio,delay-us = <5>;
+ i2c-gpio,scl-output-only;
+
+ mcu@50 {
+ reg = <0x50>;
+ compatible = "sonix,sn8f25e21";
+ };
+ };
+
+ keys {
+ compatible = "gpio-keys";
+
+ pinctrl-0 = <&button_pins>;
+ pinctrl-names = "default";
+
+ ir-remote {
+ label = "ir-remote";
+ gpios = <&qcom_pinmux 15 GPIO_ACTIVE_LOW>;
+ linux,code = <BTN_0>;
+ };
+
+ reset {
+ label = "reset";
+ gpios = <&qcom_pinmux 16 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_RESTART>;
+ };
+
+ wps5g {
+ label = "wps5g";
+ gpios = <&qcom_pinmux 64 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WPS_BUTTON>;
+ };
+
+ wps2g {
+ label = "wps2g";
+ gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
+ linux,code = <KEY_WPS_BUTTON>;
+ };
+ };
+};
+
+&adm_dma {
+ status = "okay";
+};
+
+&gmac1 {
+ status = "okay";
+
+ pinctrl-0 = <&rgmii2_pins>;
+ pinctrl-names = "default";
+
+ phy-mode = "rgmii";
+ qcom,id = <1>;
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
+
+&gmac2 {
+ status = "okay";
+
+ phy-mode = "sgmii";
+ qcom,id = <2>;
+
+ fixed-link {
+ speed = <1000>;
+ full-duplex;
+ };
+};
+
+&gsbi4_serial {
+ pinctrl-0 = <&uart0_pins>;
+ pinctrl-names = "default";
+};
+
+&mdio0 {
+ status = "okay";
+
+ pinctrl-0 = <&mdio0_pins>;
+ pinctrl-names = "default";
+
+ ethernet-phy@0 {
+ reg = <0>;
+ qca,ar8327-initvals = <
+ 0x00004 0x7600000 /* PAD0_MODE */
+ 0x00008 0x1000000 /* PAD5_MODE */
+ 0x0000c 0x80 /* PAD6_MODE */
+ 0x000e4 0x6a545 /* MAC_POWER_SEL */
+ 0x000e0 0xc74164de /* SGMII_CTRL */
+ 0x0007c 0x4e /* PORT0_STATUS */
+ 0x00094 0x4e /* PORT6_STATUS */
+ >;
+ };
+};
+
+&nand_controller {
+ status = "okay";
+
+ pinctrl-0 = <&nand_pins>;
+ pinctrl-names = "default";
+
+ nand@0 {
+ reg = <0>;
+ compatible = "qcom,nandcs";
+
+ nand-ecc-strength = <4>;
+ nand-bus-width = <8>;
+ nand-ecc-step-size = <512>;
+
+ partitions {
+ compatible = "qcom,smem";
+ };
+ };
+};
+
+&pcie0 {
+ status = "okay";
+};
+
+&pcie1 {
+ status = "okay";
+};
+
+&qcom_pinmux {
+ led_pins: led_pins {
+ mux {
+ pins = "gpio7", "gpio8", "gpio9", "gpio26";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+
+ button_pins: button_pins {
+ mux {
+ pins = "gpio15", "gpio16", "gpio64", "gpio65";
+ function = "gpio";
+ drive-strength = <2>;
+ bias-pull-up;
+ };
+ };
+
+ uart0_pins: uart0_pins {
+ mux {
+ pins = "gpio10", "gpio11";
+ function = "gsbi4";
+ drive-strength = <10>;
+ bias-disable;
+ };
+ };
+};
+
+&rpm {
+ pinctrl-0 = <&i2c4_pins>;
+ pinctrl-names = "default";
+};
+
+&usb3_0 {
+ status = "okay";
+};
+
+&usb3_1 {
+ status = "okay";
+};
+
+&tcsr {
+ qcom,usb-ctrl-select = <TCSR_USB_SELECT_USB3_DUAL>;
+};
+
+/delete-node/ &pcie2_pins;
+/delete-node/ &pcie2;
) >> $@
endef
+define Build/edimax-header
+ $(eval edimax_model=$(word 1,$(1)))
+
+ $(STAGING_DIR_HOST)/bin/mkedimaximg \
+ -b -s CSYS -m $(edimax_model) \
+ -f 0x70000 -S 0x1200000 \
+ -i $@ -o $@.new
+ @mv $@.new $@
+endef
+
define Device/Default
PROFILES := Default
KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata
endef
+define Device/asrock_g10
+ $(call Device/FitImage)
+ $(call Device/UbiFit)
+ SOC := qcom-ipq8064
+ DEVICE_VENDOR := ASRock
+ DEVICE_MODEL := G10
+ BLOCKSIZE := 128k
+ PAGESIZE := 2048
+ KERNEL_SIZE := 5332k
+ DEVICE_PACKAGES := kmod-i2c-gpio ath10k-firmware-qca99x0-ct
+ IMAGE/nand-factory.bin := append-ubi | edimax-header RN67
+endef
+TARGET_DEVICES += asrock_g10
+
define Device/buffalo_wxr-2533dhp
$(call Device/LegacyImage)
SOC := qcom-ipq8064
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -843,6 +843,20 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -843,6 +843,21 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-ipq4019-ap.dk07.1-c1.dtb \
qcom-ipq4019-ap.dk07.1-c2.dtb \
qcom-ipq8064-ap148.dtb \
+ qcom-ipq8064-ap161.dtb \
+ qcom-ipq8064-ea7500-v1.dtb \
+ qcom-ipq8064-ea8500.dtb \
++ qcom-ipq8064-g10.dtb \
+ qcom-ipq8064-r7500.dtb \
+ qcom-ipq8064-r7500v2.dtb \
+ qcom-ipq8064-wg2600hp.dtb \
--- /dev/null
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -1836,6 +1836,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
+ Only command line ATAG will be processed, the rest of the ATAGs
+ sent by bootloader will be ignored.
+
++config CMDLINE_OVERRIDE
++ bool "Use alternative cmdline from device tree"
++ help
++ Some bootloaders may have uneditable bootargs. While CMDLINE_FORCE can
++ be used, this is not a good option for kernels that are shared across
++ devices. This setting enables using "chosen/cmdline-override" as the
++ cmdline if it exists in the device tree.
++
+ endchoice
+
+ config CMDLINE
+--- a/drivers/of/fdt.c
++++ b/drivers/of/fdt.c
+@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns
+ if (p != NULL && l > 0)
+ strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
+
++ /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
++ * device tree option of chosen/bootargs-override. This is
++ * helpful on boards where u-boot sets bootargs, and is unable
++ * to be modified.
++ */
++#ifdef CONFIG_CMDLINE_OVERRIDE
++ p = of_get_flat_dt_prop(node, "bootargs-override", &l);
++ if (p != NULL && l > 0)
++ strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));
++#endif
++
+ /*
+ * CONFIG_CMDLINE is meant to be a default in case nothing else
+ * managed to set the command line, unless CONFIG_CMDLINE_FORCE
+ if (p != NULL && l > 0)
+ strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
- /*
- * CONFIG_CMDLINE is meant to be a default in case nothing else
+ /* CONFIG_CMDLINE_OVERRIDE is used to fallback to a different
+ * device tree option of chosen/bootargs-override. This is
projects / openwrt / staging / dangole.git / commitdiff