[LEDE-DEV] [PATCHv2] ipq806x: add support for ZyXEL NBG6817

John Crispin john at phrozen.org
Mon Oct 17 23:22:11 PDT 2016


Hi André,

few comments inline

On 17/10/2016 21:22, André Valentin wrote:
> CPU: 1.8GHz ARM, RAM: 512MB
> Storage: 4MiB Serial Flash, 3.9GiB MMC
> NIC: 2x1GBit/s, 5 external and 2 internal Port Switch
> WiFi: Dualband, ATH10k 2.4GHz, 5GHz MU-MIMO
> 
> Changes:
> -remove kernel compression changes
> -give spi-nor.c patch a correct name
> 
> Signed-off-by: André Valentin <avalentin at marcant.net>
> ---
>  .../linux/ipq806x/base-files/etc/board.d/01_leds   |   5 +
>  .../ipq806x/base-files/etc/board.d/02_network      |   4 +
>  .../etc/hotplug.d/firmware/11-ath10k-caldata       |   6 +
>  target/linux/ipq806x/base-files/lib/ipq806x.sh     |   3 +
>  .../base-files/lib/preinit/04_set_mtd_ipq806x.sh   |  21 ++
>  .../lib/preinit/05_set_iface_mac_ipq806x.sh        |  21 ++
>  .../ipq806x/base-files/lib/upgrade/platform.sh     |   2 +
>  target/linux/ipq806x/config-4.4                    |  18 +-
>  .../arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts     | 338 +++++++++++++++++++++
>  target/linux/ipq806x/image/Makefile                |  26 +-
>  .../linux/ipq806x/patches-4.4/800-devicetree.patch |   3 +-
>  .../patches-4.4/999-add-spi-nor-mx25u3235f.patch   |  10 +
>  12 files changed, 449 insertions(+), 8 deletions(-)
>  create mode 100644 target/linux/ipq806x/base-files/lib/preinit/04_set_mtd_ipq806x.sh
>  create mode 100644 target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
>  create mode 100644 target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
>  create mode 100644 target/linux/ipq806x/patches-4.4/999-add-spi-nor-mx25u3235f.patch
> 
> diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds
> index a7ace1f..33774e8 100755
> --- a/target/linux/ipq806x/base-files/etc/board.d/01_leds
> +++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds
> @@ -33,6 +33,11 @@ ea8500)
>  	ucidef_set_led_wlan "wifi" "WIFI" "ea8500:green:wifi" "phy0radio"
>  	ucidef_set_led_default "wps" "WPS" "ea8500:green:wps" "0"
>  	;;
> +nbg6817)
> +	ucidef_set_led_wlan "wifi" "WIFI" "${board}:white:wifi" "phy0radio"
> +	ucidef_set_led_wlan "wifi5g" "WIFI5G" "${board}:white:wifi5g" "phy1radio"
> +	ucidef_set_led_netdev "wan" "WAN" "${board}:white:internet" "eth0"
> +	;;

you can drop the brackets around $board

alphabetical ordering is wrong here

>  *)
>  	;;
>  esac
> diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
> index b720455..9168ae7 100755
> --- a/target/linux/ipq806x/base-files/etc/board.d/02_network
> +++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
> @@ -35,6 +35,10 @@ ea8500)
>  	ucidef_set_interface_macaddr "lan" "$hw_mac_addr"
>  	ucidef_set_interface_macaddr "wan" "$hw_mac_addr"
>  	;;
> +nbg6817)
> +	ucidef_add_switch "switch0" \
> +		"1:lan" "2:lan" "3:lan" "4:lan" "6 at eth1" "5:wan" "0 at eth0"
> +	;;

alphabetical ordering is wrong here

>  *)
>  	echo "Unsupported hardware. Network interfaces not intialized"
>  	;;
> diff --git a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
> index c7977e6..0a9004f 100644
> --- a/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
> +++ b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
> @@ -60,6 +60,9 @@ case "$FIRMWARE" in
>           r7800)
>  		ath10kcal_extract "art" 4096 12064
>  		;;
> +         nbg6817)
> +		ath10kcal_extract "0:ART" 4096 12064
> +		;;

alphabetical ordering is wrong here

>  	esac
>  	;;
>  "ath10k/cal-pci-0001:01:00.0.bin")
> @@ -76,6 +79,9 @@ case "$FIRMWARE" in
>          r7800)
>  		ath10kcal_extract "art" 20480 12064
>  		;;
> +         nbg6817)
> +		ath10kcal_extract "0:ART" 20480 12064
> +		;;

alphabetical ordering is wrong here

>  	esac
>  	;;
>  *)
> diff --git a/target/linux/ipq806x/base-files/lib/ipq806x.sh b/target/linux/ipq806x/base-files/lib/ipq806x.sh
> index ea45381..8f3718c 100644
> --- a/target/linux/ipq806x/base-files/lib/ipq806x.sh
> +++ b/target/linux/ipq806x/base-files/lib/ipq806x.sh
> @@ -38,6 +38,9 @@ ipq806x_board_detect() {
>  	*"R7800")
>  		name="r7800"
>  		;;
> +	*"NBG6817")
> +		name="nbg6817"
> +		;;

alphabetical ordering is wrong here

>  	esac
>  
>  	[ -z "$name" ] && name="unknown"
> diff --git a/target/linux/ipq806x/base-files/lib/preinit/04_set_mtd_ipq806x.sh b/target/linux/ipq806x/base-files/lib/preinit/04_set_mtd_ipq806x.sh
> new file mode 100644
> index 0000000..024cd81
> --- /dev/null
> +++ b/target/linux/ipq806x/base-files/lib/preinit/04_set_mtd_ipq806x.sh
> @@ -0,0 +1,21 @@
> +#
> +# Copyright (C) 2009 OpenWrt.org
> +#
> +
> +. /lib/ipq806x.sh
> +. /lib/functions/system.sh
> +
> +preinit_assign_mtd2block() {
> +	case $(ipq806x_board_name) in
> +		nbg6817)
> +			echo "/dev/mmcblk0p2,64KiB,romd" > /sys/module/block2mtd/parameters/block2mtd
> +			echo "/dev/mmcblk0p3,64KiB,header" > /sys/module/block2mtd/parameters/block2mtd
> +			echo "/dev/mmcblk0p4,64KiB,kernel" > /sys/module/block2mtd/parameters/block2mtd
> +			echo "/dev/mmcblk0p6,64KiB,header_1" > /sys/module/block2mtd/parameters/block2mtd
> +			echo "/dev/mmcblk0p7,64KiB,kernel_1" > /sys/module/block2mtd/parameters/block2mtd
> +			echo "/dev/mmcblk0p8,64KiB,rootfs_1" > /sys/module/block2mtd/parameters/block2mtd
> +			;;
> +	esac
> +}
> +

can this not go into the commandline inside the devicetree ?


> +boot_hook_add preinit_main preinit_assign_mtd2block
> diff --git a/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh b/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
> new file mode 100644
> index 0000000..b8246ab
> --- /dev/null
> +++ b/target/linux/ipq806x/base-files/lib/preinit/05_set_iface_mac_ipq806x.sh
> @@ -0,0 +1,21 @@
> +#
> +# Copyright (C) 2009 OpenWrt.org
> +#
> +
> +. /lib/ipq806x.sh
> +. /lib/functions/system.sh
> +
> +preinit_set_mac_address() {
> +	case $(ipq806x_board_name) in
> +		nbg6817)
> +			mac_lan=$(dd if=/dev/mtdblock9 bs=1 skip=4 count=65532 2>/dev/null | tr \\0 \\n | grep ^ethaddr= | cut -d= -f2)
> +			[ -n "$mac_lan" ] && {
> +				ifconfig eth0 hw ether "$mac_lan"
> +				mac_wan=$(macaddr_add "$mac_lan" 1)
> +				ifconfig eth1 hw ether "$mac_wan"
> +			}
> +			;;
> +	esac
> +}

please set this inside
target/linux/ipq806x/base-files/etc/board.d/02_network   you can find an
example of how to set the mac inside
target/linux/ramips/base-files/etc/board.d/02_network

> +
> +boot_hook_add preinit_main preinit_set_mac_address
> diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
> index 8768930..dd0cb15 100644
> --- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
> +++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
> @@ -9,6 +9,7 @@ platform_check_image() {
>  	ap148 |\
>  	d7800 |\
>  	ea8500 |\
> +	nbg6817 |\
>  	r7500 |\
>  	r7500v2 |\
>  	r7800)
> @@ -34,6 +35,7 @@ platform_pre_upgrade() {
>  	case "$board" in
>  	ap148 |\
>  	d7800 |\
> +	nbg6817 |\
>  	r7500 |\
>  	r7500v2 |\
>  	r7800)
> diff --git a/target/linux/ipq806x/config-4.4 b/target/linux/ipq806x/config-4.4
> index bc04049..c27a827 100644
> --- a/target/linux/ipq806x/config-4.4
> +++ b/target/linux/ipq806x/config-4.4
> @@ -262,6 +257,16 @@ CONFIG_MFD_SYSCON=y
>  CONFIG_MIGHT_HAVE_CACHE_L2X0=y
>  CONFIG_MIGHT_HAVE_PCI=y
>  CONFIG_MIGRATION=y
> +CONFIG_MMC=y
> +CONFIG_MMC_ARMMMCI=y
> +CONFIG_MMC_BLOCK=y
> +CONFIG_MMC_BLOCK_MINORS=16
> +CONFIG_MMC_QCOM_DML=y
> +CONFIG_MMC_SDHCI=y
> +CONFIG_MMC_SDHCI_MSM=y
> +# CONFIG_MMC_SDHCI_PCI is not set
> +CONFIG_MMC_SDHCI_PLTFM=y
> +# CONFIG_MMC_TIFM_SD is not set
>  CONFIG_MODULES_TREE_LOOKUP=y
>  CONFIG_MODULES_USE_ELF_REL=y
>  CONFIG_MSM_GCC_8660=y
> @@ -271,6 +276,7 @@ CONFIG_MSM_GCC_8974=y
>  # CONFIG_MSM_LCC_8960 is not set
>  CONFIG_MSM_MMCC_8960=y
>  CONFIG_MSM_MMCC_8974=y
> +CONFIG_MTD_BLOCK2MTD=y
>  CONFIG_MTD_CMDLINE_PARTS=y
>  CONFIG_MTD_M25P80=y
>  CONFIG_MTD_NAND=y
> @@ -378,7 +384,6 @@ CONFIG_QCOM_SCM=y
>  CONFIG_QCOM_SCM_32=y
>  # CONFIG_QCOM_SMD is not set
>  CONFIG_QCOM_SMEM=y
> -# CONFIG_QCOM_SPMI_TEMP_ALARM is not set
>  CONFIG_QCOM_WDT=y
>  CONFIG_RAS=y
>  CONFIG_RATIONAL=y
> @@ -389,6 +394,7 @@ CONFIG_RD_GZIP=y
>  CONFIG_REGMAP=y
>  CONFIG_REGMAP_MMIO=y
>  CONFIG_REGULATOR=y
> +CONFIG_REGULATOR_FIXED_VOLTAGE=y
>  CONFIG_REGULATOR_QCOM_RPM=y
>  # CONFIG_REGULATOR_QCOM_SPMI is not set
>  CONFIG_RESET_CONTROLLER=y
> diff --git a/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
> new file mode 100644
> index 0000000..2e1302d
> --- /dev/null
> +++ b/target/linux/ipq806x/files/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts
> @@ -0,0 +1,338 @@
> +#include "qcom-ipq8065-v1.0.dtsi"
> +
> +#include <dt-bindings/input/input.h>
> +
> +/ {
> +	model = "ZyXEL NBG6817";
> +	compatible = "zyxel,nbg6817", "qcom,ipq8065";
> +
> +	memory at 0 {
> +		reg = <0x42000000 0x1e000000>;
> +		device_type = "memory";
> +	};
> +
> +	reserved-memory {
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +		ranges;
> +		rsvd at 41200000 {
> +			reg = <0x41200000 0x300000>;
> +			no-map;
> +		};
> +	};
> +
> +	aliases {
> +		serial0 = &uart4;
> +		mdio-gpio0 = &mdio0;
> +		sdcc1 = &sdcc1;
> +	};
> +
> +	chosen {
> +		bootargs = "rootfstype=squashfs noinitrd block2mtd.block2mtd=/dev/mmcblk0p5,65536,ubi,5 ubi.mtd=ubi";
> +		linux,stdout-path = "serial0:115200n8";
> +	};
> +
> +	soc {
> +		pinmux at 800000 {
> +			pinctrl-0 = <&mdio0_pins &rgmii2_pins>;
> +			pinctrl-names = "default";
> +
> +			i2c4_pins: i2c4_pinmux {
> +				mux {
> +					pins = "gpio12", "gpio13";
> +					function = "gsbi4";
> +					drive-strength = <12>;
> +					bias-disable;
> +				};
> +			};
> +
> +			mdio0_pins: mdio0_pins {
> +				mux {
> +					pins = "gpio0", "gpio1";
> +					function = "gpio";
> +					drive-strength = <8>;
> +					bias-disable;
> +				};
> +
> +				clk {
> +					pins = "gpio1";
> +					input-disable;
> +				};
> +			};
> +
> +			rgmii2_pins: rgmii2_pins {
> +				mux {
> +					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32",
> +					       "gpio51", "gpio52", "gpio59", "gpio60", "gpio61", "gpio62" ;
> +					function = "rgmii2";
> +					drive-strength = <8>;
> +					bias-disable;
> +				};
> +
> +				tx {
> +					pins = "gpio27", "gpio28", "gpio29", "gpio30", "gpio31", "gpio32" ;
> +					input-disable;
> +				};
> +			};
> +
> +			spi_pins: spi_pins {
> +				mux {
> +					pins = "gpio18", "gpio19", "gpio21";
> +					function = "gsbi5";
> +					drive-strength = <10>;
> +					bias-none;
> +				};
> +
> +				cs {
> +					pins = "gpio20";
> +					drive-strength = <12>;
> +				};
> +			};
> +		};
> +
> +		gsbi at 16300000 {
> +			qcom,mode = <GSBI_PROT_I2C_UART>;
> +			status = "ok";
> +			serial at 16340000 {
> +				status = "ok";
> +			};
> +			/*
> +			 * The i2c device on gsbi4 should not be enabled.
> +			 * On ipq806x designs gsbi4 i2c is meant for exclusive
> +			 * RPM usage. Turning this on in kernel manifests as
> +			 * i2c failure for the RPM.
> +			 */
> +		};
> +
> +		gsbi5: gsbi at 1a200000 {
> +			qcom,mode = <GSBI_PROT_SPI>;
> +			status = "ok";
> +
> +			spi4: spi at 1a280000 {
> +				status = "ok";
> +				spi-max-frequency = <50000000>;
> +				pinctrl-0 = <&spi_pins>;
> +				pinctrl-names = "default";
> +
> +				cs-gpios = <&qcom_pinmux 20 0>;
> +
> +				flash: m25p80 at 0 {
> +					compatible = "s25fl512s";
> +					#address-cells = <1>;
> +					#size-cells = <1>;
> +					spi-max-frequency = <51200000>;
> +					reg = <0>;
> +
> +					linux,part-probe = "qcom-smem";
> +				};
> +			};
> +		};
> +
> +		phy at 100f8800 {		/* USB3 port 1 HS phy */
> +			status = "ok";
> +		};
> +
> +		phy at 100f8830 {		/* USB3 port 1 SS phy */
> +			status = "ok";
> +		};
> +
> +		phy at 110f8800 {		/* USB3 port 0 HS phy */
> +			status = "ok";
> +		};
> +
> +		phy at 110f8830 {		/* USB3 port 0 SS phy */
> +			status = "ok";
> +		};
> +
> +		usb30 at 0 {
> +			status = "ok";
> +		};
> +
> +		usb30 at 1 {
> +			status = "ok";
> +		};
> +
> +		pcie0: pci at 1b500000 {
> +			status = "ok";
> +			reset-gpio = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
> +			pinctrl-0 = <&pcie0_pins>;
> +			pinctrl-names = "default";
> +		};
> +
> +		pcie1: pci at 1b700000 {
> +			status = "ok";
> +			reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
> +			pinctrl-0 = <&pcie1_pins>;
> +			pinctrl-names = "default";
> +		};
> +
> +		mdio0: mdio {
> +			compatible = "virtual,mdio-gpio";
> +			#address-cells = <1>;
> +			#size-cells = <0>;
> +			gpios = <&qcom_pinmux 1 0 &qcom_pinmux 0 0>;
> +
> +			phy0: ethernet-phy at 0 {
> +				device_type = "ethernet-phy";
> +				reg = <0>;
> +				qca,ar8327-initvals = <
> +					0x00004 0x7600000   /* PAD0_MODE */
> +					0x00008 0x1000000   /* PAD5_MODE */
> +					0x0000c 0x80        /* PAD6_MODE */
> +					0x000e4 0xaa545     /* MAC_POWER_SEL */
> +					0x000e0 0xc74164de  /* SGMII_CTRL */
> +					0x0007c 0x4e        /* PORT0_STATUS */
> +					0x00094 0x4e        /* PORT6_STATUS */
> +					0x00970 0x1e864443  /* QM_PORT0_CTRL0 */
> +					0x00974 0x000001c6  /* QM_PORT0_CTRL1 */
> +					0x00978 0x19008643  /* QM_PORT1_CTRL0 */
> +					0x0097c 0x000001c6  /* QM_PORT1_CTRL1 */
> +					0x00980 0x19008643  /* QM_PORT2_CTRL0 */
> +					0x00984 0x000001c6  /* QM_PORT2_CTRL1 */
> +					0x00988 0x19008643  /* QM_PORT3_CTRL0 */
> +					0x0098c 0x000001c6  /* QM_PORT3_CTRL1 */
> +					0x00990 0x19008643  /* QM_PORT4_CTRL0 */
> +					0x00994 0x000001c6  /* QM_PORT4_CTRL1 */
> +					0x00998 0x1e864443  /* QM_PORT5_CTRL0 */
> +					0x0099c 0x000001c6  /* QM_PORT5_CTRL1 */
> +					0x009a0 0x1e864443  /* QM_PORT6_CTRL0 */
> +					0x009a4 0x000001c6  /* QM_PORT6_CTRL1 */
> +					>;
> +			};
> +
> +			phy4: ethernet-phy at 4 {
> +				device_type = "ethernet-phy";
> +				reg = <4>;
> +				qca,ar8327-initvals = <
> +					0x000e4 0x6a545     /* MAC_POWER_SEL */
> +					0x0000c 0x80        /* PAD6_MODE */
> +					>;
> +			};
> +		};
> +
> +		gmac1: ethernet at 37200000 {
> +			status = "ok";
> +			phy-mode = "rgmii";
> +			qcom,id = <1>;
> +			qcom,phy_mdio_addr = <4>;
> +			qcom,poll_required = <0>;
> +			qcom,rgmii_delay = <1>;
> +			qcom,phy_mii_type = <0>;
> +			qcom,emulation = <0>;
> +			qcom,irq = <255>;
> +			mdiobus = <&mdio0>;
> +
> +			fixed-link {
> +				speed = <1000>;
> +				full-duplex;
> +			};
> +		};
> +
> +		gmac2: ethernet at 37400000 {
> +			status = "ok";
> +			phy-mode = "sgmii";
> +			qcom,id = <2>;
> +			qcom,phy_mdio_addr = <0>;	/* none */
> +			qcom,poll_required = <0>;	/* no polling */
> +			qcom,rgmii_delay = <0>;
> +			qcom,phy_mii_type = <1>;
> +			qcom,emulation = <0>;
> +			qcom,irq = <258>;
> +			mdiobus = <&mdio0>;
> +
> +			fixed-link {
> +				speed = <1000>;
> +				full-duplex;
> +			};
> +		};
> +
> +		rpm at 108000 {
> +			pinctrl-0 = <&i2c4_pins>;
> +			pinctrl-names = "default";
> +		};
> +
> +		amba {
> +			sdcc1: sdcc at 12400000 {
> +				status          = "okay";
> +                                dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
> +                                dma-names = "tx", "rx";
> +			};
> +		};
> +	};
> +
> +	gpio-keys {
> +		compatible = "gpio-keys";
> +		wifi {
> +			label = "wifi";
> +			gpios = <&qcom_pinmux 6 1>;
> +			linux,code = <KEY_WLAN>;
> +		};
> +
> +		reset {
> +			label = "reset";
> +			gpios = <&qcom_pinmux 54 1>;
> +			linux,code = <KEY_RESTART>;
> +		};
> +
> +		wps {
> +			label = "wps";
> +			gpios = <&qcom_pinmux 65 1>;
> +			linux,code = <KEY_WPS_BUTTON>;
> +		};
> +	};
> +
> +	gpio-leds {
> +		compatible = "gpio-leds";
> +		internet {
> +			label = "nbg6817:white:internet";
> +			gpios = <&qcom_pinmux 64 0>;
> +		};
> +
> +		power {
> +			label = "nbg6817:white:power";
> +			gpios = <&qcom_pinmux 9 0>;
> +			default-state = "on";
> +		};
> +
> +		wifi {
> +			label = "nbg6817:white:wifi";
> +			gpios = <&qcom_pinmux 33 0>;
> +		};
> +
> +		wifi5g {
> +			label = "nbg6817:white:wifi5g";
> +			gpios = <&qcom_pinmux 26 0>;
> +		};
> +	};
> +
> +	gpio_export {
> +		compatible = "gpio-export";
> +		#size-cells = <0>;
> +
> +		usb0_status {
> +			gpio-export,name = "usb0";
> +			gpio-export,output = <1>;
> +			gpios = <&qcom_pinmux 15 0>;
> +		};
> +
> +		usb1_status {
> +			gpio-export,name = "usb1";
> +			gpio-export,output = <1>;
> +			gpios = <&qcom_pinmux 16 0>;
> +		};
> +		usb1_power {
> +			gpio-export,name = "usb1_power";
> +			gpio-export,output = <1>;
> +			gpios = <&qcom_pinmux 14 0>;
> +		};
> +		usb2_power {
> +			gpio-export,name = "usb2_power";
> +			gpio-export,output = <1>;
> +			gpios = <&qcom_pinmux 17 0>;
> +		};
> +	};
> +};
> +
> +&adm_dma {
> +	status = "ok";
> +};
> diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
> index 7703a62..4f9a87f 100644
> --- a/target/linux/ipq806x/image/Makefile
> +++ b/target/linux/ipq806x/image/Makefile
> @@ -61,6 +61,18 @@ define Device/UbiFit
>  	IMAGE/nand-sysupgrade.tar := sysupgrade-tar
>  endef
>  
> +define Device/ZyXELImage
> +	PROFILES += $$(DEVICE_NAME)
> +	FILESYSTEMS := squashfs
> +	KERNEL_SUFFIX := -uImage
> +	KERNEL = kernel-bin | append-dtb | uImage none | pad-to $$(KERNEL_SIZE)
> +	KERNEL_NAME := zImage
> +	IMAGES := sysupgrade.tar mmcblk0p5-rootfs.bin mmcblk0p4-kernel.bin
> +	IMAGE/sysupgrade.tar = sysupgrade-tar
> +	IMAGE/mmcblk0p5-rootfs.bin := append-ubi
> +	IMAGE/mmcblk0p4-kernel.bin := append-kernel
> +endef
> +
>  define Device/DniImage
>  	PROFILES += $$(DEVICE_NAME)
>  	FILESYSTEMS := squashfs
> @@ -200,6 +212,18 @@ define Device/R7800
>  	DEVICE_PACKAGES := ath10k-firmware-qca9984
>  endef
>  
> -TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800
> +define Device/NBG6817
> +	DEVICE_DTS := qcom-ipq8065-nbg6817
> +	KERNEL_SIZE := 4194304
> +	BLOCKSIZE := 64k
> +	PAGESIZE := 128
> +	SUBPAGESIZE := 64
> +	BOARD_NAME := nbg6817
> +	DEVICE_TITLE := ZyXEL NBG6817
> +	DEVICE_PACKAGES := ath10k-firmware-qca9984 kmod-fs-ext4
> +	$(call Device/ZyXELImage)
> +endef
> +
> +TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 R7500 R7500v2 R7800 NBG6817
>  
>  $(eval $(call BuildImage))
> diff --git a/target/linux/ipq806x/patches-4.4/800-devicetree.patch b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
> index 85f2534..922dcfc 100644
> --- a/target/linux/ipq806x/patches-4.4/800-devicetree.patch
> +++ b/target/linux/ipq806x/patches-4.4/800-devicetree.patch
> @@ -12,7 +12,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
>  
>  --- a/arch/arm/boot/dts/Makefile
>  +++ b/arch/arm/boot/dts/Makefile
> -@@ -506,7 +506,13 @@ dtb-$(CONFIG_ARCH_QCOM) += \
> +@@ -506,7 +506,14 @@ dtb-$(CONFIG_ARCH_QCOM) += \
>   	qcom-apq8084-ifc6540.dtb \
>   	qcom-apq8084-mtp.dtb \
>   	qcom-ipq8064-ap148.dtb \
> @@ -23,6 +23,7 @@ Signed-off-by: Jonas Gorski <jogo at openwrt.org>
>  +	qcom-ipq8064-r7500.dtb \
>  +	qcom-ipq8064-r7500v2.dtb \
>  +	qcom-ipq8065-r7800.dtb \
> ++	qcom-ipq8065-nbg6817.dtb \

please stick to alphabetical ordering


>   	qcom-msm8660-surf.dtb \
>   	qcom-msm8960-cdp.dtb \
>   	qcom-msm8974-sony-xperia-honami.dtb
> diff --git a/target/linux/ipq806x/patches-4.4/999-add-spi-nor-mx25u3235f.patch b/target/linux/ipq806x/patches-4.4/999-add-spi-nor-mx25u3235f.patch
> new file mode 100644
> index 0000000..45533e1
> --- /dev/null
> +++ b/target/linux/ipq806x/patches-4.4/477-add-spi-nor-mx25u3235f.patch
> @@ -0,0 +1,10 @@
> +--- a/drivers/mtd/spi-nor/spi-nor.c	2016-10-09 00:34:19.206155838 +0200
> ++++ b/drivers/mtd/spi-nor/spi-nor.c	2016-10-09 00:37:11.048495602 +0200
> +@@ -721,6 +721,7 @@ static const struct flash_info spi_nor_i
> + 	{ "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
> + 	{ "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
> + 	{ "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
> ++	{ "mx25u3235f",	 INFO(0xc22536, 0, 64 * 1024, 64, 0) },
> + 	{ "mx25u6435f",  INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
> + 	{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
> + 	{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
> 

please send the patch adding a new mtd id separately

	John




More information about the Lede-dev mailing list